Update libs/fills/src/lib/test-helpers.ts

test: update internal conditions test
chore: update no markets text
2023-10-02 14:53:44 +01:00 · 2023-10-02 10:16:12 +01:00 · 2023-10-02 10:07:40 +01:00 · 2023-10-02 09:42:36 +01:00 · 2023-09-30 22:09:35 +01:00 · 2023-09-29 19:53:35 +01:00
190 changed files with 1542 additions and 2463 deletions
@@ -82,38 +82,3 @@ jobs:
            https://${{ env.IPFS_V1 }}.ipfs.dweb.link/
            https://${{ env.IPFS_V1 }}.ipfs.cf-ipfs.com/
            ipfs://${{ env.IPFS_V0 }}/
-
-      - name: Ensure 'Released' label exists
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          REPO="${{ github.repository }}"
-          LABEL_EXIST=$(curl -s -H "Authorization: token $GITHUB_TOKEN" \
-                            -H "Accept: application/vnd.github.v3+json" \
-                            "https://api.github.com/repos/$REPO/labels/Released")
-          if [[ "$LABEL_EXIST" == *"Not Found"* ]]; then
-            curl -s -H "Authorization: token $GITHUB_TOKEN" \
-                  -H "Accept: application/vnd.github.v3+json" \
-                  -X POST "https://api.github.com/repos/$REPO/labels" \
-                  -d '{"name": "Released", "color": "FFFFFF"}'
-          fi
-
-      - name: Extract issues from release notes
-        id: extract-issues
-        run: |
-          ISSUES=$(echo "${{ github.event.release.body }}" | grep -o -E '#[0-9]+' | tr -d '#' | jq -R . | jq -cs .)
-          echo "Issues to label: $ISSUES"
-          echo "::set-output name=issue_numbers::$ISSUES"
-
-      - name: Add 'Released' label to issues
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          ISSUE_NUMBERS="${{ steps.extract-issues.outputs.issue_numbers }}"
-          REPO="${{ github.repository }}"
-          for ISSUE in $(echo "$ISSUE_NUMBERS" | jq -r '.[]'); do
-            curl -s -H "Authorization: token $GITHUB_TOKEN" \
-                  -H "Accept: application/vnd.github.v3+json" \
-                  -X POST "https://api.github.com/repos/$REPO/issues/$ISSUE/labels" \
-                  -d '{"labels": ["Released"]}'
-          done
@@ -5,7 +5,6 @@ on:
    branches:
      - release/*
      - develop
-      - main
  pull_request:
    types:
      - opened
@@ -170,48 +169,25 @@ jobs:
      preview_explorer: ${{ env.PREVIEW_EXPLORER }}
      preview_tools: ${{ env.PREVIEW_TOOLS }}

-  check-e2e-needed:
-    runs-on: ubuntu-latest
-    needs: build-sources
-    name: '(CI) check if e2e needed'
-    outputs:
-      run-tests: ${{ steps.check-test.outputs.e2e-needed }}
-    steps:
-      - name: Check branch
-        id: check-test
-        run: |
-          if [[ "${{ github.base_ref }}" == "develop" ]]; then
-            echo "e2e-needed=true" >> $GITHUB_OUTPUT
-          elif [[ "${{ github.base_ref }}" == "main" ]]; then 
-            echo "e2e-needed=true" >> $GITHUB_OUTPUT
-          elif [[ "${{ github.event_name }}" == "push"  &&  "${{ github.ref_name }}" == *"release/"* ]]; then
-            echo "e2e-needed=true" >> $GITHUB_OUTPUT
-          else
-            echo "e2e-needed=false" >> $GITHUB_OUTPUT
-          fi
-      - name: Print result
-        run: |
-          echo "e2e-needed: ${{ steps.check-test.outputs.e2e-needed }}"
+  # console-e2e:
+  #   needs: build-sources
+  #   name: '(CI) console python'
+  #   uses: ./.github/workflows/console-test-run.yml
+  #   secrets: inherit
+  #   if: ${{ contains(fromJSON(needs.build-sources.outputs.projects), 'trading') && github.event_name == 'pull_request' }}
+  #   with:
+  #     github-sha: ${{ github.event.pull_request.head.sha || github.sha }}

  cypress:
-    needs: [build-sources, check-e2e-needed]
+    needs: build-sources
    name: '(CI) cypress'
-    if: ${{ needs.check-e2e-needed.outputs.run-tests == 'true' }}
+    # if: ${{ needs.build-sources.outputs.projects-e2e != '[]' }}
    uses: ./.github/workflows/cypress-run.yml
    secrets: inherit
    with:
      projects: ${{ needs.build-sources.outputs.projects-e2e }}
      tags: '@smoke'

-  console-e2e:
-    needs: [build-sources, check-e2e-needed]
-    name: '(CI) console python'
-    uses: ./.github/workflows/console-test-run.yml
-    secrets: inherit
-    if: ${{ needs.check-e2e-needed.outputs.run-tests == 'true' }} && ${{ contains(fromJSON(needs.build-sources.outputs.projects), 'trading') }}
-    with:
-      github-sha: ${{ github.event.pull_request.head.sha || github.sha }}
-
  publish-dist:
    needs: build-sources
    name: '(CD) publish dist'
@@ -1,29 +0,0 @@
-# https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#managing-caches
-name: cleanup caches by a branch
-on:
-  pull_request:
-    types:
-      - closed
-jobs:
-  cleanup:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Cleanup
-        run: |
-          gh extension install actions/gh-actions-cache
-
-          echo "Fetching list of cache key"
-          cacheKeysForPR=$(gh actions-cache list -R $REPO -B $BRANCH -L 100 | cut -f 1 )
-
-          ## Setting this to not fail the workflow while deleting cache keys.
-          set +e
-          echo "Deleting caches..."
-          for cacheKey in $cacheKeysForPR
-          do
-              gh actions-cache delete $cacheKey -R $REPO -B $BRANCH --confirm
-          done
-          echo "Done"
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          REPO: ${{ github.repository }}
-          BRANCH: refs/pull/${{ github.event.pull_request.number }}/merge
@@ -1,5 +1,8 @@
 name: (CI) Console tests

+env:
+  VEGA_VERSION: v0.72.14
+
 on:
  workflow_call:
    inputs:
@@ -16,9 +19,9 @@ on:
          - develop

 jobs:
-  create-docker-image:
-    name: Create docker image for console-test
-    runs-on: ubuntu-22.04
+  run-tests:
+    name: run-tests
+    runs-on: 8-cores
    timeout-minutes: 20
    steps:
      #----------------------------------------------
@@ -55,105 +58,23 @@ jobs:
      #----------------------------------------------
      #       build trading
      #----------------------------------------------
-      - name: Build trading app
+      - name: Build affected spec
        run: |
          yarn env-cmd -f ./apps/trading/.env.stagnet1 yarn nx export trading
-          DIST_LOCATION=dist/apps/trading/exported
-          mv $DIST_LOCATION dist-result
-          tree dist-result
-
      #----------------------------------------------
-      #       export trading app docker image
+      #       run trading server
      #----------------------------------------------
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Build and export to local Docker
-        id: docker_build
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: docker/node-outside-docker.Dockerfile
-          load: true
-          build-args: |
-            APP=trading
-            ENV_NAME=stagnet1
-          tags: ci/trading:local
-          outputs: type=docker,dest=/tmp/console-image.tar
-
-      - name: Verify docker image created
+      - name: Run trading server
        run: |
-          echo ${{ steps.docker_build.outputs.digest }}
-          echo ${{ steps.docker_build.outputs.imageid }}
-
-      - name: Upload docker image for console-test usage
-        uses: actions/upload-artifact@v3
-        with:
-          name: console-image
-          path: /tmp/console-image.tar
-
-  console-test-branch:
-    name: Choose console-test branch to run on
-    runs-on: ubuntu-22.04
-    timeout-minutes: 5
-    outputs:
-      console-branch: ${{ steps.output-step.outputs.branch }}
-    steps:
-      - name: Workflow dispatch input
-        id: dispatch-step
-        if: github.event_name == 'workflow_dispatch'
-        run: echo "branch=${{ inputs.console-test-branch }}" >> $GITHUB_OUTPUT
-
-      - name: Print Workflow dispatch input
-        if: github.event_name == 'workflow_dispatch'
-        run: echo ${{ steps.dispatch-step.outputs.branch }}
-
-      - name: Workflow_call input
-        id: workflow_call-step
-        if: github.event_name != 'workflow_dispatch'
-        run: |
-          if [[ "${{ github.base_ref }}" == "main" ]]; then
-            echo "branch=main" >> $GITHUB_OUTPUT
-          elif [[ "${{ github.base_ref }}" == "develop" && "${{ github.ref_name }}" == "main" ]]; then
-            echo "branch=main" >> $GITHUB_OUTPUT
-          elif [[ "${{ github.event_name }}" == "push" && "${{ github.ref_name }}" == *"release/mainnet"* ]]; then
-            echo "branch=main" >> $GITHUB_OUTPUT
-          else
-            echo "branch=develop" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Print Workflow_call input
-        if: github.event_name != 'workflow_dispatch'
-        run: echo ${{ steps.workflow_call-step.outputs.branch }}
-
-      - name: Set output
-        id: output-step
-        run: echo "branch=${{ steps.dispatch-step.outputs.branch || steps.workflow_call-step.outputs.branch }}" >> $GITHUB_OUTPUT
-
-      - name: Print final output
-        run: echo ${{ steps.output-step.outputs.branch }}
-
-  run-tests:
-    name: run-tests
-    runs-on: 8-cores
-    needs: [create-docker-image, console-test-branch]
-    timeout-minutes: 20
-    steps:
+          docker run -d -p 80:4200 -v $PWD/docker/nginx.conf:/etc/nginx/conf.d/default.conf -v $PWD/dist/apps/trading/exported:/usr/share/nginx/html nginx:1.23-alpine@sha256:6318314189b40e73145a48060bff4783a116c34cc7241532d0d94198fb2c9629
+          sleep 5
+          docker ps
      #----------------------------------------------
-      #       load docker image
+      #       check if container persists between runs
      #----------------------------------------------
-      - name: Download docker image from previous job
-        uses: actions/download-artifact@v3
-        with:
-          name: console-image
-          path: /tmp
-
-      - name: Load Docker image
+      - name: Check server
        run: |
-          docker load --input /tmp/console-image.tar
-          docker image ls -a
-
+          docker ps
      #----------------------------------------------
      #       check-out tests repo
      #----------------------------------------------
@@ -161,55 +82,62 @@ jobs:
        uses: actions/checkout@v3
        with:
          repository: vegaprotocol/console-test
-          ref: ${{ needs.console-test-branch.outputs.console-branch }}
+          ref: ${{ inputs.console-test-branch }}
+          path: './console-test'

      - name: Load console test envs
        id: console-test-env
        uses: falti/dotenv-action@v1.0.4
        with:
-          path: '.env.${{ needs.console-test-branch.outputs.console-branch  }}'
+          path: './console-test/.env.${{ inputs.console-test-branch }}'
          export-variables: true
          keys-case: upper
          log-variables: true

      #----------------------------------------------
-      #  -----  Setup python  -----
-      #----------------------------------------------
-      - name: Setup Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.10'
-      #----------------------------------------------
-      #  -----  install & configure poetry  -----
-      #----------------------------------------------
-      - name: Install Poetry
-        uses: snok/install-poetry@v1
-        with:
-          virtualenvs-create: true
-          virtualenvs-in-project: true
-          virtualenvs-path: .venv
-
-      #----------------------------------------------
-      # install python dependencies
+      #       install dependencies
      #----------------------------------------------
      - name: Install dependencies
+        working-directory: ./console-test
        run: poetry install --no-interaction --no-root
      #----------------------------------------------
-      # install vega binaries
+      #       find vega binaries path
+      #----------------------------------------------
+      - name: Find vega binaries path
+        id: vega_bin_path
+        working-directory: ./console-test
+        run: echo path=$(poetry run python -c "import vega_sim; print(vega_sim.vega_bin_path)") >> $GITHUB_OUTPUT
+      #----------------------------------------------
+      #       vega binaries cache
+      #----------------------------------------------
+      - name: Vega binaries cache
+        uses: actions/cache@v3
+        id: vega_binaries_cache
+        with:
+          path: ${{ steps.vega_bin_path.outputs.path }}
+          key: ${{ runner.os }}-vega-binaries-${{ env.VEGA_VERSION }}
+      #----------------------------------------------
+      #       install vega binaries
      #----------------------------------------------
      - name: Install vega binaries
+        working-directory: ./console-test
        run: poetry run python -m vega_sim.tools.load_binaries --force --version ${{ env.VEGA_VERSION }}
      #----------------------------------------------
      # install playwright
      #----------------------------------------------
      - name: install playwright
        run: poetry run playwright install --with-deps chromium
+        working-directory: ./console-test
      #----------------------------------------------
      # run tests
      #----------------------------------------------
      - name: Run tests
-        run: CONSOLE_IMAGE_NAME=ci/trading:local poetry run pytest -v -s --numprocesses 4 --dist loadfile --durations=15
-
+        working-directory: ./console-test
+        run: poetry run pytest -v -s --numprocesses 4 --dist loadfile --durations=15
+      - name: Check files
+        run: |
+          ls -al .
+          ls -al console-test
      #----------------------------------------------
      # upload traces
      #----------------------------------------------
@@ -21,11 +21,11 @@ jobs:
      - name: Check branch
        id: step
        run: |
-          if [[ "${{ github.base_ref }}" == "main" ]]; then
+          if [ ${{ github.base_ref }} == 'main' ]; then
            echo "runner=mainnet-compatible-runner" >> $GITHUB_OUTPUT
-          elif [[ "${{ github.base_ref }}" == "develop" && "${{ github.ref_name }}" == "main" ]]; then
+          elif [ ${{ github.base_ref }} == 'develop' ] && [ ${{ github.ref_name }} == 'main' ]; then
            echo "runner=mainnet-compatible-runner" >> $GITHUB_OUTPUT
-          elif [[ "${{ github.event_name }}" == "push" && "${{ github.ref_name }}" == *"release/mainnet"* ]]; then
+          elif [ ${{ github.event_name }} == 'push' ] && [ ${{ contains(github.ref_name, 'release/mainnet') }} ]; then
            echo "runner=mainnet-compatible-runner" >> $GITHUB_OUTPUT
          else
            echo "runner=self-hosted-runner" >> $GITHUB_OUTPUT
@@ -85,7 +85,6 @@ jobs:
      - name: Run Vegacapsule network and Vega wallet
        id: setup-vega
        uses: ./frontend-monorepo/.github/actions/run-vegacapsule
-        timeout-minutes: 10

      ######
      ## Run some tests
@@ -63,7 +63,7 @@ jobs:
          echo IS_IPFS_RELEASE=true >> $GITHUB_ENV

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

@@ -195,7 +195,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' || env.IS_DEV_IMAGE == 'true' && 'develop' || env.IS_MAIN_IMAGE == 'true' && 'main' || '' }}
+            vegaprotocol/${{ matrix.app }}:${{ env.IS_MAINNET_RELEASE == 'true' && 'mainnet' || env.IS_TESTNET_RELEASE == 'true' && 'testnet' || env.IS_DEV_IMAGE == 'true' && 'develop' || env.IS_MAIN_IMAGE == 'true && main' || '' }}

      - name: Publish dist as docker image (ghcr - retry)
        uses: docker/build-push-action@v3
@@ -222,7 +222,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' || env.IS_DEV_IMAGE == 'true' && 'develop' || env.IS_MAIN_IMAGE == 'true' && 'main' || '' }}
+            vegaprotocol/${{ matrix.app }}:${{ env.IS_MAINNET_RELEASE == 'true' && 'mainnet' || env.IS_TESTNET_RELEASE == 'true' && 'testnet' || env.IS_DEV_IMAGE == 'true' && 'develop' || env.IS_MAIN_IMAGE == 'true && main' || '' }}

      # bucket creation in github.com/vegaprotocol/terraform//frontend
      - name: Publish dist to s3
@@ -36,7 +36,7 @@ context('Market page', { tags: '@regression' }, function () {

    it('Able to go to market details page', function () {
      cy.navigate_to('markets');
-      cy.contains('Test market 1').click();
+      cy.get_element_by_col_id('actions').eq(1).click();
      cy.getByTestId(marketHeaders).should('have.text', 'Test market 1');
      cy.validate_element_from_table('Name', 'Test market 1');
      cy.validate_element_from_table('Market ID', this.createdMarketId);
@@ -90,7 +90,7 @@ context('Market page', { tags: '@regression' }, function () {
      // Liquidity price range
      cy.validate_element_from_table(
        'Liquidity Price Range',
-        '95.00% of mid price'
+        '1,000.00% of mid price'
      );
      cy.validate_element_from_table('Lowest Price', '0.00 fUSDC');
      cy.validate_element_from_table('Highest Price', '0.00 fUSDC');
@@ -40,7 +40,7 @@ context.skip('Node switcher', { tags: '@regression' }, function () {
      const errorTypeTxt = 'Error: invalid url';
      const nodeErrorTxt = 'fakeUrl is not a valid url.';

-      cy.getByTestId('node-url-custom').click({ force: true });
+      cy.getByTestId('node-url-custom').click();

      cy.getByTestId(customNodeBtn).within(() => {
        cy.get('input').clear().type('fakeUrl');
@@ -49,37 +49,6 @@ fragment ExplorerOracleDataSource on OracleSpec {
          }
          ... on DataSourceDefinitionExternal {
            sourceType {
-              ... on EthCallSpec {
-                abi
-                args
-                method
-                requiredConfirmations
-                address
-                normalisers {
-                  name
-                  expression
-                }
-                trigger {
-                  trigger {
-                    ... on EthTimeTrigger {
-                      initial
-                      every
-                      until
-                    }
-                  }
-                }
-                filters {
-                  key {
-                    name
-                    type
-                    numberDecimalPlaces
-                  }
-                  conditions {
-                    value
-                    operator
-                  }
-                }
-              }
              ... on DataSourceSpecConfiguration {
                signers {
                  signer {
@@ -5,19 +5,19 @@ import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
 export type ExplorerOracleDataConnectionFragment = { __typename?: 'OracleSpec', dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } };

-export type ExplorerOracleDataSourceFragment = { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } | { __typename?: 'EthCallSpec', abi?: Array<string> | null, args?: Array<string> | null, method: string, requiredConfirmations: number, address: string, normalisers?: Array<{ __typename?: 'Normaliser', name: string, expression: string }> | null, trigger: { __typename?: 'EthCallTrigger', trigger: { __typename?: 'EthTimeTrigger', initial?: any | null, every?: number | null, until?: any | null } }, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } | { __typename?: 'DataSourceSpecConfigurationTimeTrigger' } } } } }, dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } };
+export type ExplorerOracleDataSourceFragment = { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } | { __typename?: 'EthCallSpec' } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } | { __typename?: 'DataSourceSpecConfigurationTimeTrigger' } } } } }, dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } };

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


-export type ExplorerOracleSpecsQuery = { __typename?: 'Query', oracleSpecsConnection?: { __typename?: 'OracleSpecsConnection', pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean }, edges?: Array<{ __typename?: 'OracleSpecEdge', node: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } | { __typename?: 'EthCallSpec', abi?: Array<string> | null, args?: Array<string> | null, method: string, requiredConfirmations: number, address: string, normalisers?: Array<{ __typename?: 'Normaliser', name: string, expression: string }> | null, trigger: { __typename?: 'EthCallTrigger', trigger: { __typename?: 'EthTimeTrigger', initial?: any | null, every?: number | null, until?: any | null } }, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } | { __typename?: 'DataSourceSpecConfigurationTimeTrigger' } } } } }, dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } } } | null> | null } | null };
+export type ExplorerOracleSpecsQuery = { __typename?: 'Query', oracleSpecsConnection?: { __typename?: 'OracleSpecsConnection', pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean }, edges?: Array<{ __typename?: 'OracleSpecEdge', node: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } | { __typename?: 'EthCallSpec' } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } | { __typename?: 'DataSourceSpecConfigurationTimeTrigger' } } } } }, dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } } } | null> | null } | null };

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


-export type ExplorerOracleSpecByIdQuery = { __typename?: 'Query', oracleSpec?: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } | { __typename?: 'EthCallSpec', abi?: Array<string> | null, args?: Array<string> | null, method: string, requiredConfirmations: number, address: string, normalisers?: Array<{ __typename?: 'Normaliser', name: string, expression: string }> | null, trigger: { __typename?: 'EthCallTrigger', trigger: { __typename?: 'EthTimeTrigger', initial?: any | null, every?: number | null, until?: any | null } }, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } | { __typename?: 'DataSourceSpecConfigurationTimeTrigger' } } } } }, dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } } | null };
+export type ExplorerOracleSpecByIdQuery = { __typename?: 'Query', oracleSpec?: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } | { __typename?: 'EthCallSpec' } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } | { __typename?: 'DataSourceSpecConfigurationTimeTrigger' } } } } }, dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } } | null };

 export const ExplorerOracleDataConnectionFragmentDoc = gql`
    fragment ExplorerOracleDataConnection on OracleSpec {
@@ -72,37 +72,6 @@ export const ExplorerOracleDataSourceFragmentDoc = gql`
          }
          ... on DataSourceDefinitionExternal {
            sourceType {
-              ... on EthCallSpec {
-                abi
-                args
-                method
-                requiredConfirmations
-                address
-                normalisers {
-                  name
-                  expression
-                }
-                trigger {
-                  trigger {
-                    ... on EthTimeTrigger {
-                      initial
-                      every
-                      until
-                    }
-                  }
-                }
-                filters {
-                  key {
-                    name
-                    type
-                    numberDecimalPlaces
-                  }
-                  conditions {
-                    value
-                    operator
-                  }
-                }
-              }
              ... on DataSourceSpecConfiguration {
                signers {
                  signer {
@@ -8,9 +8,7 @@ import { useScrollToLocation } from '../../../hooks/scroll-to-location';
 import filter from 'recursive-key-filter';

 const Oracles = () => {
-  const { data, loading, error } = useExplorerOracleSpecsQuery({
-    errorPolicy: 'ignore',
-  });
+  const { data, loading, error } = useExplorerOracleSpecsQuery();

  useDocumentTitle(['Oracles']);
  useScrollToLocation();
@@ -22,7 +22,6 @@ NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 NX_VEGA_REST_URL=http://localhost:3008/api/v2/
 NX_SUCCESSOR_MARKETS=true
 NX_PRODUCT_PERPETUALS=true
-NX_UPDATE_MARKET_STATE=true

 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
@@ -0,0 +1,21 @@
+{
+  "rationale": {
+    "title": "Add USDT Coin (USDT)",
+    "description": "Proposal to add USDT Coin (USDT) as an asset"
+  },
+  "terms": {
+    "newAsset": {
+      "changes": {
+        "name": "USDT Coin",
+        "symbol": "USDT",
+        "decimals": "18",
+        "quantum": "1",
+        "erc20": {
+          "contractAddress": "0xb404c51bbc10dcbe948077f18a4b8e553d160084"
+        }
+      }
+    },
+    "closingTimestamp": 1662374250,
+    "enactmentTimestamp": 1662460650
+  }
+}
@@ -1,16 +0,0 @@
-{
-  "rationale": {
-    "title": "Market resume test",
-    "description": "E2E test for market resume proposal"
-  },
-  "terms": {
-    "updateMarketState": {
-      "changes": {
-        "marketId": "b33bb4157e12355db22e41f277ddd0c10104dec29a4d6960bbcb96d186c40cbd",
-        "updateType": "MARKET_STATE_UPDATE_TYPE_RESUME"
-      }
-    },
-    "closingTimestamp": 0,
-    "enactmentTimestamp": 0
-  }
-}
@@ -1,16 +0,0 @@
-{
-  "rationale": {
-    "title": "Market suspended test",
-    "description": "E2E test for market suspended proposal"
-  },
-  "terms": {
-    "updateMarketState": {
-      "changes": {
-        "marketId": "",
-        "updateType": "MARKET_STATE_UPDATE_TYPE_SUSPEND"
-      }
-    },
-    "closingTimestamp": 0,
-    "enactmentTimestamp": 0
-  }
-}
@@ -1,17 +0,0 @@
-{
-  "rationale": {
-    "title": "Market terminate test",
-    "description": "E2E test for market terminate proposal"
-  },
-  "terms": {
-    "updateMarketState": {
-      "changes": {
-        "marketId": "",
-        "updateType": "MARKET_STATE_UPDATE_TYPE_TERMINATE",
-        "price": "100"
-      }
-    },
-    "closingTimestamp": 0,
-    "enactmentTimestamp": 0
-  }
-}
@@ -0,0 +1,85 @@
+{
+  "instrument": {
+    "code": "Token.24h",
+    "future": {
+      "quoteName": "fBTC",
+      "dataSourceSpecForSettlementData": {
+        "external": {
+          "oracle": {
+            "signers": [
+              {
+                "pubKey": {
+                  "key": "70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680"
+                }
+              }
+            ],
+            "filters": [
+              {
+                "key": {
+                  "name": "prices.BTC.value",
+                  "type": "TYPE_INTEGER"
+                },
+                "conditions": [
+                  {
+                    "operator": "OPERATOR_GREATER_THAN",
+                    "value": "0"
+                  }
+                ]
+              }
+            ]
+          }
+        }
+      },
+      "dataSourceSpecForTradingTermination": {
+        "external": {
+          "oracle": {
+            "signers": [
+              {
+                "pubKey": {
+                  "key": "70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680"
+                }
+              }
+            ],
+            "filters": [
+              {
+                "key": {
+                  "name": "trading.terminated.ETH5",
+                  "type": "TYPE_BOOLEAN"
+                },
+                "conditions": [
+                  {
+                    "operator": "OPERATOR_GREATER_THAN_OR_EQUAL",
+                    "value": "1648684800000000000"
+                  }
+                ]
+              }
+            ]
+          }
+        }
+      },
+      "dataSourceSpecBinding": {
+        "settlementDataProperty": "prices.BTC.value",
+        "tradingTerminationProperty": "trading.terminated.ETH5"
+      }
+    }
+  },
+  "metadata": ["sector:energy", "sector:food", "source:docs.vega.xyz"],
+  "priceMonitoringParameters": {
+    "triggers": [
+      {
+        "horizon": "43200",
+        "probability": "0.9999999",
+        "auctionExtension": "600"
+      }
+    ]
+  },
+  "logNormal": {
+    "tau": 0.0001140771161,
+    "riskAversionParameter": 0.001,
+    "params": {
+      "mu": 0,
+      "r": 0.016,
+      "sigma": 0.3
+    }
+  }
+}
@@ -60,17 +60,6 @@ describe(
    before('connect wallets and set approval limit', function () {
      cy.visit('/');
      ethereumWalletConnect();
-      cy.createMarket();
-      navigateTo(navigation.proposals);
-      cy.getByTestId('closed-proposals').within(() => {
-        cy.contains('Add Lorem Ipsum market')
-          .parentsUntil(proposalListItem)
-          .last()
-          .within(() => {
-            cy.getByTestId(viewProposalButton).click();
-          });
-      });
-      getProposalInformationFromTable('ID').invoke('text').as('parentMarketId');
    });

    beforeEach('visit proposals tab', function () {
@@ -309,6 +298,9 @@ describe(
    });

    it('Able to see successor market details with new and updated values', function () {
+      cy.createMarket();
+      cy.reload();
+      waitForSpinner();
      cy.getByTestId('closed-proposals').within(() => {
        cy.contains('Add Lorem Ipsum market')
          .parentsUntil(proposalListItem)
@@ -317,9 +309,14 @@ describe(
            cy.getByTestId(viewProposalButton).click();
          });
      });
-      cy.VegaWalletSubmitProposal(
-        createSuccessorMarketProposalTxBody(this.parentMarketId)
-      );
+      getProposalInformationFromTable('ID')
+        .invoke('text')
+        .as('parentMarketId')
+        .then(() => {
+          cy.VegaWalletSubmitProposal(
+            createSuccessorMarketProposalTxBody(this.parentMarketId)
+          );
+        });
      navigateTo(navigation.proposals);
      cy.reload();
      getProposalFromTitle('Test successor market proposal details').within(
@@ -433,92 +430,9 @@ describe(
        'contain.text',
        '0.3'
      );
-      getProposalDetailsValue('Min Probability Of Trading LP Orders').should(
-        'contain.text',
-        '1e-8'
-      );
-    });
-
-    it('Able to see suspended market proposal', function () {
-      const proposalPath = 'src/fixtures/proposals/suspend-market-raw.json';
-      const enactmentTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(3);
-      const closingTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(2);
-      submitUniqueRawProposal({
-        proposalBody: proposalPath,
-        updateMarketId: this.parentMarketId,
-        enactmentTimestamp: enactmentTimestamp,
-        closingTimestamp: closingTimestamp,
-      });
-      getProposalFromTitle('Market suspended test').within(() => {
-        cy.getByTestId(marketProposalType).should(
-          'have.text',
-          'Suspend market'
-        );
-        cy.getByTestId(viewProposalButton).click();
-      });
-      cy.getByTestId(marketProposalType).should('have.text', 'Suspend market');
-      cy.getByTestId(marketDataToggle).click();
-      cy.getByTestId('proposal-update-market-state').within(() => {
-        getProposalInformationFromTable('Market ID')
-          .invoke('text')
-          .and('eq', this.parentMarketId);
-      });
-    });
-
-    it('Able to see resume market proposal', function () {
-      const proposalPath = 'src/fixtures/proposals/resume-market-raw.json';
-      const enactmentTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(3);
-      const closingTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(2);
-      submitUniqueRawProposal({
-        proposalBody: proposalPath,
-        updateMarketId: this.parentMarketId,
-        enactmentTimestamp: enactmentTimestamp,
-        closingTimestamp: closingTimestamp,
-      });
-      getProposalFromTitle('Market resume test').within(() => {
-        cy.getByTestId(marketProposalType).should('have.text', 'Resume market');
-        cy.getByTestId(viewProposalButton).click();
-      });
-      cy.getByTestId(marketProposalType).should('have.text', 'Resume market');
-      cy.getByTestId(marketDataToggle).click();
-      cy.getByTestId('proposal-update-market-state').within(() => {
-        getProposalInformationFromTable('Market ID')
-          .invoke('text')
-          .and('eq', this.parentMarketId);
-      });
-    });
-
-    it('Able to see terminate market proposal', function () {
-      const proposalPath = 'src/fixtures/proposals/terminate-market-raw.json';
-      const enactmentTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(3);
-      const closingTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(2);
-      submitUniqueRawProposal({
-        proposalBody: proposalPath,
-        updateMarketId: this.parentMarketId,
-        enactmentTimestamp: enactmentTimestamp,
-        closingTimestamp: closingTimestamp,
-      });
-      getProposalFromTitle('Market terminate test').within(() => {
-        cy.getByTestId(marketProposalType).should(
-          'have.text',
-          'Terminate market'
-        );
-        cy.getByTestId(viewProposalButton).click();
-      });
-      cy.getByTestId(marketProposalType).should(
-        'have.text',
-        'Terminate market'
-      );
-      cy.getByTestId(marketDataToggle).click();
-      cy.getByTestId('proposal-update-market-state').within(() => {
-        getProposalInformationFromTable('Market ID')
-          .invoke('text')
-          .and('eq', this.parentMarketId);
-        getProposalDetailsValue('Termination Price').should(
-          'contain.text',
-          '0.001 fUSDC'
-        );
-      });
+      getProposalDetailsValue(
+        'Minimum Probability Of Trading LP Orders'
+      ).should('contain.text', '1e-8');
    });
  }
 );
@@ -310,9 +310,7 @@ context(
        closeStakingDialog();
        navigateTo(navigation.validators);
        clickOnValidatorFromList(0);
-        cy.getByTestId(stakeRemoveStakeRadioButton, txTimeout).click({
-          force: true,
-        });
+        cy.getByTestId(stakeRemoveStakeRadioButton, txTimeout).click();
        cy.getByTestId(stakeTokenAmountInputBox).type('-0.1');
        cy.contains('Waiting for next epoch to start', epochTimeout);
        cy.getByTestId(stakeTokenSubmitButton)
@@ -333,7 +331,7 @@ context(
        closeStakingDialog();
        navigateTo(navigation.validators);
        clickOnValidatorFromList(0);
-        cy.getByTestId(stakeRemoveStakeRadioButton).click({ force: true });
+        cy.getByTestId(stakeRemoveStakeRadioButton).click();
        cy.getByTestId(stakeTokenAmountInputBox).type('4');
        cy.contains('Waiting for next epoch to start', epochTimeout);
        cy.getByTestId(stakeTokenSubmitButton)
@@ -424,7 +422,7 @@ context(
        validateValidatorListTotalStakeAndShare('0', '3,002.00', '50.02%');
      });

-      it.skip('Associating wallet tokens - when some already staked - auto stakes tokens to staked validator', function () {
+      it('Associating wallet tokens - when some already staked - auto stakes tokens to staked validator', function () {
        // 1002-STKE-004
        stakingPageAssociateTokens('3');
        verifyUnstakedBalance(3.0);
@@ -438,7 +436,7 @@ context(
        verifyStakedBalance(7.0);
      });

-      it.skip('Associating vesting contract tokens - when some already staked - auto stakes tokens to staked validator', function () {
+      it('Associating vesting contract tokens - when some already staked - auto stakes tokens to staked validator', function () {
        // 1002-STKE-004
        stakingPageAssociateTokens('3', { type: 'contract' });
        verifyUnstakedBalance(3.0);
@@ -452,7 +450,7 @@ context(
        verifyStakedBalance(7.0);
      });

-      it.skip('Associating vesting contract tokens - when wallet tokens already staked - auto stakes tokens to staked validator', function () {
+      it('Associating vesting contract tokens - when wallet tokens already staked - auto stakes tokens to staked validator', function () {
        // 1002-STKE-004
        stakingPageAssociateTokens('3', { type: 'wallet' });
        verifyUnstakedBalance(3.0);
@@ -466,7 +464,7 @@ context(
        verifyStakedBalance(7.0);
      });

-      it.skip('Associating tokens - with multiple validators already staked - auto stakes to staked validators - abiding by existing stake ratio', function () {
+      it('Associating tokens - with multiple validators already staked - auto stakes to staked validators - abiding by existing stake ratio', function () {
        // 1002-STKE-004
        stakingPageAssociateTokens('6');
        verifyUnstakedBalance(6.0);
@@ -156,7 +156,7 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
        cy.getByTestId('subscription-cell').should('have.text', 'Yes');
      });
      cy.getByTestId('connect').should('be.disabled');
-      cy.getByTestId('node-url-custom').click({ force: true });
+      cy.getByTestId('node-url-custom').click();
      cy.get('input').should('exist');
      cy.getByTestId('connect').should('be.disabled');
      cy.getByTestId('icon-cross').click();
@@ -74,12 +74,25 @@ context(
    });

    it('should be able to see a working link for - find out more about Vega governance', function () {
-      // 3001-VOTE-001  // 3002-PROP-001
+      // 3001-VOTE-001
      cy.getByTestId(proposalDocumentationLink)
        .should('be.visible')
        .and('have.text', 'Find out more about Vega governance')
        .and('have.attr', 'href')
        .and('equal', governanceDocsUrl);
+
+      // 3002-PROP-001
+      cy.request(governanceDocsUrl)
+        .its('body')
+        .then((body) => {
+          if (!body.includes('Govern the network')) {
+            assert.include(
+              body,
+              'Govern the network',
+              `Checking that governance link destination includes 'Govern the network' text`
+            );
+          }
+        });
    });

    // 3007-PNE-021
@@ -11,6 +11,7 @@ import {
  waitForBeginningOfEpoch,
 } from '../../support/staking.functions';
 import { previousEpochData } from '../../fixtures/mocks/previous-epoch';
+import { chainIdQuery, statisticsQuery } from '@vegaprotocol/mock';

 const guideLink = 'staking-guide-link';
 const validatorTitle = 'validator-node-title';
@@ -37,11 +38,17 @@ const txTimeout = Cypress.env('txTimeout');

 context('Validators Page - verify elements on page', function () {
  before('navigate to validators page', () => {
-    cy.mockChainId();
+    cy.mockGQL((req) => {
+      aliasGQLQuery(req, 'ChainId', chainIdQuery());
+      aliasGQLQuery(req, 'Statistics', statisticsQuery());
+    });
    cy.visit('/validators');
  });
  beforeEach(() => {
-    cy.mockChainId();
+    cy.mockGQL((req) => {
+      aliasGQLQuery(req, 'ChainId', chainIdQuery());
+      aliasGQLQuery(req, 'Statistics', statisticsQuery());
+    });
  });

  describe('with wallets disconnected', { tags: '@smoke' }, function () {
@@ -182,7 +189,10 @@ context('Validators Page - verify elements on page', function () {
    { tags: '@smoke' },
    function () {
      before('connect wallets and click on validator', function () {
-        cy.mockChainId();
+        cy.mockGQL((req) => {
+          aliasGQLQuery(req, 'ChainId', chainIdQuery());
+          aliasGQLQuery(req, 'Statistics', statisticsQuery());
+        });
        cy.visit('/validators');
        cy.connectVegaWallet();
        clickOnValidatorFromList(0);
@@ -4,6 +4,8 @@ import {
  vegaWalletFaucetAssetsWithoutCheck,
  vegaWalletTeardown,
 } from '../../support/wallet-functions';
+import { aliasGQLQuery } from '@vegaprotocol/cypress';
+import { chainIdQuery, statisticsQuery } from '@vegaprotocol/mock';

 const walletContainer = 'aside [data-testid="vega-wallet"]';
 const walletHeader = '[data-testid="wallet-header"] h1';
@@ -86,7 +88,10 @@ context(

    describe('when vega wallet connected', function () {
      before('connect vega wallet', function () {
-        cy.mockChainId();
+        cy.mockGQL((req) => {
+          aliasGQLQuery(req, 'ChainId', chainIdQuery());
+          aliasGQLQuery(req, 'Statistics', statisticsQuery());
+        });
        cy.visit('/');
        cy.wait('@ChainId');
        cy.connectVegaWallet();
@@ -271,7 +276,10 @@ context(
        ];

        before('faucet assets to connected vega wallet', function () {
-          cy.mockChainId();
+          cy.mockGQL((req) => {
+            aliasGQLQuery(req, 'ChainId', chainIdQuery());
+            aliasGQLQuery(req, 'Statistics', statisticsQuery());
+          });
          for (const { id, amount } of assets) {
            vegaWalletFaucetAssetsWithoutCheck(id, amount, vegaWalletPublicKey);
          }
@@ -54,7 +54,6 @@ export function submitUniqueRawProposal(proposalFields: {
  proposalBody?: string;
  proposalTitle?: string;
  proposalDescription?: string;
-  updateMarketId?: string;
  closingTimestamp?: number;
  enactmentTimestamp?: number;
  submit?: boolean;
@@ -72,10 +71,6 @@ export function submitUniqueRawProposal(proposalFields: {
    if (proposalFields.proposalDescription) {
      rawProposal.rationale.description = proposalFields.proposalDescription;
    }
-    if (proposalFields.updateMarketId) {
-      rawProposal.terms.updateMarketState.changes.marketId =
-        proposalFields.updateMarketId;
-    }
    if (proposalFields.closingTimestamp) {
      rawProposal.terms.closingTimestamp = proposalFields.closingTimestamp;
    } else if (
@@ -9,6 +9,8 @@ import './wallet-functions.ts';
 import './proposal.functions.ts';
 import 'cypress-mochawesome-reporter/register';
 import registerCypressGrep from '@cypress/grep';
+import { aliasGQLQuery } from '@vegaprotocol/cypress';
+import { chainIdQuery, statisticsQuery } from '@vegaprotocol/mock';
 import { turnTelemetryOff } from './common.functions.ts';
 registerCypressGrep();

@@ -27,7 +29,10 @@ before(() => {
  // // Ensuring the telemetry modal doesn't disrupt the tests
  turnTelemetryOff();
  // Mock chainId fetch which happens on every page for wallet connection
-  cy.mockChainId();
+  cy.mockGQL((req) => {
+    aliasGQLQuery(req, 'ChainId', chainIdQuery());
+    aliasGQLQuery(req, 'Statistics', statisticsQuery());
+  });
  // Self stake validators so they are displayed
  cy.validatorsSelfDelegate();
 });
@@ -46,7 +46,7 @@ export function stakingValidatorPageAddStake(stake: string) {

 export function stakingValidatorPageRemoveStake(stake: string) {
  cy.highlight(`Removing a stake of ${stake}`);
-  cy.get(removeStakeRadioButton, epochTimeout).click({ force: true });
+  cy.get(removeStakeRadioButton, epochTimeout).click();
  cy.get(tokenAmountInputBox).type(stake);
  waitForBeginningOfEpoch();
  cy.get(tokenSubmitButton)
@@ -70,13 +70,9 @@ export function stakingPageAssociateTokens(
  cy.highlight(`Associating ${amount} tokens from ${type}`);
  cy.get(ethWalletAssociateButton).first().click();
  if (type === 'wallet') {
-    cy.get(associateWalletRadioButton, { timeout: 30000 }).click({
-      force: true,
-    });
+    cy.get(associateWalletRadioButton, { timeout: 30000 }).click();
  } else if (type === 'contract') {
-    cy.get(associateContractRadioButton, { timeout: 30000 }).click({
-      force: true,
-    });
+    cy.get(associateContractRadioButton, { timeout: 30000 }).click();
  } else {
    cy.highlight(`${type} is not association option`);
  }
@@ -8,7 +8,6 @@ NX_FAIRGROUND=false
 NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","STAGNET1":"https://governance.stagnet1.vega.rocks","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.vega.xyz"}'
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_WALLET_URL=http://localhost:1789
-NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 NX_VEGA_EXPLORER_URL=https://explorer.stagnet1.vega.rocks
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json

@@ -35,4 +34,3 @@ NX_SUCCESSOR_MARKETS=true
 NX_METAMASK_SNAPS=true
 NX_PRODUCT_PERPETUALS=false
 NX_UPDATE_MARKET_STATE=false
-NX_GOVERNANCE_TRANSFERS=false
@@ -17,7 +17,7 @@ NX_VEGA_REST_URL=https://api.vega.community/api/v2/
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-mainnet
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
+
 NX_TENDERMINT_URL=https://be.vega.community
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket

@@ -10,7 +10,6 @@ NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_REST_URL=https://api.n00.stagnet1.vega.xyz/api/v2/
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72

 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
@@ -23,4 +22,3 @@ NX_SUCCESSOR_MARKETS=true
 NX_METAMASK_SNAPS=true
 NX_PRODUCT_PERPETUALS=true
 NX_UPDATE_MARKET_STATE=true
-NX_GOVERNANCE_TRANSFERS=true
@@ -15,7 +15,6 @@ NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/annou
 NX_VEGA_REST_URL=https://api.n07.testnet.vega.xyz/api/v2/
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72

 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
@@ -26,11 +26,11 @@ import {
 } from '@vegaprotocol/web3';
 import { Web3Provider } from '@vegaprotocol/web3';
 import { VegaWalletDialogs } from './components/vega-wallet-dialogs';
-import { VegaWalletProvider } from '@vegaprotocol/wallet';
 import {
  useVegaTransactionManager,
  useVegaTransactionUpdater,
-} from '@vegaprotocol/web3';
+  VegaWalletProvider,
+} from '@vegaprotocol/wallet';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { useEthereumConfig } from '@vegaprotocol/web3';
 import {
@@ -888,7 +888,5 @@
  "HowToPropose": "How to make a proposal",
  "HowToProposeRawStep1": "1. Sense check your proposal with the community on the forum:",
  "HowToProposeRawStep2": "2. Use the appropriate proposal template in the docs:",
-  "HowToProposeRawStep3": "3. Submit on-chain below",
-  "proposalTransferDetails": "New governance transfer details",
-  "proposalCancelTransferDetails": "Cancel governance transfer details"
+  "HowToProposeRawStep3": "3. Submit on-chain below"
 }
@@ -7,17 +7,12 @@ import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 import { truncateMiddle } from '../../../../lib/truncate-middle';
 import { CurrentProposalState } from '../current-proposal-state';
 import { ProposalInfoLabel } from '../proposal-info-label';
-import {
-  useCancelTransferProposalDetails,
-  useNewTransferProposalDetails,
-  useSuccessorMarketProposalDetails,
-} from '@vegaprotocol/proposals';
+import { useSuccessorMarketProposalDetails } from '@vegaprotocol/proposals';
 import { FLAGS } from '@vegaprotocol/environment';
 import Routes from '../../../routes';
 import { Link } from 'react-router-dom';
 import type { VoteState } from '../vote-details/use-user-vote';
 import { VoteBreakdown } from '../vote-breakdown';
-import { GovernanceTransferKindMapping } from '@vegaprotocol/types';

 export const ProposalHeader = ({
  proposal,
@@ -152,20 +147,6 @@ export const ProposalHeader = ({
      );
      break;
    }
-    case 'NewTransfer':
-      proposalType = 'NewTransfer';
-      fallbackTitle = t('NewTransferProposal');
-      details = FLAGS.GOVERNANCE_TRANSFERS ? (
-        <NewTransferSummary proposalId={proposal?.id} />
-      ) : null;
-      break;
-    case 'CancelTransfer':
-      proposalType = 'CancelTransfer';
-      fallbackTitle = t('CancelTransferProposal');
-      details = FLAGS.GOVERNANCE_TRANSFERS ? (
-        <CancelTransferSummary proposalId={proposal?.id} />
-      ) : null;
-      break;
  }

  return (
@@ -243,36 +224,3 @@ const SuccessorCode = ({ proposalId }: { proposalId?: string | null }) => {
    </span>
  ) : null;
 };
-
-const NewTransferSummary = ({ proposalId }: { proposalId?: string | null }) => {
-  const { t } = useTranslation();
-  const details = useNewTransferProposalDetails(proposalId);
-
-  if (!details) return null;
-
-  return (
-    <span>
-      {GovernanceTransferKindMapping[details.kind.__typename]}{' '}
-      {t('transfer from')} <Lozenge>{truncateMiddle(details.source)}</Lozenge>{' '}
-      {t('to')} <Lozenge>{truncateMiddle(details.destination)}</Lozenge>
-    </span>
-  );
-};
-
-const CancelTransferSummary = ({
-  proposalId,
-}: {
-  proposalId?: string | null;
-}) => {
-  const { t } = useTranslation();
-  const details = useCancelTransferProposalDetails(proposalId);
-
-  if (!details) return null;
-
-  return (
-    <span>
-      {t('Cancel transfer: ')}{' '}
-      <Lozenge>{truncateMiddle(details.transferId)}</Lozenge>
-    </span>
-  );
-};
@@ -1,2 +0,0 @@
-export * from './proposal-transfer-details';
-export * from './proposal-cancel-transfer-details';
@@ -1,37 +0,0 @@
-import { useTranslation } from 'react-i18next';
-import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
-import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
-import { useCancelTransferProposalDetails } from '@vegaprotocol/proposals';
-import {
-  KeyValueTable,
-  KeyValueTableRow,
-  RoundedWrapper,
-} from '@vegaprotocol/ui-toolkit';
-import { SubHeading } from '../../../../components/heading';
-
-export const ProposalCancelTransferDetails = ({
-  proposal,
-}: {
-  proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
-}) => {
-  const { t } = useTranslation();
-  const details = useCancelTransferProposalDetails(proposal?.id);
-
-  if (!details) {
-    return null;
-  }
-
-  return (
-    <>
-      <SubHeading title={t('proposalCancelTransferDetails')} />
-      <RoundedWrapper paddingBottom={true}>
-        <KeyValueTable data-testid="proposal-cancel-transfer-details-table">
-          <KeyValueTableRow noBorder={true}>
-            {t('transferId')}
-            {details.transferId}
-          </KeyValueTableRow>
-        </KeyValueTable>
-      </RoundedWrapper>
-    </>
-  );
-};
@@ -1,145 +0,0 @@
-import { useState } from 'react';
-import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
-import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
-import { CollapsibleToggle } from '../../../../components/collapsible-toggle';
-import { SubHeading } from '../../../../components/heading';
-import { useTranslation } from 'react-i18next';
-import {
-  KeyValueTable,
-  KeyValueTableRow,
-  RoundedWrapper,
-  Tooltip,
-} from '@vegaprotocol/ui-toolkit';
-import { useNewTransferProposalDetails } from '@vegaprotocol/proposals';
-import {
-  AccountTypeMapping,
-  DescriptionGovernanceTransferTypeMapping,
-  GovernanceTransferKindMapping,
-  GovernanceTransferTypeMapping,
-} from '@vegaprotocol/types';
-import {
-  addDecimalsFormatNumberQuantum,
-  formatDateWithLocalTimezone,
-} from '@vegaprotocol/utils';
-
-export const ProposalTransferDetails = ({
-  proposal,
-}: {
-  proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
-}) => {
-  const { t } = useTranslation();
-  const [show, setShow] = useState(false);
-
-  const details = useNewTransferProposalDetails(proposal?.id);
-  if (!details) {
-    return null;
-  }
-
-  return (
-    <>
-      <CollapsibleToggle
-        toggleState={show}
-        setToggleState={setShow}
-        dataTestId="proposal-transfer-details"
-      >
-        <SubHeading title={t('proposalTransferDetails')} />
-      </CollapsibleToggle>
-      {show && (
-        <RoundedWrapper paddingBottom={true}>
-          <KeyValueTable data-testid="proposal-transfer-details-table">
-            {/* The source account */}
-            <KeyValueTableRow>
-              {t('Source')}
-              {details.source}
-            </KeyValueTableRow>
-
-            {/* The type of source account */}
-            <KeyValueTableRow>
-              {t('Source Type')}
-              {AccountTypeMapping[details.sourceType]}
-            </KeyValueTableRow>
-
-            {/* The destination account */}
-            <KeyValueTableRow>
-              {t('Destination')}
-              {details.destination}
-            </KeyValueTableRow>
-
-            {/* The type of destination account */}
-            <KeyValueTableRow>
-              {t('Destination Type')}
-              {AccountTypeMapping[details.destinationType]}
-            </KeyValueTableRow>
-
-            {/* The asset to transfer */}
-            <KeyValueTableRow>
-              {t('Asset')}
-              {details.asset.symbol}
-            </KeyValueTableRow>
-
-            {/*The fraction of the balance to be transfer */}
-            <KeyValueTableRow>
-              {t('Fraction Of Balance')}
-              {`${Number(details.fraction_of_balance) * 100}%`}
-            </KeyValueTableRow>
-
-            {/* The maximum amount to be transferred */}
-            <KeyValueTableRow>
-              {t('Amount')}
-              {addDecimalsFormatNumberQuantum(
-                details.amount,
-                details.asset.decimals,
-                details.asset.quantum
-              )}
-            </KeyValueTableRow>
-
-            {/* The type of the governance transfer */}
-            <KeyValueTableRow>
-              {t('Transfer Type')}
-              <Tooltip
-                description={
-                  DescriptionGovernanceTransferTypeMapping[details.transferType]
-                }
-              >
-                <span>
-                  {GovernanceTransferTypeMapping[details.transferType]}
-                </span>
-              </Tooltip>
-            </KeyValueTableRow>
-
-            {/* The type of governance transfer being made, i.e. a one-off or recurring trans */}
-            <KeyValueTableRow>
-              {t('Kind')}
-              {GovernanceTransferKindMapping[details.kind.__typename]}
-            </KeyValueTableRow>
-
-            {details.kind.__typename === 'OneOffGovernanceTransfer' &&
-              details.kind.deliverOn && (
-                <KeyValueTableRow noBorder={true}>
-                  {t('Deliver On')}
-                  {formatDateWithLocalTimezone(
-                    new Date(details.kind.deliverOn)
-                  )}
-                </KeyValueTableRow>
-              )}
-
-            {details.kind.__typename === 'RecurringGovernanceTransfer' && (
-              <>
-                <KeyValueTableRow noBorder={!details.kind.endEpoch}>
-                  {t('Start On')}
-                  <span>{details.kind.startEpoch}</span>
-                </KeyValueTableRow>
-                {details.kind.endEpoch && (
-                  <KeyValueTableRow noBorder={true}>
-                    {t('End on')}
-                    {details.kind.endEpoch}
-                  </KeyValueTableRow>
-                )}
-              </>
-            )}
-          </KeyValueTable>
-        </RoundedWrapper>
-      )}
-    </>
-  );
-};
@@ -20,11 +20,6 @@ import { ProposalUpdateMarketState } from '../proposal-update-market-state';
 import type { NetworkParamsResult } from '@vegaprotocol/network-parameters';
 import { useVoteSubmit } from '@vegaprotocol/proposals';
 import { useUserVote } from '../vote-details/use-user-vote';
