fix: typename reset

Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/submit-iceberg
feat(trading): view iceberg orders (#4207 )
2023-07-17 15:43:38 +02:00 · 2023-07-17 15:15:03 +02:00 · 2023-07-17 13:04:03 +00:00 · 2023-07-17 14:36:37 +02:00 · 2023-07-17 14:35:36 +02:00 · 2023-07-17 14:26:05 +02:00
166 changed files with 3314 additions and 1622 deletions
@@ -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,39 @@ 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
+          echo IS_S3_RELASE=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: Is S3 Release
+        if: ${{ env.IS_IPFS_RELASE == 'false' && github.event_name == 'push' }}
+        run: |
+          echo IS_S3_RELASE=true >> $GITHUB_ENV
+
      - name: Set up QEMU
        id: quemu
        uses: docker/setup-qemu-action@v2
@@ -33,7 +66,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 +75,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 +102,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 +118,7 @@ jobs:
              envName="mainnet"
              bucketName="ui.vega.rocks"
            fi
-          elif [[ "${{ github.ref }}" =~ .*main$ ]]; then
+          elif [[ "${{ github.ref }}" =~ .*mainnet$ ]]; then
            envName="mainnet"
          fi

@@ -145,7 +178,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 +193,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 +208,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 +218,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 +245,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_S3_RELASE == 'true' }}
        with:
          args: --acl private --follow-symlinks --delete
        env:
@@ -229,11 +262,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_S3_RELASE == 'true' }}
        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_S3_RELASE == 'true' }}
        env:
          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -246,16 +279,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 +301,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 +316,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 +325,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 +347,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
@@ -0,0 +1,13 @@
+# App configuration variables
+NX_TENDERMINT_URL=https://be.mainnet-mirror.vega.rocks
+NX_TENDERMINT_WEBSOCKET_URL=wss://be.mainnet-mirror.vega.rocks/websocket
+NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996
+NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/mainnet-mirror/vegawallet-mainnet-mirror.toml
+NX_VEGA_URL=https://api.mainnet-mirror.vega.rocks/graphql
+NX_VEGA_ENV=MAINNET-MIRROR
+NX_BLOCK_EXPLORER=https://be.mainnet-mirror.vega.rocks/rest
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io
+NX_VEGA_GOVERNANCE_URL=https://governance.mainnet-mirror.vega.rocks
+NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
+NX_VEGA_EXPLORER_URL=https://explorer.mainnet-mirror.vega.rocks/
+NX_VEGA_CONSOLE_URL=https://console.mainnet-mirror.vega.rocks
@@ -32,6 +32,7 @@ yarn nx serve explorer
 Example configurations are provided here:

 - [Mainnet](./.env.mainnet)
+- [Mainnet-mirror](./.env.mainnet-mirror)
 - [Devnet](./.env.devnet)
 - [Capsule](./.env.capsule)
 - [Testnet](./.env.testnet)
@@ -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);
                });
@@ -0,0 +1,15 @@
+# App configuration variables
+NX_VEGA_ENV=MAINNET-MIRROR
+NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/mainnet-mirror/vegawallet-mainnet-mirror.toml
+NX_VEGA_URL=https://api.mainnet-mirror.vega.rocks/graphql
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.vega.xyz","MAINNET-MIRROR":"https://governance.mainnet-mirror.vega.rocks","STAGNET1":"https://trading.stagnet1.vega.rocks"}'
+NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io
+NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
+NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996
+NX_VEGA_EXPLORER_URL=https://explorer.mainnet-mirror.vega.rocks
+NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
+NX_DELEGATIONS_PAGINATION=50
+NX_TRANCHES_SERVICE_URL=https://tranches-mainnet-mirror-k8s.ops.vega.xyz
+NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
+NX_VEGA_REST_URL=https://api.mainnet-mirror.vega.rocks/api/v2/
@@ -25,6 +25,7 @@ yarn nx serve governance
 Example configurations are provided here:

 - [Mainnet](./.env.mainnet)
+- [Mainnet-mirror](./.env.mainnet-mirror)
 - [Devnet](./.env.devnet)
 - [Testnet](./.env.testnet)

@@ -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: '',
@@ -91,46 +91,46 @@ query Proposal($proposalId: ID!) {
                  }
                }
              }
