chore: run and remove migrations.json

fix: wait for invisible element click in trading-trades e2e tests
chore: nx migrate latest
2023-07-03 11:22:34 +02:00 · 2023-07-03 10:02:14 +02:00 · 2023-07-02 15:14:13 +02:00
196 changed files with 2109 additions and 3903 deletions
@@ -5,7 +5,10 @@ on:
    branches:
      - release/*
      - develop
-  pull_request:
+      - 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:
    types:
      - opened
      - ready_for_review
@@ -46,7 +49,7 @@ jobs:

  lint-pr-title:
    needs: node-modules
-    if: ${{ github.event_name == 'pull_request' }}
+    if: ${{ github.event_name == 'pull_request' || github.event_name == 'pull_request_target' }}
    name: Verify PR title
    uses: ./.github/workflows/lint-pr.yml
    secrets: inherit
@@ -107,7 +110,6 @@ 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=()
@@ -178,31 +180,6 @@ 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[@]}")
@@ -237,7 +214,7 @@ jobs:
  publish-dist:
    needs: lint-test-build
    name: '(CD) publish dist'
-    if: ${{ (github.event_name == 'pull_request' &&  github.event.pull_request.head.repo.full_name == 'vegaprotocol/frontend-monorepo') || github.event_name == 'push' }}
+    # if: ${{ needs.lint-test-build.outputs.projects != '[]' }}
    uses: ./.github/workflows/publish-dist.yml
    secrets: inherit
    with:
@@ -248,7 +225,7 @@ jobs:
    needs:
      - publish-dist
      - lint-test-build
-    if: ${{ github.event_name == 'pull_request' &&  github.event.pull_request.head.repo.full_name == 'vegaprotocol/frontend-monorepo' }}
+    if: ${{ github.event_name == 'pull_request' || github.event_name == 'pull_request_target' }}
    timeout-minutes: 60
    name: '(CD) comment preview links'
    steps:
@@ -264,26 +241,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 --insecure --location --fail "${{ needs.lint-test-build.outputs.preview_governance }}"; do
-              echo "waiting for governance preview: ${{ needs.lint-test-build.outputs.preview_governance }}"
+            until curl -L --fail "${{ needs.lint-test-build.outputs.preview_governance }}"; do
+              echo "waiting for governance preview"
              sleep 5
            done
          fi
          if [[ "${{ needs.lint-test-build.outputs.preview_explorer }}" =~ $regex ]]; then
-            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 }}"
+            until curl -L --fail "${{ needs.lint-test-build.outputs.preview_explorer }}"; do
+              echo "waiting for explorer preview"
              sleep 5
            done
          fi
          if [[ "${{ needs.lint-test-build.outputs.preview_trading }}" =~ $regex ]]; then
-            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 }}"
+            until curl -L --fail "${{ needs.lint-test-build.outputs.preview_trading }}"; do
+              echo "waiting for trading preview"
              sleep 5
            done
          fi
          if [[ "${{ needs.lint-test-build.outputs.preview_tools }}" =~ $regex ]]; then
-            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 }}"
+            until curl -L --fail "${{ needs.lint-test-build.outputs.preview_tools }}"; do
+              echo "waiting for tools preview"
              sleep 5
            done
          fi
@@ -294,7 +271,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 }}
@@ -1,59 +0,0 @@
-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,39 +22,6 @@ 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
@@ -66,7 +33,7 @@ jobs:
        uses: docker/setup-buildx-action@v2

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

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

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

          if [[ "${{ github.ref }}" =~ .*release/.* ]]; then
-            # remove prefixing release/ and take the first string limited by - which is supposed to be name of the environment for releasing (format: release/testnet-trading)
-            envName="$(echo ${{ github.ref }} | sed -e "s|refs/heads/release/||" | cut -d '-' -f 1 )"
+            envName="$(echo ${{ github.ref }} | rev | cut -d '/' -f 1 | rev)"
          elif [[ "${{ github.ref }}" =~ .*develop$ ]]; then
            envName="stagnet1"
            if [[ "${{ matrix.app }}" = "multisig-signer" ]]; then
@@ -118,7 +85,7 @@ jobs:
              envName="mainnet"
              bucketName="ui.vega.rocks"
            fi
-          elif [[ "${{ github.ref }}" =~ .*mainnet$ ]]; then
+          elif [[ "${{ github.ref }}" =~ .*main$ ]]; then
            envName="mainnet"
          fi

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

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

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

      - name: Publish dist as docker image (ghcr - retry)
        uses: docker/build-push-action@v3
@@ -245,13 +212,13 @@ jobs:
            ENV_NAME=${{ env.ENV_NAME }}
          tags: |
            vegaprotocol/${{ matrix.app }}:${{ github.sha }}
-            vegaprotocol/${{ matrix.app }}:${{ env.IS_MAINNET_RELEASE == 'true' && 'mainnet' || env.IS_TESTNET_RELEASE == 'true' && 'testnet' || '' }}
+            vegaprotocol/${{ matrix.app }}:${{ endsWith(github.ref, 'main') && 'mainnet' || endsWith(github.ref, 'release/testnet') && '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: ${{ env.IS_S3_RELASE == 'true' }}
+        if: ${{ github.event_name == 'push' && ( matrix.app != 'trading' || (matrix.app == 'trading' && !( endsWith(github.ref, 'main') || endsWith(github.ref, 'release/testnet') ) ) ) }}
        with:
          args: --acl private --follow-symlinks --delete
        env:
@@ -262,11 +229,11 @@ jobs:
          SOURCE_DIR: 'dist-result'

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

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

      - name: Add preview label
        uses: actions-ecosystem/action-add-labels@v1
-        if: ${{ env.IS_PR == 'true' }}
+        if: ${{ github.event_name == 'pull_request' || github.event_name == 'pull_request_target' }}
        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: ${{ env.IS_IPFS_RELEASE == 'true' }}
+        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && ( endsWith(github.ref, 'main') || endsWith(github.ref, 'release/testnet') ) }}
        run: |
-          if [[ "${{ env.IS_MAINNET_RELEASE }}" = "true" ]]; then
+          if echo ${{ github.ref }} | grep -q main; then
            # display info about app
            curl --fail -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
              -H "Content-Type: application/json" \
@@ -301,7 +268,7 @@ jobs:
              -d '{"query": "mutation{triggerDeploy(siteId:\"f8f2e051-f18e-49e6-b876-0a39369dc0d8\"){id status}}"}' \
              https://api.fleek.co/graphql

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

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

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

            # update CID files
-            if [[ "${{ env.IS_MAINNET_RELEASE }}" = "true" ]]; then
+            if echo ${{ github.ref }} | grep -q main; then
              echo $new_hash > cidv0-mainnet.txt
              echo $new_cid > cidv1-mainnet.txt
              git add cidv0-mainnet.txt cidv1-mainnet.txt
-            elif [[ "${{ env.IS_TESTNET_RELEASE }}" = "true" ]]; then
+            elif echo ${{ github.ref }} | grep -q release/testnet; 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.skip('should open details page when clicked on "View details"', () => {
+    it('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,6 +27,11 @@ 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,6 +34,11 @@ 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')
@@ -65,6 +70,11 @@ 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')
@@ -148,6 +158,11 @@ 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')
@@ -179,6 +194,11 @@ 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,6 +169,12 @@ 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,16 +60,31 @@ 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,14 +1,14 @@
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.rocks
+NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
 NX_VEGA_ENV=STAGNET1
 NX_VEGA_EXPLORER_URL=https://explorer.stagnet1.vega.rocks
 NX_VEGA_TOKEN_URL=https://governance.stagnet1.vega.rocks
 NX_VEGA_WALLET_URL=http://localhost:1789
-NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.rocks
+NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.xyz
 NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket
-NX_BLOCK_EXPLORER=https://be.stagnet1.vega.rocks/rest
+NX_BLOCK_EXPLORER=https://be.stagnet1.vega.xyz/rest
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
 NX_VEGA_GOVERNANCE_URL=https://governance.stagnet1.vega.rocks
@@ -1,5 +1,5 @@
 # App configuration variables
-NX_TENDERMINT_URL=https://tm.be.devnet1.vega.xyz/
+NX_TENDERMINT_URL=https://tm.be.devnet1.vega.xyz/tm
 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
@@ -1,13 +0,0 @@
-# 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,7 +32,6 @@ 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/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"
+          "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"
        ]
      }
    },
@@ -1,4 +1,5 @@
 import { Icon, Tooltip } from '@vegaprotocol/ui-toolkit';
+import React from 'react';

 export interface InfoBlockProps {
  title: string;
@@ -1,98 +1,33 @@
 import { render } from '@testing-library/react';
 import { MemoryRouter } from 'react-router-dom';
 import PartyLink from './party-link';
-import { MockedProvider } from '@apollo/client/testing';
-import { ExplorerNodeNamesDocument } from '../../../routes/validators/__generated__/NodeNames';
-import { act } from 'react-dom/test-utils';
-const zeroes =
-  '0000000000000000000000000000000000000000000000000000000000000000';
-const mocks = [
-  {
-    request: {
-      query: ExplorerNodeNamesDocument,
-    },
-    result: {
-      data: {
-        nodesConnection: {
-          edges: [
-            {
-              node: {
-                id: '1',
-                name: 'Validator Node',
-                pubkey:
-                  '13464e35bcb8e8a2900ca0f87acaf252d50cf2ab2fc73694845a16b7c8a0dc6e',
-                tmPubkey: 'tmPubkey1',
-                ethereumAddress: '0x123456789',
-              },
-            },
-            {
-              node: {
-                id: '2',
-                name: 'Node 2',
-                pubkey: 'pubkey2',
-                tmPubkey: 'tmPubkey2',
-                ethereumAddress: '0xabcdef123',
-              },
-            },
-          ],
-        },
-      },
-    },
-  },
-];

 describe('PartyLink', () => {
  it('renders Network for 000.000 party', () => {
-    const screen = render(
-      <MockedProvider>
-        <PartyLink id={zeroes} />
-      </MockedProvider>
-    );
+    const zeroes =
+      '0000000000000000000000000000000000000000000000000000000000000000';
+    const screen = render(<PartyLink id={zeroes} />);
    expect(screen.getByText('Network')).toBeInTheDocument();
  });

  it('renders Network for network party', () => {
-    const screen = render(
-      <MockedProvider>
-        <PartyLink id="network" />
-      </MockedProvider>
-    );
+    const screen = render(<PartyLink id="network" />);
    expect(screen.getByText('Network')).toBeInTheDocument();
  });

  it('renders ID with no link for invalid party', () => {
-    const screen = render(
-      <MockedProvider>
-        <PartyLink id="this-party-is-not-valid" />
-      </MockedProvider>
-    );
+    const screen = render(<PartyLink id="this-party-is-not-valid" />);
    expect(screen.getByTestId('invalid-party')).toBeInTheDocument();
  });

-  it('if the key is a validator, render their name instead', async () => {
-    const screen = render(
-      <MockedProvider mocks={mocks}>
-        <MemoryRouter>
-          <PartyLink id="13464e35bcb8e8a2900ca0f87acaf252d50cf2ab2fc73694845a16b7c8a0dc6e" />
-        </MemoryRouter>
-      </MockedProvider>
-    );
-
-    // Wait for hook to update with mock data
-    await act(() => new Promise((resolve) => setTimeout(resolve, 0)));
-    await expect(screen.getByText('Validator Node')).toBeInTheDocument();
-  });
-
  it('links a valid party to the party page', () => {
    const aValidParty =
      '13464e35bcb8e8a2900ca0f87acaf252d50cf2ab2fc73694845a16b7c8a0dc6e';

    const screen = render(
-      <MockedProvider>
-        <MemoryRouter>
-          <PartyLink id={aValidParty} />
-        </MemoryRouter>
-      </MockedProvider>
+      <MemoryRouter>
+        <PartyLink id={aValidParty} />
+      </MemoryRouter>
    );

    const el = screen.getByText(aValidParty);
@@ -1,44 +1,22 @@
 import { Routes } from '../../../routes/route-names';
 import { Link } from 'react-router-dom';

-import { useMemo, type ComponentProps } from 'react';
+import type { ComponentProps } from 'react';
 import Hash from '../hash';
 import { t } from '@vegaprotocol/i18n';
 import { isValidPartyId } from '../../../routes/parties/id/components/party-id-error';
-import { Icon, truncateMiddle } from '@vegaprotocol/ui-toolkit';
-import { useExplorerNodeNamesQuery } from '../../../routes/validators/__generated__/NodeNames';
-import type { ExplorerNodeNamesQuery } from '../../../routes/validators/__generated__/NodeNames';
+import { truncateMiddle } from '@vegaprotocol/ui-toolkit';

 export const SPECIAL_CASE_NETWORK_ID =
  '0000000000000000000000000000000000000000000000000000000000000000';
 export const SPECIAL_CASE_NETWORK = 'network';

-export function getNameForParty(id: string, data?: ExplorerNodeNamesQuery) {
-  if (!data || data?.nodesConnection?.edges?.length === 0) {
-    return id;
-  }
-
-  const validator = data.nodesConnection.edges?.find((e) => {
-    return e?.node.pubkey === id;
-  });
-
-  if (validator) {
-    return validator.node.name;
-  }
-
-  return id;
-}
-
 export type PartyLinkProps = Partial<ComponentProps<typeof Link>> & {
  id: string;
  truncate?: boolean;
 };

 const PartyLink = ({ id, truncate = false, ...props }: PartyLinkProps) => {
-  const { data } = useExplorerNodeNamesQuery();
-  const name = useMemo(() => getNameForParty(id, data), [data, id]);
-  const useName = name !== id;
-
  // Some transactions will involve the 'network' party, which is alias for  '000...000'
  // The party page does not handle this nicely, so in this case we render the word 'Network'
  if (id === SPECIAL_CASE_NETWORK || id === SPECIAL_CASE_NETWORK_ID) {
@@ -60,20 +38,13 @@ const PartyLink = ({ id, truncate = false, ...props }: PartyLinkProps) => {
  }

  return (
-    <span className="whitespace-nowrap">
-      {useName && <Icon size={4} name="cube" className="mr-2" />}
-      <Link
-        className="underline font-mono"
-        {...props}
-        to={`/${Routes.PARTIES}/${id}`}
-      >
-        {useName ? (
-          name
-        ) : (
-          <Hash text={truncate ? truncateMiddle(id, 4, 4) : id} />
-        )}
-      </Link>
-    </span>
+    <Link
+      className="underline font-mono"
+      {...props}
+      to={`/${Routes.PARTIES}/${id}`}
+    >
+      <Hash text={truncate ? truncateMiddle(id) : id} />
+    </Link>
  );
 };

@@ -13,10 +13,6 @@ fragment ExplorerDeterministicOrderFields on Order {
  remaining
  size
  rejectionReason
-  peggedOrder {
-    reference
-    offset
-  }
  party {
    id
  }
@@ -3,7 +3,7 @@ import * as Types from '@vegaprotocol/types';
 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
-export type ExplorerDeterministicOrderFieldsFragment = { __typename?: 'Order', id: string, type?: Types.OrderType | null, reference: string, status: Types.OrderStatus, version: string, createdAt: any, updatedAt?: any | null, expiresAt?: any | null, timeInForce: Types.OrderTimeInForce, price: string, side: Types.Side, remaining: string, size: string, rejectionReason?: Types.OrderRejectionReason | null, peggedOrder?: { __typename?: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | null, party: { __typename?: 'Party', id: string }, market: { __typename?: 'Market', id: string, decimalPlaces: number, positionDecimalPlaces: number, state: Types.MarketState, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, product: { __typename?: 'Future', quoteName: string } } } } };
+export type ExplorerDeterministicOrderFieldsFragment = { __typename?: 'Order', id: string, type?: Types.OrderType | null, reference: string, status: Types.OrderStatus, version: string, createdAt: any, updatedAt?: any | null, expiresAt?: any | null, timeInForce: Types.OrderTimeInForce, price: string, side: Types.Side, remaining: string, size: string, rejectionReason?: Types.OrderRejectionReason | null, party: { __typename?: 'Party', id: string }, market: { __typename?: 'Market', id: string, decimalPlaces: number, positionDecimalPlaces: number, state: Types.MarketState, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, product: { __typename?: 'Future', quoteName: string } } } } };

 export type ExplorerDeterministicOrderQueryVariables = Types.Exact<{
  orderId: Types.Scalars['ID'];
@@ -11,7 +11,7 @@ export type ExplorerDeterministicOrderQueryVariables = Types.Exact<{
 }>;


-export type ExplorerDeterministicOrderQuery = { __typename?: 'Query', orderByID: { __typename?: 'Order', id: string, type?: Types.OrderType | null, reference: string, status: Types.OrderStatus, version: string, createdAt: any, updatedAt?: any | null, expiresAt?: any | null, timeInForce: Types.OrderTimeInForce, price: string, side: Types.Side, remaining: string, size: string, rejectionReason?: Types.OrderRejectionReason | null, peggedOrder?: { __typename?: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | null, party: { __typename?: 'Party', id: string }, market: { __typename?: 'Market', id: string, decimalPlaces: number, positionDecimalPlaces: number, state: Types.MarketState, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, product: { __typename?: 'Future', quoteName: string } } } } } };
+export type ExplorerDeterministicOrderQuery = { __typename?: 'Query', orderByID: { __typename?: 'Order', id: string, type?: Types.OrderType | null, reference: string, status: Types.OrderStatus, version: string, createdAt: any, updatedAt?: any | null, expiresAt?: any | null, timeInForce: Types.OrderTimeInForce, price: string, side: Types.Side, remaining: string, size: string, rejectionReason?: Types.OrderRejectionReason | null, party: { __typename?: 'Party', id: string }, market: { __typename?: 'Market', id: string, decimalPlaces: number, positionDecimalPlaces: number, state: Types.MarketState, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, product: { __typename?: 'Future', quoteName: string } } } } } };

 export const ExplorerDeterministicOrderFieldsFragmentDoc = gql`
    fragment ExplorerDeterministicOrderFields on Order {
@@ -29,10 +29,6 @@ export const ExplorerDeterministicOrderFieldsFragmentDoc = gql`
  remaining
  size
  rejectionReason
-  peggedOrder {
-    reference
-    offset
-  }
  party {
    id
  }
@@ -53,7 +53,6 @@ function renderExistingAmend(
            timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
            price: '200',
            side: 'BUY',
-            peggedOrder: null,
            remaining: '99',
            rejectionReason: 'rejection',
            reference: '123',
@@ -101,7 +100,6 @@ function renderExistingAmend(
            updatedAt: '456',
            expiresAt: '789',
            timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
-            peggedOrder: null,
            price: '200',
            side: 'BUY',
            remaining: '99',
@@ -5,7 +5,6 @@ import PriceInMarket from '../price-in-market/price-in-market';
 import { Time } from '../time';
 import { sideText, statusText, tifFull, tifShort } from './lib/order-labels';
 import SizeInMarket from '../size-in-market/size-in-market';
-import { TxOrderPeggedReference } from '../txs/details/order/tx-order-peg';

 export interface DeterministicOrderDetailsProps {
  id: string;
@@ -69,35 +68,25 @@ const DeterministicOrderDetails = ({
            <span className="mx-5 text-base">@</span>
            <PriceInMarket price={o.price} marketId={o.market.id} />
          </h2>
-          <p className="text-gray-200">
+          <p className="text-gray-500 mb-4">
            In <MarketLink id={o.market.id} /> at <Time date={o.createdAt} />.
          </p>
-          {o.peggedOrder ? (
-            <p className="text-gray-200">
-              {t('Price peg')}:{' '}
-              <TxOrderPeggedReference
-                side={o.side}
-                reference={o.peggedOrder.reference}
-                offset={o.peggedOrder.offset}
-                marketId={o.market.id}
-              />
-            </p>
-          ) : null}
-
          {o.reference ? (
-            <p className="text-gray-500 mt-4">
+            <p className="text-gray-500 mb-4">
              <span>{t('Reference')}</span>: {o.reference}
            </p>
          ) : null}
-          <div className="grid md:grid-cols-4 gap-x-6 mt-4">
-            <div className="mb-12 md:mb-0">
-              <h2 className="text-2xl font-bold text-dark mb-4">
-                {t('Status')}
-              </h2>
-              <h5 className="text-lg font-medium text-gray-500 mb-0 capitalize">
-                {statusText[o.status]}
-              </h5>
-            </div>
+          <div className="grid md:grid-cols-4 gap-x-6">
+            {version !== 0 ? null : (
+              <div className="mb-12 md:mb-0">
+                <h2 className="text-2xl font-bold text-dark mb-4">
+                  {t('Status')}
+                </h2>
+                <h5 className="text-lg font-medium text-gray-500 mb-0 capitalize">
+                  {statusText[o.status]}
+                </h5>
+              </div>
+            )}

            <div className="mb-12 md:mb-0">
              <h2 className="text-2xl font-bold text-dark mb-4">{t('Size')}</h2>
@@ -106,6 +95,17 @@ const DeterministicOrderDetails = ({
              </h5>
            </div>

+            {version !== 0 ? null : (
+              <div className="">
+                <h2 className="text-2xl font-bold text-dark mb-4">
+                  {t('Remaining')}
+                </h2>
+                <h5 className="text-lg font-medium text-gray-500 mb-0">
+                  <SizeInMarket size={o.remaining} marketId={o.market.id} />
+                </h5>
+              </div>
+            )}
+
            <div className="">
              <h2 className="text-2xl font-bold text-dark mb-4">
                {t('Version')}
@@ -31,7 +31,6 @@ const mock = {
        side: 'SIDE_BUY',
        remaining: '100',
        size: '100',
-        peggedOrder: null,
        party: {
          id: '456',
        },
@@ -1,4 +1,4 @@
-import { Icon, Tooltip } from '@vegaprotocol/ui-toolkit';
+import { Icon } from '@vegaprotocol/ui-toolkit';

 // https://github.com/vegaprotocol/vega/blob/develop/core/blockchain/response.go
 export const ErrorCodes = new Map([
@@ -17,8 +17,6 @@ interface ChainResponseCodeProps {
  code: number;
  hideLabel?: boolean;
  error?: string;
-  hideIfOk?: boolean;
-  small?: boolean;
 }

 /**
@@ -30,21 +28,14 @@ export const ChainResponseCode = ({
  code,
  hideLabel = false,
  error,
-  hideIfOk = false,
-  small = false,
 }: ChainResponseCodeProps) => {
-  if (hideIfOk && code === 0) {
-    return null;
-  }
-
  const isSuccess = successCodes.has(code);
-  const size = small ? 3 : 4;
  const successColour =
-    code === 71 ? '!fill-vega-orange' : '!fill-vega-green-600';
+    code === 71 ? 'fill-vega-orange' : 'fill-vega-green-600';
  const icon = isSuccess ? (
-    <Icon size={size} name="tick-circle" className={`${successColour}`} />
+    <Icon name="tick-circle" className={successColour} />
  ) : (
-    <Icon size={size} name="cross" className="!fill-vega-pink-500" />
+    <Icon name="cross" className="fill-vega-pink-600" />
  );
  const label = ErrorCodes.get(code) || 'Unknown response code';

@@ -53,28 +44,18 @@ export const ChainResponseCode = ({
    error && error.length > 100 ? error.replace(/,/g, ',\r\n') : error;

  return (
-    <Tooltip
-      description={
-        <span>
-          Response code: {code} - {label}
-        </span>
-      }
-    >
-      <div className="mt-[-1px] inline-block">
-        <span
-          className="mr-2"
-          aria-label={isSuccess ? 'Success' : 'Warning'}
-          role="img"
-        >
-          {icon}
-        </span>
-        {hideLabel ? null : <span>{label}</span>}
-        {!hideLabel && !!displayError ? (
-          <span className="ml-1 whitespace-pre">
-            &mdash;&nbsp;{displayError}
-          </span>
-        ) : null}
-      </div>
-    </Tooltip>
+    <div title={`Response code: ${code} - ${label}`} className=" inline-block">
+      <span
+        className="mr-2"
+        aria-label={isSuccess ? 'Success' : 'Warning'}
+        role="img"
+      >
+        {icon}
+      </span>
+      {hideLabel ? null : <span>{label}</span>}
+      {!hideLabel && !!displayError ? (
+        <span className="ml-1 whitespace-pre">&mdash;&nbsp;{displayError}</span>
+      ) : null}
+    </div>
  );
 };
@@ -1,113 +0,0 @@
-import { render } from '@testing-library/react';
-import type { TxDetailsOrderProps } from './tx-order-peg';
-import { TxOrderPeggedReference, getMarketDecimals } from './tx-order-peg';
-import { useExplorerMarketQuery } from '../../../links/market-link/__generated__/Market';
-import type { ExplorerMarketQuery } from '../../../links/market-link/__generated__/Market';
-import { PeggedReference, Side } from '@vegaprotocol/types';
-
-// Mock the useExplorerMarketQuery hook
-jest.mock('../../../links/market-link/__generated__/Market', () => ({
-  useExplorerMarketQuery: jest.fn().mockReturnValue({
-    data: {
-      market: { decimalPlaces: 0 },
-    },
-    loading: false,
-  }),
-}));
-
-describe('getSettlementAsset', () => {
-  it('should return the decimal places if data is defined', () => {
-    const data = {
-      market: {
-        __typename: 'Market',
-        id: '123',
-        decimalPlaces: 8,
-      },
-    };
-
-    const result = getMarketDecimals(data as Partial<ExplorerMarketQuery>);
-
-    expect(result).toEqual(8);
-  });
-
-  it('should return 0 if data is undefined', () => {
-    const result = getMarketDecimals(undefined);
-
-    expect(result).toEqual(0);
-  });
-});
-
-describe('TxOrderPeggedReference', () => {
-  beforeEach(() => {
-    // Mock the useExplorerMarketQuery hook return value
-    (useExplorerMarketQuery as jest.Mock).mockReturnValue({
-      data: {
-        settlementAsset: 'some-settlement-asset',
-      },
-      loading: false,
-    });
-  });
-
-  afterEach(() => {
-    jest.resetAllMocks();
-  });
-
-  it('should render the offset and reference correctly', () => {
-    const props: TxDetailsOrderProps = {
-      side: Side.SIDE_BUY,
-      offset: '10',
-      reference: PeggedReference.PEGGED_REFERENCE_MID,
-      marketId: 'some-market-id',
-    };
-
-    const { getByTestId } = render(<TxOrderPeggedReference {...props} />);
-
-    expect(getByTestId('pegged-reference')).toHaveTextContent('Mid + 10');
-  });
-
-  it('should return null if the reference is "PEGGED_REFERENCE_UNSPECIFIED"', () => {
-    const props: TxDetailsOrderProps = {
-      side: Side.SIDE_BUY,
-      offset: '10',
-      reference: 'PEGGED_REFERENCE_UNSPECIFIED',
-      marketId: 'some-market-id',
-    };
-
-    const { container } = render(<TxOrderPeggedReference {...props} />);
-
-    expect(container.firstChild).toBeNull();
-  });
-
-  it('should render the offset without formatting initially, then render the formatted version', () => {
-    const props: TxDetailsOrderProps = {
-      side: Side.SIDE_BUY,
-      offset: '10',
-      reference: PeggedReference.PEGGED_REFERENCE_BEST_ASK,
-      marketId: 'some-market-id',
-    };
-
-    (useExplorerMarketQuery as jest.Mock).mockReturnValue({
-      data: null,
-      loading: true,
-    });
-
-    const screen = render(<TxOrderPeggedReference {...props} />);
-    expect(screen.getByTestId('pegged-reference')).toHaveTextContent(
-      'Ask + 10'
-    );
-
-    (useExplorerMarketQuery as jest.Mock).mockReturnValue({
-      data: {
-        market: {
-          decimalPlaces: 10,
-        },
-      },
-      loading: false,
-    });
-
-    screen.rerender(<TxOrderPeggedReference {...props} />);
-    expect(screen.getByTestId('pegged-reference')).toHaveTextContent(
-      'Ask + 0.000000001'
-    );
-  });
-});
@@ -1,72 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import { TableCell, TableRow } from '../../../table';
-import type { VegaPeggedReference } from '../liquidity-provision/liquidity-provision-details';
-import { Side, PeggedReferenceMapping } from '@vegaprotocol/types';
-import { useExplorerMarketQuery } from '../../../links/market-link/__generated__/Market';
-import type { ExplorerMarketQuery } from '../../../links/market-link/__generated__/Market';
-import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
-
-export interface TxDetailsOrderProps {
-  offset: string;
-  reference: VegaPeggedReference;
-  marketId: string;
-  side: Side;
-}
-
-export function getMarketDecimals(
-  data: ExplorerMarketQuery | undefined
-): number {
-  return data?.market?.decimalPlaces || 0;
-}
-
-/**
- * Summarises an order's peg
- */
-export const TxOrderPeggedReferenceRow = ({
-  offset,
-  reference,
-  marketId,
-  side,
-}: TxDetailsOrderProps) => {
-  return (
-    <TableRow modifier="bordered">
-      <TableCell>{t('Pegged order')}</TableCell>
-      <TableCell>
-        <TxOrderPeggedReference
-          side={side}
-          offset={offset}
-          reference={reference}
-          marketId={marketId}
-        />
-      </TableCell>
-    </TableRow>
-  );
-};
-
-export const TxOrderPeggedReference = ({
-  offset,
-  reference,
-  marketId,
-  side,
-}: TxDetailsOrderProps) => {
-  const { data, loading } = useExplorerMarketQuery({
-    variables: { id: marketId },
-  });
-
-  const direction = side === Side.SIDE_BUY ? '+' : '-';
-  const decimalPlaces = getMarketDecimals(data);
-
-  if (reference === 'PEGGED_REFERENCE_UNSPECIFIED') {
-    return null;
-  }
-
-  return (
-    <span data-testid="pegged-reference">
-      {PeggedReferenceMapping[reference]}&nbsp;
-      {direction}&nbsp;
-      {!loading && data
-        ? addDecimalsFormatNumber(offset, decimalPlaces)
-        : offset}
-    </span>
-  );
-};
@@ -6,32 +6,10 @@ 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 { 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',
-};
+import type { Transfer } from '../transfer-details';

 interface TransferParticipantsProps {
  transfer: Transfer;
@@ -52,22 +30,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: AccountTypes =
+  const fromAcct =
    transfer.fromAccountType &&
    transfer.fromAccountType !== 'ACCOUNT_TYPE_UNSPECIFIED'
-      ? transfer.fromAccountType
-      : 'ACCOUNT_TYPE_GENERAL';
-  const fromAccountTypeLabel: string = transfer.fromAccountType
-    ? AccountType[fromAcct]
+      ? AccountType[transfer.fromAccountType]
+      : AccountType.ACCOUNT_TYPE_GENERAL;
+  const fromAccountTypeLabel = transfer.fromAccountType
+    ? AccountTypeMapping[fromAcct]
    : 'Unknown';

-  const toAcct: AccountTypes =
+  const toAcct =
    transfer.toAccountType &&
    transfer.toAccountType !== 'ACCOUNT_TYPE_UNSPECIFIED'
-      ? transfer.toAccountType
-      : 'ACCOUNT_TYPE_GENERAL';
+      ? AccountType[transfer.toAccountType]
+      : AccountType.ACCOUNT_TYPE_GENERAL;
  const toAccountTypeLabel = transfer.fromAccountType
-    ? AccountType[toAcct]
+    ? AccountTypeMapping[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">
-        <div>
+        <p>
          <EpochOverview id={recurring.startEpoch} />
-        </div>
+        </p>
        <p className="leading-10 my-2">
          <IconForEpoch
            start={recurring.startEpoch}
@@ -37,13 +37,13 @@ export function TransferRepeat({ recurring }: TransferRepeatProps) {
            current={data?.epoch.id}
          />
        </p>
-        <div>
+        <p>
          {recurring.endEpoch ? (
            <EpochOverview id={recurring.endEpoch} />
          ) : (
            <span>{t('Forever')}</span>
          )}
-        </div>
+        </p>
      </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: Record<Metric, string> = {
+const metricLabels = {
  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']['commandsv1RecurringTransfer'];
+export type Recurring = components['schemas']['v1RecurringTransfer'];
 export type Metric = components['schemas']['vegaDispatchMetric'];

 export const wrapperClasses =
@@ -7,7 +7,6 @@ import { TableCell, TableRow, TableWithTbody } from '../../table';
 import { txSignatureToDeterministicId } from '../lib/deterministic-ids';
 import DeterministicOrderDetails from '../../order-details/deterministic-order-details';
 import Hash from '../../links/hash';
-import { TxOrderPeggedReferenceRow } from './order/tx-order-peg';

 interface TxDetailsOrderProps {
  txData: BlockExplorerTransactionResult | undefined;
@@ -30,8 +29,6 @@ export const TxDetailsOrder = ({
    return <>{t('Awaiting Block Explorer transaction details')}</>;
  }
  const marketId = txData.command.orderSubmission.marketId || '-';
-  const reference = txData.command.orderSubmission.peggedOrder;
-  const side = txData.command.orderSubmission.side;

  let deterministicId = '';

@@ -66,14 +63,6 @@ export const TxDetailsOrder = ({
            <MarketLink id={marketId} />
          </TableCell>
        </TableRow>
-        {reference ? (
-          <TxOrderPeggedReferenceRow
-            side={side}
-            offset={reference.offset}
-            reference={reference.reference}
-            marketId={marketId}
-          />
-        ) : null}
      </TableWithTbody>

      {deterministicId.length > 0 ? (
@@ -10,17 +10,13 @@ export interface FilterLabelProps {
 */
 export function FilterLabel({ filters }: FilterLabelProps) {
  if (!filters || filters.size !== 1) {
-    return (
-      <span data-testid="filter-empty" className="uppercase">
-        {t('Filter')}
-      </span>
-    );
+    return <span className="uppercase">{t('Filter')}</span>;
  }

  return (
-    <div data-testid="filter-selected">
+    <div>
      <span className="uppercase">{t('Filters')}:</span>&nbsp;
-      <code className="bg-vega-light-150 dark:bg-vega-light-300 px-2 rounded-md capitalize dark:text-black">
+      <code className="bg-vega-light-150 px-2 rounded-md capitalize">
        {Array.from(filters)[0]}
      </code>
    </div>
@@ -1,21 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import { TxsFilter } from './tx-filter';
-import type { FilterOption } from './tx-filter';
-
-describe('TxsFilter', () => {
-  it('renders holding text when nothing is selected', () => {
-    const filters: Set<FilterOption> = new Set([]);
-    const setFilters = jest.fn();
-    render(<TxsFilter filters={filters} setFilters={setFilters} />);
-    expect(screen.getByTestId('filter-empty')).toBeInTheDocument();
-    expect(screen.getByText('Filter')).toBeInTheDocument();
-  });
-
-  it('renders the submit order filter as selected', () => {
-    const filters: Set<FilterOption> = new Set(['Submit Order']);
-    const setFilters = jest.fn();
-    render(<TxsFilter filters={filters} setFilters={setFilters} />);
-    expect(screen.getByTestId('filter-selected')).toBeInTheDocument();
-    expect(screen.getByText('Submit Order')).toBeInTheDocument();
-  });
-});
@@ -91,7 +91,7 @@ export interface TxFilterProps {
 * types. It allows a user to select one transaction type to view. Later
 * it will support multiple selection, but until the API supports that it is
 * one or all.
- * @param filters null or Set of transaction types
+ * @param filters null or Set of tranaction types
 * @param setFilters A function to update the filters prop
 * @returns
 */
@@ -100,15 +100,15 @@ export const TxsFilter = ({ filters, setFilters }: TxFilterProps) => {
    <DropdownMenu
      modal={false}
      trigger={
-        <DropdownMenuTrigger className="ml-0">
-          <Button size="xs" data-testid="filter-trigger">
+        <DropdownMenuTrigger className="ml-2">
+          <Button size="xs">
            <FilterLabel filters={filters} />
          </Button>
        </DropdownMenuTrigger>
      }
    >
      <DropdownMenuContent>
-        {filters.size > 0 ? null : (
+        {filters.size > 1 ? null : (
          <>
            <DropdownMenuCheckboxItem
              onCheckedChange={() => setFilters(new Set(AllFilterOptions))}
@@ -1,113 +0,0 @@
-import { render, screen, fireEvent } from '@testing-library/react';
-import { TxsListNavigation } from './tx-list-navigation';
-
-const NOOP = () => {
-  return;
-};
-describe('TxsListNavigation', () => {
-  it('renders transaction list navigation', () => {
-    render(
-      <TxsListNavigation
-        refreshTxs={NOOP}
-        nextPage={NOOP}
-        previousPage={NOOP}
-        hasMoreTxs={true}
-        hasPreviousPage={true}
-      >
-        <span></span>
-      </TxsListNavigation>
-    );
-
-    expect(screen.getByText('Newer')).toBeInTheDocument();
-    expect(screen.getByText('Older')).toBeInTheDocument();
-  });
-
-  it('calls previousPage when "Newer" button is clicked', () => {
-    const previousPageMock = jest.fn();
-
-    render(
-      <TxsListNavigation
-        refreshTxs={NOOP}
-        nextPage={NOOP}
-        previousPage={previousPageMock}
-        hasMoreTxs={true}
-        hasPreviousPage={true}
-      >
-        <span></span>
-      </TxsListNavigation>
-    );
-
-    fireEvent.click(screen.getByText('Newer'));
-
-    expect(previousPageMock).toHaveBeenCalledTimes(1);
-  });
-
-  it('calls nextPage when "Older" button is clicked', () => {
-    const nextPageMock = jest.fn();
-
-    render(
-      <TxsListNavigation
-        refreshTxs={NOOP}
-        nextPage={nextPageMock}
-        previousPage={NOOP}
-        hasMoreTxs={true}
-        hasPreviousPage={true}
-      >
-        <span></span>
-      </TxsListNavigation>
-    );
-
-    fireEvent.click(screen.getByText('Older'));
-
-    expect(nextPageMock).toHaveBeenCalledTimes(1);
-  });
-
-  it('disables "Older" button if hasMoreTxs is false', () => {
-    render(
-      <TxsListNavigation
-        refreshTxs={NOOP}
-        nextPage={NOOP}
-        previousPage={NOOP}
-        hasMoreTxs={false}
-        hasPreviousPage={false}
-      >
-        <span></span>
-      </TxsListNavigation>
-    );
-
-    expect(screen.getByText('Older')).toBeDisabled();
-  });
-
-  it('disables "Newer" button if hasPreviousPage is false', () => {
-    render(
-      <TxsListNavigation
-        refreshTxs={NOOP}
-        nextPage={NOOP}
-        previousPage={NOOP}
-        hasMoreTxs={true}
-        hasPreviousPage={false}
-      >
-        <span></span>
-      </TxsListNavigation>
-    );
-
-    expect(screen.getByText('Newer')).toBeDisabled();
-  });
-
-  it('disables both buttons when more and previous are false', () => {
-    render(
-      <TxsListNavigation
-        refreshTxs={NOOP}
-        nextPage={NOOP}
-        previousPage={NOOP}
-        hasMoreTxs={false}
-        hasPreviousPage={false}
-      >
-        <span></span>
-      </TxsListNavigation>
-    );
-
-    expect(screen.getByText('Newer')).toBeDisabled();
-    expect(screen.getByText('Older')).toBeDisabled();
-  });
-});
@@ -1,63 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import { BlocksRefetch } from '../blocks';
-
-import { Button } from '@vegaprotocol/ui-toolkit';
-
-export interface TxListNavigationProps {
-  refreshTxs: () => void;
-  nextPage: () => void;
-  previousPage: () => void;
-  loading?: boolean;
-  hasPreviousPage: boolean;
-  hasMoreTxs: boolean;
-  children: React.ReactNode;
-}
-/**
- * Displays a list of transactions with filters and controls to navigate through the list.
- *
- * @returns {JSX.Element} Transaction List and controls
- */
-export const TxsListNavigation = ({
-  refreshTxs,
-  nextPage,
-  previousPage,
-  hasMoreTxs,
-  hasPreviousPage,
-  children,
-  loading = false,
-}: TxListNavigationProps) => {
-  return (
-    <>
-      <menu className="mb-2 w-full ">{children}</menu>
-      <menu className="mb-2 w-full">
-        <BlocksRefetch refetch={refreshTxs} />
-        <div className="float-right">
-          <Button
-            className="mr-2"
-            size="xs"
-            disabled={!hasPreviousPage || loading}
-            onClick={() => {
-              previousPage();
-            }}
-          >
-            {t('Newer')}
-          </Button>
-          <Button
-            size="xs"
-            disabled={!hasMoreTxs || loading}
-            onClick={() => {
-              nextPage();
-            }}
-          >
-            {t('Older')}
-          </Button>
-        </div>
-        <div className="float-right mr-2">
-          {loading ? (
-            <span className="text-vega-light-300">{t('Loading...')}</span>
-          ) : null}
-        </div>
-      </menu>
-    </>
-  );
-};
@@ -16,7 +16,7 @@ interface StringMap {
 const displayString: StringMap = {
  OrderSubmission: 'Order Submission',
  'Submit Order': 'Order',
-  OrderCancellation: 'Cancel order',
+  OrderCancellation: 'Order Cancellation',
  OrderAmendment: 'Order Amendment',
  VoteSubmission: 'Vote Submission',
  WithdrawSubmission: 'Withdraw Submission',
@@ -24,7 +24,6 @@ const displayString: StringMap = {
  LiquidityProvisionSubmission: 'LP order',
  'Liquidity Provision Order': 'LP order',
  LiquidityProvisionCancellation: 'LP cancel',
-  'Cancel LiquidityProvision Order': 'LP cancel',
  LiquidityProvisionAmendment: 'LP update',
  'Amend LiquidityProvision Order': 'Amend LP',
  ProposalSubmission: 'Governance Proposal',
@@ -37,34 +36,12 @@ const displayString: StringMap = {
  UndelegateSubmission: 'Undelegation',
  KeyRotateSubmission: 'Key Rotation',
  StateVariableProposal: 'State Variable',
-  'State Variable Proposal': 'State Variable',
  Transfer: 'Transfer',
  CancelTransfer: 'Cancel Transfer',
-  'Cancel Transfer Funds': 'Cancel Transfer',
  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
@@ -136,8 +113,6 @@ export function getLabelForChainEvent(
      return t('Signer threshold');
    }
    return t('Multisig update');
-  } else if (chainEvent.contractCall) {
-    return t('Contract call');
  }
  return t('Chain Event');
 }
@@ -197,7 +172,7 @@ export const TxOrderType = ({ orderType, command }: TxOrderTypeProps) => {
  return (
    <div
      data-testid="tx-type"
-      className={`text-sm rounded-md leading-tight px-2 inline-block whitespace-nowrap ${colours}`}
+      className={`text-sm rounded-md leading-none px-2 py-2 inline-block ${colours}`}
    >
      {type}
    </div>
@@ -1,4 +1,3 @@
-import { MockedProvider } from '@apollo/client/testing';
 import { TxsInfiniteListItem } from './txs-infinite-list-item';
 import { render, screen } from '@testing-library/react';
 import { MemoryRouter } from 'react-router-dom';
@@ -84,22 +83,21 @@ describe('Txs infinite list item', () => {

  it('renders data correctly', () => {
    render(
-      <MockedProvider>
-        <MemoryRouter>
-          <TxsInfiniteListItem
-            type="testType"
-            submitter="testPubKey"
-            hash="testTxHash"
-            block="1"
-            code={0}
-            command={{}}
-          />
-        </MemoryRouter>
-      </MockedProvider>
+      <MemoryRouter>
+        <TxsInfiniteListItem
+          type="testType"
+          submitter="testPubKey"
+          hash="testTxHash"
+          block="1"
+          code={0}
+          command={{}}
+        />
+      </MemoryRouter>
    );
    expect(screen.getByTestId('tx-hash')).toHaveTextContent('testTxHash');
    expect(screen.getByTestId('pub-key')).toHaveTextContent('testPubKey');
    expect(screen.getByTestId('tx-type')).toHaveTextContent('testType');
    expect(screen.getByTestId('tx-block')).toHaveTextContent('1');
+    expect(screen.getByTestId('tx-success')).toHaveTextContent('Success');
  });
 });
@@ -1,3 +1,4 @@
+import React from 'react';
 import { TruncatedLink } from '../truncate/truncated-link';
 import { Routes } from '../../routes/route-names';
 import { TxOrderType } from './tx-order-type';
@@ -5,25 +6,8 @@ import type { BlockExplorerTransactionResult } from '../../routes/types/block-ex
 import { toHex } from '../search/detect-search';
 import { ChainResponseCode } from './details/chain-response-code/chain-reponse.code';
 import isNumber from 'lodash/isNumber';
-import { PartyLink } from '../links';
-import { useScreenDimensions } from '@vegaprotocol/react-helpers';
-import type { Screen } from '@vegaprotocol/react-helpers';
-import { useMemo } from 'react';

-const DEFAULT_TRUNCATE_LENGTH = 7;
-
-export function getIdTruncateLength(screen: Screen): number {
-  if (['xxxl', 'xxl'].includes(screen)) {
-    return 64;
-  } else if (['xl', 'lg', 'md'].includes(screen)) {
-    return 32;
-  }
-  return DEFAULT_TRUNCATE_LENGTH;
-}
-
-export function shouldTruncateParty(screen: Screen): boolean {
-  return !['xxxl', 'xxl', 'xl'].includes(screen);
-}
+const TRUNCATE_LENGTH = 10;

 export const TxsInfiniteListItem = ({
  hash,
@@ -33,12 +17,6 @@ export const TxsInfiniteListItem = ({
  block,
  command,
 }: Partial<BlockExplorerTransactionResult>) => {
-  const { screenSize } = useScreenDimensions();
-  const idTruncateLength = useMemo(
-    () => getIdTruncateLength(screenSize),
-    [screenSize]
-  );
-
  if (
    !hash ||
    !submitter ||
@@ -51,40 +29,68 @@ export const TxsInfiniteListItem = ({
  }

  return (
-    <tr
+    <div
      data-testid="transaction-row"
-      className="transaction-row text-left items-center h-full border-t border-neutral-600 dark:border-neutral-800 txs-infinite-list-item py-[2px]"
+      className="flex items-center h-full border-t border-neutral-600 dark:border-neutral-800 txs-infinite-list-item grid grid-cols-10"
    >
-      <td
-        className="text-sm leading-none whitespace-nowrap font-mono"
+      <div
+        className="text-sm col-span-10 md:col-span-3 leading-none"
        data-testid="tx-hash"
      >
-        {isNumber(code) ? (
-          <ChainResponseCode code={code} hideLabel={true} hideIfOk={true} />
-        ) : (
-          code
-        )}
+        <span className="md:hidden uppercase text-vega-dark-300">
+          ID:&nbsp;
+        </span>
        <TruncatedLink
          to={`/${Routes.TX}/${toHex(hash)}`}
          text={hash}
-          startChars={idTruncateLength}
-          endChars={0}
+          startChars={TRUNCATE_LENGTH}
+          endChars={TRUNCATE_LENGTH}
        />
-      </td>
-      <td className="text-sm leading-none">
+      </div>
+      <div
+        className="text-sm col-span-10 md:col-span-3 leading-none"
+        data-testid="pub-key"
+      >
+        <span className="md:hidden uppercase text-vega-dark-300">
+          By:&nbsp;
+        </span>
+        <TruncatedLink
+          to={`/${Routes.PARTIES}/${submitter}`}
+          text={submitter}
+          startChars={TRUNCATE_LENGTH}
+          endChars={TRUNCATE_LENGTH}
+        />
+      </div>
+      <div className="text-sm col-span-5 md:col-span-2 leading-none	flex items-center">
        <TxOrderType orderType={type} command={command} />
-      </td>
-      <td className="text-sm leading-none" data-testid="pub-key">
-        <PartyLink truncate={shouldTruncateParty(screenSize)} id={submitter} />
-      </td>
-      <td className="text-sm items-center font-mono" data-testid="tx-block">
+      </div>
+      <div
+        className="text-sm col-span-3 md:col-span-1 leading-none flex items-center"
+        data-testid="tx-block"
+      >
+        <span className="md:hidden uppercase text-vega-dark-300">
+          Block:&nbsp;
+        </span>
        <TruncatedLink
          to={`/${Routes.BLOCKS}/${block}`}
          text={block}
-          startChars={5}
-          endChars={5}
+          startChars={TRUNCATE_LENGTH}
+          endChars={TRUNCATE_LENGTH}
        />
-      </td>
-    </tr>
+      </div>
+      <div
+        className="text-sm col-span-2 md:col-span-1 leading-none flex items-center"
+        data-testid="tx-success"
+      >
+        <span className="md:hidden uppercase text-vega-dark-300">
+          Success&nbsp;
+        </span>
+        {isNumber(code) ? (
+          <ChainResponseCode code={code} hideLabel={true} />
+        ) : (
+          code
+        )}
+      </div>
+    </div>
  );
 };
@@ -1,9 +1,8 @@
 import { TxsInfiniteList } from './txs-infinite-list';
-import { render, screen } from '@testing-library/react';
+import { render, screen, fireEvent, act } from '@testing-library/react';
 import { MemoryRouter } from 'react-router-dom';
 import type { BlockExplorerTransactionResult } from '../../routes/types/block-explorer-response';
 import { Side } from '@vegaprotocol/types';
-import { MockedProvider } from '@apollo/client/testing';

 const generateTxs = (number: number): BlockExplorerTransactionResult[] => {
  return Array.from(Array(number)).map((_) => ({
@@ -41,7 +40,7 @@ describe('Txs infinite list', () => {
  it('should display a "no items" message when no items provided', () => {
    render(
      <TxsInfiniteList
-        txs={undefined as unknown as BlockExplorerTransactionResult[]}
+        txs={undefined}
        areTxsLoading={false}
        hasMoreTxs={false}
        loadMoreTxs={() => null}
@@ -49,7 +48,23 @@ describe('Txs infinite list', () => {
      />
    );
    expect(screen.getByTestId('emptylist')).toBeInTheDocument();
-    expect(screen.getByText('No transactions found')).toBeInTheDocument();
+    expect(
+      screen.getByText('This chain has 0 transactions')
+    ).toBeInTheDocument();
+  });
+
+  it('error is displayed at item level', () => {
+    const txs = generateTxs(1);
+    render(
+      <TxsInfiniteList
+        txs={txs}
+        areTxsLoading={false}
+        hasMoreTxs={false}
+        loadMoreTxs={() => null}
+        error={Error('test error!')}
+      />
+    );
+    expect(screen.getByText('Cannot fetch transaction')).toBeInTheDocument();
  });

  it('item renders data of n length into list of n length', () => {
@@ -58,22 +73,85 @@ describe('Txs infinite list', () => {
    const txs = generateTxs(7);
    render(
      <MemoryRouter>
-        <MockedProvider>
-          <TxsInfiniteList
-            txs={txs}
-            areTxsLoading={false}
-            hasMoreTxs={false}
-            loadMoreTxs={() => null}
-            error={undefined}
-          />
-        </MockedProvider>
+        <TxsInfiniteList
+          txs={txs}
+          areTxsLoading={false}
+          hasMoreTxs={false}
+          loadMoreTxs={() => null}
+          error={undefined}
+        />
      </MemoryRouter>
    );

    expect(
      screen
-        .getByTestId('transactions-list')
-        .querySelectorAll('.transaction-row')
+        .getByTestId('infinite-scroll-wrapper')
+        .querySelectorAll('.txs-infinite-list-item')
    ).toHaveLength(7);
  });
+
+  it('tries to load more items when required to initially fill the list', () => {
+    // For example, if initially rendering 15, the bottom of the list is
+    // in view of the viewport, and the callback should be executed
+    const txs = generateTxs(15);
+    const callback = jest.fn();
+
+    render(
+      <MemoryRouter>
+        <TxsInfiniteList
+          txs={txs}
+          areTxsLoading={false}
+          hasMoreTxs={true}
+          loadMoreTxs={callback}
+          error={undefined}
+        />
+      </MemoryRouter>
+    );
+
+    expect(callback.mock.calls.length).toEqual(1);
+  });
+
+  it('does not try to load more items if there are no more', () => {
+    const txs = generateTxs(3);
+    const callback = jest.fn();
+
+    render(
+      <MemoryRouter>
+        <TxsInfiniteList
+          txs={txs}
+          areTxsLoading={false}
+          hasMoreTxs={false}
+          loadMoreTxs={callback}
+          error={undefined}
+        />
+      </MemoryRouter>
+    );
+
+    expect(callback.mock.calls.length).toEqual(0);
+  });
+
+  it('loads more items is called when scrolled', () => {
+    const txs = generateTxs(14);
+    const callback = jest.fn();
+
+    render(
+      <MemoryRouter>
+        <TxsInfiniteList
+          txs={txs}
+          areTxsLoading={false}
+          hasMoreTxs={true}
+          loadMoreTxs={callback}
+          error={undefined}
+        />
+      </MemoryRouter>
+    );
+
+    act(() => {
+      fireEvent.scroll(screen.getByTestId('infinite-scroll-wrapper'), {
+        target: { scrollY: 2000 },
+      });
+    });
+
+    expect(callback.mock.calls.length).toEqual(1);
+  });
 });
@@ -1,4 +1,8 @@
+import React, { useEffect, useRef } from 'react';
+import { FixedSizeList as List } from 'react-window';
+import InfiniteLoader from 'react-window-infinite-loader';
 import { t } from '@vegaprotocol/i18n';
+import { useScreenDimensions } from '@vegaprotocol/react-helpers';
 import { TxsInfiniteListItem } from './txs-infinite-list-item';
 import type { BlockExplorerTransactionResult } from '../../routes/types/block-explorer-response';
 import EmptyList from '../empty-list/empty-list';
@@ -7,46 +11,82 @@ import { Loader } from '@vegaprotocol/ui-toolkit';
 interface TxsInfiniteListProps {
  hasMoreTxs: boolean;
  areTxsLoading: boolean | undefined;
-  txs: BlockExplorerTransactionResult[];
+  txs: BlockExplorerTransactionResult[] | undefined;
  loadMoreTxs: () => void;
  error: Error | undefined;
  className?: string;
-  hasFilters?: boolean;
 }

 interface ItemProps {
-  tx: BlockExplorerTransactionResult;
+  index: BlockExplorerTransactionResult;
+  style: React.CSSProperties;
+  isLoading: boolean;
+  error: Error | undefined;
 }

-const Item = ({ tx }: ItemProps) => {
-  const { hash, submitter, type, command, block, code, index: blockIndex } = tx;
-  return (
-    <TxsInfiniteListItem
-      type={type}
-      code={code}
-      command={command}
-      submitter={submitter}
-      hash={hash}
-      block={block}
-      index={blockIndex}
-    />
-  );
+// eslint-disable-next-line @typescript-eslint/no-empty-function
+const NOOP = () => {};
+
+const Item = ({ index, style, isLoading, error }: ItemProps) => {
+  let content;
+  if (error) {
+    content = t(`Cannot fetch transaction`);
+  } else if (isLoading) {
+    content = <Loader />;
+  } else {
+    const {
+      hash,
+      submitter,
+      type,
+      command,
+      block,
+      code,
+      index: blockIndex,
+    } = index;
+    content = (
+      <TxsInfiniteListItem
+        type={type}
+        code={code}
+        command={command}
+        submitter={submitter}
+        hash={hash}
+        block={block}
+        index={blockIndex}
+      />
+    );
+  }
+
+  return <div style={style}>{content}</div>;
 };

 export const TxsInfiniteList = ({
+  hasMoreTxs,
  areTxsLoading,
  txs,
+  loadMoreTxs,
+  error,
  className,
-  hasFilters = false,
 }: TxsInfiniteListProps) => {
-  if (!txs || txs.length === 0) {
+  const { screenSize } = useScreenDimensions();
+  const isStacked = ['xs', 'sm'].includes(screenSize);
+  const infiniteLoaderRef = useRef<InfiniteLoader>(null);
+  const hasMountedRef = useRef(false);
+
+  useEffect(() => {
+    if (hasMountedRef.current) {
+      if (infiniteLoaderRef.current) {
+        infiniteLoaderRef.current.resetloadMoreItemsCache(true);
+      }
+    }
+    hasMountedRef.current = true;
+  }, [loadMoreTxs]);
+
+  if (!txs) {
    if (!areTxsLoading) {
      return (
        <EmptyList
-          heading={t('No transactions found')}
-          label={
-            hasFilters ? t('Try a different filter') : t('Check back soon')
-          }
+          heading={t('This chain has 0 transactions')}
+          label={t('Check back soon')}
        />
      );
    } else {
@@ -54,26 +94,57 @@ export const TxsInfiniteList = ({
    }
  }

+  // If there are more items to be loaded then add an extra row to hold a loading indicator.
+  const itemCount = hasMoreTxs ? txs.length + 1 : txs.length;
+
+  // Pass an empty callback to InfiniteLoader in case it asks us to load more than once.
+  // eslint-disable-next-line @typescript-eslint/no-empty-function
+  const loadMoreItems = areTxsLoading ? NOOP : loadMoreTxs;
+
+  // Every row is loaded except for our loading indicator row.
+  const isItemLoaded = (index: number) => !hasMoreTxs || index < txs.length;
+
  return (
-    <div className="overflow-scroll">
-      <table className={className} data-testid="transactions-list">
-        <thead>
-          <tr className="w-full mb-3 text-vega-dark-300 uppercase text-left">
-            <th>
-              <span className="hidden xl:inline">{t('Txn')} &nbsp;</span>
-              <span>ID</span>
-            </th>
-            <th>{t('Type')}</th>
-            <th className="text-left">{t('From')}</th>
-            <th>{t('Block')}</th>
-          </tr>
-        </thead>
-        <tbody>
-          {txs.map((t) => (
-            <Item key={t.hash} tx={t} />
-          ))}
-        </tbody>
-      </table>
+    <div className={className} data-testid="transactions-list">
+      <div className="lg:grid grid-cols-10 w-full mb-3 hidden text-vega-dark-300 uppercase">
+        <div className="col-span-3">
+          <span className="hidden xl:inline">{t('Transaction')} &nbsp;</span>
+          <span>ID</span>
+        </div>
+        <div className="col-span-3">{t('Submitted By')}</div>
+        <div className="col-span-2">{t('Type')}</div>
+        <div className="col-span-1">{t('Block')}</div>
+        <div className="col-span-1">{t('Success')}</div>
+      </div>
+      <div data-testid="infinite-scroll-wrapper">
+        <InfiniteLoader
+          isItemLoaded={isItemLoaded}
+          itemCount={itemCount}
+          loadMoreItems={loadMoreItems}
+          ref={infiniteLoaderRef}
+        >
+          {({ onItemsRendered, ref }) => (
+            <List
+              className="List"
+              height={995}
+              itemCount={itemCount}
+              itemSize={isStacked ? 134 : 50}
+              onItemsRendered={onItemsRendered}
+              ref={ref}
+              width={'100%'}
+            >
+              {({ index, style }) => (
+                <Item
+                  index={txs[index]}
+                  style={style}
+                  isLoading={!isItemLoaded(index)}
+                  error={error}
+                />
+              )}
+            </List>
+          )}
+        </InfiniteLoader>
+      </div>
    </div>
  );
 };
@@ -1,17 +1,23 @@
-import { Table, TableRow } from '../table';
+import { Routes } from '../../routes/route-names';
+import { TruncatedLink } from '../truncate/truncated-link';
+import { TxOrderType } from './tx-order-type';
+import { Table, TableRow, TableCell } from '../table';
 import { t } from '@vegaprotocol/i18n';
 import { useFetch } from '@vegaprotocol/react-helpers';
 import type { BlockExplorerTransactions } from '../../routes/types/block-explorer-response';
+import isNumber from 'lodash/isNumber';
+import { ChainResponseCode } from './details/chain-response-code/chain-reponse.code';
 import { getTxsDataUrl } from '../../hooks/use-txs-data';
 import { AsyncRenderer, Loader } from '@vegaprotocol/ui-toolkit';
 import EmptyList from '../empty-list/empty-list';
-import { TxsInfiniteListItem } from './txs-infinite-list-item';

 interface TxsPerBlockProps {
  blockHeight: string;
  txCount: number;
 }

+const truncateLength = 5;
+
 export const TxsPerBlock = ({ blockHeight, txCount }: TxsPerBlockProps) => {
  const filters = `filters[block.height]=${blockHeight}`;
  const url = getTxsDataUrl({ limit: txCount.toString(), filters });
@@ -27,23 +33,53 @@ export const TxsPerBlock = ({ blockHeight, txCount }: TxsPerBlockProps) => {
            <thead>
              <TableRow modifier="bordered" className="font-mono">
                <td>{t('Transaction')}</td>
-                <td>{t('Type')}</td>
                <td>{t('From')}</td>
-                <td>{t('Block')}</td>
+                <td>{t('Type')}</td>
+                <td>{t('Status')}</td>
              </TableRow>
            </thead>
            <tbody>
              {data.transactions.map(
-                ({ hash, submitter, type, command, code, block }) => {
+                ({ hash, submitter, type, command, code }) => {
                  return (
-                    <TxsInfiniteListItem
-                      block={block}
-                      hash={hash}
-                      submitter={submitter}
-                      type={type}
-                      command={command}
-                      code={code}
-                    />
+                    <TableRow
+                      modifier="bordered"
+                      key={hash}
+                      data-testid="transaction-row"
+                    >
+                      <TableCell
+                        modifier="bordered"
+                        className="pr-12 font-mono"
+                      >
+                        <TruncatedLink
+                          to={`/${Routes.TX}/${hash}`}
+                          text={hash}
+                          startChars={truncateLength}
+                          endChars={truncateLength}
+                        />
+                      </TableCell>
+                      <TableCell
+                        modifier="bordered"
+                        className="pr-12 font-mono"
+                      >
+                        <TruncatedLink
+                          to={`/${Routes.PARTIES}/${submitter}`}
+                          text={submitter}
+                          startChars={truncateLength}
+                          endChars={truncateLength}
+                        />
+                      </TableCell>
+                      <TableCell modifier="bordered">
+                        <TxOrderType orderType={type} command={command} />
+                      </TableCell>
+                      <TableCell modifier="bordered" className="text">
+                        {isNumber(code) ? (
+                          <ChainResponseCode code={code} hideLabel={true} />
+                        ) : (
+                          code
+                        )}
+                      </TableCell>
+                    </TableRow>
                  );
                }
              )}
@@ -56,14 +56,10 @@ export function VoteIcon({

  return (
    <div
-      className={`voteicon inline-block py-0 px-2 py rounded-md text-white whitespace-nowrap leading-tight sm align-top ${bg}`}
+      className={`voteicon inline-block my-1 py-1 px-2 py rounded-md text-white leading-one sm align-top ${bg}`}
    >
-      <Icon
-        name={icon}
-        size={3}
-        className={`mr-2 p-0 mb-[-1px] fill-${fill}`}
-      />
-      <span className={`text-${text}`} data-testid="label">
+      <Icon name={icon} size={3} className={`mr-2 p-0 fill-${fill}`} />
+      <span className={`text-base text-${text}`} data-testid="label">
        {label}
      </span>
    </div>
@@ -10,18 +10,16 @@ import isNumber from 'lodash/isNumber';
 export interface TxsStateProps {
  txsData: BlockExplorerTransactionResult[];
  hasMoreTxs: boolean;
-  cursor: string;
-  previousCursors: string[];
-  hasPreviousPage: boolean;
+  lastCursor: string;
 }

 export interface IUseTxsData {
-  limit: number;
+  limit?: number;
  filters?: string;
 }

 interface IGetTxsDataUrl {
-  limit: string;
+  limit?: string;
  filters?: string;
 }

@@ -42,89 +40,63 @@ export const getTxsDataUrl = ({ limit, filters }: IGetTxsDataUrl) => {
 };

 export const useTxsData = ({ limit, filters }: IUseTxsData) => {
-  const [
-    { txsData, hasMoreTxs, cursor, previousCursors, hasPreviousPage },
-    setTxsState,
-  ] = useState<TxsStateProps>({
-    txsData: [],
-    hasMoreTxs: false,
-    previousCursors: [],
-    cursor: '',
-    hasPreviousPage: false,
-  });
+  const [{ txsData, hasMoreTxs, lastCursor }, setTxsState] =
+    useState<TxsStateProps>({
+      txsData: [],
+      hasMoreTxs: true,
+      lastCursor: '',
+    });

-  const url = getTxsDataUrl({ limit: limit.toString(), filters });
+  const url = getTxsDataUrl({ limit: limit?.toString(), filters });

  const {
    state: { data, error, loading },
    refetch,
-  } = useFetch<BlockExplorerTransactions>(url, {}, true);
+  } = useFetch<BlockExplorerTransactions>(url, {}, false);

  useEffect(() => {
-    if (!loading && data && isNumber(data.transactions.length)) {
-      setTxsState((prev) => {
-        return {
-          ...prev,
-          txsData: data.transactions,
-          hasMoreTxs: data.transactions.length >= limit,
-          cursor: data?.transactions.at(-1)?.cursor || '',
-        };
-      });
+    if (data && isNumber(data?.transactions?.length)) {
+      setTxsState((prev) => ({
+        txsData: [...prev.txsData, ...data.transactions],
+        hasMoreTxs: data.transactions.length > 0,
+        lastCursor:
+          data.transactions[data.transactions.length - 1]?.cursor || '',
+      }));
    }
-  }, [loading, setTxsState, data, limit]);
-
-  const nextPage = useCallback(() => {
-    const c = data?.transactions.at(0)?.cursor;
-    const newPreviousCursors = c ? [...previousCursors, c] : previousCursors;
+  }, [setTxsState, data]);

+  useEffect(() => {
    setTxsState((prev) => ({
-      ...prev,
-      hasPreviousPage: true,
-      previousCursors: newPreviousCursors,
+      txsData: [],
+      hasMoreTxs: true,
+      lastCursor: '',
    }));
+  }, [filters]);

+  const loadTxs = useCallback(() => {
    return refetch({
-      limit,
-      before: cursor,
+      limit: limit,
+      before: lastCursor,
    });
-  }, [data, previousCursors, cursor, limit, refetch]);
-
-  const previousPage = useCallback(() => {
-    const previousCursor = [...previousCursors].pop();
-    const newPreviousCursors = previousCursors.slice(0, -1);
-    setTxsState((prev) => ({
-      ...prev,
-      hasPreviousPage: newPreviousCursors.length > 0,
-      previousCursors: newPreviousCursors,
-    }));
-    return refetch({
-      limit,
-      before: previousCursor,
-    });
-  }, [previousCursors, limit, refetch]);
+  }, [lastCursor, limit, refetch]);

  const refreshTxs = useCallback(async () => {
-    setTxsState(() => ({
+    setTxsState((prev) => ({
+      ...prev,
+      lastCursor: '',
+      hasMoreTxs: true,
      txsData: [],
-      cursor: '',
-      previousCursors: [],
-      hasMoreTxs: false,
-      hasPreviousPage: false,
    }));
-
-    refetch({ limit });
-  }, [setTxsState, limit, refetch, filters]); // eslint-disable-line react-hooks/exhaustive-deps
+  }, [setTxsState]);

  return {
-    txsData,
+    data,
    loading,
    error,
+    txsData,
    hasMoreTxs,
-    hasPreviousPage,
-    previousCursors,
-    cursor,
+    lastCursor,
    refreshTxs,
-    nextPage,
-    previousPage,
+    loadTxs,
  };
 };
@@ -21,7 +21,6 @@ import {
 import { Footer } from '../components/footer/footer';
 import { Header } from '../components/header';
 import { Routes } from './route-names';
-import { useExplorerNodeNamesLazyQuery } from './validators/__generated__/NodeNames';

 const DialogsContainer = () => {
  const { isOpen, id, trigger, asJson, setOpen } = useAssetDetailsDialogStore();
@@ -40,7 +39,6 @@ export const Layout = () => {
  const isHome = Boolean(useMatch(Routes.HOME));
  const { ANNOUNCEMENTS_CONFIG_URL } = useEnvironment();
  const fixedWidthClasses = 'w-full max-w-[1500px] mx-auto';
-  useExplorerNodeNamesLazyQuery();

  return (
    <>
@@ -51,7 +49,7 @@ export const Layout = () => {
          'grid grid-rows-[auto_1fr_auto] grid-cols-1',
          'border-vega-light-200 dark:border-vega-dark-200',
          'antialiased text-black dark:text-white',
-          'relative'
+          'overflow-hidden relative'
        )}
      >
        <div>
@@ -2,15 +2,12 @@ import { render } from '@testing-library/react';
 import { MemoryRouter } from 'react-router-dom';
 import type { SourceType } from './oracle';
 import { OracleSigners } from './oracle-signers';
-import { MockedProvider } from '@apollo/client/testing';

 function renderComponent(sourceType: SourceType) {
  return (
-    <MockedProvider>
-      <MemoryRouter>
-        <OracleSigners sourceType={sourceType} />
-      </MemoryRouter>
-    </MockedProvider>
+    <MemoryRouter>
+      <OracleSigners sourceType={sourceType} />
+    </MemoryRouter>
  );
 }

@@ -1,6 +1,6 @@
 import { t } from '@vegaprotocol/i18n';
 import { useScreenDimensions } from '@vegaprotocol/react-helpers';
-import { useMemo, useState } from 'react';
+import { useMemo } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 import { SubHeading } from '../../../components/sub-heading';
 import { toNonHex } from '../../../components/search/detect-search';
@@ -14,11 +14,8 @@ import { PartyBlockStake } from './components/party-block-stake';
 import { PartyBlockAccounts } from './components/party-block-accounts';
 import { isValidPartyId } from './components/party-id-error';
 import { useDataProvider } from '@vegaprotocol/data-provider';
-import { TxsListNavigation } from '../../../components/txs/tx-list-navigation';
-import { AllFilterOptions, TxsFilter } from '../../../components/txs/tx-filter';

 const Party = () => {
-  const [filters, setFilters] = useState(new Set(AllFilterOptions));
  const { party } = useParams<{ party: string }>();

  useDocumentTitle(['Public keys', party || '-']);
@@ -27,24 +24,10 @@ const Party = () => {
  const partyId = toNonHex(party ? party : '');
  const { isMobile } = useScreenDimensions();
  const visibleChars = useMemo(() => (isMobile ? 10 : 14), [isMobile]);
-  const baseFilters = `filters[tx.submitter]=${partyId}`;
-  const f =
-    filters && filters.size === 1
-      ? `${baseFilters}&filters[cmd.type]=${Array.from(filters)[0]}`
-      : baseFilters;
-
-  const {
-    hasMoreTxs,
-    nextPage,
-    previousPage,
-    error,
-    refreshTxs,
-    loading,
-    txsData,
-    hasPreviousPage,
-  } = useTxsData({
-    limit: 25,
-    filters: f,
+  const filters = `filters[tx.submitter]=${partyId}`;
+  const { hasMoreTxs, loadTxs, error, txsData, loading } = useTxsData({
+    limit: 10,
+    filters,
  });

  const variables = useMemo(() => ({ partyId }), [partyId]);
@@ -98,24 +81,14 @@ const Party = () => {
      </div>

      <SubHeading>{t('Transactions')}</SubHeading>
-      <TxsListNavigation
-        refreshTxs={refreshTxs}
-        nextPage={nextPage}
-        previousPage={previousPage}
-        hasPreviousPage={hasPreviousPage}
-        loading={loading}
-        hasMoreTxs={hasMoreTxs}
-      >
-        <TxsFilter filters={filters} setFilters={setFilters} />
-      </TxsListNavigation>
      {!error && txsData ? (
        <TxsInfiniteList
          hasMoreTxs={hasMoreTxs}
          areTxsLoading={loading}
          txs={txsData}
-          loadMoreTxs={nextPage}
+          loadMoreTxs={loadTxs}
          error={error}
-          className="mb-28 w-full"
+          className="mb-28"
        />
      ) : (
        <Splash>
@@ -1,14 +1,14 @@
 import { t } from '@vegaprotocol/i18n';
 import { RouteTitle } from '../../../components/route-title';
+import { BlocksRefetch } from '../../../components/blocks';
 import { TxsInfiniteList } from '../../../components/txs';
 import { useTxsData } from '../../../hooks/use-txs-data';
 import { useDocumentTitle } from '../../../hooks/use-document-title';

 import { useState } from 'react';
 import { AllFilterOptions, TxsFilter } from '../../../components/txs/tx-filter';
-import { TxsListNavigation } from '../../../components/txs/tx-list-navigation';

-const BE_TXS_PER_REQUEST = 25;
+const BE_TXS_PER_REQUEST = 15;

 export const TxsList = () => {
  useDocumentTitle(['Transactions']);
@@ -21,11 +21,6 @@ export const TxsList = () => {
  );
 };

-/**
- * Displays a list of transactions with filters and controls to navigate through the list.
- *
- * @returns {JSX.Element} Transaction List and controls
- */
 export const TxsListFiltered = () => {
  const [filters, setFilters] = useState(new Set(AllFilterOptions));

@@ -34,40 +29,26 @@ export const TxsListFiltered = () => {
      ? `filters[cmd.type]=${Array.from(filters)[0]}`
      : '';

-  const {
-    hasMoreTxs,
-    nextPage,
-    previousPage,
-    error,
-    refreshTxs,
-    loading,
-    txsData,
-    hasPreviousPage,
-  } = useTxsData({
-    limit: BE_TXS_PER_REQUEST,
-    filters: f,
-  });
+  const { hasMoreTxs, loadTxs, error, txsData, refreshTxs, loading } =
+    useTxsData({
+      limit: BE_TXS_PER_REQUEST,
+      filters: f,
+    });

  return (
    <>
-      <TxsListNavigation
-        refreshTxs={refreshTxs}
-        nextPage={nextPage}
-        previousPage={previousPage}
-        hasPreviousPage={hasPreviousPage}
-        loading={loading}
-        hasMoreTxs={hasMoreTxs}
-      >
+      <menu className="mb-2">
+        <BlocksRefetch refetch={refreshTxs} />
        <TxsFilter filters={filters} setFilters={setFilters} />
-      </TxsListNavigation>
+      </menu>
+
      <TxsInfiniteList
-        hasFilters={filters.size > 0}
        hasMoreTxs={hasMoreTxs}
        areTxsLoading={loading}
        txs={txsData}
-        loadMoreTxs={nextPage}
+        loadMoreTxs={loadTxs}
        error={error}
-        className="mb-28 w-full min-w-[400px]"
+        className="mb-28"
      />
    </>
  );
@@ -1,11 +1,10 @@
+import { BrowserRouter as Router } from 'react-router-dom';
 import { render, screen } from '@testing-library/react';
 import { TxDetails } from './tx-details';
 import type {
  BlockExplorerTransactionResult,
  ValidatorHeartbeat,
 } from '../../../routes/types/block-explorer-response';
-import { MemoryRouter } from 'react-router-dom';
-import { MockedProvider } from '@apollo/client/testing';

 // Note: Long enough that there is a truncated output and a full output
 const pubKey =
@@ -28,11 +27,9 @@ const txData: BlockExplorerTransactionResult = {
 };

 const renderComponent = (txData: BlockExplorerTransactionResult) => (
-  <MemoryRouter>
-    <MockedProvider>
-      <TxDetails txData={txData} pubKey={pubKey} />
-    </MockedProvider>
-  </MemoryRouter>
+  <Router>
+    <TxDetails txData={txData} pubKey={pubKey} />
+  </Router>
 );

 describe('Transaction details', () => {
@@ -1,13 +0,0 @@
-query ExplorerNodeNames {
-  nodesConnection {
-    edges {
-      node {
-        id
-        name
-        pubkey
-        tmPubkey
-        ethereumAddress
-      }
-    }
-  }
-}
@@ -1,53 +0,0 @@
-import * as Types from '@vegaprotocol/types';
-
-import { gql } from '@apollo/client';
-import * as Apollo from '@apollo/client';
-const defaultOptions = {} as const;
-export type ExplorerNodeNamesQueryVariables = Types.Exact<{ [key: string]: never; }>;
-
-
-export type ExplorerNodeNamesQuery = { __typename?: 'Query', nodesConnection: { __typename?: 'NodesConnection', edges?: Array<{ __typename?: 'NodeEdge', node: { __typename?: 'Node', id: string, name: string, pubkey: string, tmPubkey: string, ethereumAddress: string } } | null> | null } };
-
-
-export const ExplorerNodeNamesDocument = gql`
-    query ExplorerNodeNames {
-  nodesConnection {
-    edges {
-      node {
-        id
-        name
-        pubkey
-        tmPubkey
-        ethereumAddress
-      }
-    }
-  }
-}
-    `;
-
-/**
- * __useExplorerNodeNamesQuery__
- *
- * To run a query within a React component, call `useExplorerNodeNamesQuery` and pass it any options that fit your needs.
- * When your component renders, `useExplorerNodeNamesQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useExplorerNodeNamesQuery({
- *   variables: {
- *   },
- * });
- */
-export function useExplorerNodeNamesQuery(baseOptions?: Apollo.QueryHookOptions<ExplorerNodeNamesQuery, ExplorerNodeNamesQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<ExplorerNodeNamesQuery, ExplorerNodeNamesQueryVariables>(ExplorerNodeNamesDocument, options);
-      }
-export function useExplorerNodeNamesLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<ExplorerNodeNamesQuery, ExplorerNodeNamesQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<ExplorerNodeNamesQuery, ExplorerNodeNamesQueryVariables>(ExplorerNodeNamesDocument, options);
-        }
-export type ExplorerNodeNamesQueryHookResult = ReturnType<typeof useExplorerNodeNamesQuery>;
-export type ExplorerNodeNamesLazyQueryHookResult = ReturnType<typeof useExplorerNodeNamesLazyQuery>;
-export type ExplorerNodeNamesQueryResult = Apollo.QueryResult<ExplorerNodeNamesQuery, ExplorerNodeNamesQueryVariables>;
@@ -3,7 +3,7 @@
 * Do not make direct changes to the file.
 */

-/** OneOf type helpers */
+/** 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,8 +41,6 @@ export interface paths {
  };
 }

-export type webhooks = Record<string, never>;
-
 export interface components {
  schemas: {
    /**
@@ -103,17 +101,6 @@ 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}
@@ -156,36 +143,6 @@ 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. */
@@ -197,8 +154,8 @@ export interface components {
       * should be taken.
       */
      readonly fromAccountType?: components['schemas']['vegaAccountType'];
-      readonly oneOff?: components['schemas']['commandsv1OneOffTransfer'];
-      readonly recurring?: components['schemas']['commandsv1RecurringTransfer'];
+      readonly oneOff?: components['schemas']['v1OneOffTransfer'];
+      readonly recurring?: components['schemas']['v1RecurringTransfer'];
      /** @description Reference to be attached to the transfer. */
      readonly reference?: string;
      /** @description Public key of the destination account. */
@@ -214,19 +171,8 @@ export interface components {
    };
    readonly protobufAny: {
      readonly '@type'?: string;
-      [key: string]: unknown;
+      [key: string]: unknown | undefined;
    };
-    /**
-     * @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. */
@@ -279,19 +225,18 @@ 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. */
@@ -356,19 +301,6 @@ 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;
@@ -393,7 +325,7 @@ export interface components {
       */
      readonly blockHeight?: string;
      /** @description Command to request cancelling a recurring transfer. */
-      readonly cancelTransfer?: components['schemas']['commandsv1CancelTransfer'];
+      readonly cancelTransfer?: components['schemas']['v1CancelTransfer'];
      /**
       * @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
@@ -449,10 +381,6 @@ 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. */
@@ -520,9 +448,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. */
+      /** @description Market ID for the order, required field. */
      readonly marketId?: string;
-      /** @description Reference to be added to every order created out of this liquidity provision submission. */
+      /** @description Reference to be added to every order created out of this liquidityProvisionSubmission. */
      readonly reference?: string;
      /** @description Set of liquidity sell orders to meet the liquidity provision obligation. */
      readonly sells?: readonly components['schemas']['vegaLiquidityOrder'][];
@@ -602,6 +530,15 @@ 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: {
      /**
@@ -659,12 +596,10 @@ export interface components {
    readonly v1OrderSubmission: {
      /**
       * Format: int64
-       * @description Timestamp in Unix nanoseconds for when the order will expire,
+       * @description Timestamp for when the order will expire, in nanoseconds,
       * 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. */
@@ -764,6 +699,23 @@ 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.
@@ -780,7 +732,7 @@ export interface components {
      readonly version?: number;
    };
    readonly v1Signer: {
-      /** @description In case of an open oracle - Ethereum address will be submitted. */
+      /** 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
@@ -794,55 +746,6 @@ 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.
@@ -919,7 +822,6 @@ 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}
     */
@@ -940,8 +842,7 @@ 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_HOLDING';
+      | 'ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS';
    /** Vega representation of an external asset */
    readonly vegaAssetDetails: {
      /** @description Vega built-in asset. */
@@ -997,14 +898,6 @@ 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
@@ -1019,7 +912,6 @@ 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'];
    };
    /**
@@ -1255,64 +1147,6 @@ 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. */
@@ -1326,14 +1160,6 @@ 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. */
@@ -1342,8 +1168,6 @@ 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;
@@ -1434,14 +1258,14 @@ export interface components {
      /** @description Configuration of the new market. */
      readonly changes?: components['schemas']['vegaNewMarketConfiguration'];
    };
-    /** Configuration for a new futures market on Vega */
+    /** Configuration for a new market on Vega */
    readonly vegaNewMarketConfiguration: {
      /**
       * Format: uint64
-       * @description Decimal places used for the new futures market, sets the smallest price increment on the book.
+       * @description Decimal places used for the new market, sets the smallest price increment on the book.
       */
      readonly decimalPlaces?: string;
-      /** @description New futures market instrument configuration. */
+      /** @description New 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;
@@ -1454,11 +1278,11 @@ export interface components {
       * price levels over which automated liquidity provision orders will be deployed.
       */
      readonly lpPriceRange?: string;
-      /** @description Optional new futures market metadata, tags. */
+      /** @description Optional new market metadata, tags. */
      readonly metadata?: readonly string[];
      /**
       * Format: int64
-       * @description Decimal places for order sizes, sets what size the smallest order / position on the futures market can be.
+       * @description Decimal places for order sizes, sets what size the smallest order / position on the market can be.
       */
      readonly positionDecimalPlaces?: string;
      /** @description Price monitoring parameters. */
@@ -1467,80 +1291,6 @@ 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
@@ -1619,8 +1369,6 @@ 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,
@@ -1640,39 +1388,20 @@ export interface components {
       * and can be used to gauge community sentiment.
       */
      readonly newFreeform?: components['schemas']['vegaNewFreeform'];
-      /** @description Proposal change for creating new futures market on Vega. */
+      /** @description Proposal change for creating new 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 futures market on Vega. */
+      /** @description Proposal change for modifying an existing 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;
    };
@@ -1713,15 +1442,6 @@ 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;
@@ -1787,13 +1507,6 @@ 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: {
      /**
@@ -1834,14 +1547,14 @@ export interface components {
    };
    /** Update an existing market on Vega */
    readonly vegaUpdateMarket: {
-      /** @description Updated configuration of the futures market. */
+      /** @description Updated configuration of the market. */
      readonly changes?: components['schemas']['vegaUpdateMarketConfiguration'];
      /** @description Market ID the update is for. */
      readonly marketId?: string;
    };
-    /** Configuration to update a futures market on Vega */
+    /** Configuration to update a market on Vega */
    readonly vegaUpdateMarketConfiguration: {
-      /** @description Updated futures market instrument configuration. */
+      /** @description Updated 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;
@@ -1854,7 +1567,7 @@ export interface components {
       * price levels over which automated liquidity provision orders will be deployed.
       */
      readonly lpPriceRange?: string;
-      /** @description Optional futures market metadata, tags. */
+      /** @description Optional market metadata, tags. */
      readonly metadata?: readonly string[];
      /** @description Price monitoring parameters. */
      readonly priceMonitoringParameters?: components['schemas']['vegaPriceMonitoringParameters'];
@@ -1868,26 +1581,6 @@ 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[];
    };
@@ -1916,12 +1609,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: {
@@ -1937,38 +1630,19 @@ export interface operations {
      };
    };
  };
-  /**
-   * List transactions
-   * @description List transactions from the Vega blockchain
-   */
  BlockExplorer_ListTransactions: {
-    parameters: {
-      query?: {
-        /**
-         * @description Number of transactions to be returned from the blockchain.
-         * This is deprecated, use first and last instead.
-         */
+    /**
+     * 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?: {
        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: {
@@ -1986,14 +1660,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: {
-      path: {
-        /** @description Hash of the transaction */
+      /** @description Hash of the transaction */
+      readonly path: {
        hash: string;
      };
    };
@@ -15,6 +15,5 @@ module.exports = composePlugins(withNx(), withReact(), (config) => {
  return {
    ...config,
    plugins: [...additionalPlugins, ...config.plugins],
-    ignoreWarnings: [/Failed to parse source map/],
  };
 });
@@ -98,6 +98,11 @@ 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');
-      cy.getByTestId(connectToVegaWalletButton).click();
+        .and('have.text', 'Connect Vega wallet')
+        .click();
      cy.getByTestId('connector-jsonRpc').click();
      cy.getByTestId(vegaWalletNameElement).should('be.visible');
      cy.getByTestId(connectToVegaWalletButton).should('not.exist');
@@ -295,7 +295,7 @@ context(

    // Will fail if run after 'Able to submit update market proposal and vote for proposal'
    // 3002-PROP-022
-    it.skip('Unable to submit update market proposal without equity-like share in the market', function () {
+    it('Unable to submit update market proposal without equity-like share in the market', function () {
      switchVegaWalletPubKey();
      stakingPageAssociateTokens('1');
      goToMakeNewProposal(governanceProposalType.UPDATE_MARKET);
@@ -116,6 +116,12 @@ 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')
@@ -129,6 +135,11 @@ 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.')
@@ -138,6 +149,11 @@ 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')
@@ -145,6 +161,11 @@ 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')
@@ -186,6 +207,11 @@ 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')
@@ -197,6 +223,11 @@ 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')
@@ -212,18 +243,33 @@ 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')
@@ -247,6 +293,11 @@ 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,6 +16,11 @@ 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(() => {
@@ -35,6 +40,11 @@ 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()
@@ -94,6 +104,11 @@ 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) => {
@@ -120,6 +135,11 @@ 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(() => {
@@ -131,6 +151,11 @@ 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(() => {
@@ -161,7 +186,7 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
      cy.getByTestId('menu-drawer').should('be.visible');
    });

-    it('should have link for proposal page', function () {
+    it.skip('should have link for proposal page', function () {
      cy.getByTestId('menu-drawer').within(() => {
        cy.get('[href="/proposals"]')
          .should('exist')
@@ -14,9 +14,6 @@ const proposalDocsLink = 'proposal-docs-link';
 const proposalDocumentationLink = 'proposal-documentation-link';
 const connectToVegaWalletButton = 'connect-to-vega-wallet-btn';
 const governanceDocsUrl = 'https://vega.xyz/governance';
-const networkUpgradeProposalListItem = 'protocol-upgrade-proposals-list-item';
-const closedProposals = 'closed-proposals';
-const closedProposalToggle = 'closed-proposals-toggle-networkUpgrades';

 context(
  'Governance Page - verify elements on page',
@@ -130,7 +127,7 @@ context(
      mockNetworkUpgradeProposal();
      cy.visit('/');
      cy.getByTestId('home-proposal-list').within(() => {
-        cy.getByTestId(networkUpgradeProposalListItem).should('exist');
+        cy.getByTestId('protocol-upgrade-proposals-list-item').should('exist');
        cy.getByTestId('protocol-upgrade-proposal-title').should(
          'have.text',
          'Vega release v1'
@@ -142,9 +139,18 @@ 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)
+          .should(
+            'have.attr',
+            'data-testid',
+            'protocol-upgrade-proposals-list-item'
+          )
          .within(() => {
            cy.get('h2').should('have.text', 'Vega release v1');
            cy.getByTestId('protocol-upgrade-proposal-type').should(
@@ -165,19 +171,19 @@ context(
            );
          });
      });
-      cy.getByTestId(closedProposals).within(() => {
-        cy.getByTestId(networkUpgradeProposalListItem).should('not.exist');
-      });
-      cy.getByTestId(closedProposalToggle).click();
-      cy.getByTestId(closedProposals).within(() => {
-        cy.getByTestId(networkUpgradeProposalListItem).should('have.length', 1);
+      cy.get('[data-testid="closed-proposals-toggle-networkUpgrades"]').click();
+      cy.getByTestId('closed-proposals').within(() => {
+        cy.getByTestId('protocol-upgrade-proposals-list-item').should(
+          'have.length',
+          1
+        );
      });
    });

    it('should see details of network upgrade proposal', function () {
      mockNetworkUpgradeProposal();
      navigateTo(navigation.proposals);
-      cy.getByTestId(networkUpgradeProposalListItem)
+      cy.getByTestId('protocol-upgrade-proposals-list-item')
        .first()
        .find('[data-testid="view-proposal-btn"]')
        .click();
@@ -200,6 +206,11 @@ 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) => {
@@ -214,18 +225,5 @@ context(
        );
      });
    });
-
-    it('filtering proposal should not display any network upgrade proposals', function () {
-      const proposalId =
-        'd848fc7881f13d366df5f61ab139d5fcfa72bf838151bb51b54381870e357931';
-
-      mockNetworkUpgradeProposal();
-      navigateTo(navigation.proposals);
-      cy.get('[data-testid="proposal-filter-toggle"]').click();
-      cy.get('[data-testid="filter-input"]').type(proposalId);
-      cy.getByTestId(closedProposals).should('have.length', 1);
-      cy.getByTestId(networkUpgradeProposalListItem).should('not.exist');
-      cy.getByTestId(closedProposalToggle).should('not.exist');
-    });
  }
 );
@@ -1,12 +1,13 @@
 /// <reference types="cypress" />

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

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

-    goToMakeNewProposal(governanceProposalType.RAW);
-    enterRawProposalBody(createTenDigitUnixTimeStampForSpecifiedDays(8));
+    navigateTo(navigation.proposals);
+    goToMakeNewProposal(governanceProposalType.FREEFORM);
+    enterUniqueFreeFormProposalBody('50', 'pub key proposal test');
    cy.getByTestId('dialog-content')
      .first()
      .within(() => {
@@ -42,6 +42,11 @@ 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,6 +21,11 @@ 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()
@@ -51,6 +56,11 @@ 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) => {
@@ -58,6 +68,11 @@ 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) => {
@@ -71,6 +86,11 @@ 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,6 +74,11 @@ 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) => {
@@ -82,6 +87,11 @@ 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) => {
@@ -105,6 +115,11 @@ 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) => {
@@ -126,6 +141,11 @@ 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) => {
@@ -146,6 +166,11 @@ 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-rest')
+          cy.getByTestId('connector-hosted')
            .should('be.visible')
            .and('have.text', 'Hosted Fairground wallet');
        });
@@ -94,7 +94,7 @@ context(
    describe('when rest connector form opened', function () {
      before('click hosted wallet app button', function () {
        cy.getByTestId(connectorsList).within(() => {
-          cy.getByTestId('connector-rest').click();
+          cy.getByTestId('connector-hosted').click();
        });
      });

@@ -340,7 +340,7 @@ context(
                .contains(name)
                .parent()
                .siblings()
-                .should((elementAmount) => {
+                .then((elementAmount) => {
                  const displayedAmount = parseFloat(elementAmount.text());
                  expect(displayedAmount).be.gte(expectedAmount);
                });
@@ -1,15 +0,0 @@
-# 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,7 +25,6 @@ yarn nx serve governance
 Example configurations are provided here:

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

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

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

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

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

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

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

@@ -49,7 +52,9 @@ export enum AppStateActionType {
  SET_TOKEN,
  SET_ALLOWANCE,
  REFRESH_BALANCES,
+  SET_VEGA_WALLET_OVERLAY,
  SET_VEGA_WALLET_MANAGE_OVERLAY,
+  SET_DRAWER,
  REFRESH_ASSOCIATED_BALANCES,
  SET_ASSOCIATION_BREAKDOWN,
  SET_TRANSACTION_OVERLAY,
@@ -64,10 +69,18 @@ export type AppStateAction =
      totalSupply: BigNumber;
      totalAssociated: BigNumber;
    }
+  | {
+      type: AppStateActionType.SET_VEGA_WALLET_OVERLAY;
+      isOpen: boolean;
+    }
  | {
      type: AppStateActionType.SET_VEGA_WALLET_MANAGE_OVERLAY;
      isOpen: boolean;
    }
+  | {
+      type: AppStateActionType.SET_DRAWER;
+      isOpen: boolean;
+    }
  | {
      type: AppStateActionType.SET_TRANSACTION_OVERLAY;
      isOpen: boolean;
@@ -14,6 +14,7 @@ const initialAppState: AppState = {
  totalAssociated: new BigNumber(0),
  decimals: 0,
  totalSupply: new BigNumber(0),
+  vegaWalletOverlay: false,
  vegaWalletManageOverlay: false,
  transactionOverlay: false,
  bannerMessage: '',
@@ -30,10 +31,23 @@ function appStateReducer(state: AppState, action: AppStateAction): AppState {
        totalAssociated: action.totalAssociated,
      };
    }
+    case AppStateActionType.SET_VEGA_WALLET_OVERLAY: {
+      return {
+        ...state,
+        vegaWalletOverlay: action.isOpen,
+      };
+    }
    case AppStateActionType.SET_VEGA_WALLET_MANAGE_OVERLAY: {
      return {
        ...state,
        vegaWalletManageOverlay: action.isOpen,
+        vegaWalletOverlay: action.isOpen ? false : state.vegaWalletOverlay,
+      };
+    }
+    case AppStateActionType.SET_DRAWER: {
+      return {
+        ...state,
+        vegaWalletOverlay: false,
      };
    }
    case AppStateActionType.SET_TRANSACTION_OVERLAY: {
@@ -2,18 +2,15 @@ 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,7 +10,10 @@ import {
 } from '@vegaprotocol/ui-toolkit';
 import { addDecimal, toBigNum } from '@vegaprotocol/utils';
 import { ProposalState, VoteValue } from '@vegaprotocol/types';
-import { useAppState } from '../../../../contexts/app-state/app-state-context';
+import {
+  AppStateActionType,
+  useAppState,
+} from '../../../../contexts/app-state/app-state-context';
 import { BigNumber } from '../../../../lib/bignumber';
 import { DATE_FORMAT_LONG } from '../../../../lib/date-formats';
 import { VoteState } from './use-user-vote';
@@ -70,6 +73,7 @@ export const VoteButtons = ({
  dialog: Dialog,
 }: VoteButtonsProps) => {
  const { t } = useTranslation();
+  const { appDispatch } = useAppState();
  const { pubKey } = useVegaWallet();
  const { openVegaWalletDialog } = useVegaWalletDialogStore((store) => ({
    openVegaWalletDialog: store.openVegaWalletDialog,
@@ -94,6 +98,10 @@ export const VoteButtons = ({
        <div data-testid="connect-wallet">
          <ButtonLink
            onClick={() => {
+              appDispatch({
+                type: AppStateActionType.SET_VEGA_WALLET_OVERLAY,
+                isOpen: true,
+              });
              openVegaWalletDialog();
            }}
          >
@@ -134,6 +142,7 @@ export const VoteButtons = ({
    minVoterBalance,
    spamProtectionMinTokens,
    t,
+    appDispatch,
    openVegaWalletDialog,
  ]);

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

 export const ConnectToSeeRewards = () => {
+  const { appDispatch } = useAppState();
  const { openVegaWalletDialog } = useVegaWalletDialogStore((store) => ({
    openVegaWalletDialog: store.openVegaWalletDialog,
  }));
@@ -21,6 +26,10 @@ export const ConnectToSeeRewards = () => {
      <Button
        data-testid="connect-to-vega-wallet-btn"
        onClick={() => {
+          appDispatch({
+            type: AppStateActionType.SET_VEGA_WALLET_OVERLAY,
+            isOpen: true,
+          });
          openVegaWalletDialog();
        }}
      >
@@ -14,6 +14,5 @@ module.exports = composePlugins(withNx(), withReact(), (config, context) => {
  return {
    ...config,
    plugins: [...additionalPlugins, ...config.plugins],
-    ignoreWarnings: [/Failed to parse source map/],
  };
 });
@@ -2,6 +2,7 @@ import { removeDecimal } from '@vegaprotocol/cypress';
 import * as Schema from '@vegaprotocol/types';
 import {
  OrderStatusMapping,
+  OrderTimeInForceMapping,
  OrderTypeMapping,
  Side,
 } from '@vegaprotocol/types';
@@ -16,6 +17,7 @@ const orderStatus = 'status';
 const orderRemaining = 'remaining';
 const orderPrice = 'price';
 const orderTimeInForce = 'timeInForce';
+const orderCreatedAt = 'createdAt';
 const orderUpdatedAt = 'updatedAt';
 const assetSelectField = 'select[name="asset"]';
 const amountField = 'input[name="amount"]';
@@ -90,14 +92,16 @@ describe('capsule - without MultiSign', { tags: '@slow' }, () => {

    cy.highlight('deposit verification');

-    cy.get('[col-id="asset.symbol"]', txTimeout).should(
-      'contain.text',
-      btcSymbol
-    );
+    cy.getByTestId('asset', 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)
@@ -145,6 +149,7 @@ 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);
@@ -155,9 +160,18 @@ describe('capsule - without MultiSign', { tags: '@slow' }, () => {
      'contain.text',
      'Funds unlocked'
    );
-    // cy.getByTestId(toastCloseBtn).click();
+    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.highlight('withdrawals verification');
-    cy.getByTestId('toast-complete-withdrawal').last().click();
+    cy.getByTestId('toast-complete-withdrawal').click();

    cy.getByTestId(toastContent, txTimeout).should(
      'contain.text',
@@ -214,12 +228,9 @@ 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.get('[col-id="asset.symbol"]', txTimeout).should(
-      'contain.text',
-      usdcSymbol
-    );
+    cy.getByTestId('asset', txTimeout).should('contain.text', usdcSymbol);

    createOrder(order);

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

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

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

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

-          checkIfDataAndTimeOfCreationAndUpdateIsEqual(orderUpdatedAt);
+          checkIfDataAndTimeOfCreationAndUpdateIsEqual(orderCreatedAt);
        });
    });
  });
  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);
@@ -306,7 +318,6 @@ 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(
@@ -343,7 +354,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');
@@ -354,6 +365,14 @@ 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();
@@ -401,6 +420,11 @@ 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)
@@ -430,7 +454,6 @@ 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');
@@ -451,8 +474,8 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {
    // 1002-WITH-007

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

    cy.highlight('deposit verification');

-    cy.get('[col-id="asset.symbol"]', txTimeout).should(
-      'contain.text',
-      vegaSymbol
-    );
+    cy.getByTestId('asset', 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)
@@ -510,16 +535,6 @@ 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 settlement asset details');
+      .should('have.text', 'View asset');
    cy.getByTestId('market-actions-content').click();
  });

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

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

  it('instrument displayed', () => {
@@ -137,6 +137,11 @@ 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(
@@ -170,6 +175,11 @@ 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',
@@ -196,6 +206,11 @@ 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')
@@ -126,8 +126,7 @@ describe(
        { name: 'Moving average', infoText: 'Moving average: 174.08302' },
        {
          name: 'Price monitoring bounds',
-          infoText:
-            'Price Monitoring Bounds: Min 162.56291Max 182.96869Reference 172.47489',
+          infoText: 'Price Monitoring Bounds: Min -Max -Reference -',
        },
      ];

@@ -151,7 +150,7 @@ describe(
        { name: 'Force index', infoText: 'Force index: 987.48858' },
        { name: 'MACD', infoText: 'MACD: S -0.06420D 0.00359MACD -0.06062' },
        { name: 'RSI', infoText: 'RSI: 47.08648' },
-        { name: 'Volume', infoText: 'Volume: 55,000' },
+        { name: 'Volume', infoText: 'Volume: 55,000.00000' },
      ];
      cy.get(indicatorInfo).eq(1).realHover();
      cy.get('.close-button-module_closeButton__2ifkl').click({ force: true });
@@ -16,7 +16,7 @@ const orderStatus = 'status';
 const orderRemaining = 'remaining';
 const orderPrice = 'price';
 const orderTimeInForce = 'timeInForce';
-const orderUpdatedAt = 'updatedAt';
+const orderCreatedAt = 'createdAt';
 const cancelOrderBtn = 'cancel';
 const cancelAllOrdersBtn = 'cancelAll';
 const editOrderBtn = 'edit';
@@ -46,10 +46,6 @@ 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');
          });
@@ -62,6 +58,10 @@ 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='${orderUpdatedAt}']`).each(($dateTime) => {
+          cy.get(`[col-id='${orderCreatedAt}']`).each(($dateTime) => {
            cy.wrap($dateTime).invoke('text').should('not.be.empty');
          });
        });
@@ -96,8 +96,7 @@ describe('orders list', { tags: '@smoke', testIsolation: true }, () => {
          'have.text',
          'Partially Filled'
        );
-        cy.get(`[col-id='${orderRemaining}']`).should('have.text', '7');
-        cy.get(`[col-id='${orderSize}']`).should('have.text', '-10');
+        cy.get(`[col-id='${orderRemaining}']`).should('have.text', '7/10');
        cy.getByTestId(cancelOrderBtn).should('not.exist');
        cy.getByTestId(editOrderBtn).should('not.exist');
      });
@@ -119,6 +118,11 @@ 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)
@@ -215,7 +219,7 @@ describe('subscribe orders', { tags: '@smoke' }, () => {
    cy.getByTestId(`order-status-${orderId}`)
      .parentsUntil(`.ag-row`)
      .siblings(`[col-id=${orderRemaining}]`)
-      .should('have.text', '4');
+      .should('have.text', '4/5');
  });

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

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

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

  it('for Active order when is part of a liquidity or peg shape, must not see an option to amend the individual order ', () => {
@@ -442,6 +446,11 @@ 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')
@@ -471,6 +480,11 @@ 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')
@@ -493,6 +507,11 @@ 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) => {
@@ -509,6 +528,11 @@ 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,10 +47,15 @@ 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', 17);
+          cy.wrap(fields).find('label').should('have.length', 16);
        });
      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-market-green-600',
-        'text-market-red'
+        'text-vega-green',
+        'text-vega-pink'
      );
    });
    cy.get('.ag-center-cols-container').within(() => {
      assertPNLColor(
        '[col-id="unrealisedPNL"]',
-        'text-market-green-600',
-        'text-market-red'
+        'text-vega-green',
+        'text-vega-pink'
      );
    });
    cy.get('.ag-center-cols-container').within(() => {
      assertPNLColor(
        '[col-id="openVolume"]',
-        'text-market-green-600',
-        'text-market-red'
+        'text-vega-green',
+        'text-vega-pink'
      );
    });
  });
@@ -71,7 +71,7 @@ describe('trades', { tags: '@smoke' }, () => {
      });
  });

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

      cy.getByTestId('rest-connector-form').find('button[type=submit]').click();
@@ -14,4 +14,4 @@ NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/annou
 NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
 NX_VEGA_CONSOLE_URL=https://console.vega.xyz
 # TAG name of the current app version - TODO: bump to the latest upon release
-NX_APP_VERSION=v0.20.21-core-0.71.6
+NX_APP_VERSION=v0.20.19-core-0.71.6
@@ -1,17 +0,0 @@
-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 trading
+yarn nx serve explorer
 ```

 ### Configuration
@@ -19,14 +19,13 @@ yarn nx serve trading
 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\trading\.env.{env} yarn nx run trading:serve # e.g. stagnet1
+yarn env-cmd -f .\apps\token\.env.{env} yarn nx run token:serve # e.g. stagnet1
 ```

 There are a few different configuration options offered for this app:
@@ -160,9 +160,8 @@ const DataRow = ({
 const PriceChange = ({ candles }: { candles: string[] }) => {
  const priceChange = candles ? priceChangePercentage(candles) : undefined;
  const priceChangeClasses = classNames('text-xs', {
-    'text-market-red': priceChange && priceChange < 0,
-    'text-market-green-600 dark:text-market-green':
-      priceChange && priceChange > 0,
+    'text-vega-pink': priceChange && priceChange < 0,
+    'text-vega-green': priceChange && priceChange > 0,
  });
  let prefix = '';
  if (priceChange && priceChange > 0) {
@@ -9,7 +9,10 @@ import { t } from '@vegaprotocol/i18n';
 import { OracleBanner } from '@vegaprotocol/markets';
 import type { Market } from '@vegaprotocol/markets';
 import { Filter } from '@vegaprotocol/orders';
-import { useScreenDimensions } from '@vegaprotocol/react-helpers';
+import {
+  usePaneLayout,
+  useScreenDimensions,
+} from '@vegaprotocol/react-helpers';
 import {
  Tab,
  LocalStoragePersistTabs as Tabs,
@@ -22,12 +25,10 @@ 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;
@@ -317,8 +318,7 @@ export const TradeGrid = ({ market, pinnedAsset }: TradeGridProps) => {
      <div className="border-b border-default min-w-0">
        <HeaderStats market={market} />
      </div>
-      <div className="col-span-2">
-        <MarketSuccessorBanner market={market} />
+      <div className="col-span-2 bg-vega-green">
        <OracleBanner marketId={market?.id || ''} />
      </div>
      {sidebarOpen && (
@@ -21,7 +21,6 @@ import { HeaderStats } from './header-stats';
 import * as DialogPrimitives from '@radix-ui/react-dialog';
 import { HeaderTitle } from '../../components/header';
 import { MarketSelector } from './market-selector';
-import { MarketSuccessorBanner } from '../../components/market-banner';

 interface TradePanelsProps {
  market: Market | null;
@@ -93,7 +92,6 @@ export const TradePanels = ({
        <HeaderStats market={market} />
      </div>
      <div>
-        <MarketSuccessorBanner market={market} />
        <OracleBanner marketId={market?.id || ''} />
      </div>
      <div className="h-full">
@@ -18,7 +18,7 @@ import type {
  MarketMaybeWithData,
 } from '@vegaprotocol/markets';
 import {
-  MarketActionsDropdown,
+  MarketTableActions,
  closedMarketsWithDataProvider,
 } from '@vegaprotocol/markets';
 import { useVegaWallet } from '@vegaprotocol/wallet';
@@ -291,7 +291,7 @@ const ClosedMarketsDataGrid = ({
        cellRenderer: ({ data }: VegaICellRendererParams<Row>) => {
          if (!data) return null;
          return (
-            <MarketActionsDropdown
+            <MarketTableActions
              marketId={data.id}
              assetId={data.settlementAsset.id}
            />
@@ -24,10 +24,7 @@ import { PriceChart } from 'pennant';
 import 'pennant/dist/style.css';
 import type { Account } from '@vegaprotocol/accounts';
 import { accountsDataProvider } from '@vegaprotocol/accounts';
-import {
-  useLocalStorageSnapshot,
-  useThemeSwitcher,
-} from '@vegaprotocol/react-helpers';
+import { useThemeSwitcher } from '@vegaprotocol/react-helpers';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import type { Market } from '@vegaprotocol/markets';

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

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

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

  const variables = useMemo(
@@ -222,14 +211,14 @@ const AccountHistoryManager = ({
      >
        <DropdownMenuContent>
          {assets.map((a) => (
-            <DropdownMenuItem key={a.id} onClick={() => setAssetId(a.id)}>
+            <DropdownMenuItem key={a.id} onClick={() => setAsset(a)}>
              {a.symbol}
            </DropdownMenuItem>
          ))}
        </DropdownMenuContent>
      </DropdownMenu>
    );
-  }, [asset, assets, setAssetId]);
+  }, [assets, asset]);
  const marketsMenu = useMemo(() => {
    return accountType === Schema.AccountType.ACCOUNT_TYPE_MARGIN &&
      markets?.length ? (
@@ -4,6 +4,7 @@ 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';
@@ -19,7 +20,6 @@ import { AccountHistoryContainer } from './account-history-container';
 import {
  ResizableGrid,
  ResizableGridPanel,
-  usePaneLayout,
 } from '../../components/resizable-grid';

 const WithdrawalsIndicator = () => {
@@ -1 +0,0 @@
-export * from './market-successor-banner';
@@ -1,188 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import { MockedProvider } from '@apollo/react-testing';
-import * as dataProviders from '@vegaprotocol/data-provider';
-import { MarketSuccessorBanner } from './market-successor-banner';
-import * as Types from '@vegaprotocol/types';
-import * as allUtils from '@vegaprotocol/utils';
-import type { Market } from '@vegaprotocol/markets';
-import type { PartialDeep } from 'type-fest';
-
-const market = {
-  id: 'marketId',
-  tradableInstrument: {
-    instrument: {
-      metadata: {
-        tags: [],
-      },
-    },
-  },
-  marketTimestamps: {
-    close: null,
-  },
-  successorMarketID: 'successorMarketID',
-} as unknown as Market;
-
-let mockDataSuccessorMarket: PartialDeep<Market> | null = null;
-jest.mock('@vegaprotocol/data-provider', () => ({
-  ...jest.requireActual('@vegaprotocol/data-provider'),
-  useDataProvider: jest.fn().mockImplementation((args) => {
-    if (args.skip) {
-      return {
-        data: null,
-        error: null,
-      };
-    }
-    return {
-      data: mockDataSuccessorMarket,
-      error: null,
-    };
-  }),
-}));
-jest.mock('@vegaprotocol/utils', () => ({
-  ...jest.requireActual('@vegaprotocol/utils'),
-  getMarketExpiryDate: jest.fn(),
-}));
-let mockCandles = {};
-jest.mock('@vegaprotocol/markets', () => ({
-  ...jest.requireActual('@vegaprotocol/markets'),
-  useCandles: () => mockCandles,
-}));
-
-describe('MarketSuccessorBanner', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-    mockDataSuccessorMarket = {
-      id: 'successorMarketID',
-      state: Types.MarketState.STATE_ACTIVE,
-      tradingMode: Types.MarketTradingMode.TRADING_MODE_CONTINUOUS,
-      tradableInstrument: {
-        instrument: {
-          name: 'Successor Market Name',
-        },
-      },
-    };
-  });
-  describe('should be hidden', () => {
-    it('when no market', () => {
-      const { container } = render(<MarketSuccessorBanner market={null} />, {
-        wrapper: MockedProvider,
-      });
-      expect(container).toBeEmptyDOMElement();
-    });
-
-    it('when no successorMarketID', () => {
-      const amendedMarket = {
-        ...market,
-        successorMarketID: null,
-      };
-      const { container } = render(
-        <MarketSuccessorBanner market={amendedMarket} />,
-        {
-          wrapper: MockedProvider,
-        }
-      );
-      expect(container).toBeEmptyDOMElement();
-      expect(dataProviders.useDataProvider).lastCalledWith(
-        expect.objectContaining({ skip: true })
-      );
-    });
-
-    it('no successor market data', () => {
-      mockDataSuccessorMarket = null;
-      const { container } = render(<MarketSuccessorBanner market={market} />, {
-        wrapper: MockedProvider,
-      });
-      expect(container).toBeEmptyDOMElement();
-      expect(dataProviders.useDataProvider).lastCalledWith(
-        expect.objectContaining({
-          variables: { marketId: 'successorMarketID' },
-          skip: false,
-        })
-      );
-    });
-
-    it('successor market not in continuous mode', () => {
-      mockDataSuccessorMarket = {
-        ...mockDataSuccessorMarket,
-        tradingMode: Types.MarketTradingMode.TRADING_MODE_NO_TRADING,
-      };
-      const { container } = render(<MarketSuccessorBanner market={market} />, {
-        wrapper: MockedProvider,
-      });
-      expect(container).toBeEmptyDOMElement();
-      expect(dataProviders.useDataProvider).lastCalledWith(
-        expect.objectContaining({
-          variables: { marketId: 'successorMarketID' },
-          skip: false,
-        })
-      );
-      expect(allUtils.getMarketExpiryDate).toHaveBeenCalled();
-    });
-
-    it('successor market is not active', () => {
-      mockDataSuccessorMarket = {
-        ...mockDataSuccessorMarket,
-        state: Types.MarketState.STATE_PENDING,
-      };
-      const { container } = render(<MarketSuccessorBanner market={market} />, {
-        wrapper: MockedProvider,
-      });
-      expect(container).toBeEmptyDOMElement();
-      expect(dataProviders.useDataProvider).lastCalledWith(
-        expect.objectContaining({
-          variables: { marketId: 'successorMarketID' },
-          skip: false,
-        })
-      );
-      expect(allUtils.getMarketExpiryDate).toHaveBeenCalled();
-    });
-  });
-
-  describe('should be displayed', () => {
-    it('should be rendered', () => {
-      render(<MarketSuccessorBanner market={market} />, {
-        wrapper: MockedProvider,
-      });
-      expect(
-        screen.getByText('This market has been succeeded')
-      ).toBeInTheDocument();
-      expect(
-        screen.getByRole('link', { name: 'Successor Market Name' })
-      ).toHaveAttribute('href', '/#/markets/successorMarketID');
-    });
-
-    it('should display optionally successor volume', () => {
-      mockDataSuccessorMarket = {
-        ...mockDataSuccessorMarket,
-        positionDecimalPlaces: 3,
-      };
-      mockCandles = {
-        oneDayCandles: [
-          { volume: 123 },
-          { volume: 456 },
-          { volume: 789 },
-          { volume: 99999 },
-        ],
-      };
-
-      render(<MarketSuccessorBanner market={market} />, {
-        wrapper: MockedProvider,
-      });
-      expect(screen.getByText('has 101.367 24h vol.')).toBeInTheDocument();
-    });
-
-    it('should display optionally duration', () => {
-      jest
-        .spyOn(allUtils, 'getMarketExpiryDate')
-        .mockReturnValue(
-          new Date(Date.now() + 24 * 60 * 60 * 1000 + 60 * 1000)
-        );
-      render(<MarketSuccessorBanner market={market} />, {
-        wrapper: MockedProvider,
-      });
-      expect(
-        screen.getByText(/^This market expires in 1 day/)
-      ).toBeInTheDocument();
-    });
-  });
-});
@@ -1,115 +0,0 @@
-import { useState } from 'react';
-import { isBefore, formatDuration, intervalToDuration } from 'date-fns';
-import { useDataProvider } from '@vegaprotocol/data-provider';
-import type { Market } from '@vegaprotocol/markets';
-import {
-  calcCandleVolume,
-  marketProvider,
-  useCandles,
-} from '@vegaprotocol/markets';
-import {
-  ExternalLink,
-  Intent,
-  NotificationBanner,
-} from '@vegaprotocol/ui-toolkit';
-import {
-  addDecimalsFormatNumber,
-  getMarketExpiryDate,
-  isNumeric,
-} from '@vegaprotocol/utils';
-import { t } from '@vegaprotocol/i18n';
-import * as Types from '@vegaprotocol/types';
-
-const getExpiryDate = (tags: string[], close?: string): Date | null => {
-  const expiryDate = getMarketExpiryDate(tags);
-  return expiryDate || (close && new Date(close)) || null;
-};
-
-export const MarketSuccessorBanner = ({
-  market,
-}: {
-  market: Market | null;
-}) => {
-  const { data: successorData } = useDataProvider({
-    dataProvider: marketProvider,
-    variables: {
-      marketId: market?.successorMarketID || '',
-    },
-    skip: !market?.successorMarketID,
-  });
-  const [visible, setVisible] = useState(true);
-
-  const expiry = market
-    ? getExpiryDate(
-        market.tradableInstrument.instrument.metadata.tags || [],
-        market.marketTimestamps.close
-      )
-    : null;
-
-  const duration =
-    expiry && isBefore(new Date(), expiry)
-      ? intervalToDuration({ start: new Date(), end: expiry })
-      : null;
-
-  const isInContinuesMode =
-    successorData?.state === Types.MarketState.STATE_ACTIVE &&
-    successorData?.tradingMode ===
-      Types.MarketTradingMode.TRADING_MODE_CONTINUOUS;
-
-  const { oneDayCandles } = useCandles({
-    marketId: successorData?.id,
-  });
-
-  const candleVolume = oneDayCandles?.length
-    ? calcCandleVolume(oneDayCandles)
-    : null;
-
-  const successorVolume =
-    candleVolume && isNumeric(successorData?.positionDecimalPlaces)
-      ? addDecimalsFormatNumber(
-          candleVolume,
-          successorData?.positionDecimalPlaces as number
-        )
-      : null;
-
-  if (isInContinuesMode && visible) {
-    return (
-      <NotificationBanner
-        intent={Intent.Primary}
-        onClose={() => {
-          setVisible(false);
-        }}
-      >
-        <div className="uppercase mb-1">
-          {t('This market has been succeeded')}
-        </div>
-        <div>
-          {duration && (
-            <span>
-              {t('This market expires in %s.', [
-                formatDuration(duration, {
-                  format: [
-                    'years',
-                    'months',
-                    'weeks',
-                    'days',
-                    'hours',
-                    'minutes',
-                  ],
-                }),
-              ])}
-            </span>
-          )}{' '}
-          {t('The successor market')}{' '}
-          <ExternalLink href={`/#/markets/${successorData?.id}`}>
-            {successorData?.tradableInstrument.instrument.name}
-          </ExternalLink>
-          {successorVolume && (
-            <span> {t('has %s 24h vol.', [successorVolume])}</span>
-          )}
-        </div>
-      </NotificationBanner>
-    );
-  }
-  return null;
-};
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Bartłomiej Głownia	46c8b8badc	chore: run and remove migrations.json	2023-07-03 11:22:34 +02:00
Bartłomiej Głownia	e91b210398	fix: wait for invisible element click in trading-trades e2e tests	2023-07-03 10:02:14 +02:00
Bartłomiej Głownia	395dfc04a1	chore: nx migrate latest	2023-07-02 15:14:13 +02:00