-import {
-  ProposalCancelTransferDetails,
-  ProposalTransferDetails,
-} from '../proposal-transfer';
-import { FLAGS } from '@vegaprotocol/environment';

 export interface ProposalProps {
  proposal: ProposalQuery['proposal'];
@@ -104,37 +99,9 @@ export const Proposal = ({
        minVoterBalance =
          networkParams.governance_proposal_freeform_minVoterBalance;
        break;
-      case 'NewTransfer':
-        // TODO: check minVoterBalance for 'NewTransfer'
-        minVoterBalance =
-          networkParams.governance_proposal_freeform_minVoterBalance;
-        break;
-      case 'CancelTransfer':
-        // TODO: check minVoterBalance for 'CancelTransfer'
-        minVoterBalance =
-          networkParams.governance_proposal_freeform_minVoterBalance;
    }
  }

-  // Show governance transfer details only if the GOVERNANCE_TRANSFERS flag is on.
-  const governanceTransferDetails = FLAGS.GOVERNANCE_TRANSFERS && (
-    <>
-      {proposal.terms.change.__typename === 'NewTransfer' && (
-        /** Governance New Transfer Details */
-        <div className="mb-4">
-          <ProposalTransferDetails proposal={proposal} />
-        </div>
-      )}
-
-      {proposal.terms.change.__typename === 'CancelTransfer' && (
-        /** Governance Cancel Transfer Details */
-        <div className="mb-4">
-          <ProposalCancelTransferDetails proposal={proposal} />
-        </div>
-      )}
-    </>
-  );
-
  return (
    <section data-testid="proposal">
      <div className="flex items-center gap-1 mb-6">
@@ -220,8 +187,6 @@ export const Proposal = ({
          </div>
        )}

-      {governanceTransferDetails}
-
      <div className="mb-10">
        <RoundedWrapper paddingBottom={true}>
          <UserVote
@@ -4,7 +4,7 @@ import {
  getProposalDialogTitle,
 } from '@vegaprotocol/proposals';
 import type { ProposalEventFieldsFragment } from '@vegaprotocol/proposals';
-import type { DialogProps } from '@vegaprotocol/proposals';
+import type { DialogProps } from '@vegaprotocol/wallet';

 interface ProposalFormTransactionDialogProps {
  finalizedProposal: ProposalEventFieldsFragment | null;
@@ -6,7 +6,7 @@ import { ConnectToVega } from '../../../../components/connect-to-vega';
 import { VoteButtonsContainer } from './vote-buttons';
 import { SubHeading } from '../../../../components/heading';
 import type { VoteValue } from '@vegaprotocol/types';
-import type { DialogProps, VegaTxState } from '@vegaprotocol/proposals';
+import type { DialogProps, VegaTxState } from '@vegaprotocol/wallet';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 import type { VoteState } from './use-user-vote';
@@ -1,7 +1,7 @@
 import { render, screen } from '@testing-library/react';
 import { VoteTransactionDialog } from './vote-transaction-dialog';
 import { VoteState } from './use-user-vote';
-import { VegaTxStatus } from '@vegaprotocol/proposals';
+import { VegaTxStatus } from '@vegaprotocol/wallet';

 describe('VoteTransactionDialog', () => {
  const mockTransactionDialog = jest.fn(({ title, content }) => (
@@ -17,7 +17,7 @@ import { VoteState } from './use-user-vote';
 import { ProposalMinRequirements, ProposalUserAction } from '../shared';
 import { VoteTransactionDialog } from './vote-transaction-dialog';
 import { useVoteButtonsQuery } from './__generated__/Stake';
-import type { DialogProps, VegaTxState } from '@vegaprotocol/proposals';
+import type { DialogProps, VegaTxState } from '@vegaprotocol/wallet';

 interface VoteButtonsContainerProps {
  voteState: VoteState | null;
@@ -1,6 +1,6 @@
 import { t } from '@vegaprotocol/i18n';
 import { VoteState } from './use-user-vote';
-import type { DialogProps, VegaTxState } from '@vegaprotocol/proposals';
+import type { DialogProps, VegaTxState } from '@vegaprotocol/wallet';

 interface VoteTransactionDialogProps {
  voteState: VoteState;
@@ -61,7 +61,7 @@ describe('home', { tags: '@regression' }, () => {
      // 0006-NETW-020
      cy.getByTestId(nodeHealthTrigger).click();
      cy.getByTestId('connect').should('be.disabled');
-      cy.getByTestId('node-url-custom').click({ force: true });
+      cy.getByTestId('node-url-custom').click();
      cy.getByTestId('connect').should('be.disabled');
      cy.get("input[placeholder='https://']")
        .focus()
@@ -11,8 +11,102 @@ describe('accounts', { tags: '@smoke' }, () => {
    cy.visit('/#/markets/market-0');
  });

-  it('should open usage breakdown dialog when clicked on used', () => {
+  it('renders accounts', () => {
+    // 7001-COLL-001
+    // 7001-COLL-002
+    // 7001-COLL-003
+    // 7001-COLL-004
+    // 7001-COLL-005
+    // 7001-COLL-006
+    // 7001-COLL-007
+    // 1003-TRAN-001
+    // 7001-COLL-012
+
+    const tradingAccountRowId = '[row-id="t-0"]';
    cy.getByTestId('Collateral').click();
+
+    cy.getByTestId('tab-accounts').should('be.visible');
+
+    cy.getByTestId('tab-accounts')
+      .get(tradingAccountRowId)
+      .find('[col-id="asset.symbol"]')
+      .should('have.text', 'AST0');
+
+    cy.getByTestId('tab-accounts')
+      .get(tradingAccountRowId)
+      .find('[col-id="used"]')
+      .should('have.text', '1.01' + '1.00%');
+
+    cy.getByTestId('tab-accounts')
+      .get(tradingAccountRowId)
+      .find('[col-id="available"]')
+      .should('have.text', '100.00');
+
+    cy.getByTestId('tab-accounts')
+      .get(tradingAccountRowId)
+      .find('[col-id="total"]')
+      .should('have.text', '101.01');
+
+    cy.getByTestId('tab-accounts')
+      .get(tradingAccountRowId)
+      .find('[col-id="accounts-actions"]')
+      .should('have.text', '');
+
+    cy.getByTestId('tab-accounts')
+      .get('[col-id="accounts-actions"]')
+      .find('[data-testid="dropdown-menu"]')
+      .eq(1)
+      .click();
+    cy.getByTestId('deposit').should('be.visible');
+    cy.getByTestId('withdraw').should('be.visible');
+    cy.getByTestId('transfer').should('be.visible');
+    cy.getByTestId('breakdown').should('be.visible');
+    cy.getByTestId('Collateral').click({ force: true });
+  });
+
+  it('should open asset details dialog when clicked on symbol', () => {
+    // 7001-COLL-008
+    // 6501-ASSE-001
+    // 6501-ASSE-002
+    // 6501-ASSE-003
+    // 6501-ASSE-004
+    // 6501-ASSE-005
+    // 6501-ASSE-006
+    // 6501-ASSE-007
+    // 6501-ASSE-008
+    // 6501-ASSE-009
+    // 6501-ASSE-010
+    // 6501-ASSE-011
+    // 6501-ASSE-012
+    // 6501-ASSE-013
+    const titles = [
+      'ID',
+      'Type',
+      'Name',
+      'Symbol',
+      'Decimals',
+      'Quantum',
+      'Status',
+      'Contract address',
+      'Withdrawal threshold',
+      'Lifetime limit',
+      'Infrastructure fee account balance',
+      'Global reward pool account balance',
+      'Maker paid fees account balance',
+      'Maker received fees account balance',
+      'Liquidity provision fee reward account balance',
+      'Market proposer reward account balance',
+    ];
+    cy.get('[col-id="asset.symbol"]').contains('tEURO').click();
+    cy.get('[data-testid$="_label"]').should('have.length', 16);
+    cy.get('[data-testid$="_label"]').each((element, index) => {
+      cy.wrap(element).should('have.text', titles[index]);
+    });
+    cy.getByTestId(dialogClose).click();
+    cy.getByTestId(dialogClose).should('not.exist');
+  });
+
+  it('should open usage breakdown dialog when clicked on used', () => {
    // 7001-COLL-009
    cy.get('[col-id="used"]').contains('1.01').click();
    const headers = ['Market', 'Account type', 'Balance', 'Margin health'];
@@ -1,11 +1,92 @@
 import * as Schema from '@vegaprotocol/types';
+import { aliasGQLQuery } from '@vegaprotocol/cypress';
+import {
+  accountsQuery,
+  amendGeneralAccountBalance,
+  amendMarginAccountBalance,
+} from '@vegaprotocol/mock';
 import type { OrderSubmission } from '@vegaprotocol/wallet';
 import { createOrder } from '../support/create-order';

-describe(
-  'vega wallet - prompt',
+describe.skip(
+  'account validation',
  { tags: '@regression', testIsolation: true },
  () => {
+    describe.skip('zero balance error', () => {
+      beforeEach(() => {
+        cy.setVegaWallet();
+        cy.mockTradingPage();
+        let accounts = accountsQuery();
+        accounts = amendMarginAccountBalance(accounts, 'market-0', '1000');
+        accounts = amendGeneralAccountBalance(accounts, 'market-0', '0');
+        cy.mockGQL((req) => {
+          aliasGQLQuery(req, 'Accounts', accounts);
+        });
+        cy.mockSubscription();
+        cy.visit('/#/markets/market-0');
+        cy.wait('@Markets');
+      });
+
+      it('should show an error if your balance is zero', () => {
+        const accounts = accountsQuery();
+        amendMarginAccountBalance(accounts, 'market-0', '0');
+        cy.mockGQL((req) => {
+          aliasGQLQuery(req, 'Accounts', accounts);
+        });
+        // 7002-SORD-060
+        cy.getByTestId('place-order').should('be.enabled');
+        // 7002-SORD-003
+        cy.getByTestId('deal-ticket-error-message-zero-balance').should(
+          'have.text',
+          'You need ' +
+            'tDAI' +
+            ' in your wallet to trade in this market. See all your collateral.Make a deposit'
+        );
+        cy.getByTestId('deal-ticket-deposit-dialog-button').should('exist');
+      });
+    });
+
+    describe('not enough balance warning', () => {
+      beforeEach(() => {
+        cy.setVegaWallet();
+        cy.mockTradingPage();
+        let accounts = accountsQuery();
+        accounts = amendMarginAccountBalance(accounts, 'market-0', '1000');
+        accounts = amendGeneralAccountBalance(accounts, 'market-0', '1');
+        cy.mockGQL((req) => {
+          aliasGQLQuery(req, 'Accounts', accounts);
+        });
+        cy.mockSubscription();
+        cy.visit('/#/markets/market-0');
+        cy.wait('@Markets');
+
+        cy.get('[data-testid="deal-ticket-form"]').then(($form) => {
+          if (!$form.length) {
+            cy.getByTestId('Order').click();
+          }
+        });
+      });
+
+      it('should display info and button for deposit', () => {
+        // 7002-SORD-003
+
+        // warning should show immediately
+        cy.getByTestId('deal-ticket-warning-margin').should(
+          'contain.text',
+          'You may not have enough margin available to open this position'
+        );
+        cy.getByTestId('deal-ticket-warning-margin').should(
+          'contain.text',
+          'You may not have enough margin available to open this position. 5.00 tDAI is currently required. You have only 0.01001 tDAI available.'
+        );
+        cy.getByTestId('deal-ticket-deposit-dialog-button').click();
+        cy.getByTestId('sidebar-content')
+          .find('h2')
+          .eq(0)
+          .should('have.text', 'Deposit');
+      });
+    });
+
    describe('must submit order', { tags: '@smoke' }, () => {
      // 7002-SORD-039
      beforeEach(() => {
@@ -7,6 +7,7 @@ import {
  assetQuery,
  assetsQuery,
  candlesQuery,
+  chainIdQuery,
  chartQuery,
  depositsQuery,
  estimateFeesQuery,
@@ -24,6 +25,7 @@ import {
  estimatePositionQuery,
  positionsQuery,
  proposalListQuery,
+  statisticsQuery,
  tradesQuery,
  withdrawalsQuery,
  protocolUpgradeProposalsQuery,
@@ -89,6 +91,8 @@ const mockTradingPage = (
  tradingMode?: Schema.MarketTradingMode,
  trigger?: Schema.AuctionTrigger
 ) => {
+  aliasGQLQuery(req, 'ChainId', chainIdQuery());
+  aliasGQLQuery(req, 'NodeCheck', statisticsQuery());
  aliasGQLQuery(req, 'NodeGuard', nodeGuardQuery());
  aliasGQLQuery(
    req,
@@ -214,7 +218,6 @@ export const addMockTradingPage = () => {
      trigger,
      oracleStatus
    ) => {
-      cy.mockChainId();
      cy.mockGQL((req) => {
        mockTradingPage(req, state, tradingMode, trigger);
      });
@@ -12,7 +12,6 @@ NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
-NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
@@ -15,7 +15,6 @@ NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/annou
 NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json

 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
@@ -16,7 +16,6 @@ NX_VEGA_CONSOLE_URL=https://console.vega.xyz
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-mainnet/codfcglpplgmmlokgilfkpcjnmkbfiel
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-mainnet
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72

 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
@@ -16,7 +16,7 @@ NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
+

 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
@@ -17,7 +17,6 @@ NX_VEGA_CONSOLE_URL=https://console.fairground.wtf
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72

 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
@@ -1,5 +0,0 @@
-import MarketPage from '../market';
-
-export const ClosedMarketPage = () => {
-  return <MarketPage closed />;
-};
@@ -1 +0,0 @@
-export { ClosedMarketPage as default } from './closed-market';
@@ -9,10 +9,9 @@ import { useGlobalStore, usePageTitleStore } from '../../stores';
 import { TradeGrid } from './trade-grid';
 import { TradePanels } from './trade-panels';
 import { useNavigate, useParams } from 'react-router-dom';
-import { Links, Routes } from '../../lib/links';
+import { Links } from '../../lib/links';
 import { ViewType, useSidebar } from '../../components/sidebar';
 import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';
-import { MarketState } from '@vegaprotocol/types';

 const calculatePrice = (markPrice?: string, decimalPlaces?: number) => {
  return markPrice && decimalPlaces
@@ -57,7 +56,7 @@ const TitleUpdater = ({
  return null;
 };

-export const MarketPage = ({ closed }: { closed?: boolean }) => {
+export const MarketPage = () => {
  const { marketId } = useParams();
  const navigate = useNavigate();
  const currentRouteId = useGetCurrentRouteId();
@@ -71,33 +70,16 @@ export const MarketPage = ({ closed }: { closed?: boolean }) => {
  const { data, error, loading } = useMarket(marketId);

  useEffect(() => {
-    if (
-      data?.state &&
-      [
-        MarketState.STATE_SETTLED,
-        MarketState.STATE_TRADING_TERMINATED,
-      ].includes(data.state) &&
-      currentRouteId !== Routes.CLOSED_MARKETS &&
-      marketId
-    ) {
-      navigate(Links.CLOSED_MARKETS(marketId));
-    }
-  }, [data?.state, currentRouteId, navigate, marketId]);
-
-  useEffect(() => {
-    if (data?.id && data.id !== lastMarketId && !closed) {
+    if (data?.id && data.id !== lastMarketId) {
      update({ marketId: data.id });
    }
-  }, [update, lastMarketId, data?.id, closed]);
+  }, [update, lastMarketId, data?.id]);

  useEffect(() => {
    if (largeScreen && view === undefined) {
-      setViews(
-        { type: closed ? ViewType.Info : ViewType.Order },
-        currentRouteId
-      );
+      setViews({ type: ViewType.Order }, currentRouteId);
    }
-  }, [setViews, view, currentRouteId, largeScreen, closed]);
+  }, [setViews, view, currentRouteId, largeScreen]);

  const pinnedAsset = data && getAsset(data);

@@ -136,7 +136,7 @@ const MainGrid = memo(
                </Tab>
              ) : null}
              <Tab id="fills" name={t('Fills')}>
-                <TradingViews.fills.component />
+                <TradingViews.fills.component marketId={marketId} />
              </Tab>
              <Tab
                id="accounts"
@@ -1,4 +1,4 @@
-import { act, render, screen, waitFor, within } from '@testing-library/react';
+import { act, render, screen, within } from '@testing-library/react';
 import { MemoryRouter } from 'react-router-dom';
 import { Closed } from './closed';
 import { MarketStateMapping, PropertyKeyType } from '@vegaprotocol/types';
@@ -300,11 +300,9 @@ describe('Closed', () => {
      ].includes(m.node.state);
    });

-    await waitFor(() => {
-      // check rows length is correct
-      const rows = container.getAllByRole('row');
-      expect(rows).toHaveLength(expectedRows.length);
-    });
+    // check rows length is correct
+    const rows = container.getAllByRole('row');
+    expect(rows).toHaveLength(expectedRows.length);

    // check that only included ids are shown
    const cells = screen
@@ -22,8 +22,6 @@ import { SettlementPriceCell } from './settlement-price-cell';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import { MarketCodeCell } from './market-code-cell';
 import { MarketActionsDropdown } from './market-table-actions';
-import type { CellClickedEvent } from 'ag-grid-community';
-import { useClosedMarketClickHandler } from '../../lib/hooks/use-market-click-handler';

 type SettlementAsset = Pick<
  Asset,
@@ -127,7 +125,6 @@ const ClosedMarketsDataGrid = ({
  rowData: Row[];
  error: Error | undefined;
 }) => {
-  const handleOnSelect = useClosedMarketClickHandler();
  const openAssetDialog = useAssetDetailsDialogStore((store) => store.open);

  const colDefs = useMemo(() => {
@@ -284,27 +281,6 @@ const ClosedMarketsDataGrid = ({
      overlayNoRowsTemplate={error ? error.message : t('No markets')}
      components={components}
      rowHeight={45}
-      onCellClicked={({ data, column, event }: CellClickedEvent<Row>) => {
-        if (!data) return;
-
-        // prevent navigating to the market page if any of the below cells are clicked
-        // event.preventDefault or event.stopPropagation dont seem to apply for aggird
-        const colId = column.getColId();
-
-        if (
-          [
-            'settlementDate',
-            'settlementDataOracleId',
-            'settlementAsset',
-            'market-actions',
-          ].includes(colId)
-        ) {
-          return;
-        }
-
-        // @ts-ignore metaKey exists
-        handleOnSelect(data.id, event ? event.metaKey : false);
-      }}
    />
  );
 };
@@ -10,10 +10,12 @@ import classNames from 'classnames';
 import { Navigate, useSearchParams } from 'react-router-dom';
 import { useEffect, useRef, useState } from 'react';
 import { Button } from './buttons';
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import {
+  useTransactionEventSubscription,
+  useVegaWallet,
+} from '@vegaprotocol/wallet';
 import { useReferral } from './hooks/use-referral';
 import { Routes } from '../../lib/links';
-import { useTransactionEventSubscription } from '@vegaprotocol/web3';

 export const ApplyCodeForm = () => {
  const [status, setStatus] = useState<
@@ -9,7 +9,7 @@ import type { DataGridSlice } from '../../stores/datagrid-store-slice';
 import { createDataGridSlice } from '../../stores/datagrid-store-slice';
 import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';

-export const FillsContainer = () => {
+export const FillsContainer = ({ marketId }: { marketId?: string }) => {
  const onMarketClick = useMarketClickHandler(true);
  const { pubKey } = useVegaWallet();

@@ -31,6 +31,7 @@ export const FillsContainer = () => {
  return (
    <FillsManager
      partyId={pubKey}
+      marketId={marketId}
      onMarketClick={onMarketClick}
      gridProps={gridStoreCallbacks}
    />
@@ -23,10 +23,6 @@ export const LayoutWithSidebar = () => {
      <div className="col-span-full">
        <Routes>
          <Route path="markets/:marketId" element={<MarketHeader />} />
-          <Route
-            path="markets/all/closed/:marketId"
-            element={<MarketHeader />}
-          />
          <Route path="liquidity/:marketId" element={<LiquidityHeader />} />
        </Routes>
      </div>
@@ -7,8 +7,6 @@ import * as Schema from '@vegaprotocol/types';
 import { HeaderStat } from '../header';
 import { useCallback, useRef, useState } from 'react';
 import * as constants from '../constants';
-import { DocsLinks } from '@vegaprotocol/environment';
-import { ExternalLink } from '@vegaprotocol/ui-toolkit';

 export const MarketState = ({ market }: { market: Market | null }) => {
  const [marketState, setMarketState] = useState<Schema.MarketState | null>(
@@ -92,20 +90,5 @@ const getMarketStateTooltip = (state: Schema.MarketState | null) => {
    );
  }

-  if (state === Schema.MarketState.STATE_SUSPENDED_VIA_GOVERNANCE) {
-    return (
-      <p>
-        {t(
-          `This market has been suspended via a governance vote and can be resumed or terminated by further votes.`
-        )}
-        {DocsLinks && (
-          <ExternalLink href={DocsLinks.MARKET_LIFECYCLE} className="ml-1">
-            {t('Find out more')}
-          </ExternalLink>
-        )}
-      </p>
-    );
-  }
-
  return undefined;
 };
@@ -135,21 +135,6 @@ export const Sidebar = () => {
              </>
            }
          />
-          <Route
-            path="markets/all/closed/:marketId"
-            element={
-              <>
-                <AssetSidebarButtons />
-                <SidebarDivider />
-                <SidebarButton
-                  view={ViewType.Info}
-                  icon={VegaIconNames.BREAKDOWN}
-                  tooltip={t('Market specification')}
-                  routeId={currentRouteId}
-                />
-              </>
-            }
-          />
        </Routes>
      </nav>
      <nav className={classNames(navClasses, 'ml-auto lg:mt-auto lg:ml-0')}>
@@ -1,6 +1,6 @@
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { WithdrawFormContainer } from '@vegaprotocol/withdraws';
-import { useVegaTransactionStore } from '@vegaprotocol/web3';
+import { useVegaTransactionStore } from '@vegaprotocol/wallet';

 export const WithdrawContainer = ({ assetId }: { assetId?: string }) => {
  const { pubKey } = useVegaWallet();
@@ -20,16 +20,3 @@ export const useMarketLiquidityClickHandler = () => {
    window.open(`/#/liquidity/${selectedId}`, metaKey ? '_blank' : '_self');
  }, []);
 };
-
-export const useClosedMarketClickHandler = (replace = false) => {
-  const navigate = useNavigate();
-
-  return (selectedId: string, metaKey?: boolean) => {
-    const link = Links.CLOSED_MARKETS(selectedId);
-    if (metaKey) {
-      window.open(`/#${link}`, '_blank');
-    } else {
-      navigate(link, { replace });
-    }
-  };
-};
@@ -5,7 +5,6 @@ import trimEnd from 'lodash/trimEnd';
 export const Routes = {
  HOME: '/',
  MARKETS: '/markets/all',
-  CLOSED_MARKETS: '/markets/all/closed/:marketId',
  MARKET: '/markets/:marketId',
  LIQUIDITY: '/liquidity/:marketId',
  PORTFOLIO: '/portfolio',
@@ -29,8 +28,6 @@ export const Links: ConsoleLinks = {
  MARKET: (marketId: string) =>
    trimEnd(Routes.MARKET.replace(':marketId', marketId)),
  MARKETS: () => Routes.MARKETS,
-  CLOSED_MARKETS: (marketId: string) =>
-    trimEnd(Routes.CLOSED_MARKETS.replace(':marketId', marketId)),
  PORTFOLIO: () => Routes.PORTFOLIO,
  LIQUIDITY: (marketId: string) =>
    trimEnd(Routes.LIQUIDITY.replace(':marketId', marketId)),
@@ -5,7 +5,6 @@ const MARKET_TEMPLATE = [
  MarketState.STATE_ACTIVE,
  MarketState.STATE_SUSPENDED,
  MarketState.STATE_PENDING,
-  MarketState.STATE_SUSPENDED_VIA_GOVERNANCE,
 ];

 export const isMarketActive = (state: MarketState) => {
@@ -4,12 +4,10 @@ import type { AppProps } from 'next/app';
 import { t } from '@vegaprotocol/i18n';
 import {
  useEagerConnect as useVegaEagerConnect,
-  useVegaWallet,
-} from '@vegaprotocol/wallet';
-import {
  useVegaTransactionManager,
  useVegaTransactionUpdater,
-} from '@vegaprotocol/web3';
+  useVegaWallet,
+} from '@vegaprotocol/wallet';
 import {
  useEagerConnect as useEthereumEagerConnect,
  useEthTransactionManager,
@@ -26,7 +26,6 @@ import { FLAGS } from '@vegaprotocol/environment';
 // These must remain dynamically imported as pennant cannot be compiled by nextjs due to ESM
 // Using dynamic imports is a workaround for this until pennant is published as ESM
 const MarketPage = lazy(() => import('../client-pages/market'));
-const ClosedMarketPage = lazy(() => import('../client-pages/closed-market'));
 const Portfolio = lazy(() => import('../client-pages/portfolio'));

 const NotFound = () => (
@@ -102,11 +101,6 @@ export const routerConfig: RouteObject[] = compact([
            element: <MarketPage />,
            id: Routes.MARKET,
          },
-          {
-            path: 'all/closed/:marketId',
-            element: <ClosedMarketPage />,
-            id: Routes.CLOSED_MARKETS,
-          },
        ],
      },
      {
@@ -1,75 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import '@testing-library/jest-dom/extend-expect';
-import { AccountsActionsDropdown } from './accounts-actions-dropdown';
-import userEvent from '@testing-library/user-event';
-
-describe('AccountsActionsDropdown', () => {
-  let onClickDeposit: jest.Mock;
-  let onClickWithdraw: jest.Mock;
-  let onClickBreakdown: jest.Mock;
-  let onClickTransfer: jest.Mock;
-
-  beforeEach(() => {
-    onClickDeposit = jest.fn();
-    onClickWithdraw = jest.fn();
-    onClickBreakdown = jest.fn();
-    onClickTransfer = jest.fn();
-  });
-
-  it('should render dropdown items correctly', async () => {
-    // 7001-COLL-005
-    // 7001-COLL-006
-    // 1003-TRAN-001
-    render(
-      <AccountsActionsDropdown
-        assetId="testAssetId"
-        assetContractAddress="testAssetContractAddress"
-        onClickDeposit={onClickDeposit}
-        onClickWithdraw={onClickWithdraw}
-        onClickBreakdown={onClickBreakdown}
-        onClickTransfer={onClickTransfer}
-      />
-    );
-
-    await userEvent.click(screen.getByTestId('icon-kebab'));
-
-    expect(screen.getByTestId('deposit')).toHaveTextContent('Deposit');
-    expect(screen.getByTestId('withdraw')).toHaveTextContent('Withdraw');
-    expect(screen.getByTestId('transfer')).toHaveTextContent('Transfer');
-    expect(screen.getByTestId('breakdown')).toHaveTextContent(
-      'View usage breakdown'
-    );
-    expect(screen.getByText('View asset details')).toBeInTheDocument();
-    expect(screen.getByText('Copy asset ID')).toBeInTheDocument();
-    expect(screen.getByText('View on Etherscan')).toBeInTheDocument();
-  });
-
-  it('should call callback functions on click', async () => {
-    render(
-      <AccountsActionsDropdown
-        assetId="testAssetId"
-        assetContractAddress="testAssetContractAddress"
-        onClickDeposit={onClickDeposit}
-        onClickWithdraw={onClickWithdraw}
-        onClickBreakdown={onClickBreakdown}
-        onClickTransfer={onClickTransfer}
-      />
-    );
-
-    await userEvent.click(screen.getByTestId('icon-kebab'));
-    await userEvent.click(screen.getByTestId('deposit'));
-    expect(onClickDeposit).toHaveBeenCalledTimes(1);
-
-    await userEvent.click(screen.getByTestId('icon-kebab'));
-    await userEvent.click(screen.getByTestId('withdraw'));
-    expect(onClickWithdraw).toHaveBeenCalledTimes(1);
-
-    await userEvent.click(screen.getByTestId('icon-kebab'));
-    await userEvent.click(screen.getByTestId('transfer'));
-    expect(onClickTransfer).toHaveBeenCalledTimes(1);
-
-    await userEvent.click(screen.getByTestId('icon-kebab'));
-    await userEvent.click(screen.getByTestId('breakdown'));
-    expect(onClickBreakdown).toHaveBeenCalledTimes(1);
-  });
-});
@@ -26,13 +26,6 @@ const singleRowData = [singleRow];

 describe('AccountsTable', () => {
  it('should render correct columns', async () => {
-    // 7001-COLL-001
-    // 7001-COLL-002
-    // 7001-COLL-003
-    // 7001-COLL-004
-    // 7001-COLL-007
-    // 1003-TRAN-001
-    // 7001-COLL-012
    await act(async () => {
      render(
        <AccountTable
@@ -37,7 +37,6 @@ const BreakdownTable = forwardRef<AgGridReact, BreakdownTableProps>(
          headerName: t('Market'),
          field: 'market.tradableInstrument.instrument.code',
          minWidth: 200,
-          sort: 'desc',
          cellRenderer: ({
            value,
            data,
@@ -141,7 +140,6 @@ const BreakdownTable = forwardRef<AgGridReact, BreakdownTableProps>(
        tooltipShowDelay={500}
        defaultColDef={defaultColDef}
        columnDefs={coldefs}
-        domLayout="autoHeight"
      />
    );
  }
@@ -7,8 +7,7 @@ import {
 } from '@vegaprotocol/network-parameters';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import type { Transfer } from '@vegaprotocol/wallet';
-import { useVegaTransactionStore } from '@vegaprotocol/web3';
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useVegaTransactionStore, useVegaWallet } from '@vegaprotocol/wallet';
 import { useCallback, useMemo } from 'react';
 import { accountsDataProvider } from './accounts-data-provider';
 import { TransferForm } from './transfer-form';
@@ -258,21 +258,21 @@ export const TransferForm = ({
        )}
      </TradingFormGroup>
      <div className="mb-4">
-        <Tooltip
-          description={t(
-            `The fee will be taken from the amount you are transferring.`
-          )}
-        >
-          <div>
-            <TradingCheckbox
-              name="include-transfer-fee"
-              disabled={!transferAmount}
-              label={t('Include transfer fee')}
-              checked={includeFee}
-              onCheckedChange={() => setIncludeFee(!includeFee)}
-            />
-          </div>
-        </Tooltip>
+        <TradingCheckbox
+          name="include-transfer-fee"
+          disabled={!transferAmount}
+          label={
+            <Tooltip
+              description={t(
+                `The fee will be taken from the amount you are transferring.`
+              )}
+            >
+              <div>{t('Include transfer fee')}</div>
+            </Tooltip>
+          }
+          checked={includeFee}
+          onCheckedChange={() => setIncludeFee(!includeFee)}
+        />
      </div>
      {transferAmount && fee && (
        <TransferFee
@@ -62,20 +62,6 @@ const WrappedAssetDetailsDialog = ({ assetId }: { assetId: string }) => (
 );

 describe('AssetDetailsDialog', () => {
-  // 7001-COLL-008
-  // 6501-ASSE-001
-  // 6501-ASSE-002
-  // 6501-ASSE-003
-  // 6501-ASSE-004
-  // 6501-ASSE-005
-  // 6501-ASSE-006
-  // 6501-ASSE-007
-  // 6501-ASSE-008
-  // 6501-ASSE-009
-  // 6501-ASSE-010
-  // 6501-ASSE-011
-  // 6501-ASSE-012
-  // 6501-ASSE-013
  it('should show no data message given unknown asset symbol', async () => {
    render(<WrappedAssetDetailsDialog assetId={'UNKNOWN_FOR_SURE'} />);
    expect((await screen.findByTestId('splash')).textContent).toContain(
@@ -22,6 +22,7 @@ export * from '../markets/src/lib/oracle-spec-data-connection.mock';
 export * from '../orders/src/lib/components/order-data-provider/orders.mock';
 export * from '../positions/src/lib/positions.mock';
 export * from '../network-parameters/src/network-params.mock';
+export * from '../wallet/src/connect-dialog/chain-id.mock';
 export * from '../positions/src/lib/estimate-position.mock';
 export * from '../trades/src/lib/trades.mock';
 export * from '../withdraws/src/lib/withdrawal.mock';
@@ -1,5 +1,5 @@
 import { addGetTestIdcommand } from './lib/commands/get-by-test-id';
-import { addMockGQLCommand, addMockStatistics } from './lib/mock-gql';
+import { addMockGQLCommand } from './lib/mock-gql';
 import { addMockSubscription } from './lib/mock-ws';
 import { addMockWalletCommand } from './lib/mock-rest';
 import { addMockWeb3ProviderCommand } from './lib/commands/mock-web3-provider';
@@ -28,7 +28,6 @@ import { addMockChainId } from './lib/commands/mock-chain-id';

 addGetTestIdcommand();
 addMockGQLCommand();
-addMockStatistics();
 addMockSubscription();
 addMockWalletCommand();
 addMockWeb3ProviderCommand();
@@ -1,6 +1,6 @@
 import { aliasGQLQuery } from '../mock-gql';
 // eslint-disable-next-line @nx/enforce-module-boundaries
-import { statisticsQuery } from '@vegaprotocol/mock';
+import { chainIdQuery, statisticsQuery } from '@vegaprotocol/mock';

 declare global {
  // eslint-disable-next-line @typescript-eslint/no-namespace
@@ -12,26 +12,11 @@ declare global {
  }
 }

-const chainId = 'test-id';
-
 export function addMockChainId() {
  Cypress.Commands.add('mockChainId', () => {
-    const result = {
-      statistics: {
-        chainId,
-      },
-    };
    cy.mockGQL((req) => {
-      aliasGQLQuery(req, 'NodeCheck', statisticsQuery(result));
-    });
-    cy.mockStatistics((req) => {
-      req.reply({
-        statusCode: 200,
-        body: result,
-        headers: {
-          'Content-Type': 'application/json',
-        },
-      });
+      aliasGQLQuery(req, 'ChainId', chainIdQuery());
+      aliasGQLQuery(req, 'Statistics', statisticsQuery());
    });
  });
 }
@@ -8,7 +8,6 @@ declare global {
    // eslint-disable-next-line @typescript-eslint/no-unused-vars
    interface Chainable<Subject> {
      mockGQL(handler: RouteHandler): void;
-      mockStatistics(handler: RouteHandler): void;
    }
  }
 }
@@ -41,16 +40,6 @@ const extractVariables = (req: CyHttpMessages.IncomingHttpRequest): object => {
  );
 };

-export function addMockStatistics() {
-  Cypress.Commands.add('mockStatistics', (handler: RouteHandler) => {
-    cy.intercept(
-      'GET',
-      Cypress.env('VEGA_URL').replace('graphql', 'statistics'),
-      handler
-    ).as('ChainId');
-  });
-}
-
 export function addMockGQLCommand() {
  Cypress.Commands.add('mockGQL', (handler: RouteHandler) => {
    cy.intercept('POST', Cypress.env('VEGA_URL'), handler).as('GQL');
@@ -1,4 +1,4 @@
-import { useVegaTransactionStore } from '@vegaprotocol/web3';
+import { useVegaTransactionStore } from '@vegaprotocol/wallet';
 import {
  isStopOrderType,
  useDealTicketFormValues,
@@ -273,7 +273,7 @@ export const DealTicketMarginDetails = ({
                key={'value-dropdown'}
                className="flex items-center justify-between w-full gap-2"
              >
-                <div className="flex items-center gap-1 text-left">
+                <div className="flex items-center gap-1">
                  <Tooltip description={MARGIN_DIFF_TOOLTIP_TEXT(assetSymbol)}>
                    <span className="text-muted">{t('Margin required')}</span>
                  </Tooltip>
@@ -494,16 +494,16 @@ const TimeInForce = ({
 );

 const ReduceOnly = () => (
-  <Tooltip description={<span>{t(REDUCE_ONLY_TOOLTIP)}</span>}>
-    <div>
-      <Checkbox
-        name="reduce-only"
-        checked={true}
-        disabled={true}
-        label={t('Reduce only')}
-      />
-    </div>
-  </Tooltip>
+  <Checkbox
+    name="reduce-only"
+    checked={true}
+    disabled={true}
+    label={
+      <Tooltip description={<span>{t(REDUCE_ONLY_TOOLTIP)}</span>}>
+        <>{t('Reduce only')}</>
+      </Tooltip>
+    }
+  />
 );

 const NotionalAndFees = ({
@@ -264,11 +264,7 @@ export const DealTicket = ({
    orders,
    collateralAvailable:
      marginAccountBalance || generalAccountBalance ? balance : undefined,
-    skip:
-      !normalizedOrder ||
-      (normalizedOrder.type !== Schema.OrderType.TYPE_MARKET &&
-        (!normalizedOrder.price || normalizedOrder.price === '0')) ||
-      normalizedOrder.size === '0',
+    skip: !normalizedOrder,
  });

  const assetSymbol = getAsset(market).symbol;
@@ -548,62 +544,62 @@ export const DealTicket = ({
          name="postOnly"
          control={control}
          render={({ field }) => (
-            <Tooltip
-              description={
-                <span>
-                  {disablePostOnlyCheckbox
-                    ? t(
-                        '"Post only" can not be used on "Fill or Kill" or "Immediate or Cancel" orders.'
-                      )
-                    : t(
-                        '"Post only" will ensure the order is not filled immediately but is placed on the order book as a passive order. When the order is processed it is either stopped (if it would not be filled immediately), or placed in the order book as a passive order until the price taker matches with it.'
-                      )}
-                </span>
+            <Checkbox
+              name="post-only"
+              checked={!disablePostOnlyCheckbox && field.value}
+              disabled={disablePostOnlyCheckbox}
+              onCheckedChange={(postOnly) => {
+                field.onChange(postOnly);
+                setValue('reduceOnly', false);
+              }}
+              label={
+                <Tooltip
+                  description={
+                    <span>
+                      {disablePostOnlyCheckbox
+                        ? t(
+                            '"Post only" can not be used on "Fill or Kill" or "Immediate or Cancel" orders.'
+                          )
+                        : t(
+                            '"Post only" will ensure the order is not filled immediately but is placed on the order book as a passive order. When the order is processed it is either stopped (if it would not be filled immediately), or placed in the order book as a passive order until the price taker matches with it.'
+                          )}
+                    </span>
+                  }
+                >
+                  <span className="text-xs">{t('Post only')}</span>
+                </Tooltip>
              }
-            >
-              <div>
-                <Checkbox
-                  name="post-only"
-                  checked={!disablePostOnlyCheckbox && field.value}
-                  disabled={disablePostOnlyCheckbox}
-                  onCheckedChange={(postOnly) => {
-                    field.onChange(postOnly);
-                    setValue('reduceOnly', false);
-                  }}
-                  label={t('Post only')}
-                />
-              </div>
-            </Tooltip>
+            />
          )}
        />
        <Controller
          name="reduceOnly"
          control={control}
          render={({ field }) => (
-            <Tooltip
-              description={
-                <span>
-                  {disableReduceOnlyCheckbox
-                    ? t(
-                        '"Reduce only" can be used only with non-persistent orders, such as "Fill or Kill" or "Immediate or Cancel".'
-                      )
-                    : t(REDUCE_ONLY_TOOLTIP)}
-                </span>
+            <Checkbox
+              name="reduce-only"
+              checked={!disableReduceOnlyCheckbox && field.value}
+              disabled={disableReduceOnlyCheckbox}
+              onCheckedChange={(reduceOnly) => {
+                field.onChange(reduceOnly);
+                setValue('postOnly', false);
+              }}
+              label={
+                <Tooltip
+                  description={
+                    <span>
+                      {disableReduceOnlyCheckbox
+                        ? t(
+                            '"Reduce only" can be used only with non-persistent orders, such as "Fill or Kill" or "Immediate or Cancel".'
+                          )
+                        : t(REDUCE_ONLY_TOOLTIP)}
+                    </span>
+                  }
+                >
+                  <span className="text-xs">{t('Reduce only')}</span>
+                </Tooltip>
              }
-            >
-              <div>
-                <Checkbox
-                  name="reduce-only"
-                  checked={!disableReduceOnlyCheckbox && field.value}
-                  disabled={disableReduceOnlyCheckbox}
-                  onCheckedChange={(reduceOnly) => {
-                    field.onChange(reduceOnly);
-                    setValue('postOnly', false);
-                  }}
-                  label={t('Reduce only')}
-                />
-              </div>
-            </Tooltip>
+            />
          )}
        />
      </div>
@@ -614,26 +610,26 @@ export const DealTicket = ({
              name="iceberg"
              control={control}
              render={({ field }) => (
-                <Tooltip
-                  description={
-                    <p>
-                      {t(`Trade only a fraction of the order size at once.
+                <Checkbox
+                  name="iceberg"
+                  checked={field.value}
+                  onCheckedChange={field.onChange}
+                  disabled={disableIcebergCheckbox}
+                  label={
+                    <Tooltip
+                      description={
+                        <p>
+                          {t(`Trade only a fraction of the order size at once.
                            After the peak size of the order has traded, the size is reset. This is repeated until the order is cancelled, expires, or its full volume trades away.
                            For example, an iceberg order with a size of 1000 and a peak size of 100 will effectively be split into 10 orders with a size of 100 each.
                            Note that the full volume of the order is not hidden and is still reflected in the order book.`)}
-                    </p>
+                        </p>
+                      }
+                    >
+                      <span className="text-xs">{t('Iceberg')}</span>
+                    </Tooltip>
                  }
-                >
-                  <div>
-                    <Checkbox
-                      name="iceberg"
-                      checked={field.value}
-                      onCheckedChange={field.onChange}
-                      disabled={disableIcebergCheckbox}
-                      label={t('Iceberg')}
-                    />
-                  </div>
-                </Tooltip>
+                />
              )}
            />
          </div>
@@ -25,11 +25,11 @@ export const KeyValue = ({
 }: KeyValuePros) => {
  const displayValue = `${formattedValue ?? '-'} ${symbol || ''}`;
  const valueElement = onClick ? (
-    <button onClick={onClick} className="font-mono ml-auto">
+    <button onClick={onClick} className="font-mono">
      {displayValue}
    </button>
  ) : (
-    <div className="font-mono ml-auto">{displayValue}</div>
+    <div className="font-mono">{displayValue}</div>
  );
  return (
    <div
@@ -40,12 +40,12 @@ export const KeyValue = ({
      }`}
      key={typeof label === 'string' ? label : 'value-dropdown'}
      className={classnames(
-        'text-xs flex justify-between items-center gap-4 flex-wrap text-right',
+        'text-xs flex justify-between items-center gap-4 flex-wrap',
        { 'ml-2': indent }
      )}
    >
      <Tooltip description={labelDescription}>
-        <div className="text-muted text-left">{label}</div>
+        <div className="text-muted">{label}</div>
      </Tooltip>
      <Tooltip description={`${value ?? '-'} ${symbol || ''}`}>
        {valueElement}
@@ -114,20 +114,6 @@ export const TradingModeTooltip = ({
        </section>
      );
    }
-    case Schema.MarketTradingMode.TRADING_MODE_SUSPENDED_VIA_GOVERNANCE: {
-      return (
-        <section data-testid="trading-mode-suspended-via-governance">
-          {t(
-            `This market has been suspended via a governance vote and can be resumed or terminated by further votes.`
-          )}
-          {DocsLinks && (
-            <ExternalLink href={DocsLinks.MARKET_LIFECYCLE} className="ml-1">
-              {t('Find out more')}
-            </ExternalLink>
-          )}
-        </section>
-      );
-    }
    case Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION: {
      switch (trigger) {
        case Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET: {
@@ -30,11 +30,9 @@ export const usePositionEstimate = ({
    fetchPolicy: 'no-cache',
  });
  useEffect(() => {
-    if (skip) {
-      setEstimates(undefined);
-    } else if (data) {
+    if (data) {
      setEstimates(data);
    }
-  }, [data, skip]);
+  }, [data]);
  return estimates;
 };
@@ -423,12 +423,6 @@ function compileFeatureFlags(): FeatureFlags {
        process.env['NX_UPDATE_MARKET_STATE']
      ) as string
    ),
-    GOVERNANCE_TRANSFERS: TRUTHY.includes(
-      windowOrDefault(
-        'NX_GOVERNANCE_TRANSFERS',
-        process.env['NX_GOVERNANCE_TRANSFERS']
-      ) as string
-    ),
  };
  const EXPLORER_FLAGS = {
    EXPLORER_ASSETS: TRUTHY.includes(
@@ -80,7 +80,6 @@ export const DocsLinks = VEGA_DOCS_URL
      LIQUIDITY: `${VEGA_DOCS_URL}/concepts/liquidity/provision`,
      WITHDRAWAL_LIMITS: `${VEGA_DOCS_URL}/concepts/assets/deposits-withdrawals#withdrawal-limits`,
      VALIDATOR_SCORES_REWARDS: `${VEGA_DOCS_URL}/concepts/vega-chain/validator-scores-and-rewards`,
-      MARKET_LIFECYCLE: `${VEGA_DOCS_URL}/concepts/trading-on-vega/market-lifecycle`,
    }
  : undefined;

@@ -25,7 +25,6 @@ export type CosmicElevatorFlags = Pick<
  | 'METAMASK_SNAPS'
  | 'REFERRALS'
  | 'UPDATE_MARKET_STATE'
-  | 'GOVERNANCE_TRANSFERS'
 >;
 export type Configuration = z.infer<typeof tomlConfigSchema>;
 export const CUSTOM_NODE_KEY = 'custom' as const;
@@ -80,7 +80,6 @@ const COSMIC_ELEVATOR_FLAGS = {
  METAMASK_SNAPS: z.optional(z.boolean()),
  REFERRALS: z.optional(z.boolean()),
  UPDATE_MARKET_STATE: z.optional(z.boolean()),
-  GOVERNANCE_TRANSFERS: z.optional(z.boolean()),
 };

 const EXPLORER_FLAGS = {
@@ -9,12 +9,14 @@ import { fillsWithMarketProvider } from './fills-data-provider';

 interface FillsManagerProps {
  partyId: string;
+  marketId?: string;
  onMarketClick?: (marketId: string, metaKey?: boolean) => void;
  gridProps: ReturnType<typeof useDataGridEvents>;
 }

 export const FillsManager = ({
  partyId,
+  marketId,
  onMarketClick,
  gridProps,
 }: FillsManagerProps) => {
@@ -22,6 +24,9 @@ export const FillsManager = ({
  const filter: Schema.TradesFilter | Schema.TradesSubscriptionFilter = {
    partyIds: [partyId],
  };
+  if (marketId) {
+    filter.marketIds = [marketId];
+  }
  const { data, error } = useDataProvider({
    dataProvider: fillsWithMarketProvider,
    update: ({ data }) => {
@@ -4,10 +4,6 @@ fragment DataSourceFilter on Filter {
    type
    numberDecimalPlaces
  }
-  conditions {
-    value
-    operator
-  }
 }

 fragment DataSource on DataSourceSpec {
@@ -16,37 +12,6 @@ fragment DataSource on DataSourceSpec {
    sourceType {
      ... on DataSourceDefinitionExternal {
        sourceType {
-          ... on EthCallSpec {
-            abi
-            address
-            args
-            method
-            requiredConfirmations
-            normalisers {
-              name
-              expression
-            }
-            trigger {
-              trigger {
-                ... on EthTimeTrigger {
-                  initial
-                  every
-                  until
-                }
-              }
-            }
-            filters {
-              key {
-                name
-                type
-                numberDecimalPlaces
-              }
-              conditions {
-                value
-                operator
-              }
-            }
-          }
          ... on DataSourceSpecConfiguration {
            signers {
              signer {
@@ -6,21 +6,13 @@ import { t } from '@vegaprotocol/i18n';
 import { marketDataProvider } from '../../market-data-provider';
 import { totalFeesPercentage } from '../../market-utils';
 import {
-  Accordion,
-  AccordionChevron,
-  AccordionPanel,
-  CopyWithTooltip,
  ExternalLink,
  Intent,
-  KeyValueTable,
-  KeyValueTableRow,
  Lozenge,
  Splash,
-  SyntaxHighlighter,
  Tooltip,
  VegaIcon,
  VegaIconNames,
-  truncateMiddle,
 } from '@vegaprotocol/ui-toolkit';
 import {
  addDecimalsFormatNumber,
@@ -39,7 +31,6 @@ import { Last24hVolume } from '../last-24h-volume';
 import BigNumber from 'bignumber.js';
 import type {
  DataSourceDefinition,
-  EthCallSpec,
  MarketTradingMode,
  SignerKind,
 } from '@vegaprotocol/types';
@@ -49,7 +40,6 @@ import {
 } from '@vegaprotocol/types';
 import {
  DApp,
-  EtherscanLink,
  FLAGS,
  TOKEN_PROPOSAL,
  useEnvironment,
@@ -75,7 +65,6 @@ import {
 } from '@vegaprotocol/network-parameters';
 import type { DataSourceFragment } from './__generated__/MarketInfo';
 import { formatDuration } from 'date-fns';
-import * as AccordionPrimitive from '@radix-ui/react-accordion';

 type MarketInfoProps = {
  market: MarketInfo;
@@ -670,97 +659,6 @@ export const LiquidityMonitoringParametersInfoPanel = ({
  return <MarketInfoTable data={marketData} parentData={parentMarketData} />;
 };

-export const EthOraclePanel = ({ sourceType }: { sourceType: EthCallSpec }) => {
-  const abis = sourceType.abi?.map((abi) => JSON.parse(abi));
-  const header = 'uppercase my-1 text-left';
-  return (
-    <>
-      <h3 className={header}>{t('Ethereum Oracle')}</h3>
-      {sourceType.address && (
-        <>
-          <KeyValueTable>
-            <KeyValueTableRow noBorder>
-              <div>{t('Address')}</div>
-              <CopyWithTooltip text={sourceType.address}>
-                <button
-                  data-testid="copy-eth-oracle-address"
-                  className="uppercase text-right"
-                >
-                  <span className="flex gap-1">
-                    {truncateMiddle(sourceType.address)}
-                    <VegaIcon name={VegaIconNames.COPY} size={16} />
-                  </span>
-                </button>
-              </CopyWithTooltip>
-            </KeyValueTableRow>
-          </KeyValueTable>
-
-          <div className="my-2">
-            <EtherscanLink address={sourceType.address}>
-              {t('View on Etherscan')}
-            </EtherscanLink>
-          </div>
-        </>
-      )}
-
-      <MarketInfoTable
-        key="eth-call-spec"
-        data={{
-          method: sourceType.method,
-          requiredConfirmations: sourceType.requiredConfirmations,
-        }}
-      />
-      <Accordion>
-        <AccordionPanel
-          itemId="abi"
-          trigger={
-            <AccordionPrimitive.Trigger
-              data-testid="accordion-toggle"
-              className={classNames(
-                'w-full pt-2',
-                'flex items-center gap-2',
-                'group'
-              )}
-            >
-              <div
-                data-testid={`abi-dropdown`}
-                key={'value-dropdown'}
-                className="flex items-center gap-2 w-full"
-              >
-                <div className="underline underline-offset-4 mb-1 uppercase">
-                  {t('ABI specification')}
-                </div>
-                <AccordionChevron size={14} />
-                <div className="flex items-center gap-1"></div>
-              </div>
-            </AccordionPrimitive.Trigger>
-          }
-        >
-          <SyntaxHighlighter data={abis} />
-        </AccordionPanel>
-      </Accordion>
-
-      <h3 className={header}>{t('Normalisers')}</h3>
-      {sourceType.normalisers?.map((normaliser, i) => (
-        <MarketInfoTable key={i} data={normaliser} />
-      ))}
-      <h3 className={header}>{t('Filters')}</h3>
-      <h3 className={header}>{t('Key')}</h3>
-      {sourceType.filters?.map((filter, i) => (
-        <>
-          <MarketInfoTable key={i} data={filter.key} />
-          <h3 className={header}>{t('Conditions')}</h3>
-          {filter.conditions?.map((condition, i) => (
-            <span>
-              {ConditionOperatorMapping[condition.operator]} {condition.value}
-            </span>
-          ))}
-        </>
-      ))}
-    </>
-  );
-};
-
 export const LiquidityPriceRangeInfoPanel = ({
  market,
  parentMarket,
@@ -884,7 +782,7 @@ export const LiquiditySLAParametersInfoPanel = ({
          market.liquiditySLAParameters?.slaCompetitionFactor
        ).times(100)
      ),
-    commitmentMinTimeFraction:
+    commitmentMinimumTimeFraction:
      market.liquiditySLAParameters?.commitmentMinTimeFraction &&
      formatNumberPercentage(
        new BigNumber(
@@ -899,7 +797,7 @@ export const LiquiditySLAParametersInfoPanel = ({
          parentMarket.liquiditySLAParameters?.performanceHysteresisEpochs,
        slaCompetitionFactor:
          parentMarket.liquiditySLAParameters?.slaCompetitionFactor,
-        commitmentMinTimeFraction:
+        commitmentMinimumTimeFraction:
          parentMarket.liquiditySLAParameters?.commitmentMinTimeFraction,
      }
    : undefined;
@@ -925,13 +823,13 @@ export const LiquiditySLAParametersInfoPanel = ({
      networkParams['market_liquidity_nonPerformanceBondPenaltySlope'],
    nonPerformanceBondPenaltyMax:
      networkParams['market_liquidity_sla_nonPerformanceBondPenaltyMax'],
-    maxLiquidityFeeFactorLevel:
+    maximumLiquidityFeeFactorLevel:
      networkParams['market_liquidity_maximumLiquidityFeeFactorLevel'],
    stakeToCCYVolume: networkParams['market_liquidity_stakeToCcyVolume'],
    earlyExitPenalty: networkParams['market_liquidity_earlyExitPenalty'],
    probabilityOfTradingTauScaling:
      networkParams['market_liquidity_probabilityOfTrading_tau_scaling'],
-    minProbabilityOfTradingLPOrders:
+    minimumProbabilityOfTradingLPOrders:
      networkParams['market_liquidity_minimum_probabilityOfTrading_lpOrders'],
    feeCalculationTimeStep:
      networkParams['market_liquidity_feeCalculationTimeStep'] &&
@@ -1033,10 +931,6 @@ export const OracleInfoPanel = ({
        </Lozenge>
      )}

-      {dataSourceSpec?.sourceType.sourceType.__typename === 'EthCallSpec' && (
-        <EthOraclePanel sourceType={dataSourceSpec?.sourceType.sourceType} />
-      )}
-
      <div className={wrapperClasses}>
        {shouldShowParentData &&
          parentDataSourceSpec &&
@@ -1051,13 +945,6 @@ export const OracleInfoPanel = ({
                dataSourceSpecId={parentDataSourceSpecId}
              />

-              {parentDataSourceSpec?.sourceType.sourceType.__typename ===
-                'EthCallSpec' && (
-                <EthOraclePanel
-                  sourceType={parentDataSourceSpec?.sourceType.sourceType}
-                />
-              )}
-
              {dataSourceSpecId && (
                <ExternalLink
                  data-testid="oracle-spec-links"
@@ -106,7 +106,7 @@ export const tooltipMapping: Record<string, ReactNode> = {
  insurancePoolFraction: t(
    'The fraction of the insurance pool balance that is carried over from the parent market to the successor.'
  ),
-  commitmentMinTimeFraction: t(
+  commitmentMinimumTimeFraction: t(
    `Specifies the minimum fraction of time LPs must spend 'on the book' providing their committed liquidity. This is a market parameter.`
  ),
  feeCalculationTimeStep: t(
@@ -127,7 +127,7 @@ export const tooltipMapping: Record<string, ReactNode> = {
  nonPerformanceBondPenaltyMax: t(
    `The maximum amount, as a fraction, that an LP's bond can be slashed by if they fail to reach the minimum SLA. This is a network parameter.`
  ),
-  maxLiquidityFeeFactorLevel: t(
+  maximumLiquidityFeeFactorLevel: t(
    'Maximum value that a proposed fee amount can be, which is submitted as part of the LP commitment transaction. Note that a value of 0.05 = 5%. This is a network parameter.'
  ),
  stakeToCCYVolume: t(
@@ -137,12 +137,12 @@ export const tooltipMapping: Record<string, ReactNode> = {
    'How long an epoch is. LP rewards from liquidity fees are paid out once per epoch. How much they receive depends on whether they met the liquidity SLA and their previous performance in recent epochs. This is a network parameter.'
  ),
  earlyExitPenalty: t(
-    `The percentage of their bond an LP forfeits if they reduce their commitment while the market is below target stake. If 100%, an LP's entire bond is forfeited when they cancel their full commitment. This is a network parameter.`
+    `How much an LP forfeits of their bond if they reduce their commitment while the market is below target stake, expressed as a factor. If set to 0 there is no penalty for early exit. If set to 1 an LP's entire bond is forfeited when an LP removes their full commitment. This is a network parameter.`
  ),
  probabilityOfTradingTauScaling: t(
    `Determines how the probability of trading is scaled from the risk model, and is used to measure the relative competitiveness of an LP's supplied volume. This is a network parameter.`
  ),
-  minProbabilityOfTradingLPOrders: t(
+  minimumProbabilityOfTradingLPOrders: t(
    'The lower bound for the probability of trading calculation, used to measure liquidity available on a market to determine if LPs are meeting their commitment. This is a network parameter.'
  ),
 };
@@ -96,7 +96,6 @@ export const createMarketFragment = (
                  filters: [
                    {
                      __typename: 'Filter',
-                      conditions: [],
                      key: {
                        __typename: 'PropertyKey',
                        name: 'settlement-data-property',
@@ -130,7 +129,6 @@ export const createMarketFragment = (
                  filters: [
                    {
                      __typename: 'Filter',
-                      conditions: [],
                      key: {
                        __typename: 'PropertyKey',
                        name: 'settlement-data-property',
@@ -1,7 +1,6 @@
 import { t } from '@vegaprotocol/i18n';
 import { TradingButton } from '@vegaprotocol/ui-toolkit';
-import { useVegaWallet } from '@vegaprotocol/wallet';
-import { useVegaTransactionStore } from '@vegaprotocol/web3';
+import { useVegaTransactionStore, useVegaWallet } from '@vegaprotocol/wallet';
 import { useHasAmendableOrder } from '../../order-hooks';

 export const OpenOrdersMenu = ({ marketId }: { marketId: string }) => {
@@ -32,6 +32,12 @@ fragment OrderFields on Order {
  }
 }

+query OrderById($orderId: ID!) {
+  orderByID(id: $orderId) {
+    ...OrderFields
+  }
+}
+
 query Orders(
  $partyId: ID!
  $marketIds: [ID!]
@@ -147,3 +153,9 @@ query StopOrders($filter: StopOrderFilter) {
    }
  }
 }
+
+query StopOrderById($stopOrderId: ID!) {
+  stopOrder(id: $stopOrderId) {
+    ...StopOrderFields
+  }
+}
@@ -5,6 +5,13 @@ import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
 export type OrderFieldsFragment = { __typename?: 'Order', id: string, type?: Types.OrderType | null, side: Types.Side, size: string, status: Types.OrderStatus, rejectionReason?: Types.OrderRejectionReason | null, price: string, timeInForce: Types.OrderTimeInForce, remaining: string, expiresAt?: any | null, createdAt: any, updatedAt?: any | null, postOnly?: boolean | null, reduceOnly?: boolean | null, market: { __typename?: 'Market', id: string }, liquidityProvision?: { __typename: 'LiquidityProvision' } | null, peggedOrder?: { __typename: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | null, icebergOrder?: { __typename: 'IcebergOrder', peakSize: string, minimumVisibleSize: string, reservedRemaining: string } | null };

+export type OrderByIdQueryVariables = Types.Exact<{
+  orderId: Types.Scalars['ID'];
+}>;
+
+
+export type OrderByIdQuery = { __typename?: 'Query', orderByID: { __typename?: 'Order', id: string, type?: Types.OrderType | null, side: Types.Side, size: string, status: Types.OrderStatus, rejectionReason?: Types.OrderRejectionReason | null, price: string, timeInForce: Types.OrderTimeInForce, remaining: string, expiresAt?: any | null, createdAt: any, updatedAt?: any | null, postOnly?: boolean | null, reduceOnly?: boolean | null, market: { __typename?: 'Market', id: string }, liquidityProvision?: { __typename: 'LiquidityProvision' } | null, peggedOrder?: { __typename: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | null, icebergOrder?: { __typename: 'IcebergOrder', peakSize: string, minimumVisibleSize: string, reservedRemaining: string } | null } };
+
 export type OrdersQueryVariables = Types.Exact<{
  partyId: Types.Scalars['ID'];
  marketIds?: Types.InputMaybe<Array<Types.Scalars['ID']> | Types.Scalars['ID']>;
@@ -36,6 +43,13 @@ export type StopOrdersQueryVariables = Types.Exact<{

 export type StopOrdersQuery = { __typename?: 'Query', stopOrders?: { __typename?: 'StopOrderConnection', edges?: Array<{ __typename?: 'StopOrderEdge', node?: { __typename?: 'StopOrder', id: string, ocoLinkId?: string | null, expiresAt?: any | null, expiryStrategy?: Types.StopOrderExpiryStrategy | null, triggerDirection: Types.StopOrderTriggerDirection, status: Types.StopOrderStatus, createdAt: any, updatedAt?: any | null, partyId: string, marketId: string, order?: { __typename?: 'Order', id: string, type?: Types.OrderType | null, side: Types.Side, size: string, status: Types.OrderStatus, rejectionReason?: Types.OrderRejectionReason | null, price: string, timeInForce: Types.OrderTimeInForce, remaining: string, expiresAt?: any | null, createdAt: any, updatedAt?: any | null, postOnly?: boolean | null, reduceOnly?: boolean | null, market: { __typename?: 'Market', id: string }, liquidityProvision?: { __typename: 'LiquidityProvision' } | null, peggedOrder?: { __typename: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | null, icebergOrder?: { __typename: 'IcebergOrder', peakSize: string, minimumVisibleSize: string, reservedRemaining: string } | null } | null, trigger: { __typename?: 'StopOrderPrice', price: string } | { __typename?: 'StopOrderTrailingPercentOffset', trailingPercentOffset: string }, submission: { __typename?: 'OrderSubmission', marketId: string, price: string, size: string, side: Types.Side, timeInForce: Types.OrderTimeInForce, expiresAt: any, type: Types.OrderType, reference?: string | null, postOnly?: boolean | null, reduceOnly?: boolean | null, peggedOrder?: { __typename?: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | null } } | null }> | null } | null };

+export type StopOrderByIdQueryVariables = Types.Exact<{
+  stopOrderId: Types.Scalars['ID'];
+}>;
+
+
+export type StopOrderByIdQuery = { __typename?: 'Query', stopOrder?: { __typename?: 'StopOrder', id: string, ocoLinkId?: string | null, expiresAt?: any | null, expiryStrategy?: Types.StopOrderExpiryStrategy | null, triggerDirection: Types.StopOrderTriggerDirection, status: Types.StopOrderStatus, createdAt: any, updatedAt?: any | null, partyId: string, marketId: string, order?: { __typename?: 'Order', id: string, type?: Types.OrderType | null, side: Types.Side, size: string, status: Types.OrderStatus, rejectionReason?: Types.OrderRejectionReason | null, price: string, timeInForce: Types.OrderTimeInForce, remaining: string, expiresAt?: any | null, createdAt: any, updatedAt?: any | null, postOnly?: boolean | null, reduceOnly?: boolean | null, market: { __typename?: 'Market', id: string }, liquidityProvision?: { __typename: 'LiquidityProvision' } | null, peggedOrder?: { __typename: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | null, icebergOrder?: { __typename: 'IcebergOrder', peakSize: string, minimumVisibleSize: string, reservedRemaining: string } | null } | null, trigger: { __typename?: 'StopOrderPrice', price: string } | { __typename?: 'StopOrderTrailingPercentOffset', trailingPercentOffset: string }, submission: { __typename?: 'OrderSubmission', marketId: string, price: string, size: string, side: Types.Side, timeInForce: Types.OrderTimeInForce, expiresAt: any, type: Types.OrderType, reference?: string | null, postOnly?: boolean | null, reduceOnly?: boolean | null, peggedOrder?: { __typename?: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | null } } | null };
+
 export const OrderUpdateFieldsFragmentDoc = gql`
    fragment OrderUpdateFields on OrderUpdate {
  id
@@ -147,6 +161,41 @@ export const StopOrderFieldsFragmentDoc = gql`
 }
    ${OrderFieldsFragmentDoc}
 ${OrderSubmissionFieldsFragmentDoc}`;
+export const OrderByIdDocument = gql`
+    query OrderById($orderId: ID!) {
+  orderByID(id: $orderId) {
+    ...OrderFields
+  }
+}
+    ${OrderFieldsFragmentDoc}`;
+
+/**
+ * __useOrderByIdQuery__
+ *
+ * To run a query within a React component, call `useOrderByIdQuery` and pass it any options that fit your needs.
+ * When your component renders, `useOrderByIdQuery` 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 } = useOrderByIdQuery({
+ *   variables: {
+ *      orderId: // value for 'orderId'
+ *   },
+ * });
+ */
+export function useOrderByIdQuery(baseOptions: Apollo.QueryHookOptions<OrderByIdQuery, OrderByIdQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<OrderByIdQuery, OrderByIdQueryVariables>(OrderByIdDocument, options);
+      }
+export function useOrderByIdLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<OrderByIdQuery, OrderByIdQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<OrderByIdQuery, OrderByIdQueryVariables>(OrderByIdDocument, options);
+        }
+export type OrderByIdQueryHookResult = ReturnType<typeof useOrderByIdQuery>;
+export type OrderByIdLazyQueryHookResult = ReturnType<typeof useOrderByIdLazyQuery>;
+export type OrderByIdQueryResult = Apollo.QueryResult<OrderByIdQuery, OrderByIdQueryVariables>;
 export const OrdersDocument = gql`
    query Orders($partyId: ID!, $marketIds: [ID!], $pagination: Pagination, $filter: OrderFilter) {
  party(id: $partyId) {
@@ -271,4 +320,39 @@ export function useStopOrdersLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions
        }
 export type StopOrdersQueryHookResult = ReturnType<typeof useStopOrdersQuery>;
 export type StopOrdersLazyQueryHookResult = ReturnType<typeof useStopOrdersLazyQuery>;
-export type StopOrdersQueryResult = Apollo.QueryResult<StopOrdersQuery, StopOrdersQueryVariables>;
+export type StopOrdersQueryResult = Apollo.QueryResult<StopOrdersQuery, StopOrdersQueryVariables>;
+export const StopOrderByIdDocument = gql`
+    query StopOrderById($stopOrderId: ID!) {
+  stopOrder(id: $stopOrderId) {
+    ...StopOrderFields
+  }
+}
+    ${StopOrderFieldsFragmentDoc}`;
+
+/**
+ * __useStopOrderByIdQuery__
+ *
+ * To run a query within a React component, call `useStopOrderByIdQuery` and pass it any options that fit your needs.
+ * When your component renders, `useStopOrderByIdQuery` 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 } = useStopOrderByIdQuery({
+ *   variables: {
+ *      stopOrderId: // value for 'stopOrderId'
+ *   },
+ * });
+ */
+export function useStopOrderByIdQuery(baseOptions: Apollo.QueryHookOptions<StopOrderByIdQuery, StopOrderByIdQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<StopOrderByIdQuery, StopOrderByIdQueryVariables>(StopOrderByIdDocument, options);
+      }
+export function useStopOrderByIdLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<StopOrderByIdQuery, StopOrderByIdQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<StopOrderByIdQuery, StopOrderByIdQueryVariables>(StopOrderByIdDocument, options);
+        }
+export type StopOrderByIdQueryHookResult = ReturnType<typeof useStopOrderByIdQuery>;
+export type StopOrderByIdLazyQueryHookResult = ReturnType<typeof useStopOrderByIdLazyQuery>;
+export type StopOrderByIdQueryResult = Apollo.QueryResult<StopOrderByIdQuery, StopOrderByIdQueryVariables>;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
m.ray	aaaab3c279	Update libs/fills/src/lib/test-helpers.ts	2023-10-02 14:53:44 +01:00
Madalina Raicu	ca38b43ac0	test: update internal conditions test	2023-10-02 10:16:12 +01:00
Madalina Raicu	1f5876b521	chore: update no markets text	2023-10-02 10:07:40 +01:00
Madalina Raicu	6c8925d30c	test: update market-info-panels.spec.ts	2023-10-02 09:42:36 +01:00
Madalina Raicu	9116eca9f7	fix: fix internal conditions test date	2023-09-30 22:09:35 +01:00
Madalina Raicu	2bfded0ab6	test: update mocks with triggering ratio LP param	2023-09-29 19:53:35 +01:00
Madalina Raicu	b829aae335	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into fix/remove-market-value-proxy	2023-09-29 19:45:29 +01:00
Madalina Raicu	b413eeec98	fix: internal conditions termination oracle unix timestamp date	2023-09-29 19:43:31 +01:00
Madalina Raicu	624a661fd8	fix: update with liquidity monitoring parameters the mocks	2023-09-28 14:49:52 +01:00
Madalina Raicu	20121c4ddb	fix: update with liquidity monitoring parameters the mocks	2023-09-28 14:01:21 +01:00
Madalina Raicu	a29be39107	feat(trading): use triggering ratio from market for liq. supplied calculation	2023-09-27 17:43:05 +01:00
Madalina Raicu	d310803e71	fix(trading): remove market value proxy	2023-09-27 17:33:15 +01:00
				`@@ -1 +0,0 @@`
				`export { ClosedMarketPage as default } from './closed-market';`