-              dataSourceSpecForTradingTermination {
-                sourceType {
-                  ... on DataSourceDefinitionInternal {
-                    sourceType {
-                      ... on DataSourceSpecConfigurationTime {
-                        conditions {
-                          operator
-                          value
-                        }
-                      }
-                    }
-                  }
-                  ... on DataSourceDefinitionExternal {
-                    sourceType {
-                      ... on DataSourceSpecConfiguration {
-                        signers {
-                          signer {
-                            ... on PubKey {
-                              key
-                            }
-                            ... on ETHAddress {
-                              address
-                            }
-                          }
-                        }
-                        filters {
-                          key {
-                            name
-                            type
-                          }
-                          conditions {
-                            operator
-                            value
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
+              # dataSourceSpecForTradingTermination {
+              #   sourceType {
+              #     ... on DataSourceDefinitionInternal {
+              #       sourceType {
+              #         ... on DataSourceSpecConfigurationTime {
+              #           conditions {
+              #             operator
+              #             value
+              #           }
+              #         }
+              #       }
+              #     }
+              #     ... on DataSourceDefinitionExternal {
+              #       sourceType {
+              #         ... on DataSourceSpecConfiguration {
+              #           signers {
+              #             signer {
+              #               ... on PubKey {
+              #                 key
+              #               }
+              #               ... on ETHAddress {
+              #                 address
+              #               }
+              #             }
+              #           }
+              #           filters {
+              #             key {
+              #               name
+              #               type
+              #             }
+              #             conditions {
+              #               operator
+              #               value
+              #             }
+              #           }
+              #         }
+              #       }
+              #     }
+              #   }
+              # }
              dataSourceSpecBinding {
                settlementDataProperty
                tradingTerminationProperty
@@ -203,46 +203,46 @@ query Proposal($proposalId: ID!) {
                    }
                  }
                }
-                dataSourceSpecForTradingTermination {
-                  sourceType {
-                    ... on DataSourceDefinitionInternal {
-                      sourceType {
-                        ... on DataSourceSpecConfigurationTime {
-                          conditions {
-                            operator
-                            value
-                          }
-                        }
-                      }
-                    }
-                    ... on DataSourceDefinitionExternal {
-                      sourceType {
-                        ... on DataSourceSpecConfiguration {
-                          signers {
-                            signer {
-                              ... on PubKey {
-                                key
-                              }
-                              ... on ETHAddress {
-                                address
-                              }
-                            }
-                          }
-                          filters {
-                            key {
-                              name
-                              type
-                            }
-                            conditions {
-                              operator
-                              value
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
+                # dataSourceSpecForTradingTermination {
+                #   sourceType {
+                #     ... on DataSourceDefinitionInternal {
+                #       sourceType {
+                #         ... on DataSourceSpecConfigurationTime {
+                #           conditions {
+                #             operator
+                #             value
+                #           }
+                #         }
+                #       }
+                #     }
+                #     ... on DataSourceDefinitionExternal {
+                #       sourceType {
+                #         ... on DataSourceSpecConfiguration {
+                #           signers {
+                #             signer {
+                #               ... on PubKey {
+                #                 key
+                #               }
+                #               ... on ETHAddress {
+                #                 address
+                #               }
+                #             }
+                #           }
+                #           filters {
+                #             key {
+                #               name
+                #               type
+                #             }
+                #             conditions {
+                #               operator
+                #               value
+                #             }
+                #           }
+                #         }
+                #       }
+                #     }
+                #   }
+                # }
                dataSourceSpecBinding {
                  settlementDataProperty
                  tradingTerminationProperty
@@ -3,12 +3,12 @@ import * as Types from '@vegaprotocol/types';
 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
-export type ProposalFieldsFragment = { __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, datetime: any, rejectionReason?: Types.ProposalRejectionReason | null, errorDetails?: string | null, rationale: { __typename?: 'ProposalRationale', title: string, description: string }, party: { __typename?: 'Party', id: string }, terms: { __typename?: 'ProposalTerms', closingDatetime: any, enactmentDatetime?: any | null, change: { __typename: 'NewAsset', name: string, symbol: string, decimals: number, quantum: string, source: { __typename?: 'BuiltinAsset', maxFaucetAmountMint: string } | { __typename?: 'ERC20', contractAddress: string, withdrawThreshold: string, lifetimeLimit: string } } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', instrument: { __typename?: 'InstrumentConfiguration', name: string, code: string, futureProduct?: { __typename?: 'FutureProduct', settlementAsset: { __typename?: 'Asset', symbol: string } } | null } } | { __typename?: 'UpdateAsset', quantum: string, assetId: string, source: { __typename?: 'UpdateERC20', lifetimeLimit: string, withdrawThreshold: string } } | { __typename?: 'UpdateMarket', marketId: string } | { __typename?: 'UpdateNetworkParameter', networkParameter: { __typename?: 'NetworkParameter', key: string, value: string } } }, votes: { __typename?: 'ProposalVotes', yes: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string }, no: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string } } };
+export type ProposalFieldsFragment = { __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, datetime: any, rejectionReason?: Types.ProposalRejectionReason | null, errorDetails?: string | null, rationale: { __typename?: 'ProposalRationale', title: string, description: string }, party: { __typename?: 'Party', id: string }, terms: { __typename?: 'ProposalTerms', closingDatetime: any, enactmentDatetime?: any | null, change: { __typename?: 'CancelTransfer' } | { __typename: 'NewAsset', name: string, symbol: string, decimals: number, quantum: string, source: { __typename?: 'BuiltinAsset', maxFaucetAmountMint: string } | { __typename?: 'ERC20', contractAddress: string, withdrawThreshold: string, lifetimeLimit: string } } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', instrument: { __typename?: 'InstrumentConfiguration', name: string, code: string, futureProduct?: { __typename?: 'FutureProduct', settlementAsset: { __typename?: 'Asset', symbol: string } } | null } } | { __typename?: 'NewTransfer' } | { __typename?: 'UpdateAsset', quantum: string, assetId: string, source: { __typename?: 'UpdateERC20', lifetimeLimit: string, withdrawThreshold: string } } | { __typename?: 'UpdateMarket', marketId: string } | { __typename?: 'UpdateNetworkParameter', networkParameter: { __typename?: 'NetworkParameter', key: string, value: string } } }, votes: { __typename?: 'ProposalVotes', yes: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string }, no: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string } } };

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


-export type ProposalsQuery = { __typename?: 'Query', proposalsConnection?: { __typename?: 'ProposalsConnection', edges?: Array<{ __typename?: 'ProposalEdge', node: { __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, datetime: any, rejectionReason?: Types.ProposalRejectionReason | null, errorDetails?: string | null, rationale: { __typename?: 'ProposalRationale', title: string, description: string }, party: { __typename?: 'Party', id: string }, terms: { __typename?: 'ProposalTerms', closingDatetime: any, enactmentDatetime?: any | null, change: { __typename: 'NewAsset', name: string, symbol: string, decimals: number, quantum: string, source: { __typename?: 'BuiltinAsset', maxFaucetAmountMint: string } | { __typename?: 'ERC20', contractAddress: string, withdrawThreshold: string, lifetimeLimit: string } } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', instrument: { __typename?: 'InstrumentConfiguration', name: string, code: string, futureProduct?: { __typename?: 'FutureProduct', settlementAsset: { __typename?: 'Asset', symbol: string } } | null } } | { __typename?: 'UpdateAsset', quantum: string, assetId: string, source: { __typename?: 'UpdateERC20', lifetimeLimit: string, withdrawThreshold: string } } | { __typename?: 'UpdateMarket', marketId: string } | { __typename?: 'UpdateNetworkParameter', networkParameter: { __typename?: 'NetworkParameter', key: string, value: string } } }, votes: { __typename?: 'ProposalVotes', yes: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string }, no: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string } } } } | null> | null } | null };
+export type ProposalsQuery = { __typename?: 'Query', proposalsConnection?: { __typename?: 'ProposalsConnection', edges?: Array<{ __typename?: 'ProposalEdge', node: { __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, datetime: any, rejectionReason?: Types.ProposalRejectionReason | null, errorDetails?: string | null, rationale: { __typename?: 'ProposalRationale', title: string, description: string }, party: { __typename?: 'Party', id: string }, terms: { __typename?: 'ProposalTerms', closingDatetime: any, enactmentDatetime?: any | null, change: { __typename?: 'CancelTransfer' } | { __typename: 'NewAsset', name: string, symbol: string, decimals: number, quantum: string, source: { __typename?: 'BuiltinAsset', maxFaucetAmountMint: string } | { __typename?: 'ERC20', contractAddress: string, withdrawThreshold: string, lifetimeLimit: string } } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', instrument: { __typename?: 'InstrumentConfiguration', name: string, code: string, futureProduct?: { __typename?: 'FutureProduct', settlementAsset: { __typename?: 'Asset', symbol: string } } | null } } | { __typename?: 'NewTransfer' } | { __typename?: 'UpdateAsset', quantum: string, assetId: string, source: { __typename?: 'UpdateERC20', lifetimeLimit: string, withdrawThreshold: string } } | { __typename?: 'UpdateMarket', marketId: string } | { __typename?: 'UpdateNetworkParameter', networkParameter: { __typename?: 'NetworkParameter', key: string, value: string } } }, votes: { __typename?: 'ProposalVotes', yes: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string }, no: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string } } } } | null> | null } | null };

 export const ProposalFieldsFragmentDoc = gql`
    fragment ProposalFields on Proposal {
@@ -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})\)/
+          );
+        });
+    });
  });
 });

@@ -153,7 +153,7 @@ describe('markets all table', { tags: '@smoke' }, () => {
    cy.get(dropdownContent)
      .find(dropdownContentItem)
      .eq(2)
-      .should('have.text', 'View asset');
+      .should('have.text', 'View settlement asset details');
    cy.getByTestId('market-actions-content').click();
  });

@@ -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,15 +47,10 @@ 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) => {
-          cy.wrap(fields).find('label').should('have.length', 16);
+          cy.wrap(fields).find('label').should('have.length', 18);
        });
      cy.getByTestId('"Ledger entries"').click();
      cy.get('fieldset.ag-simple-filter-body-wrapper').should('not.exist');
@@ -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'
      );
    });
  });
@@ -71,7 +71,7 @@ describe('trades', { tags: '@smoke' }, () => {
      });
  });

-  it('copy price to deal ticket form', () => {
+  it.skip('copy price to deal ticket form', () => {
    // 6005-THIS-007
    cy.get(colIdPrice).last().should('be.visible').click();
    cy.getByTestId('order-price').should('have.value', '171.16898');
@@ -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
@@ -0,0 +1,17 @@
+NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io
+NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
+NX_SENTRY_DSN=https://2ffce43721964aafa78277c50654ece4@o286262.ingest.sentry.io/6300613
+NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/mainnet-mirror/vegawallet-mainnet-mirror.toml
+NX_VEGA_ENV=MAINNET-MIRROR
+NX_VEGA_EXPLORER_URL=https://explorer.mainnet-mirror.vega.rocks
+NX_VEGA_NETWORKS={\"MAINNET\":\"https://console.vega.xyz\",\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://trading.stagnet1.vega.rocks\",\"MAINNET-MIRROR\":\"https://trading.mainnet-mirror.vega.rocks\"}
+NX_VEGA_TOKEN_URL=https://governance.mainnet-mirror.vega.rocks
+NX_VEGA_WALLET_URL=http://localhost:1789
+NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
+NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
+NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
+NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
+NX_VEGA_CONSOLE_URL=https://console.mainnet-mirror.vega.rocks
+# TAG name of the current app version - TODO: bump to the latest upon release
+NX_APP_VERSION=v0.20.19-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
@@ -19,13 +19,14 @@ yarn nx serve explorer
 Example configurations are provided here:

 - [Mainnet](./.env.mainnet)
+- [Mainnet-mirror](./.env.mainnet-mirror)
 - [Devnet](./.env.devnet)
 - [Testnet](./.env.testnet)

 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) {
@@ -9,10 +9,7 @@ import { t } from '@vegaprotocol/i18n';
 import { OracleBanner } from '@vegaprotocol/markets';
 import type { Market } from '@vegaprotocol/markets';
 import { Filter } from '@vegaprotocol/orders';
-import {
-  usePaneLayout,
-  useScreenDimensions,
-} from '@vegaprotocol/react-helpers';
+import { useScreenDimensions } from '@vegaprotocol/react-helpers';
 import {
  Tab,
  LocalStoragePersistTabs as Tabs,
@@ -25,10 +22,12 @@ import { HeaderTitle } from '../../components/header';
 import {
  ResizableGrid,
  ResizableGridPanel,
+  usePaneLayout,
 } from '../../components/resizable-grid';
 import { TradingViews } from './trade-views';
 import { MarketSelector } from './market-selector';
 import { HeaderStats } from './header-stats';
+import { MarketSuccessorBanner } from '../../components/market-banner';

 interface TradeGridProps {
  market: Market | null;
@@ -318,7 +317,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">
@@ -18,7 +18,7 @@ import type {
  MarketMaybeWithData,
 } from '@vegaprotocol/markets';
 import {
-  MarketTableActions,
+  MarketActionsDropdown,
  closedMarketsWithDataProvider,
 } from '@vegaprotocol/markets';
 import { useVegaWallet } from '@vegaprotocol/wallet';
@@ -291,7 +291,7 @@ const ClosedMarketsDataGrid = ({
        cellRenderer: ({ data }: VegaICellRendererParams<Row>) => {
          if (!data) return null;
          return (
-            <MarketTableActions
+            <MarketActionsDropdown
              marketId={data.id}
              assetId={data.settlementAsset.id}
            />
@@ -24,7 +24,10 @@ import { PriceChart } from 'pennant';
 import 'pennant/dist/style.css';
 import type { Account } from '@vegaprotocol/accounts';
 import { accountsDataProvider } from '@vegaprotocol/accounts';
-import { useThemeSwitcher } from '@vegaprotocol/react-helpers';
+import {
+  useLocalStorageSnapshot,
+  useThemeSwitcher,
+} from '@vegaprotocol/react-helpers';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import type { Market } from '@vegaprotocol/markets';

@@ -68,7 +71,7 @@ export const AccountHistoryContainer = () => {
  const { data: assets } = useAssetsDataProvider();

  if (!pubKey) {
-    return <Splash>Connect wallet</Splash>;
+    return <Splash>{t('Connect wallet')}</Splash>;
  }

  return (
@@ -114,7 +117,15 @@ const AccountHistoryManager = ({
        .sort((a, b) => a.name.localeCompare(b.name)),
    [assetData, assetIds]
  );
-  const [asset, setAsset] = useState<AssetFieldsFragment>(assets[0]);
+  const [assetId, setAssetId] = useLocalStorageSnapshot(
+    'account-history-active-asset-id'
+  );
+
+  const asset = useMemo(
+    () => assets.find((a) => a.id === assetId) || assets[0],
+    [assetId, assets]
+  );
+
  const [range, setRange] = useState<typeof DateRange[keyof typeof DateRange]>(
    DateRange.RANGE_1M
  );
@@ -146,10 +157,10 @@ const AccountHistoryManager = ({
        m.tradableInstrument.instrument.product.settlementAsset.id;
      const newAsset = assets.find((item) => item.id === newAssetId);
      if ((!asset || (assets && newAssetId !== asset.id)) && newAsset) {
-        setAsset(newAsset);
+        setAssetId(newAsset.id);
      }
    },
-    [asset, assets]
+    [asset, assets, setAssetId]
  );

  const variables = useMemo(
@@ -211,14 +222,14 @@ const AccountHistoryManager = ({
      >
        <DropdownMenuContent>
          {assets.map((a) => (
-            <DropdownMenuItem key={a.id} onClick={() => setAsset(a)}>
+            <DropdownMenuItem key={a.id} onClick={() => setAssetId(a.id)}>
              {a.symbol}
            </DropdownMenuItem>
          ))}
        </DropdownMenuContent>
      </DropdownMenu>
    );
-  }, [assets, asset]);
+  }, [asset, assets, setAssetId]);
  const marketsMenu = useMemo(() => {
    return accountType === Schema.AccountType.ACCOUNT_TYPE_MARGIN &&
      markets?.length ? (
@@ -4,7 +4,6 @@ import { LayoutPriority } from 'allotment';
 import { titlefy } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { useIncompleteWithdrawals } from '@vegaprotocol/withdraws';
-import { usePaneLayout } from '@vegaprotocol/react-helpers';
 import { Tab, LocalStoragePersistTabs as Tabs } from '@vegaprotocol/ui-toolkit';
 import { usePageTitleStore } from '../../stores';
 import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';
@@ -20,6 +19,7 @@ import { AccountHistoryContainer } from './account-history-container';
 import {
  ResizableGrid,
  ResizableGridPanel,
+  usePaneLayout,
 } from '../../components/resizable-grid';

 const WithdrawalsIndicator = () => {
@@ -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;
+};
@@ -1 +1,2 @@
 export * from './resizable-grid';
+export * from './use-pane-layout';
@@ -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 */
@@ -1,11 +1,9 @@
 import { ETHERSCAN_ADDRESS, useEtherscanLink } from '@vegaprotocol/environment';
 import { t } from '@vegaprotocol/i18n';
 import {
-  DropdownMenu,
-  DropdownMenuContent,
+  ActionsDropdown,
  DropdownMenuCopyItem,
  DropdownMenuItem,
-  DropdownMenuTrigger,
  Link,
  VegaIcon,
  VegaIconNames,
@@ -29,75 +27,65 @@ export const AccountsActionsDropdown = ({
  const etherscanLink = useEtherscanLink();
  const openTransferDialog = useTransferDialog((store) => store.open);
  const openAssetDialog = useAssetDetailsDialogStore((store) => store.open);
+
  return (
-    <DropdownMenu
-      trigger={
-        <DropdownMenuTrigger
-          className="hover:bg-vega-light-200 dark:hover:bg-vega-dark-200 p-0.5 focus:rounded-full hover:rounded-full"
-          data-testid="dropdown-menu"
-        >
-          <VegaIcon name={VegaIconNames.KEBAB} />
-        </DropdownMenuTrigger>
-      }
-    >
-      <DropdownMenuContent>
-        <DropdownMenuItem
-          key={'deposit'}
-          data-testid="deposit"
-          onClick={onClickDeposit}
-        >
-          <VegaIcon name={VegaIconNames.DEPOSIT} size={16} />
-          {t('Deposit')}
+    <ActionsDropdown>
+      <DropdownMenuItem
+        key={'deposit'}
+        data-testid="deposit"
+        onClick={onClickDeposit}
+      >
+        <VegaIcon name={VegaIconNames.DEPOSIT} size={16} />
+        {t('Deposit')}
+      </DropdownMenuItem>
+      <DropdownMenuItem
+        key={'withdraw'}
+        data-testid="withdraw"
+        onClick={onClickWithdraw}
+      >
+        <VegaIcon name={VegaIconNames.WITHDRAW} size={16} />
+        {t('Withdraw')}
+      </DropdownMenuItem>
+      <DropdownMenuItem
+        key={'transfer'}
+        data-testid="transfer"
+        onClick={() => openTransferDialog(true, assetId)}
+      >
+        <VegaIcon name={VegaIconNames.TRANSFER} size={16} />
+        {t('Transfer')}
+      </DropdownMenuItem>
+      <DropdownMenuItem
+        key={'breakdown'}
+        data-testid="breakdown"
+        onClick={onClickBreakdown}
+      >
+        <VegaIcon name={VegaIconNames.BREAKDOWN} size={16} />
+        {t('View usage breakdown')}
+      </DropdownMenuItem>
+      <DropdownMenuItem
+        onClick={(e) => {
+          openAssetDialog(assetId, e.target as HTMLElement);
+        }}
+      >
+        <VegaIcon name={VegaIconNames.INFO} size={16} />
+        {t('View asset details')}
+      </DropdownMenuItem>
+      <DropdownMenuCopyItem value={assetId} text={t('Copy asset ID')} />
+      {assetContractAddress && (
+        <DropdownMenuItem>
+          <Link
+            href={etherscanLink(
+              ETHERSCAN_ADDRESS.replace(':hash', assetContractAddress)
+            )}
+            target="_blank"
+          >
+            <span className="flex gap-2">
+              <VegaIcon name={VegaIconNames.OPEN_EXTERNAL} size={16} />
+              {t('View on Etherscan')}
+            </span>
+          </Link>
        </DropdownMenuItem>
-        <DropdownMenuItem
-          key={'withdraw'}
-          data-testid="withdraw"
-          onClick={onClickWithdraw}
-        >
-          <VegaIcon name={VegaIconNames.WITHDRAW} size={16} />
-          {t('Withdraw')}
-        </DropdownMenuItem>
-        <DropdownMenuItem
-          key={'transfer'}
-          data-testid="transfer"
-          onClick={() => openTransferDialog(true, assetId)}
-        >
-          <VegaIcon name={VegaIconNames.TRANSFER} size={16} />
-          {t('Transfer')}
-        </DropdownMenuItem>
-        <DropdownMenuItem
-          key={'breakdown'}
-          data-testid="breakdown"
-          onClick={onClickBreakdown}
-        >
-          <VegaIcon name={VegaIconNames.BREAKDOWN} size={16} />
-          {t('Breakdown')}
-        </DropdownMenuItem>
-        <DropdownMenuItem
-          onClick={(e) => {
-            openAssetDialog(assetId, e.target as HTMLElement);
-          }}
-        >
-          <VegaIcon name={VegaIconNames.BREAKDOWN} size={16} />
-          {t('View asset')}
-        </DropdownMenuItem>
-        <DropdownMenuCopyItem value={assetId} text={t('Copy asset ID')} />
-        {assetContractAddress && (
-          <DropdownMenuItem>
-            <Link
-              href={etherscanLink(
-                ETHERSCAN_ADDRESS.replace(':hash', assetContractAddress)
-              )}
-              target="_blank"
-            >
-              <span className="flex gap-2">
-                <VegaIcon name={VegaIconNames.OPEN_EXTERNAL} size={16} />
-                {t('View on Etherscan')}
-              </span>
-            </Link>
-          </DropdownMenuItem>
-        )}
-      </DropdownMenuContent>
-    </DropdownMenu>
+      )}
+    </ActionsDropdown>
  );
 };
@@ -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}%`,
@@ -13,6 +13,7 @@ import { accountsDataProvider } from './accounts-data-provider';
 import { TransferForm } from './transfer-form';
 import { useTransferDialog } from './transfer-dialog';
 import { Lozenge } from '@vegaprotocol/ui-toolkit';
+import sortBy from 'lodash/sortBy';

 export const TransferContainer = ({ assetId }: { assetId?: string }) => {
  const { pubKey, pubKeys } = useVegaWallet();
@@ -58,7 +59,7 @@ export const TransferContainer = ({ assetId }: { assetId?: string }) => {
      <TransferForm
        pubKey={pubKey}
        pubKeys={pubKeys ? pubKeys?.map((pk) => pk.publicKey) : null}
-        assets={assets}
+        assets={sortBy(assets, 'name')}
        assetId={assetId}
        feeFactor={param}
        submitTransfer={transfer}
@@ -8,7 +8,7 @@ import {
 import BigNumber from 'bignumber.js';
 import { AddressField, TransferFee, TransferForm } from './transfer-form';
 import { AccountType } from '@vegaprotocol/types';
-import { formatNumber, removeDecimal } from '@vegaprotocol/utils';
+import { addDecimal, formatNumber, removeDecimal } from '@vegaprotocol/utils';

 describe('TransferForm', () => {
  const submit = () => fireEvent.submit(screen.getByTestId('transfer-form'));
@@ -16,11 +16,11 @@ describe('TransferForm', () => {
  const pubKey =
    '70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680';
  const asset = {
-    id: 'asset-0',
-    symbol: 'ASSET 0',
-    name: 'Asset 0',
+    id: 'eur',
+    symbol: '€',
+    name: 'EUR',
    decimals: 2,
-    balance: '1000',
+    balance: addDecimal(100000, 2), // 1000
  };
  const props = {
    pubKey,
@@ -92,7 +92,7 @@ describe('TransferForm', () => {
    expect(await screen.findByTestId('select-asset')).toHaveTextContent(
      asset.name
    );
-    expect(screen.getByTestId('asset-balance')).toHaveTextContent(
+    expect(await screen.findByTestId('asset-balance')).toHaveTextContent(
      formatNumber(asset.balance, asset.decimals)
    );

@@ -168,7 +168,7 @@ describe('TransferForm', () => {
      expect(await screen.findByTestId('select-asset')).toHaveTextContent(
        asset.name
      );
-      expect(screen.getByTestId('asset-balance')).toHaveTextContent(
+      expect(await screen.findByTestId('asset-balance')).toHaveTextContent(
        formatNumber(asset.balance, asset.decimals)
      );

@@ -244,7 +244,7 @@ describe('TransferForm', () => {
      expect(await screen.findByTestId('select-asset')).toHaveTextContent(
        asset.name
      );
-      expect(screen.getByTestId('asset-balance')).toHaveTextContent(
+      expect(await screen.findByTestId('asset-balance')).toHaveTextContent(
        formatNumber(asset.balance, asset.decimals)
      );

@@ -12,7 +12,6 @@ import {
  FormGroup,
  Input,
  InputError,
-  Option,
  RichSelect,
  Select,
  Tooltip,
@@ -24,6 +23,7 @@ import BigNumber from 'bignumber.js';
 import type { ReactNode } from 'react';
 import { useCallback, useMemo, useState } from 'react';
 import { Controller, useForm } from 'react-hook-form';
+import { AssetOption, Balance } from '@vegaprotocol/assets';

 interface FormFields {
  toAddress: string;
@@ -193,21 +193,20 @@ export const TransferForm = ({
              onValueChange={(value) => {
                field.onChange(value);
              }}
-              placeholder={t('Please select')}
+              placeholder={t('Please select an asset')}
              value={field.value}
            >
              {assets.map((a) => (
-                <Option key={a.id} value={a.id}>
-                  <div className="text-left" data-testid={`asset-${a.id}`}>
-                    <div>{a.name}</div>
-                    <div className="text-xs">
-                      <span className="font-mono" data-testid="asset-balance">
-                        {formatNumber(a.balance, a.decimals)}
-                      </span>{' '}
-                      <span>{a.symbol}</span>
-                    </div>
-                  </div>
-                </Option>
+                <AssetOption
+                  key={a.id}
+                  asset={a}
+                  balance={
+                    <Balance
+                      balance={formatNumber(a.balance, a.decimals)}
+                      symbol={a.symbol}
+                    />
+                  }
+                />
              ))}
            </RichSelect>
          )}
@@ -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();
@@ -5,7 +5,7 @@ import { t } from '@vegaprotocol/i18n';
 import type { ReactNode } from 'react';

 type AssetOptionProps = {
-  asset: AssetFieldsFragment;
+  asset: Pick<AssetFieldsFragment, 'id' | 'name' | 'symbol'>;
  balance?: ReactNode;
 };

@@ -17,11 +17,13 @@ export const Balance = ({
  symbol: string;
 }) =>
  balance ? (
-    <div className="mt-1 font-alpha">
+    <div className="mt-1 font-alpha" data-testid="asset-balance">
      {balance} {symbol}
    </div>
  ) : (
-    <div className="text-vega-orange-500">{t('Fetching balance…')}</div>
+    <div className="text-vega-orange-500" data-testid="asset-balance">
+      {t('Fetching balance…')}
+    </div>
  );

 export const AssetOption = ({ asset, balance }: AssetOptionProps) => {
@@ -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
@@ -23,6 +23,11 @@ export const OrderTypeCell = ({
      return undefined;
    }
    if (!value) return '-';
+
+    if (order?.icebergOrder) {
+      return t('%s (Iceberg)', [Schema.OrderTypeMapping[value]]);
+    }
+
    if (order?.peggedOrder) {
      const reference =
        Schema.PeggedReferenceMapping[order.peggedOrder?.reference];
@@ -34,6 +39,7 @@ export const OrderTypeCell = ({
      );
      return t('%s %s %s Peg limit', [reference, side, offset]);
    }
+
    if (order?.liquidityProvision) {
      return t('Liquidity provision');
    }
@@ -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>
  );
 };
@@ -0,0 +1,195 @@
+import { Controller, type Control } from 'react-hook-form';
+import type { Market } from '@vegaprotocol/markets';
+import type { OrderObj } from '@vegaprotocol/orders';
+import type { OrderFormFields } from '../../hooks/use-order-form';
+import { toDecimal, validateAmount } from '@vegaprotocol/utils';
+import { t } from '@vegaprotocol/i18n';
+import {
+  FormGroup,
+  Input,
+  InputError,
+  Tooltip,
+} from '@vegaprotocol/ui-toolkit';
+
+export interface DealTicketSizeIcebergProps {
+  control: Control<OrderFormFields>;
+  market: Market;
+  peakSizeError?: string;
+  minimumVisibleSizeError?: string;
+  update: (obj: Partial<OrderObj>) => void;
+  peakSize: string;
+  minimumVisibleSize: string;
+  size: string;
+}
+
+export const DealTicketSizeIceberg = ({
+  control,
+  market,
+  update,
+  peakSizeError,
+  minimumVisibleSizeError,
+  peakSize,
+  minimumVisibleSize,
+  size,
+}: DealTicketSizeIcebergProps) => {
+  const sizeStep = toDecimal(market?.positionDecimalPlaces);
+
+  const renderPeakSizeError = () => {
+    if (peakSizeError) {
+      return (
+        <InputError testId="deal-ticket-peak-error-message-size-limit">
+          {peakSizeError}
+        </InputError>
+      );
+    }
+
+    return null;
+  };
+
+  const renderMinimumSizeError = () => {
+    if (minimumVisibleSizeError) {
+      return (
+        <InputError testId="deal-ticket-minimum-error-message-size-limit">
+          {minimumVisibleSizeError}
+        </InputError>
+      );
+    }
+
+    return null;
+  };
+
+  return (
+    <div className="mb-2">
+      <div className="flex items-center gap-4">
+        <div className="flex-1">
+          <FormGroup
+            label={
+              <Tooltip
+                description={
+                  <div>
+                    {t(
+                      'The maximum volume that can be traded at once. Must be less than the total size of the order.'
+                    )}
+                  </div>
+                }
+              >
+                <span className="text-xs">{t('Peak size')}</span>
+              </Tooltip>
+            }
+            labelFor="input-order-peak-size"
+            className="!mb-1"
+          >
+            <Controller
+              name="icebergOpts.peakSize"
+              control={control}
+              rules={{
+                required: t('You need to provide a peak size'),
+                min: {
+                  value: sizeStep,
+                  message: t('Peak size cannot be lower than ' + sizeStep),
+                },
+                max: {
+                  value: size,
+                  message: t(
+                    'Peak size cannot be greater than the size (%s) ',
+                    [size]
+                  ),
+                },
+                validate: validateAmount(sizeStep, 'peakSize'),
+              }}
+              render={() => (
+                <Input
+                  id="input-order-peak-size"
+                  className="w-full"
+                  type="number"
+                  value={peakSize}
+                  onChange={(e) =>
+                    update({
+                      icebergOpts: {
+                        peakSize: e.target.value,
+                        minimumVisibleSize,
+                      },
+                    })
+                  }
+                  step={sizeStep}
+                  min={sizeStep}
+                  max={size}
+                  data-testid="order-peak-size"
+                  onWheel={(e) => e.currentTarget.blur()}
+                />
+              )}
+            />
+          </FormGroup>
+        </div>
+        <div className="flex-0 items-center">
+          <div className="flex"></div>
+          <div className="flex"></div>
+        </div>
+        <div className="flex-1">
+          <FormGroup
+            label={
+              <Tooltip
+                description={
+                  <div>
+                    {t(
+                      'When the order trades and its size falls below this threshold, it will be reset to the peak size and moved to the back of the priority order. Must be less than or equal to peak size, and greater than 0.'
+                    )}
+                  </div>
+                }
+              >
+                <span className="text-xs">{t('Minimum size')}</span>
+              </Tooltip>
+            }
+            labelFor="input-order-minimum-size"
+            className="!mb-1"
+          >
+            <Controller
+              name="icebergOpts.minimumVisibleSize"
+              control={control}
+              rules={{
+                required: t('You need to provide a minimum visible size'),
+                min: {
+                  value: sizeStep,
+                  message: t(
+                    'Minimum visible size cannot be lower than ' + sizeStep
+                  ),
+                },
+                max: {
+                  value: peakSize,
+                  message: t(
+                    'Minimum visible size cannot be greater than the peak size (%s)',
+                    [peakSize]
+                  ),
+                },
+                validate: validateAmount(sizeStep, 'minimumVisibleSize'),
+              }}
+              render={() => (
+                <Input
+                  id="input-order-minimum-size"
+                  className="w-full"
+                  type="number"
+                  value={minimumVisibleSize}
+                  onChange={(e) =>
+                    update({
+                      icebergOpts: {
+                        peakSize,
+                        minimumVisibleSize: e.target.value,
+                      },
+                    })
+                  }
+                  step={sizeStep}
+                  min={sizeStep}
+                  max={peakSize}
+                  data-testid="order-minimum-size"
+                  onWheel={(e) => e.currentTarget.blur()}
+                />
+              )}
+            />
+          </FormGroup>
+        </div>
+      </div>
+      {renderPeakSizeError()}
+      {renderMinimumSizeError()}
+    </div>
+  );
+};
@@ -1,13 +1,13 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { VegaWalletContext } from '@vegaprotocol/wallet';
-import { act, render, screen } from '@testing-library/react';
+import { act, render, renderHook, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { generateMarket, generateMarketData } from '../../test-helpers';
 import { DealTicket } from './deal-ticket';
 import * as Schema from '@vegaprotocol/types';
 import { MockedProvider } from '@apollo/client/testing';
 import { addDecimal } from '@vegaprotocol/utils';
-import { useOrderStore } from '@vegaprotocol/orders';
+import { useCreateOrderStore } from '@vegaprotocol/orders';

 jest.mock('zustand');
 jest.mock('./deal-ticket-fee-details', () => ({
@@ -30,6 +30,9 @@ function generateJsx() {
 }

 describe('DealTicket', () => {
+  const { result } = renderHook(() => useCreateOrderStore());
+  const useOrderStore = result.current;
+
  beforeEach(() => {
    localStorage.clear();
  });
@@ -138,7 +141,6 @@ describe('DealTicket', () => {
      reduceOnly: true,
      postOnly: false,
    };
-
    useOrderStore.setState({
      orders: {
        [expectedOrder.marketId]: expectedOrder,
@@ -222,6 +224,109 @@ describe('DealTicket', () => {
    expect(screen.getByTestId('reduce-only')).not.toBeChecked();
  });

+  it('should set values for a persistent post only iceberg order and disable reduce only checkbox', () => {
+    const expectedOrder = {
+      marketId: market.id,
+      type: Schema.OrderType.TYPE_LIMIT,
+      side: Schema.Side.SIDE_SELL,
+      size: '10',
+      price: '300.22',
+      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
+      persist: true,
+      reduceOnly: false,
+      postOnly: true,
+      iceberg: true,
+      icebergOpts: {
+        peakSize: '5',
+        minimumVisibleSize: '7',
+      },
+    };
+
+    useOrderStore.setState({
+      orders: {
+        [expectedOrder.marketId]: expectedOrder,
+      },
+    });
+
+    render(generateJsx());
+
+    // Assert correct defaults are used from store
+    expect(
+      screen
+        .getByTestId(`order-type-${Schema.OrderType.TYPE_LIMIT}`)
+        .querySelector('input')
+    ).toBeChecked();
+    expect(
+      screen.queryByTestId('order-side-SIDE_SELL')?.querySelector('input')
+    ).toBeChecked();
+    expect(
+      screen.queryByTestId('order-side-SIDE_BUY')?.querySelector('input')
+    ).not.toBeChecked();
+    expect(screen.getByTestId('order-size')).toHaveDisplayValue(
+      expectedOrder.size
+    );
+    expect(screen.getByTestId('order-tif')).toHaveValue(
+      expectedOrder.timeInForce
+    );
+    expect(screen.getByTestId('order-price')).toHaveDisplayValue(
+      expectedOrder.price
+    );
+    expect(screen.getByTestId('post-only')).toBeEnabled();
+    expect(screen.getByTestId('reduce-only')).toBeDisabled();
+    expect(screen.getByTestId('post-only')).toBeChecked();
+    expect(screen.getByTestId('reduce-only')).not.toBeChecked();
+    expect(screen.getByTestId('iceberg')).toBeEnabled();
+    expect(screen.getByTestId('iceberg')).toBeChecked();
+  });
+
+  it('should set values for a non-persistent iceberg order and disable post only checkbox', () => {
+    const expectedOrder = {
+      marketId: market.id,
+      type: Schema.OrderType.TYPE_LIMIT,
+      side: Schema.Side.SIDE_SELL,
+      size: '0.1',
+      price: '300.22',
+      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_IOC,
+      persist: false,
+      reduceOnly: false,
+      postOnly: false,
+    };
+    useOrderStore.setState({
+      orders: {
+        [expectedOrder.marketId]: expectedOrder,
+      },
+    });
+
+    render(generateJsx());
+
+    // Assert correct defaults are used from store
+    expect(
+      screen
+        .getByTestId(`order-type-${Schema.OrderType.TYPE_LIMIT}`)
+        .querySelector('input')
+    ).toBeChecked();
+    expect(
+      screen.queryByTestId('order-side-SIDE_SELL')?.querySelector('input')
+    ).toBeChecked();
+    expect(
+      screen.queryByTestId('order-side-SIDE_BUY')?.querySelector('input')
+    ).not.toBeChecked();
+    expect(screen.getByTestId('order-size')).toHaveDisplayValue(
+      expectedOrder.size
+    );
+    expect(screen.getByTestId('order-tif')).toHaveValue(
+      expectedOrder.timeInForce
+    );
+    expect(screen.getByTestId('order-price')).toHaveDisplayValue(
+      expectedOrder.price
+    );
+    expect(screen.getByTestId('post-only')).toBeDisabled();
+    expect(screen.getByTestId('reduce-only')).toBeEnabled();
+    expect(screen.getByTestId('reduce-only')).not.toBeChecked();
+    expect(screen.getByTestId('post-only')).not.toBeChecked();
+    expect(screen.getByTestId('iceberg')).not.toBeChecked();
+  });
+
  it('handles TIF select box dependent on order type', async () => {
    render(generateJsx());

@@ -54,6 +54,7 @@ import {
 import { OrderTimeInForce, OrderType } from '@vegaprotocol/types';
 import { useOrderForm } from '../../hooks/use-order-form';
 import { useDataProvider } from '@vegaprotocol/data-provider';
+import { DealTicketSizeIceberg } from './deal-ticket-size-iceberg';

 export interface DealTicketProps {
  market: Market;
@@ -292,6 +293,22 @@ export const DealTicket = ({
                  timeInForce: lastTIF[type] || order.timeInForce,
                  postOnly:
                    type === OrderType.TYPE_MARKET ? false : order.postOnly,
+                  iceberg:
+                    type === OrderType.TYPE_MARKET ||
+                    [
+                      OrderTimeInForce.TIME_IN_FORCE_FOK,
+                      OrderTimeInForce.TIME_IN_FORCE_IOC,
+                    ].includes(lastTIF[type] || order.timeInForce)
+                      ? false
+                      : order.iceberg,
+                  icebergOpts:
+                    type === OrderType.TYPE_MARKET ||
+                    [
+                      OrderTimeInForce.TIME_IN_FORCE_FOK,
+                      OrderTimeInForce.TIME_IN_FORCE_IOC,
+                    ].includes(lastTIF[type] || order.timeInForce)
+                      ? undefined
+                      : order.icebergOpts,
                  reduceOnly:
                    type === OrderType.TYPE_LIMIT &&
                    ![
@@ -463,6 +480,51 @@ export const DealTicket = ({
            )}
          />
        </div>
+        <div className="flex gap-2 pb-2 justify-between">
+          {order.type === Schema.OrderType.TYPE_LIMIT && (
+            <Controller
+              name="iceberg"
+              control={control}
+              render={() => (
+                <Checkbox
+                  name="iceberg"
+                  checked={order.iceberg}
+                  onCheckedChange={() => {
+                    update({ iceberg: !order.iceberg, icebergOpts: undefined });
+                  }}
+                  label={
+                    <Tooltip
+                      description={
+                        <p>
+                          {t(`Trade only a fraction of the order size at once.
+                            After the peak size of the order has traded, the size is reset. This is repeated until the order is cancelled, expires, or its full volume trades away.
+                            For example, an iceberg order with a size of 1000 and a peak size of 100 will effectively be split into 10 orders with a size of 100 each.
+                            Note that the full volume of the order is not hidden and is still reflected in the order book.`)}
+                        </p>
+                      }
+                    >
+                      <span className="text-xs">{t('Iceberg')}</span>
+                    </Tooltip>
+                  }
+                />
+              )}
+            />
+          )}
+        </div>
+        {order.iceberg && (
+          <DealTicketSizeIceberg
+            update={update}
+            market={market}
+            peakSizeError={errors.icebergOpts?.peakSize?.message}
+            minimumVisibleSizeError={
+              errors.icebergOpts?.minimumVisibleSize?.message
+            }
+            control={control}
+            size={order.size}
+            peakSize={order.icebergOpts?.peakSize || ''}
+            minimumVisibleSize={order.icebergOpts?.minimumVisibleSize || ''}
+          />
+        )}
        <SummaryMessage
          errorMessage={errors.summary?.message}
          asset={asset}
@@ -476,11 +538,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}
@@ -1,6 +1,6 @@
 import omit from 'lodash/omit';
 import { act, renderHook } from '@testing-library/react';
-import { getDefaultOrder, useOrderStore } from '@vegaprotocol/orders';
+import { getDefaultOrder, useCreateOrderStore } from '@vegaprotocol/orders';
 import { useOrderForm } from './use-order-form';

 jest.mock('zustand');
@@ -10,6 +10,8 @@ describe('useOrderForm', () => {
  const setup = (marketId: string) => {
    return renderHook(() => useOrderForm(marketId));
  };
+  const { result } = renderHook(() => useCreateOrderStore());
+  const useOrderStore = result.current;

  it('updates form fields when the order changes', async () => {
    const order = getDefaultOrder(marketId);
@@ -4,7 +4,6 @@ import { getDefaultOrder, useOrder } from '@vegaprotocol/orders';
 import { useEffect } from 'react';
 import { useForm } from 'react-hook-form';
 import type { OrderSubmission } from '@vegaprotocol/wallet';
-import type { Exact } from 'type-fest';

 export type OrderFormFields = OrderObj & {
  summary: string;
@@ -51,13 +50,11 @@ export const useOrderForm = (marketId: string) => {
    }
  }, [order, isSubmitted, getValues, setValue]);

-  const handleSubmitWrapper = (
-    cb: <T>(o: Exact<OrderSubmission, T>) => void
-  ) => {
+  const handleSubmitWrapper = (cb: (o: OrderSubmission) => void) => {
    return handleSubmit(() => {
-      // remove the persist key from the order in the store, the wallet will reject
+      // remove the persist and iceberg key from the order in the store, the wallet will reject
      // an order that contains unrecognized additional keys
-      cb(omit(order, 'persist'));
+      cb(omit(order, 'persist', 'iceberg'));
    });
  };

@@ -1,10 +1,6 @@
 import {
-  DropdownMenu,
-  DropdownMenuContent,
+  ActionsDropdown,
  DropdownMenuCopyItem,
-  DropdownMenuTrigger,
-  VegaIcon,
-  VegaIconNames,
 } from '@vegaprotocol/ui-toolkit';
 import { t } from '@vegaprotocol/i18n';

@@ -18,27 +14,13 @@ export const FillActionsDropdown = ({
  sellOrderId: string;
 }) => {
  return (
-    <DropdownMenu
-      trigger={
-        <DropdownMenuTrigger
-          className="hover:bg-vega-light-200 dark:hover:bg-vega-dark-200 p-0.5 focus:rounded-full hover:rounded-full"
-          data-testid="dropdown-menu"
-        >
-          <VegaIcon name={VegaIconNames.KEBAB} />
-        </DropdownMenuTrigger>
-      }
-    >
-      <DropdownMenuContent data-testid="market-actions-content">
-        <DropdownMenuCopyItem value={tradeId} text={t('Copy trade ID')} />
-        <DropdownMenuCopyItem
-          value={buyOrderId}
-          text={t('Copy buy order ID')}
-        />
-        <DropdownMenuCopyItem
-          value={sellOrderId}
-          text={t('Copy sell order ID')}
-        />
-      </DropdownMenuContent>
-    </DropdownMenu>
+    <ActionsDropdown data-testid="market-actions-content">
+      <DropdownMenuCopyItem value={tradeId} text={t('Copy trade ID')} />
+      <DropdownMenuCopyItem value={buyOrderId} text={t('Copy buy order ID')} />
+      <DropdownMenuCopyItem
+        value={sellOrderId}
+        text={t('Copy sell order ID')}
+      />
+    </ActionsDropdown>
  );
 };
@@ -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 () => {
@@ -3,14 +3,14 @@ import * as Types from '@vegaprotocol/types';
 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
-export type LiquidityProvisionFieldsFragment = { __typename?: 'LiquidityProvision', id?: string | null, createdAt: any, updatedAt?: any | null, commitmentAmount: string, fee: string, status: Types.LiquidityProvisionStatus, party: { __typename?: 'Party', id: string, accountsConnection?: { __typename?: 'AccountsConnection', edges?: Array<{ __typename?: 'AccountEdge', node: { __typename?: 'AccountBalance', type: Types.AccountType, balance: string } } | null> | null } | null } };
+export type LiquidityProvisionFieldsFragment = { __typename?: 'LiquidityProvision', id: string, createdAt: any, updatedAt?: any | null, commitmentAmount: string, fee: string, status: Types.LiquidityProvisionStatus, party: { __typename?: 'Party', id: string, accountsConnection?: { __typename?: 'AccountsConnection', edges?: Array<{ __typename?: 'AccountEdge', node: { __typename?: 'AccountBalance', type: Types.AccountType, balance: string } } | null> | null } | null } };

 export type LiquidityProvisionsQueryVariables = Types.Exact<{
  marketId: Types.Scalars['ID'];
 }>;


-export type LiquidityProvisionsQuery = { __typename?: 'Query', market?: { __typename?: 'Market', liquidityProvisionsConnection?: { __typename?: 'LiquidityProvisionsConnection', edges?: Array<{ __typename?: 'LiquidityProvisionsEdge', node: { __typename?: 'LiquidityProvision', id?: string | null, createdAt: any, updatedAt?: any | null, commitmentAmount: string, fee: string, status: Types.LiquidityProvisionStatus, party: { __typename?: 'Party', id: string, accountsConnection?: { __typename?: 'AccountsConnection', edges?: Array<{ __typename?: 'AccountEdge', node: { __typename?: 'AccountBalance', type: Types.AccountType, balance: string } } | null> | null } | null } } } | null> | null } | null } | null };
+export type LiquidityProvisionsQuery = { __typename?: 'Query', market?: { __typename?: 'Market', liquidityProvisionsConnection?: { __typename?: 'LiquidityProvisionsConnection', edges?: Array<{ __typename?: 'LiquidityProvisionsEdge', node: { __typename?: 'LiquidityProvision', id: string, createdAt: any, updatedAt?: any | null, commitmentAmount: string, fee: string, status: Types.LiquidityProvisionStatus, party: { __typename?: 'Party', id: string, accountsConnection?: { __typename?: 'AccountsConnection', edges?: Array<{ __typename?: 'AccountEdge', node: { __typename?: 'AccountBalance', type: Types.AccountType, balance: string } } | null> | null } | null } } } | null> | null } | null } | null };

 export type LiquidityProvisionsUpdateSubscriptionVariables = Types.Exact<{
  partyId?: Types.InputMaybe<Types.Scalars['ID']>;
@@ -18,7 +18,7 @@ export type LiquidityProvisionsUpdateSubscriptionVariables = Types.Exact<{
 }>;


-export type LiquidityProvisionsUpdateSubscription = { __typename?: 'Subscription', liquidityProvisions?: Array<{ __typename?: 'LiquidityProvisionUpdate', id?: string | null, partyID: string, createdAt: any, updatedAt?: any | null, marketID: string, commitmentAmount: string, fee: string, status: Types.LiquidityProvisionStatus }> | null };
+export type LiquidityProvisionsUpdateSubscription = { __typename?: 'Subscription', liquidityProvisions?: Array<{ __typename?: 'LiquidityProvisionUpdate', id: string, partyID: string, createdAt: any, updatedAt?: any | null, marketID: string, commitmentAmount: string, fee: string, status: Types.LiquidityProvisionStatus }> | null };

 export type LiquidityProviderFeeShareFieldsFragment = { __typename?: 'LiquidityProviderFeeShare', equityLikeShare: string, averageEntryValuation: string, party: { __typename?: 'Party', id: string } };

@@ -9,7 +9,7 @@ import type {
  MarketDepthUpdateSubscription,
  PriceLevelFieldsFragment,
 } from './__generated__/MarketDepth';
-import { useOrderStore } from '@vegaprotocol/orders';
+import { useCreateOrderStore } from '@vegaprotocol/orders';

 export type OrderbookData = {
  asks: PriceLevelFieldsFragment[];
@@ -50,8 +50,8 @@ export const OrderbookManager = ({ marketId }: OrderbookManagerProps) => {
    dataProvider: marketDataProvider,
    variables,
  });
-
-  const updateOrder = useOrderStore((store) => store.update);
+  const useOrderStoreRef = useCreateOrderStore();
+  const updateOrder = useOrderStoreRef((store) => store.update);

  return (
    <AsyncRenderer
@@ -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`
@@ -16,6 +16,16 @@ fragment DataSource on DataSourceDefinition {
        }
      }
    }
+    ... on DataSourceDefinitionInternal {
+      sourceType {
+        ... on DataSourceSpecConfigurationTime {
+          conditions {
+            operator
+            value
+          }
+        }
+      }
+    }
  }
 }

@@ -142,5 +152,6 @@ query MarketInfo($marketId: ID!) {
        }
      }
    }
+    parentMarketID
  }
 }
@@ -3,14 +3,14 @@ import * as Types from '@vegaprotocol/types';
 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
-export type DataSourceFragment = { __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' } };
+export type DataSourceFragment = { __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', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', operator: Types.ConditionOperator, value?: string | null } | null> } } };

 export type MarketInfoQueryVariables = Types.Exact<{
  marketId: Types.Scalars['ID'];
 }>;


-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', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', operator: Types.ConditionOperator, value?: string | null } | null> } } } }, 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', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', operator: Types.ConditionOperator, value?: string | null } | null> } } } }, 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 {
@@ -31,6 +31,16 @@ export const DataSourceFragmentDoc = gql`
        }
      }
    }
+    ... on DataSourceDefinitionInternal {
+      sourceType {
+        ... on DataSourceSpecConfigurationTime {
+          conditions {
+            operator
+            value
+          }
+        }
+      }
+    }
  }
 }
    `;
@@ -158,6 +168,7 @@ export const MarketInfoDocument = gql`
        }
      }
    }
+    parentMarketID
  }
 }
    ${DataSourceFragmentDoc}`;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Madalina Raicu	b4e655ffec	fix: typename reset	2023-07-17 15:43:38 +02:00
Madalina Raicu	f616597fd7	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/submit-iceberg	2023-07-17 15:15:03 +02:00
m.ray	056d3215e8	feat(trading): view iceberg orders (#4207 )	2023-07-17 13:04:03 +00:00
Madalina Raicu	649857a88a	Merge branch 'feat/view-iceberg-orders' of github.com:vegaprotocol/frontend-monorepo into feat/submit-iceberg	2023-07-17 14:36:37 +02:00
Madalina Raicu	ad2dbe2684	fix: skip flaky test	2023-07-17 14:35:36 +02:00
Madalina Raicu	1062db9b1a	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/submit-iceberg	2023-07-17 14:26:05 +02:00
Dexter Edwards	a68b2093e4	fix(ui-toolkit): toolkit bugs (#4329 )	2023-07-17 10:59:22 +00:00
Madalina Raicu	6b3c807dec	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/submit-iceberg	2023-07-14 12:47:46 +01:00
Madalina Raicu	11dff1fcab	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/view-iceberg-orders	2023-07-14 12:47:05 +01:00
Mikołaj Młodzikowski	f440f57be2	fix(ci): do not trigger releasing to s3 on pull requests	2023-07-14 13:45:06 +02:00
Madalina Raicu	c33b8e12ba	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/view-iceberg-orders	2023-07-14 09:30:24 +01:00
Madalina Raicu	2d0e8e0a14	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/submit-iceberg	2023-07-14 09:29:23 +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
Madalina Raicu	cc7fde6bbe	Merge branch 'fix/add-internal-data-source-termination-oracle' of github.com:vegaprotocol/frontend-monorepo into feat/submit-iceberg	2023-07-13 09:19:37 +01:00
Madalina Raicu	a96843fef7	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/submit-iceberg	2023-07-12 20:33:54 +01:00
Madalina Raicu	c1ed810d0e	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/view-iceberg-orders	2023-07-12 20:26:00 +01:00
Madalina Raicu	ee38cea4f2	fix: update market info	2023-07-12 20:24:30 +01:00
Madalina Raicu	93869b178c	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into fix/add-internal-data-source-termination-oracle	2023-07-12 20:23:58 +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
Madalina Raicu	66d3f91069	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/submit-iceberg	2023-07-12 11:57:13 +01:00
Matthew Russell	6a55319e04	feat(trading,governance,wallet): browser wallet integration (#4121 )	2023-07-12 11:34:42 +01:00
Madalina Raicu	2185c52084	chore: update test trading-portfolio	2023-07-12 11:03:34 +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
Madalina Raicu	46c18ddfe0	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/submit-iceberg	2023-07-12 09:44:30 +01: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
Madalina Raicu	03aac931fd	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/submit-iceberg	2023-07-11 23:56:05 +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
Madalina Raicu	694c9765d3	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into fix/add-internal-data-source-termination-oracle	2023-07-11 13:02:42 +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
Madalina Raicu	ac11eea37b	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into fix/add-internal-data-source-termination-oracle	2023-07-11 09:27:23 +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
Madalina Raicu	9a8e4b2526	fix: order type cast removed	2023-07-10 14:39:57 +01:00
Edd	0e10b2108e	chore(explorer): update block explorer types for 72 (#4275 )	2023-07-10 14:12:12 +01:00
Madalina Raicu	70ca29c9ee	chore: add extra tests for iceberg orders	2023-07-10 08:56:25 +01:00
Madalina Raicu	07403bdc81	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/submit-iceberg	2023-07-09 16:08:08 +03:00
Madalina Raicu	e07fa70bb7	Merge branch 'feat/view-iceberg-orders' of github.com:vegaprotocol/frontend-monorepo into feat/submit-iceberg	2023-07-07 22:54:13 +03:00
Madalina Raicu	96db36fa67	fix: add extra field	2023-07-07 22:35:31 +03:00
Madalina Raicu	abc278aab5	fix: mappings	2023-07-07 22:15:43 +03:00
Madalina Raicu	331c492408	fix: update iceberg opts	2023-07-07 19:14:47 +03:00
Madalina Raicu	52b5274f47	fix: order conflict	2023-07-07 18:59:52 +03:00
Madalina Raicu	24fc4721e7	Merge branch 'feat/view-iceberg-orders' of github.com:vegaprotocol/frontend-monorepo into feat/submit-iceberg	2023-07-07 18:56:59 +03:00
Madalina Raicu	381c1d34c8	fix: order fields update	2023-07-07 18:49:39 +03:00
Madalina Raicu	cb797e5b3f	fix: add typename	2023-07-07 18:19:07 +03:00
Bartłomiej Głownia	162a934408	feat(trading): amend market red and green colors (#4226 )	2023-07-07 14:52:38 +02:00
Madalina Raicu	6366f5d7de	chore: remove remaining from tx res	2023-07-07 13:04:26 +03: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
Madalina Raicu	7fe867756c	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/view-iceberg-orders	2023-07-06 15:16:27 +03:00
Joe Tsang	3c71a86b48	chore(governance): skip test (#4263 )	2023-07-06 09:40:57 +01:00
Madalina Raicu	dc4a7e63b5	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/view-iceberg-orders	2023-07-06 11:17:50 +03:00
Madalina Raicu	5ef0969dcb	fix: update types	2023-07-06 00:32:28 +03:00
Madalina Raicu	4c9f2ae84b	fix: update order update on iceberg subscriptions	2023-07-05 18:08:50 +03:00
Madalina Raicu	cacc7e1304	fix: update types	2023-07-05 18:04:40 +03:00
Art	b381f16ace	fix(announcements): remember dismissed announcement (#4255 )	2023-07-05 16:59:22 +02:00
Matthew Russellandsam-keen	fc6ce9e99b	fix(governance,trading): proposals not showing (#4222 ) Co-authored-by: sam-keen <samuel.kleinmann@gmail.com>	2023-07-05 14:09:13 +01:00
Art	f6fc4df1c5	chore(trading): dropdown alignments, account history default asset, transfer dialog asset selector (#4239 )	2023-07-05 13:02:02 +02:00
Art	fc8f12d6fc	fix(proposals): truncated text in network param toast (#4249 )	2023-07-05 12:50:42 +02:00
Madalina Raicu	77f49e3520	Merge branch 'feat/view-iceberg-orders' of github.com:vegaprotocol/frontend-monorepo into feat/submit-iceberg	2023-07-05 12:06:06 +03:00
Madalina Raicu	13d13bd930	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/view-iceberg-orders	2023-07-05 00:18:48 +03:00
Gordsport	26f4c1c983	feat(governance,explorer,trading): add env config for mainnet-mirror apps (#4253 )	2023-07-04 16:20:40 +00:00
Maciek	efd632f5c6	chore(orders): get rid of unnecessary stores (#4231 )	2023-07-04 17:47:04 +02:00
Madalina Raicu	c3b95357dc	fix: transfer type mappings	2023-07-04 17:59:59 +03:00
Madalina Raicu	1d74fd8311	Merge branch 'feat/view-iceberg-orders' of github.com:vegaprotocol/frontend-monorepo into feat/view-iceberg-orders	2023-07-04 17:58:21 +03:00
Madalina Raicu	981212bd64	fix: proposal type mappings	2023-07-04 17:58:07 +03:00
Madalina Raicu	54e6aadfa3	fix: account type holding	2023-07-04 17:49:20 +03:00
Madalina Raicu	be86d91249	fix: remove log	2023-07-04 17:48:17 +03:00
Madalina Raicu	93340db681	fix(trading): update order submission type wrapper	2023-07-03 14:54:59 +03:00
Madalina Raicu	869a739ea4	fix: remove log update copy	2023-07-03 11:51:09 +03:00
Madalina Raicu	6efbd514be	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/submit-iceberg	2023-06-29 14:51:43 +03:00
Madalina Raicu	39b24be40f	feat(trading): submit iceberg order using cli wallet	2023-06-29 00:47:02 +03:00
Madalina Raicu	3d26147be3	Merge branch 'feat/view-iceberg-orders' of github.com:vegaprotocol/frontend-monorepo into feat/submit-iceberg	2023-06-28 16:47:06 +03:00
Madalina Raicu	800b884ad9	fix: revert orders data provider changes	2023-06-28 16:41:12 +03:00
Madalina Raicu	44c00f808b	fix: add internal data source termination oracle	2023-06-28 16:34:01 +03:00
Madalina Raicu	32c8a926a5	feat(trading): view iceberg orders	2023-06-28 15:47:51 +03:00
Madalina Raicu	a1fec2c63f	feat(trading): submit iceberg orders deal ticket	2023-06-28 13:24:27 +03:00