chore: fix lint

feat: make animation delay negative so it starts immediately
chore: add ssr-loader component
2023-10-12 16:22:30 -07:00 · 2023-10-12 16:21:06 -07:00 · 2023-10-12 15:33:24 -07:00 · 2023-10-12 15:21:59 -07:00 · 2023-10-12 14:59:25 -07:00 · 2023-10-12 14:53:35 -07:00
381 changed files with 8623 additions and 3814 deletions
@@ -82,3 +82,38 @@ 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,12 +5,12 @@ on:
    branches:
      - release/*
      - develop
+      - main
  pull_request:
    types:
      - opened
      - ready_for_review
      - reopened
-      - edited
      - synchronize
 jobs:
  node-modules:
@@ -44,13 +44,6 @@ jobs:
        if: steps.cache.outputs.cache-hit != 'true'
        run: yarn install --pure-lockfile

-  lint-pr-title:
-    needs: node-modules
-    if: ${{ github.event_name == 'pull_request' }}
-    name: Verify PR title
-    uses: ./.github/workflows/lint-pr.yml
-    secrets: inherit
-
  lint-format:
    timeout-minutes: 20
    needs: node-modules
@@ -177,25 +170,48 @@ jobs:
      preview_explorer: ${{ env.PREVIEW_EXPLORER }}
      preview_tools: ${{ env.PREVIEW_TOOLS }}

-  # 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 }}
+  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 }}"

  cypress:
-    needs: build-sources
+    needs: [build-sources, check-e2e-needed]
    name: '(CI) cypress'
-    # if: ${{ needs.build-sources.outputs.projects-e2e != '[]' }}
+    if: ${{ needs.check-e2e-needed.outputs.run-tests == 'true' }}
    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(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'
@@ -0,0 +1,29 @@
+# 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,31 +1,42 @@
 name: (CI) Console tests

-env:
-  VEGA_VERSION: v0.72.14
-
 on:
  workflow_call:
    inputs:
      github-sha:
        required: true
        type: string
+  workflow_dispatch:
+    inputs:
+      console-test-branch:
+        type: choice
+        description: 'main: v0.72.14, develop: v0.73.0-preview7'
+        options:
+          - main
+          - develop

 jobs:
-  run-tests:
-    name: run-tests
-    runs-on: console-test
-    timeout-minutes: 40
+  create-docker-image:
+    name: Create docker image for console-test
+    runs-on: ubuntu-22.04
+    timeout-minutes: 20
    steps:
      #----------------------------------------------
      #       check-out frontend-monorepo
      #----------------------------------------------
-      - name: Checkout console test repo
+      - name: Checkout frontend-monorepo
        uses: actions/checkout@v3
        with:
-          ref: ${{ inputs.github-sha }}
+          ref: ${{ inputs.github-sha || github.sha }}
      #----------------------------------------------
      #       cache node modules
      #----------------------------------------------
+      - name: setup node
+        uses: actions/setup-node@v3
+        with:
+          node-version: '16'
+          cache: yarn
+
      - name: Cache node modules
        id: cache
        uses: actions/cache@v3
@@ -44,23 +55,105 @@ jobs:
      #----------------------------------------------
      #       build trading
      #----------------------------------------------
-      - name: Build affected spec
+      - name: Build trading app
        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
+
      #----------------------------------------------
-      #       run trading server
+      #       export trading app docker image
      #----------------------------------------------
-      - name: 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
        run: |
-          docker run -d -p 80:4200 -v $PWD/docker/nginx.conf:/etc/nginx/conf.d/default.conf -v $PWD/dist/apps/trading/exported:/usr/share/nginx/html nginx:1.23-alpine@sha256:6318314189b40e73145a48060bff4783a116c34cc7241532d0d94198fb2c9629
-          sleep 5
-          docker ps
-      #----------------------------------------------
-      #       check if container persists between runs
-      #----------------------------------------------
-      - name: Check server
+          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: |
-          docker ps
+          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:
+      #----------------------------------------------
+      #       load docker image
+      #----------------------------------------------
+      - name: Download docker image from previous job
+        uses: actions/download-artifact@v3
+        with:
+          name: console-image
+          path: /tmp
+
+      - name: Load Docker image
+        run: |
+          docker load --input /tmp/console-image.tar
+          docker image ls -a
+
      #----------------------------------------------
      #       check-out tests repo
      #----------------------------------------------
@@ -68,52 +161,55 @@ jobs:
        uses: actions/checkout@v3
        with:
          repository: vegaprotocol/console-test
-          path: './console-test'
+          ref: ${{ needs.console-test-branch.outputs.console-branch }}
+
+      - 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  }}'
+          export-variables: true
+          keys-case: upper
+          log-variables: true
+
      #----------------------------------------------
-      #       install dependencies
+      #  -----  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
      #----------------------------------------------
      - name: Install dependencies
-        working-directory: ./console-test
        run: poetry install --no-interaction --no-root
      #----------------------------------------------
-      #       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
+      # install vega binaries
      #----------------------------------------------
      - name: Install vega binaries
-        working-directory: ./console-test
-        if: steps.vega_binaries_cache.outputs.cache-hit != 'true'
-        run: poetry run python -m vega_sim.tools.load_binaries --force --version $VEGA_VERSION
+        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
-        working-directory: ./console-test
-        run: poetry run pytest -v -s --numprocesses 2 --dist loadfile --durations=20
-      - name: Check files
-        run: |
-          ls -al .
-          ls -al console-test
+        run: CONSOLE_IMAGE_NAME=ci/trading:local poetry run pytest -v -s --numprocesses 4 --dist loadfile --durations=15
+
      #----------------------------------------------
      # upload traces
      #----------------------------------------------
@@ -124,3 +220,13 @@ jobs:
          name: playwright-trace
          path: ./traces/
          retention-days: 15
+      #----------------------------------------------
+      #  -----  upload logs  -----
+      #----------------------------------------------
+      - name: Upload worker logs
+        uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: worker-logs
+          path: ./logs/
+          retention-days: 15
@@ -13,13 +13,35 @@ on:
        type: string

 jobs:
+  runner-choice:
+    runs-on: ubuntu-latest
+    outputs:
+      runner: ${{ steps.step.outputs.runner }}
+    steps:
+      - name: Check branch
+        id: step
+        run: |
+          if [[ "${{ github.base_ref }}" == "main" ]]; then
+            echo "runner=mainnet-compatible-runner" >> $GITHUB_OUTPUT
+          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
+            echo "runner=mainnet-compatible-runner" >> $GITHUB_OUTPUT
+          else
+            echo "runner=self-hosted-runner" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Print runner
+        run: echo ${{ steps.step.outputs.runner }}
+
  e2e:
    strategy:
      fail-fast: false
      matrix:
        project: ${{ fromJSON(inputs.projects) }}
    name: ${{ matrix.project }}
-    runs-on: self-hosted-runner
+    needs: runner-choice
+    runs-on: ${{ needs.runner-choice.outputs.runner }}
    timeout-minutes: 120
    steps:
      # Checks if skip cache was requested
@@ -63,6 +85,7 @@ jobs:
      - name: Run Vegacapsule network and Vega wallet
        id: setup-vega
        uses: ./frontend-monorepo/.github/actions/run-vegacapsule
+        timeout-minutes: 10

      ######
      ## Run some tests
@@ -2,7 +2,12 @@
 name: Verify PR title

 on:
-  workflow_call:
+  pull_request:
+    types:
+      - opened
+      - edited
+      - reopened
+      - synchronize

 jobs:
  lint_pr:
@@ -11,21 +16,16 @@ jobs:
    steps:
      - name: Checkout
        uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event.pull_request.head.sha || github.sha }}

      - name: Setup node
        uses: actions/setup-node@v3
        with:
-          node-version-file: '.nvmrc'
-          # https://stackoverflow.com/questions/61010294/how-to-cache-yarn-packages-in-github-actions
-          cache: yarn
+          node-version: 16

-      - name: Cache node modules
-        uses: actions/cache@v3
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-cache-node-modules-${{ hashFiles('yarn.lock') }}
+      - name: Install dependencies
+        run: |
+          rm package.json 
+          npm install --no-save @commitlint/cli @commitlint/config-conventional @commitlint/config-nx-scopes nx

      - name: Check PR title
        run: echo "${{ github.event.pull_request.title }}" | npx commitlint --config ./commitlint.config-ci.js
@@ -30,12 +30,18 @@ jobs:
          echo IS_IPFS_RELEASE=false >> $GITHUB_ENV
          echo IS_S3_RELEASE=false >> $GITHUB_ENV
          echo IS_DEV_IMAGE=false >> $GITHUB_ENV
+          echo IS_MAIN_IMAGE=false >> $GITHUB_ENV

      - name: Is dev image
-        if: ${{ contains(github.ref, 'develop') && github.event_name == 'push' && matrix.app == 'trading' }}
+        if: ${{ github.ref_name == 'develop' && github.event_name == 'push' && matrix.app == 'trading' }}
        run: |
          echo IS_DEV_IMAGE=true >> $GITHUB_ENV

+      - name: Is main image
+        if: ${{ github.ref_name == 'main' && github.event_name == 'push' && matrix.app == 'trading' }}
+        run: |
+          echo IS_MAIN_IMAGE=true >> $GITHUB_ENV
+
      - name: Is PR
        if: ${{ github.event_name == 'pull_request' }}
        run: |
@@ -57,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' }}
+        if: ${{ env.IS_IPFS_RELEASE == 'false' && github.event_name == 'push' && github.ref_name != 'main'}}
        run: |
          echo IS_S3_RELEASE=true >> $GITHUB_ENV

@@ -81,7 +87,7 @@ jobs:

      - name: Log in to the Container registry (docker hub)
        uses: docker/login-action@v2
-        if: ${{ env.IS_IPFS_RELEASE == 'true' || env.IS_DEV_IMAGE == 'true' }}
+        if: ${{ env.IS_IPFS_RELEASE == 'true' || env.IS_DEV_IMAGE == 'true' || env.IS_MAIN_IMAGE == 'true' }}
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -179,7 +185,7 @@ jobs:
        uses: docker/build-push-action@v3
        continue-on-error: true
        id: dockerhub-push
-        if: ${{ env.IS_IPFS_RELEASE == 'true' || env.IS_DEV_IMAGE == 'true'  }}
+        if: ${{ env.IS_IPFS_RELEASE == 'true' || env.IS_DEV_IMAGE == 'true' || env.IS_MAIN_IMAGE == 'true' }}
        with:
          context: .
          file: docker/node-outside-docker.Dockerfile
@@ -189,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' || '' }}
+            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
@@ -216,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' || '' }}
+            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.get_element_by_col_id('actions').eq(1).click();
+      cy.contains('Test market 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);
@@ -87,15 +87,13 @@ context('Market page', { tags: '@regression' }, function () {
      // Liquidity
      cy.validate_element_from_table('Target Stake', '0.00 fUSDC');
      cy.validate_element_from_table('Supplied Stake', '0.00 fUSDC');
-      cy.validate_element_from_table('Market Value Proxy', '0.00 fUSDC');
      // Liquidity price range
      cy.validate_element_from_table(
        'Liquidity Price Range',
-        '1,000.00% of mid price'
+        '95.00% of mid price'
      );
      cy.validate_element_from_table('Lowest Price', '0.00 fUSDC');
      cy.validate_element_from_table('Highest Price', '0.00 fUSDC');
-
      cy.getByTestId('oracle-spec-links')
        .should('have.attr', 'href')
        .and(
@@ -144,11 +142,8 @@ context('Market page', { tags: '@regression' }, function () {
        .as('successorMarketId');
      cy.contains('Token test market').click();
      cy.getByTestId(marketHeaders).should('have.text', 'Token test market');
-      cy.validate_proposal_change_type('Triggering Ratio', 'Added');
      cy.validate_element_from_table('Triggering Ratio', '0.7');
-      cy.validate_proposal_change_type('Time Window', 'Added');
      cy.validate_element_from_table('Time Window', '3,600');
-      cy.validate_proposal_change_type('Scaling Factor', 'Added');
      cy.validate_element_from_table('Scaling Factor', '10');

      cy.getByTestId(successionLineItem)
@@ -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();
+      cy.getByTestId('node-url-custom').click({ force: true });

      cy.getByTestId(customNodeBtn).within(() => {
        cy.get('input').clear().type('fakeUrl');
@@ -129,6 +129,12 @@ function getSuccessorTxBody(parentMarketId) {
              parentMarketId: parentMarketId,
              insurancePoolFraction: '0.75',
            },
+            liquiditySlaParameters: {
+              priceRange: '0.95',
+              commitmentMinTimeFraction: '0.5',
+              performanceHysteresisEpochs: 2,
+              slaCompetitionFactor: '0.75',
+            },
          },
        },
        closingTimestamp,
@@ -4,7 +4,7 @@ import { AssetTypeMapping, AssetStatusMapping } from '@vegaprotocol/assets';
 import { t } from '@vegaprotocol/i18n';
 import { ButtonLink } from '@vegaprotocol/ui-toolkit';
 import type { AgGridReact } from 'ag-grid-react';
-import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
+import { AgGrid } from '@vegaprotocol/datagrid';
 import type { VegaICellRendererParams } from '@vegaprotocol/datagrid';
 import { useRef, useLayoutEffect } from 'react';
 import { BREAKPOINT_MD } from '../../config/breakpoints';
@@ -1,6 +1,9 @@
 import { t } from '@vegaprotocol/i18n';
 import type { MarketInfoWithData } from '@vegaprotocol/markets';
 import {
+  LiquidityPriceRangeInfoPanel,
+  LiquiditySLAParametersInfoPanel,
+  MarginScalingFactorsPanel,
  PriceMonitoringBoundsInfoPanel,
  SuccessionLineInfoPanel,
  getDataSourceSpecForSettlementData,
@@ -15,7 +18,6 @@ import {
  OracleInfoPanel,
  RiskFactorsInfoPanel,
  RiskModelInfoPanel,
-  RiskParametersInfoPanel,
  SettlementAssetInfoPanel,
 } from '@vegaprotocol/markets';
 import { MarketInfoTable } from '@vegaprotocol/markets';
@@ -67,8 +69,8 @@ export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
      <MetadataInfoPanel market={market} />
      <h2 className={headerClassName}>{t('Risk model')}</h2>
      <RiskModelInfoPanel market={market} />
-      <h2 className={headerClassName}>{t('Risk parameters')}</h2>
-      <RiskParametersInfoPanel market={market} />
+      <h2 className={headerClassName}>{t('Margin scaling factors')}</h2>
+      <MarginScalingFactorsPanel market={market} />
      <h2 className={headerClassName}>{t('Risk factors')}</h2>
      <RiskFactorsInfoPanel market={market} />
      {(market.data?.priceMonitoringBounds || []).map((trigger, i) => (
@@ -94,6 +96,10 @@ export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
      )}
      <h2 className={headerClassName}>{t('Liquidity monitoring')}</h2>
      <LiquidityMonitoringParametersInfoPanel market={market} />
+      <h2 className={headerClassName}>{t('Liquidity price range')}</h2>
+      <LiquidityPriceRangeInfoPanel market={market} />
+      <h2 className={headerClassName}>{t('Liquidity SLA protocol')}</h2>
+      <LiquiditySLAParametersInfoPanel market={market} />
      <h2 className={headerClassName}>{t('Liquidity')}</h2>
      <LiquidityInfoPanel market={market} />
      {showTwoOracles ? (
@@ -4,7 +4,7 @@ import { t } from '@vegaprotocol/i18n';
 import { ButtonLink } from '@vegaprotocol/ui-toolkit';
 import type { AgGridReact } from 'ag-grid-react';
 import type { ColDef } from 'ag-grid-community';
-import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
+import { AgGrid } from '@vegaprotocol/datagrid';
 import type {
  VegaICellRendererParams,
  VegaValueGetterParams,
@@ -2,7 +2,7 @@ import type { ProposalListFieldsFragment } from '@vegaprotocol/proposals';
 import { VoteProgress } from '@vegaprotocol/proposals';
 import type { AgGridReact } from 'ag-grid-react';
 import { ExternalLink } from '@vegaprotocol/ui-toolkit';
-import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
+import { AgGrid } from '@vegaprotocol/datagrid';
 import type {
  VegaICellRendererParams,
  VegaValueFormatterParams,
@@ -105,7 +105,7 @@ export const ProposalsTable = ({ data }: ProposalsTableProps) => {
              ? new BigNumber(0)
              : yesTokens.multipliedBy(100).dividedBy(totalTokensVoted);
            return (
-              <div className="uppercase flex h-full items-center justify-center pt-2">
+              <div className="flex items-center justify-center h-full pt-2 uppercase">
                <VoteProgress
                  threshold={requiredMajorityPercentage}
                  progress={yesPercentage}
@@ -49,6 +49,37 @@ 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' } } | { __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', 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 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' } } | { __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', 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 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' } } | { __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', 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 const ExplorerOracleDataConnectionFragmentDoc = gql`
    fragment ExplorerOracleDataConnection on OracleSpec {
@@ -72,6 +72,37 @@ 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,7 +8,9 @@ import { useScrollToLocation } from '../../../hooks/scroll-to-location';
 import filter from 'recursive-key-filter';

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

  useDocumentTitle(['Oracles']);
  useScrollToLocation();
@@ -21,6 +21,12 @@ NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 NX_VEGA_REST_URL=http://localhost:3008/api/v2/
 NX_SUCCESSOR_MARKETS=true
+NX_PRODUCT_PERPETUALS=true
+NX_REFERRALS=true
+NX_UPDATE_MARKET_STATE=true
+NX_GOVERNANCE_TRANSFERS=true
+NX_VOLUME_DISCOUNTS=true
+

 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
@@ -4,3 +4,7 @@ NX_VEGA_URL=https://api.n04.d.vega.xyz/graphql
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
+NX_PRODUCT_PERPETUALS=true
+NX_UPDATE_MARKET_STATE=true
+NX_REFERRALS=true
+NX_VOLUME_DISCOUNTS=true
@@ -4,3 +4,7 @@ NX_VEGA_URL=https://api.vega.community/graphql
 NX_ETHEREUM_PROVIDER_URL=https://mainnet.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://etherscan.io
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
+NX_PRODUCT_PERPETUALS=false
+NX_UPDATE_MARKET_STATE=false
+NX_REFERRALS=false
+NX_VOLUME_DISCOUNTS=false
@@ -4,3 +4,7 @@ NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
+NX_PRODUCT_PERPETUALS=true
+NX_UPDATE_MARKET_STATE=true
+NX_REFERRALS=true
+NX_VOLUME_DISCOUNTS=true
@@ -1,21 +0,0 @@
-{
-  "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
-  }
-}
@@ -0,0 +1,15 @@
+{
+  "rationale": {
+    "title": "Governance cancel transfer proposal",
+    "description": "Rejected cancel transfer proposal"
+  },
+  "terms": {
+    "cancelTransfer": {
+      "changes": {
+        "transferId": "invalid transfer id"
+      }
+    },
+    "closingTimestamp": 0,
+    "enactmentTimestamp": 0
+  }
+}
@@ -0,0 +1,138 @@
+{
+  "rationale": {
+    "description": "## Summary\n\nThis proposal requests to list BTC PERPS Incentive as a market with USD-P as a settlement asset on the Vega Network as discussed in: https://community.vega.xyz/.\n\n## Rationale\n\n- BTC is the largest Crypto asset with the highest volume and Marketcap.\n- Given the price, 1 decimal places will be used for price due to the number of valid digits in asset price. \n- Position decimal places will be set to 4 considering the value per contract\n- USDT is chosen as settlement asset due to its stability.",
+    "title": "perpetual market proposal"
+  },
+  "terms": {
+    "closingTimestamp": 0,
+    "enactmentTimestamp": 0,
+    "newMarket": {
+      "changes": {
+        "instrument": {
+          "name": "Token test market",
+          "code": "TEST.24h",
+          "perpetual": {
+            "clampLowerBound": "0",
+            "clampUpperBound": "0",
+            "interestRate": "0",
+            "marginFundingFactor": "0.1",
+            "settlementAsset": "73174a6fb1d5802ba0ac7bd7ab79e0a3a4837b262de0a4e80815a55442692bd0",
+            "quoteName": "fBTC",
+            "dataSourceSpecForSettlementData": {
+              "external": {
+                "ethOracle": {
+                  "address": "0x1b44F3514812d835EB1BDB0acB33d3fA3351Ee43",
+                  "abi": "[{\"inputs\":[],\"name\":\"latestAnswer\",\"outputs\":[{\"internalType\":\"int256\",\"name\":\"\",\"type\":\"int256\"}],\"stateMutability\":\"view\",\"type\":\"function\"}]",
+                  "method": "latestAnswer",
+                  "normalisers": [
+                    {
+                      "name": "btc.price",
+                      "expression": "$[0]"
+                    }
+                  ],
+                  "requiredConfirmations": 3,
+                  "trigger": {
+                    "timeTrigger": {
+                      "every": 30
+                    }
+                  },
+                  "filters": [
+                    {
+                      "key": {
+                        "name": "btc.price",
+                        "type": "TYPE_INTEGER",
+                        "numberDecimalPlaces": 8
+                      },
+                      "conditions": [
+                        {
+                          "operator": "OPERATOR_GREATER_THAN_OR_EQUAL",
+                          "value": "0"
+                        }
+                      ]
+                    }
+                  ]
+                }
+              }
+            },
+            "dataSourceSpecForSettlementSchedule": {
+              "internal": {
+                "timeTrigger": {
+                  "conditions": [
+                    {
+                      "operator": "OPERATOR_GREATER_THAN_OR_EQUAL",
+                      "value": "0"
+                    }
+                  ],
+                  "triggers": [
+                    {
+                      "every": 1800
+                    }
+                  ]
+                }
+              }
+            },
+            "dataSourceSpecBinding": {
+              "settlementDataProperty": "btc.price",
+              "settlementScheduleProperty": "vegaprotocol.builtin.timetrigger"
+            }
+          }
+        },
+        "metadata": [
+          "base:BTC",
+          "quote:USD-P",
+          "class:fx/crypto",
+          "quarterly",
+          "sector:defi",
+          "enactment:2023-06-15T14:00:00Z",
+          "settlement:2023-09-30T08:00:00Z"
+        ],
+        "priceMonitoringParameters": {
+          "triggers": [
+            {
+              "horizon": "3600",
+              "probability": "0.9999",
+              "auctionExtension": "120"
+            },
+            {
+              "horizon": "14400",
+              "probability": "0.9999",
+              "auctionExtension": "180"
+            },
+            {
+              "horizon": "43200",
+              "probability": "0.9999",
+              "auctionExtension": "300"
+            }
+          ]
+        },
+        "liquidityMonitoringParameters": {
+          "targetStakeParameters": {
+            "timeWindow": "3600",
+            "scalingFactor": 1
+          },
+          "triggeringRatio": "0.7",
+          "auctionExtension": "1"
+        },
+
+        "liquiditySlaParameters": {
+          "priceRange": "0.05",
+          "commitmentMinTimeFraction": "0.95",
+          "performanceHysteresisEpochs": 1,
+          "slaCompetitionFactor": "0.95"
+        },
+
+        "logNormal": {
+          "riskAversionParameter": 0.000001,
+          "tau": 0.0001140771161,
+          "params": {
+            "sigma": 1.5
+          }
+        },
+        "decimalPlaces": "1",
+        "positionDecimalPlaces": "4",
+        "linearSlippageFactor": "0.001",
+        "quadraticSlippageFactor": "0.0"
+      }
+    }
+  }
+}
@@ -0,0 +1,16 @@
+{
+  "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
+  }
+}
@@ -0,0 +1,16 @@
+{
+  "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
+  }
+}
@@ -0,0 +1,17 @@
+{
+  "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
+  }
+}
@@ -1,85 +0,0 @@
-{
-  "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
-    }
-  }
-}
@@ -9,6 +9,7 @@ import {
  createTenDigitUnixTimeStampForSpecifiedDays,
  generateFreeFormProposalTitle,
  getDateFormatForSpecifiedDays,
+  getProposalDetailsValue,
  getProposalFromTitle,
  getProposalInformationFromTable,
  goToMakeNewProposal,
@@ -26,12 +27,16 @@ import {
 } from '../../../../governance-e2e/src/support/staking.functions';
 import { ethereumWalletConnect } from '../../../../governance-e2e/src/support/wallet-eth.functions';
 import {
+  depositAsset,
  switchVegaWalletPubKey,
  vegaWalletSetSpecifiedApprovalAmount,
 } from '../../support/wallet-functions';
 import type { testFreeformProposal } from '../../support/common-interfaces';
 import { formatDateWithLocalTimezone } from '@vegaprotocol/utils';
-import { createSuccessorMarketProposalTxBody } from '../../support/proposal.functions';
+import {
+  createGovernanceTransferProposalTxBody,
+  createSuccessorMarketProposalTxBody,
+} from '../../support/proposal.functions';

 const proposalListItem = '[data-testid="proposals-list-item"]';
 const participationNotMet = 'token-participation-not-met';
@@ -50,6 +55,8 @@ const openProposals = 'open-proposals';
 const viewProposalButton = 'view-proposal-btn';
 const proposalTermsToggle = 'proposal-json-toggle';
 const marketDataToggle = 'proposal-market-data-toggle';
+const governanceTransferToggle = 'proposal-transfer-details';
+const marketProposalType = 'proposal-type';

 describe(
  'Governance flow for proposal details',
@@ -58,6 +65,17 @@ 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 () {
@@ -296,9 +314,6 @@ 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)
@@ -307,14 +322,9 @@ describe(
            cy.getByTestId(viewProposalButton).click();
          });
      });
-      getProposalInformationFromTable('ID')
-        .invoke('text')
-        .as('parentMarketId')
-        .then(() => {
-          cy.VegaWalletSubmitProposal(
-            createSuccessorMarketProposalTxBody(this.parentMarketId)
-          );
-        });
+      cy.VegaWalletSubmitProposal(
+        createSuccessorMarketProposalTxBody(this.parentMarketId)
+      );
      navigateTo(navigation.proposals);
      cy.reload();
      getProposalFromTitle('Test successor market proposal details').within(
@@ -372,19 +382,221 @@ describe(
      });

      // 3003-PMAN-011
-      cy.get('.underline').contains('Parent Market ID').realHover();
+      cy.contains('Parent Market ID').realHover();
      cy.getByTestId('tooltip-content', { timeout: 8000 }).should(
        'contain.text',
        'The ID of the market this market succeeds.'
      );
-      cy.get('.underline')
-        .contains('Insurance Pool Fraction')
-        .realMouseUp()
-        .realHover();
+      cy.contains('Insurance Pool Fraction').realMouseUp().realHover();
      cy.getByTestId('tooltip-content', { timeout: 8000 }).should(
        'contain.text',
        'The fraction of the insurance pool balance that is carried over from the parent market to the successor.'
      );
    });
+
+    it('Able to see perpetual market', function () {
+      const proposalPath =
+        'src/fixtures/proposals/new-market-perpetual-raw.json';
+      const enactmentTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(3);
+      const closingTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(2);
+      submitUniqueRawProposal({
+        proposalBody: proposalPath,
+        enactmentTimestamp: enactmentTimestamp,
+        closingTimestamp: closingTimestamp,
+      });
+      getProposalFromTitle('perpetual market proposal').within(() => {
+        cy.getByTestId(marketProposalType).should(
+          'have.text',
+          'New market - perpetual'
+        );
+        cy.getByTestId(viewProposalButton).click();
+      });
+      cy.getByTestId(marketDataToggle).click();
+      getProposalDetailsValue('Product Type').should(
+        'contain.text',
+        'Perpetual'
+      );
+      cy.getByTestId(marketProposalType).should(
+        'have.text',
+        'New market - perpetual'
+      );
+      // Liquidity SLA protocols
+      getProposalDetailsValue('Performance Hysteresis Epochs').should(
+        'contain.text',
+        '1'
+      );
+      getProposalDetailsValue('SLA Competition Factor').should(
+        'contain.text',
+        '95.00%'
+      );
+      getProposalDetailsValue('Epoch Length').should('contain.text', '5s');
+      getProposalDetailsValue('Non Performance Bond Penalty Max').should(
+        'contain.text',
+        '0.05'
+      );
+      getProposalDetailsValue('Stake To CCY Volume').should(
+        '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'
+        );
+      });
+    });
+
+    it('Able to see governance transfer proposal', function () {
+      const vegaAssetAddress = '0x67175Da1D5e966e40D11c4B2519392B2058373de';
+      depositAsset(vegaAssetAddress, '1000', 18);
+      cy.getByTestId('currency-title', Cypress.env('txTimeout')).should(
+        'contain.text',
+        'Collateral'
+      );
+      cy.VegaWalletTopUpNetworkAccount('100');
+      cy.VegaWalletSubmitProposal(createGovernanceTransferProposalTxBody());
+      cy.reload();
+      getProposalFromTitle('Governance transfer proposal').within(() => {
+        cy.getByTestId(marketProposalType).should('have.text', 'NewTransfer');
+        cy.getByTestId(viewProposalButton).click();
+      });
+      cy.getByTestId(marketProposalType).should('have.text', 'NewTransfer');
+      cy.getByTestId(governanceTransferToggle).click();
+      cy.getByTestId('proposal-transfer-details-table').within(() => {
+        getProposalInformationFromTable('Source Type')
+          .invoke('text')
+          .and('eq', 'Network Treasury');
+        getProposalInformationFromTable('Destination')
+          .invoke('text')
+          .and('eq', Cypress.env('vegaWalletPublicKey'));
+        getProposalInformationFromTable('Asset')
+          .invoke('text')
+          .and('eq', 'VEGA');
+        getProposalInformationFromTable('Fraction Of Balance')
+          .invoke('text')
+          .and('eq', '50%');
+        getProposalInformationFromTable('Amount')
+          .invoke('text')
+          .and('eq', '100.00');
+        getProposalInformationFromTable('Transfer Type')
+          .invoke('text')
+          .and('eq', 'All or nothing');
+        getProposalInformationFromTable('Kind')
+          .invoke('text')
+          .and('eq', 'One off');
+      });
+    });
+
+    it(' Able to see cancel transfer proposal - rejected', function () {
+      const proposalPath = 'src/fixtures/proposals/cancel-transfer-raw.json';
+      const enactmentTimestamp =
+        createTenDigitUnixTimeStampForSpecifiedDays(11);
+      const closingTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(10);
+      submitUniqueRawProposal({
+        proposalBody: proposalPath,
+        enactmentTimestamp: enactmentTimestamp,
+        closingTimestamp: closingTimestamp,
+        submit: false,
+      });
+      cy.getByTestId('proposal-submit').should('be.visible').click();
+      cy.getByTestId('dialog-title').should('have.text', 'Proposal rejected');
+      cy.getByTestId('icon-cross').last().click();
+      navigateTo(navigation.proposals);
+      cy.get('[href="/proposals/rejected"]').click();
+      getProposalFromTitle('Governance cancel transfer proposal').within(() => {
+        cy.getByTestId(marketProposalType).should(
+          'have.text',
+          'CancelTransfer'
+        );
+        cy.getByTestId(viewProposalButton).click();
+      });
+      cy.getByTestId(marketProposalType).should('have.text', 'CancelTransfer');
+      getProposalInformationFromTable('Error details')
+        .invoke('text')
+        .and('eq', 'Governance transfer invalid transfer id not found');
+      getProposalInformationFromTable('transferId')
+        .invoke('text')
+        .and('eq', 'invalid transfer id');
+    });
  }
 );
@@ -65,7 +65,10 @@ context(
            cy.getByTestId(viewProposalButton).click();
          });
      });
-      cy.getByTestId('proposal-type').should('have.text', 'New market');
+      cy.getByTestId('proposal-type').should(
+        'have.text',
+        'New market - future'
+      );
      cy.getByTestId(proposalStatus).should('have.text', 'Enacted');
      cy.getByTestId(votesTable).within(() => {
        cy.contains('Voting has ended.').should('be.visible');
@@ -89,11 +89,12 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {

  it('Newly created proposals list - shows title and portion of summary', function () {
    const proposalPath = 'src/fixtures/proposals/new-market-raw.json';
-    const proposalTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(3);
+    const enactmentTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(3);
+    const closingTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(2);
    submitUniqueRawProposal({
      proposalBody: proposalPath,
-      enactmentTimestamp: proposalTimestamp,
-      closingTimestamp: proposalTimestamp,
+      enactmentTimestamp: enactmentTimestamp,
+      closingTimestamp: closingTimestamp,
    }); // 3001-VOTE-052
    // 3001-VOTE-008
    // 3001-VOTE-034
@@ -310,7 +310,9 @@ context(
        closeStakingDialog();
        navigateTo(navigation.validators);
        clickOnValidatorFromList(0);
-        cy.getByTestId(stakeRemoveStakeRadioButton, txTimeout).click();
+        cy.getByTestId(stakeRemoveStakeRadioButton, txTimeout).click({
+          force: true,
+        });
        cy.getByTestId(stakeTokenAmountInputBox).type('-0.1');
        cy.contains('Waiting for next epoch to start', epochTimeout);
        cy.getByTestId(stakeTokenSubmitButton)
@@ -331,7 +333,7 @@ context(
        closeStakingDialog();
        navigateTo(navigation.validators);
        clickOnValidatorFromList(0);
-        cy.getByTestId(stakeRemoveStakeRadioButton).click();
+        cy.getByTestId(stakeRemoveStakeRadioButton).click({ force: true });
        cy.getByTestId(stakeTokenAmountInputBox).type('4');
        cy.contains('Waiting for next epoch to start', epochTimeout);
        cy.getByTestId(stakeTokenSubmitButton)
@@ -422,7 +424,7 @@ context(
        validateValidatorListTotalStakeAndShare('0', '3,002.00', '50.02%');
      });

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

-      it('Associating vesting contract tokens - when some already staked - auto stakes tokens to staked validator', function () {
+      it.skip('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);
@@ -450,7 +452,7 @@ context(
        verifyStakedBalance(7.0);
      });

-      it('Associating vesting contract tokens - when wallet tokens already staked - auto stakes tokens to staked validator', function () {
+      it.skip('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);
@@ -464,7 +466,7 @@ context(
        verifyStakedBalance(7.0);
      });

-      it('Associating tokens - with multiple validators already staked - auto stakes to staked validators - abiding by existing stake ratio', function () {
+      it.skip('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();
+      cy.getByTestId('node-url-custom').click({ force: true });
      cy.get('input').should('exist');
      cy.getByTestId('connect').should('be.disabled');
      cy.getByTestId('icon-cross').click();
@@ -74,25 +74,12 @@ context(
    });

    it('should be able to see a working link for - find out more about Vega governance', function () {
-      // 3001-VOTE-001
+      // 3001-VOTE-001  // 3002-PROP-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,7 +11,6 @@ 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';
@@ -38,17 +37,11 @@ const txTimeout = Cypress.env('txTimeout');

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

  describe('with wallets disconnected', { tags: '@smoke' }, function () {
@@ -189,10 +182,7 @@ context('Validators Page - verify elements on page', function () {
    { tags: '@smoke' },
    function () {
      before('connect wallets and click on validator', function () {
-        cy.mockGQL((req) => {
-          aliasGQLQuery(req, 'ChainId', chainIdQuery());
-          aliasGQLQuery(req, 'Statistics', statisticsQuery());
-        });
+        cy.mockChainId();
        cy.visit('/validators');
        cy.connectVegaWallet();
        clickOnValidatorFromList(0);
@@ -4,8 +4,6 @@ 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';
@@ -88,10 +86,7 @@ context(

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

        before('faucet assets to connected vega wallet', function () {
-          cy.mockGQL((req) => {
-            aliasGQLQuery(req, 'ChainId', chainIdQuery());
-            aliasGQLQuery(req, 'Statistics', statisticsQuery());
-          });
+          cy.mockChainId();
          for (const { id, amount } of assets) {
            vegaWalletFaucetAssetsWithoutCheck(id, amount, vegaWalletPublicKey);
          }
@@ -54,6 +54,7 @@ export function submitUniqueRawProposal(proposalFields: {
  proposalBody?: string;
  proposalTitle?: string;
  proposalDescription?: string;
+  updateMarketId?: string;
  closingTimestamp?: number;
  enactmentTimestamp?: number;
  submit?: boolean;
@@ -71,6 +72,10 @@ 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 (
@@ -232,21 +237,25 @@ export function getDownloadedProposalJsonPath(proposalType: string) {
  return filepath;
 }

+export function getProposalDetailsValue(RowName: string) {
+  return cy
+    .contains(RowName)
+    .parentsUntil(proposalInformationTableRows)
+    .parent()
+    .first();
+}
+
 export function validateProposalDetailsDiff(
  RowName: string,
  changeType: proposalChangeType,
  newValue: string,
  oldValue?: string
 ) {
-  cy.contains(RowName)
-    .parentsUntil(proposalInformationTableRows)
-    .parent()
-    .first()
-    .within(() => {
-      cy.contains(changeType).should('be.visible');
-      cy.contains(newValue).should('be.visible');
-      if (oldValue) cy.contains(oldValue).should('have.class', 'line-through');
-    });
+  getProposalDetailsValue(RowName).within(() => {
+    cy.contains(changeType).should('be.visible');
+    cy.contains(newValue).should('be.visible');
+    if (oldValue) cy.contains(oldValue).should('have.class', 'line-through');
+  });
 }

 function getFormattedTime() {
@@ -9,8 +9,6 @@ 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();

@@ -29,10 +27,7 @@ before(() => {
  // // Ensuring the telemetry modal doesn't disrupt the tests
  turnTelemetryOff();
  // Mock chainId fetch which happens on every page for wallet connection
-  cy.mockGQL((req) => {
-    aliasGQLQuery(req, 'ChainId', chainIdQuery());
-    aliasGQLQuery(req, 'Statistics', statisticsQuery());
-  });
+  cy.mockChainId();
  // Self stake validators so they are displayed
  cy.validatorsSelfDelegate();
 });
@@ -1,9 +1,10 @@
-import { addSeconds, millisecondsToSeconds } from 'date-fns';
+import { addDays, addSeconds, millisecondsToSeconds } from 'date-fns';
 import type { ProposalSubmissionBody } from '@vegaprotocol/wallet';
 import { aliasGQLQuery } from '@vegaprotocol/cypress';
 import { upgradeProposalsData } from '../fixtures/mocks/network-upgrade';
 import { proposalsData } from '../fixtures/mocks/proposals';
 import { nodeData } from '../fixtures/mocks/nodes';
+import { AccountType, GovernanceTransferType } from '@vegaprotocol/types';

 export function createUpdateNetworkProposalTxBody(): ProposalSubmissionBody {
  const MIN_CLOSE_SEC = 5;
@@ -358,6 +359,46 @@ export function createSuccessorMarketProposalTxBody(
  };
 }

+export function createGovernanceTransferProposalTxBody(): ProposalSubmissionBody {
+  const MIN_CLOSE_SEC = 5;
+  const MIN_ENACT_SEC = 7;
+
+  const closingDate = addDays(new Date(), MIN_CLOSE_SEC);
+  const enactmentDate = addDays(closingDate, MIN_ENACT_SEC);
+  const closingTimestamp = millisecondsToSeconds(closingDate.getTime());
+  const enactmentTimestamp = millisecondsToSeconds(enactmentDate.getTime());
+  const destination = Cypress.env('vegaWalletPublicKey');
+  return {
+    proposalSubmission: {
+      rationale: {
+        title: 'Governance transfer proposal',
+        description: 'E2E test for transfer proposal test',
+      },
+      terms: {
+        newTransfer: {
+          changes: {
+            fractionOfBalance: '0.5',
+            amount: '100' + '0'.repeat(18),
+            sourceType: AccountType.ACCOUNT_TYPE_NETWORK_TREASURY,
+            source: '',
+            transferType:
+              GovernanceTransferType.GOVERNANCE_TRANSFER_TYPE_ALL_OR_NOTHING,
+            destinationType: AccountType.ACCOUNT_TYPE_GENERAL,
+            destination,
+            asset:
+              'b4f2726571fbe8e33b442dc92ed2d7f0d810e21835b7371a7915a365f07ccd9b',
+            oneOff: {
+              deliverOn: '0',
+            },
+          },
+        },
+        closingTimestamp,
+        enactmentTimestamp,
+      },
+    },
+  };
+}
+
 export function mockNetworkUpgradeProposal() {
  cy.mockGQL((req) => {
    aliasGQLQuery(req, 'Nodes', nodeData);
@@ -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();
+  cy.get(removeStakeRadioButton, epochTimeout).click({ force: true });
  cy.get(tokenAmountInputBox).type(stake);
  waitForBeginningOfEpoch();
  cy.get(tokenSubmitButton)
@@ -70,9 +70,13 @@ export function stakingPageAssociateTokens(
  cy.highlight(`Associating ${amount} tokens from ${type}`);
  cy.get(ethWalletAssociateButton).first().click();
  if (type === 'wallet') {
-    cy.get(associateWalletRadioButton, { timeout: 30000 }).click();
+    cy.get(associateWalletRadioButton, { timeout: 30000 }).click({
+      force: true,
+    });
  } else if (type === 'contract') {
-    cy.get(associateContractRadioButton, { timeout: 30000 }).click();
+    cy.get(associateContractRadioButton, { timeout: 30000 }).click({
+      force: true,
+    });
  } else {
    cy.highlight(`${type} is not association option`);
  }
@@ -41,6 +41,9 @@ export async function depositAsset(
 ) {
  // Approve asset
  const faucet = new Token(assetEthAddress, signer);
+  // Wait needed to allow Eth chain to catch up
+  // eslint-disable-next-line cypress/no-unnecessary-waiting
+  cy.wait(4000);
  cy.wrap(
    faucet.approve(Erc20BridgeAddress, amount + '0'.repeat(decimalPlaces + 1)),
    transactionTimeout
@@ -8,6 +8,7 @@ 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

@@ -32,3 +33,8 @@ LC_ALL="en_US.UTF-8"
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
 NX_METAMASK_SNAPS=true
+NX_PRODUCT_PERPETUALS=false
+NX_UPDATE_MARKET_STATE=false
+NX_REFERRALS=false
+NX_GOVERNANCE_TRANSFERS=false
+NX_VOLUME_DISCOUNTS=false
@@ -33,3 +33,7 @@ CYPRESS_FAIRGROUND=false
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=false
 NX_METAMASK_SNAPS=false
+NX_PRODUCT_PERPETUALS=true
+NX_UPDATE_MARKET_STATE=true
+NX_REFERRALS=true
+NX_VOLUME_DISCOUNTS=true
@@ -25,3 +25,7 @@ NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/m
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
 NX_METAMASK_SNAPS=true
+NX_PRODUCT_PERPETUALS=true
+NX_UPDATE_MARKET_STATE=true
+NX_REFERRALS=true
+NX_VOLUME_DISCOUNTS=true
@@ -17,10 +17,14 @@ 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

 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=false
 NX_METAMASK_SNAPS=false
+NX_PRODUCT_PERPETUALS=false
+NX_UPDATE_MARKET_STATE=false
+NX_REFERRALS=false
+NX_VOLUME_DISCOUNTS=false
@@ -23,3 +23,7 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://be.mainnet-mirror.vega.rocks/websocket
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=false
 NX_METAMASK_SNAPS=false
+NX_PRODUCT_PERPETUALS=false
+NX_UPDATE_MARKET_STATE=false
+NX_REFERRALS=false
+NX_VOLUME_DISCOUNTS=false
@@ -10,6 +10,7 @@ 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
@@ -20,3 +21,8 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
 NX_METAMASK_SNAPS=true
+NX_PRODUCT_PERPETUALS=true
+NX_UPDATE_MARKET_STATE=true
+NX_REFERRALS=true
+NX_GOVERNANCE_TRANSFERS=true
+NX_VOLUME_DISCOUNTS=true
@@ -15,6 +15,7 @@ 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
@@ -25,3 +26,7 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://be.testnet.vega.xyz/websocket
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
 NX_METAMASK_SNAPS=true
+NX_PRODUCT_PERPETUALS=true
+NX_UPDATE_MARKET_STATE=true
+NX_REFERRALS=true
+NX_VOLUME_DISCOUNTS=true
@@ -22,3 +22,7 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=false
 NX_METAMASK_SNAPS=false
+NX_PRODUCT_PERPETUALS=false
+NX_UPDATE_MARKET_STATE=false
+NX_REFERRALS=false
+NX_VOLUME_DISCOUNTS=false
@@ -1,4 +1,5 @@
 /* eslint-disable */
+process.env.TZ = 'GMT';
 export default {
  displayName: 'governance',
  preset: '../../jest.preset.js',
@@ -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,
-  VegaWalletProvider,
-} from '@vegaprotocol/wallet';
+} from '@vegaprotocol/web3';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { useEthereumConfig } from '@vegaprotocol/web3';
 import {
@@ -308,7 +308,7 @@ const AppContainer = () => {
    <Router>
      <ScrollToTop />
      <AppStateProvider>
-        <div className="min-h-full text-white">
+        <div className="min-h-full text-white grid">
          <NodeGuard
            skeleton={<div>{t('Loading')}</div>}
            failure={
@@ -613,6 +613,9 @@
  "proposalDetails": "Proposal details",
  "marketSpecification": "Market specification",
  "viewMarketJson": "View market JSON",
+  "marketId": "Market ID",
+  "marketName": "Market name",
+  "marketCode": "Market code",
  "proposalDescription": "Description",
  "currentlySetTo": "Currently expected to ",
  "currently": "currently",
@@ -705,10 +708,19 @@
  "parameter": "parameter",
  "NewMarketProposal": "New market proposal",
  "UpdateMarketProposal": "Update market proposal",
+  "UpdateMarketStateProposal": "Update market state proposal",
+  "UpdateReferralProgramProposal": "Update referral program proposal",
+  "UpdateVolumeDiscountProgramProposal": "Update volume discount program proposal",
+  "MarketChange": "Market change",
+  "MarketStateChange": "Market state change",
+  "MarketDetails": "Market details",
  "NewAssetProposal": "New asset proposal",
  "UpdateAssetProposal": "Update asset proposal",
  "NewFreeformProposal": "New freeform proposal",
  "NewRawProposal": "New proposal",
+  "MARKET_STATE_UPDATE_TYPE_RESUME": "Resume market",
+  "MARKET_STATE_UPDATE_TYPE_SUSPEND": "Suspend market",
+  "MARKET_STATE_UPDATE_TYPE_TERMINATE": "Terminate market",
  "MinProposalRequirements": "You must have at least {{value}} VEGA associated to make a proposal",
  "MinProposalVoteRequirements": "You must have at least {{value}} VEGA associated to vote on this proposal",
  "totalSupply": "Total Supply",
@@ -717,7 +729,13 @@
  "ProposalDocsPrefix": "For guidance on how to make proposals, see",
  "NetworkParameter": "Network parameter",
  "NewMarket": "New market",
+  "NewMarketPerpetualProduct": "New market - perpetual",
+  "NewMarketFutureProduct": "New market - future",
+  "NewMarketSpotProduct": "New market - spot",
  "UpdateMarket": "Update market",
+  "UpdateMarketState": "Update market state",
+  "UpdateReferralProgram": "Update referral program",
+  "UpdateVolumeDiscountProgram": "Update volume discount program",
  "NewAsset": "New asset",
  "UpdateAsset": "Update asset",
  "AssetID": "Asset ID",
@@ -874,5 +892,27 @@
  "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"
+  "HowToProposeRawStep3": "3. Submit on-chain below",
+  "proposalTransferDetails": "New governance transfer details",
+  "proposalCancelTransferDetails": "Cancel governance transfer details",
+  "BenefitTiers": "Benefit tiers",
+  "BenefitTierMinimumEpochs": "Minimum epochs",
+  "BenefitTierMinimumEpochsDescription": "The minimum number of epochs the party needs to be in the referral set to be eligible for the benefit",
+  "BenefitTierMinimumRunningNotionalTakerVolume": "Minimum running notional taker volume",
+  "BenefitTierMinimumRunningNotionalTakerVolumeDescription": "The minimum running notional for the given benefit tier",
+  "BenefitTierReferralDiscountFactor": "Referral discount factor",
+  "BenefitTierReferralDiscountFactorDescription": "The proportion of the referee's taker fees to be discounted",
+  "BenefitTierReferralRewardFactor": "Referral reward factor",
+  "BenefitTierReferralRewardFactorDescription": "The proportion of the referee's taker fees to be rewarded to the referrer",
+  "StakingTiers": "Staking tiers",
+  "StakingTierMinimumStakedTokens": "Minimum staked tokens",
+  "StakingTierMinimumStakedTokensDescription": "Required number of governance tokens ($VEGA) a referrer must have staked to receive the multiplier",
+  "StakingTierReferralRewardMultiplier": "Referral reward multiplier",
+  "StakingTierReferralRewardMultiplierDescription": "Multiplier applied to the referral reward factor when calculating referral rewards due to the referrer",
+  "WindowLength": "Window length",
+  "WindowLengthDescription": "Number of epochs over which to evaluate a referral set's running volume",
+  "EndOfProgramTimestamp": "End of program",
+  "EndOfProgramTimestampDescription": "Time after which when the current epoch ends, the programs will end and benefits will be disabled.",
+  "BenefitTierVolumeDiscountFactor": "Volume discount factor",
+  "BenefitTierVolumeDiscountFactorDescription": "Discount given to those in this benefit tier"
 }
@@ -12,7 +12,7 @@ import { useRefreshAfterEpoch } from '../../hooks/use-refresh-after-epoch';
 import { ProposalsListItem } from '../proposals/components/proposals-list-item';
 import { ProtocolUpgradeProposalsListItem } from '../proposals/components/protocol-upgrade-proposals-list-item/protocol-upgrade-proposals-list-item';
 import Routes from '../routes';
-import { ExternalLinks } from '@vegaprotocol/environment';
+import { ExternalLinks, FLAGS } from '@vegaprotocol/environment';
 import { removePaginationWrapper } from '@vegaprotocol/utils';
 import { useNodesQuery } from '../staking/home/__generated__/Nodes';
 import { useProposalsQuery } from '../proposals/proposals/__generated__/Proposals';
@@ -23,7 +23,6 @@ import {
 import { Heading, SubHeading } from '../../components/heading';
 import * as Schema from '@vegaprotocol/types';
 import type { RouteChildProps } from '..';
-import type { ProposalFieldsFragment } from '../proposals/proposals/__generated__/Proposals';
 import type { NodesFragmentFragment } from '../staking/home/__generated__/Nodes';
 import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
 import { useProtocolUpgradeProposalsQuery } from '@vegaprotocol/proposals';
@@ -32,6 +31,7 @@ import {
  orderByUpgradeBlockHeight,
 } from '../proposals/components/proposals-list/proposals-list';
 import { BigNumber } from '../../lib/bignumber';
+import type { ProposalQuery } from '../proposals/proposal/__generated__/Proposal';

 const nodesToShow = 6;

@@ -39,7 +39,7 @@ const HomeProposals = ({
  proposals,
  protocolUpgradeProposals,
 }: {
-  proposals: ProposalFieldsFragment[];
+  proposals: ProposalQuery['proposal'][];
  protocolUpgradeProposals: ProtocolUpgradeProposalFieldsFragment[];
 }) => {
  const { t } = useTranslation();
@@ -60,9 +60,12 @@ const HomeProposals = ({
          <ProtocolUpgradeProposalsListItem key={index} proposal={proposal} />
        ))}

-        {proposals.map((proposal) => (
-          <ProposalsListItem key={proposal.id} proposal={proposal} />
-        ))}
+        {proposals.map(
+          (proposal) =>
+            proposal?.id && (
+              <ProposalsListItem key={proposal.id} proposal={proposal} />
+            )
+        )}
      </ul>

      <div className="mt-6">
@@ -182,6 +185,12 @@ const GovernanceHome = ({ name }: RouteChildProps) => {
    pollInterval: 5000,
    fetchPolicy: 'network-only',
    errorPolicy: 'ignore',
+    variables: {
+      includeNewMarketProductFields: !!FLAGS.PRODUCT_PERPETUALS,
+      includeUpdateMarketStates: !!FLAGS.UPDATE_MARKET_STATE,
+      includeUpdateReferralPrograms: !!FLAGS.REFERRALS,
+      includeUpdateVolumeDiscountPrograms: !!FLAGS.VOLUME_DISCOUNTS,
+    },
  });

  const {
@@ -206,7 +215,9 @@ const GovernanceHome = ({ name }: RouteChildProps) => {
  const proposals = useMemo(
    () =>
      proposalsData
-        ? getNotRejectedProposals(proposalsData.proposalsConnection)
+        ? getNotRejectedProposals(
+            removePaginationWrapper(proposalsData.proposalsConnection?.edges)
+          )
        : [],
    [proposalsData]
  );
@@ -3,24 +3,28 @@ import { Lozenge, VegaIcon, VegaIconNames } from '@vegaprotocol/ui-toolkit';
 import { shorten } from '@vegaprotocol/utils';
 import { Heading, SubHeading } from '../../../../components/heading';
 import type { ReactNode } from 'react';
-import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 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 { useSuccessorMarketProposalDetails } from '@vegaprotocol/proposals';
+import {
+  useCancelTransferProposalDetails,
+  useNewTransferProposalDetails,
+  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,
  isListItem = true,
  voteState,
 }: {
-  proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
+  proposal: ProposalQuery['proposal'];
  isListItem?: boolean;
  voteState?: VoteState | null;
 }) => {
@@ -37,7 +41,10 @@ export const ProposalHeader = ({

  switch (change?.__typename) {
    case 'NewMarket': {
-      proposalType = 'NewMarket';
+      proposalType =
+        FLAGS.PRODUCT_PERPETUALS && change?.instrument?.product?.__typename
+          ? `NewMarket${change?.instrument?.product?.__typename}`
+          : 'NewMarket';
      fallbackTitle = t('NewMarketProposal');
      details = (
        <>
@@ -61,17 +68,46 @@ export const ProposalHeader = ({
      );
      break;
    }
+    case 'UpdateMarketState': {
+      proposalType =
+        FLAGS.UPDATE_MARKET_STATE && change?.updateType
+          ? t(change.updateType)
+          : 'UpdateMarketState';
+      fallbackTitle = t('UpdateMarketStateProposal');
+      details = (
+        <span>
+          {FLAGS.UPDATE_MARKET_STATE &&
+          change?.market?.id &&
+          change.updateType ? (
+            <>
+              {t(change.updateType)}: {truncateMiddle(change.market.id)}
+            </>
+          ) : null}
+        </span>
+      );
+      break;
+    }
    case 'UpdateMarket': {
      proposalType = 'UpdateMarket';
      fallbackTitle = t('UpdateMarketProposal');
      details = (
        <>
-          <span>{t('Market change')}:</span>{' '}
+          <span>{t('MarketChange')}:</span>{' '}
          <span>{truncateMiddle(change.marketId)}</span>
        </>
      );
      break;
    }
+    case 'UpdateReferralProgram': {
+      proposalType = 'UpdateReferralProgram';
+      fallbackTitle = t('UpdateReferralProgramProposal');
+      break;
+    }
+    case 'UpdateVolumeDiscountProgram': {
+      proposalType = 'UpdateVolumeDiscountProgram';
+      fallbackTitle = t('UpdateVolumeDiscountProgramProposal');
+      break;
+    }
    case 'NewAsset': {
      proposalType = 'NewAsset';
      fallbackTitle = t('NewAssetProposal');
@@ -126,6 +162,20 @@ 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 (
@@ -203,3 +253,36 @@ 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>
+  );
+};
@@ -5,17 +5,19 @@ import {
  InstrumentInfoPanel,
  KeyDetailsInfoPanel,
  LiquidityMonitoringParametersInfoPanel,
+  LiquidityPriceRangeInfoPanel,
+  LiquiditySLAParametersInfoPanel,
  MetadataInfoPanel,
  OracleInfoPanel,
  PriceMonitoringBoundsInfoPanel,
  RiskFactorsInfoPanel,
  RiskModelInfoPanel,
-  RiskParametersInfoPanel,
  SettlementAssetInfoPanel,
  getDataSourceSpecForSettlementSchedule,
  getDataSourceSpecForSettlementData,
  getDataSourceSpecForTradingTermination,
  getSigners,
+  MarginScalingFactorsPanel,
 } from '@vegaprotocol/markets';
 import {
  Button,
@@ -217,8 +219,10 @@ export const ProposalMarketData = ({
              parentMarket={parentMarketData}
            />

-            <h2 className={marketDataHeaderStyles}>{t('Risk parameters')}</h2>
-            <RiskParametersInfoPanel
+            <h2 className={marketDataHeaderStyles}>
+              {t('Margin scaling factors')}
+            </h2>
+            <MarginScalingFactorsPanel
              market={marketData}
              parentMarket={parentMarketData}
            />
@@ -270,6 +274,21 @@ export const ProposalMarketData = ({
              market={marketData}
              parentMarket={parentMarketData}
            />
+            <h2 className={marketDataHeaderStyles}>
+              {t('Liquidity price range')}
+            </h2>
+            <LiquidityPriceRangeInfoPanel
+              market={marketData}
+              parentMarket={parentMarketData}
+            />
+
+            <h2 className={marketDataHeaderStyles}>
+              {t('Liquidity SLA protocol')}
+            </h2>
+            <LiquiditySLAParametersInfoPanel
+              market={marketData}
+              parentMarket={parentMarketData}
+            />
          </div>
        </>
      )}
@@ -0,0 +1 @@
+export * from './proposal-referral-program-details';
@@ -0,0 +1,161 @@
+import { render, screen } from '@testing-library/react';
+import {
+  formatMinimumRunningNotionalTakerVolume,
+  formatReferralDiscountFactor,
+  formatReferralRewardFactor,
+  formatMinimumStakedTokens,
+  formatReferralRewardMultiplier,
+  ProposalReferralProgramDetails,
+} from './proposal-referral-program-details';
+import { generateProposal } from '../../test-helpers/generate-proposals';
+
+jest.mock('../../../../contexts/app-state/app-state-context', () => ({
+  useAppState: () => ({
+    appState: {
+      decimals: 2,
+    },
+  }),
+}));
+
+beforeEach(() => {
+  jest.useFakeTimers();
+  jest.setSystemTime(0);
+});
+
+afterEach(() => {
+  jest.useRealTimers();
+});
+
+describe('ProposalReferralProgramDetails helper functions', () => {
+  it('should format minimum running notional taker volume correctly', () => {
+    const input = '1000';
+    const formatted = formatMinimumRunningNotionalTakerVolume(input);
+    expect(formatted).toBe('1,000');
+  });
+
+  it('should format referral discount factor correctly', () => {
+    const input = '0.05';
+    const formatted = formatReferralDiscountFactor(input);
+    expect(formatted).toBe('5.00%');
+  });
+
+  it('should format referral reward factor correctly', () => {
+    const input = '0.1';
+    const formatted = formatReferralRewardFactor(input);
+    expect(formatted).toBe('10.00%');
+  });
+
+  it('should format minimum staked tokens correctly', () => {
+    const input = '15';
+    const decimals = 18;
+    const formatted = formatMinimumStakedTokens(input, decimals);
+    expect(formatted).toBe('0.000000000000000015');
+  });
+
+  it('should format referral reward multiplier correctly', () => {
+    const input = '3';
+    const formatted = formatReferralRewardMultiplier(input);
+    expect(formatted).toBe('3x');
+  });
+});
+
+const mockReferralProposal = generateProposal({
+  terms: {
+    change: {
+      __typename: 'UpdateReferralProgram',
+      changes: {
+        benefitTiers: [
+          {
+            minimumEpochs: 6,
+            minimumRunningNotionalTakerVolume: '10000',
+            referralDiscountFactor: '0.001',
+            referralRewardFactor: '0.001',
+          },
+          {
+            minimumEpochs: 24,
+            minimumRunningNotionalTakerVolume: '500000',
+            referralDiscountFactor: '0.005',
+            referralRewardFactor: '0.005',
+          },
+          {
+            minimumEpochs: 48,
+            minimumRunningNotionalTakerVolume: '1000000',
+            referralDiscountFactor: '0.01',
+            referralRewardFactor: '0.01',
+          },
+        ],
+        endOfProgramTimestamp: '2026-10-03T10:34:34Z',
+        windowLength: 3,
+        stakingTiers: [
+          {
+            minimumStakedTokens: '1',
+            referralRewardMultiplier: '1',
+          },
+          {
+            minimumStakedTokens: '2',
+            referralRewardMultiplier: '2',
+          },
+          {
+            minimumStakedTokens: '5',
+            referralRewardMultiplier: '3',
+          },
+        ],
+      },
+    },
+  },
+});
+
+describe('<ProposalReferralProgramDetails />', () => {
+  it('should not render if proposal is null', () => {
+    render(<ProposalReferralProgramDetails proposal={null} />);
+    expect(
+      screen.queryByTestId('proposal-referral-program-details')
+    ).toBeNull();
+  });
+
+  it('should not render if __typename is not UpdateReferralProgram', () => {
+    const updateMarketProposal = generateProposal({
+      terms: {
+        change: {
+          __typename: 'UpdateMarket',
+        },
+      },
+    });
+    render(<ProposalReferralProgramDetails proposal={updateMarketProposal} />);
+    expect(
+      screen.queryByTestId('proposal-referral-program-details')
+    ).toBeNull();
+  });
+
+  it('should not render if there are no relevant fields', () => {
+    const incompleteProposal = generateProposal({
+      terms: {
+        change: {
+          __typename: 'UpdateReferralProgram',
+          changes: {},
+        },
+      },
+    });
+
+    render(<ProposalReferralProgramDetails proposal={incompleteProposal} />);
+    expect(
+      screen.queryByTestId('proposal-referral-program-details')
+    ).toBeNull();
+  });
+
+  it('should render relevant fields if present', () => {
+    render(<ProposalReferralProgramDetails proposal={mockReferralProposal} />);
+    expect(
+      screen.getByTestId('proposal-referral-program-window-length')
+    ).toBeInTheDocument();
+    expect(
+      screen.getByTestId('proposal-referral-program-end-of-program-timestamp')
+    ).toBeInTheDocument();
+    expect(
+      screen.getByTestId('proposal-referral-program-benefit-tiers')
+    ).toBeInTheDocument();
+    expect(
+      screen.getByTestId('proposal-referral-program-benefit-tiers')
+    ).toBeInTheDocument();
+  });
+});
@@ -0,0 +1,233 @@
+import { useTranslation } from 'react-i18next';
+import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
+import {
+  KeyValueTable,
+  KeyValueTableRow,
+  RoundedWrapper,
+  Tooltip,
+} from '@vegaprotocol/ui-toolkit';
+import { formatNumber } from '../../../../lib/format-number';
+import {
+  formatDateWithLocalTimezone,
+  formatNumberPercentage,
+  toBigNum,
+} from '@vegaprotocol/utils';
+import BigNumber from 'bignumber.js';
+import { useAppState } from '../../../../contexts/app-state/app-state-context';
+
+interface ProposalReferralProgramDetailsProps {
+  proposal: ProposalQuery['proposal'];
+}
+
+export const formatEndOfProgramTimestamp = (value: string) => {
+  return formatDateWithLocalTimezone(new Date(value));
+};
+
+export const formatMinimumRunningNotionalTakerVolume = (value: string) => {
+  return formatNumber(toBigNum(value, 0), 0);
+};
+
+export const formatReferralDiscountFactor = (value: string) => {
+  return formatNumberPercentage(new BigNumber(value).times(100));
+};
+
+export const formatReferralRewardFactor = (value: string) => {
+  return formatNumberPercentage(new BigNumber(value).times(100));
+};
+
+export const formatMinimumStakedTokens = (value: string, decimals: number) => {
+  return formatNumber(toBigNum(value, decimals));
+};
+
+export const formatReferralRewardMultiplier = (value: string) => {
+  return `${value}x`;
+};
+
+export const ProposalReferralProgramDetails = ({
+  proposal,
+}: ProposalReferralProgramDetailsProps) => {
+  const {
+    appState: { decimals },
+  } = useAppState();
+  const { t } = useTranslation();
+  if (proposal?.terms?.change?.__typename !== 'UpdateReferralProgram') {
+    return null;
+  }
+
+  const benefitTiers = proposal?.terms?.change?.changes?.benefitTiers;
+  const stakingTiers = proposal?.terms?.change?.changes?.stakingTiers;
+  const windowLength = proposal?.terms?.change?.changes?.windowLength;
+  const endOfProgramTimestamp =
+    proposal?.terms?.change?.changes?.endOfProgramTimestamp;
+
+  if (
+    !benefitTiers &&
+    !stakingTiers &&
+    !windowLength &&
+    !endOfProgramTimestamp
+  ) {
+    return null;
+  }
+
+  return (
+    <div data-testid="proposal-referral-program-details">
+      <RoundedWrapper paddingBottom={true}>
+        {windowLength && (
+          <div data-testid="proposal-referral-program-window-length">
+            <KeyValueTable>
+              <KeyValueTableRow>
+                <Tooltip description={t('WindowLengthDescription')}>
+                  <span>{t('WindowLength')}</span>
+                </Tooltip>
+                {windowLength}
+              </KeyValueTableRow>
+            </KeyValueTable>
+          </div>
+        )}
+
+        {endOfProgramTimestamp && (
+          <div
+            className="mb-6"
+            data-testid="proposal-referral-program-end-of-program-timestamp"
+          >
+            <KeyValueTable>
+              <KeyValueTableRow>
+                <Tooltip description={t('EndOfProgramTimestampDescription')}>
+                  <span>{t('EndOfProgramTimestamp')}</span>
+                </Tooltip>
+                {formatEndOfProgramTimestamp(endOfProgramTimestamp)}
+              </KeyValueTableRow>
+            </KeyValueTable>
+          </div>
+        )}
+
+        {benefitTiers && (
+          <div
+            className="mb-6"
+            data-testid="proposal-referral-program-benefit-tiers"
+          >
+            <h3 className="mb-3 uppercase font-semibold text-lg">
+              {t('BenefitTiers')}
+            </h3>
+            <KeyValueTable>
+              {benefitTiers
+                .sort((a, b) => a.minimumEpochs - b.minimumEpochs)
+                .map((benefitTier, index) => (
+                  <div className="mb-4" key={index}>
+                    <h4 className="font-semibold uppercase">
+                      Tier {index + 1}
+                    </h4>
+                    {benefitTier.minimumEpochs && (
+                      <KeyValueTableRow>
+                        <Tooltip
+                          description={t('BenefitTierMinimumEpochsDescription')}
+                        >
+                          <span>{t('BenefitTierMinimumEpochs')}</span>
+                        </Tooltip>
+                        {benefitTier.minimumEpochs}
+                      </KeyValueTableRow>
+                    )}
+                    {benefitTier.minimumRunningNotionalTakerVolume && (
+                      <KeyValueTableRow>
+                        <Tooltip
+                          description={t(
+                            'BenefitTierMinimumRunningNotionalTakerVolumeDescription'
+                          )}
+                        >
+                          <span>
+                            {t('BenefitTierMinimumRunningNotionalTakerVolume')}
+                          </span>
+                        </Tooltip>
+                        {formatMinimumRunningNotionalTakerVolume(
+                          benefitTier.minimumRunningNotionalTakerVolume
+                        )}
+                      </KeyValueTableRow>
+                    )}
+                    {benefitTier.referralDiscountFactor && (
+                      <KeyValueTableRow>
+                        <Tooltip
+                          description={t(
+                            'BenefitTierReferralDiscountFactorDescription'
+                          )}
+                        >
+                          <span>{t('BenefitTierReferralDiscountFactor')}</span>
+                        </Tooltip>
+                        {formatReferralDiscountFactor(
+                          benefitTier.referralDiscountFactor
+                        )}
+                      </KeyValueTableRow>
+                    )}
+                    {benefitTier.referralRewardFactor && (
+                      <KeyValueTableRow>
+                        <Tooltip
+                          description={t(
+                            'BenefitTierReferralRewardFactorDescription'
+                          )}
+                        >
+                          <span>{t('BenefitTierReferralRewardFactor')}</span>
+                        </Tooltip>
+                        {formatReferralRewardFactor(
+                          benefitTier.referralRewardFactor
+                        )}
+                      </KeyValueTableRow>
+                    )}
+                  </div>
+                ))}
+            </KeyValueTable>
+          </div>
+        )}
+
+        {stakingTiers && (
+          <div data-testid="proposal-referral-program-staking-tiers">
+            <h3 className="mb-3 uppercase font-semibold text-lg">
+              {t('StakingTiers')}
+            </h3>
+            <KeyValueTable>
+              {stakingTiers
+                .sort(
+                  (a, b) =>
+                    Number(a.minimumStakedTokens) -
+                    Number(b.minimumStakedTokens)
+                )
+                .map((stakingTier, index) => (
+                  <div className="mb-4" key={index}>
+                    {stakingTier.referralRewardMultiplier && (
+                      <KeyValueTableRow>
+                        <Tooltip
+                          description={t(
+                            'StakingTierReferralRewardMultiplierDescription'
+                          )}
+                        >
+                          <span>
+                            {t('StakingTierReferralRewardMultiplier')}
+                          </span>
+                        </Tooltip>
+                        {formatReferralRewardMultiplier(
+                          stakingTier.referralRewardMultiplier
+                        )}
+                      </KeyValueTableRow>
+                    )}
+                    {stakingTier.minimumStakedTokens && (
+                      <KeyValueTableRow>
+                        <Tooltip
+                          description={t(
+                            'StakingTierMinimumStakedTokensFactorDescription'
+                          )}
+                        >
+                          <span>{t('StakingTierMinimumStakedTokens')}</span>
+                        </Tooltip>
+                        {formatMinimumStakedTokens(
+                          stakingTier.minimumStakedTokens,
+                          decimals
+                        )}
+                      </KeyValueTableRow>
+                    )}
+                  </div>
+                ))}
+            </KeyValueTable>
+          </div>
+        )}
+      </RoundedWrapper>
+    </div>
+  );
+};
@@ -0,0 +1,2 @@
+export * from './proposal-transfer-details';
+export * from './proposal-cancel-transfer-details';
@@ -0,0 +1,37 @@
+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>
+    </>
+  );
+};
@@ -0,0 +1,145 @@
+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>
+      )}
+    </>
+  );
+};
@@ -0,0 +1 @@
+export * from './proposal-update-market-state';
@@ -0,0 +1,123 @@
+import { fireEvent, render, screen } from '@testing-library/react';
+import { ProposalUpdateMarketState } from './proposal-update-market-state';
+import { generateProposal } from '../../test-helpers/generate-proposals';
+import { MarketUpdateType } from '@vegaprotocol/types';
+
+describe('<ProposalUpdateMarketState />', () => {
+  const suspendProposal = generateProposal({
+    terms: {
+      change: {
+        __typename: 'UpdateMarketState',
+        market: {
+          id: '1',
+          decimalPlaces: 0,
+          tradableInstrument: {
+            instrument: {
+              name: 'suspendProposal Name',
+              code: 'suspendProposal Code',
+              product: {
+                __typename: 'Future',
+                quoteName: 'USD',
+              },
+            },
+          },
+        },
+        updateType: MarketUpdateType.MARKET_STATE_UPDATE_TYPE_SUSPEND,
+      },
+    },
+  });
+
+  const resumeProposal = generateProposal({
+    terms: {
+      change: {
+        __typename: 'UpdateMarketState',
+        market: {
+          id: '1',
+          decimalPlaces: 0,
+          tradableInstrument: {
+            instrument: {
+              name: 'resumeProposal Name',
+              code: 'resumeProposal Code',
+              product: {
+                __typename: 'Future',
+                quoteName: 'USD',
+              },
+            },
+          },
+        },
+        updateType: MarketUpdateType.MARKET_STATE_UPDATE_TYPE_RESUME,
+      },
+    },
+  });
+
+  const terminateProposal = generateProposal({
+    terms: {
+      change: {
+        __typename: 'UpdateMarketState',
+        market: {
+          id: '1',
+          decimalPlaces: 0,
+          tradableInstrument: {
+            instrument: {
+              name: 'terminateProposal Name',
+              code: 'terminateProposal Code',
+              product: {
+                __typename: 'Future',
+                quoteName: 'USD',
+              },
+            },
+          },
+        },
+        updateType: MarketUpdateType.MARKET_STATE_UPDATE_TYPE_TERMINATE,
+        price: '123',
+      },
+    },
+  });
+
+  it('should render nothing if proposal is null', () => {
+    render(<ProposalUpdateMarketState proposal={null} />);
+    expect(screen.queryByTestId('proposal-update-market-state')).toBeNull();
+  });
+
+  it('should toggle details when CollapsibleToggle is clicked', () => {
+    render(<ProposalUpdateMarketState proposal={suspendProposal} />);
+
+    expect(
+      screen.queryByTestId('proposal-update-market-state-table')
+    ).toBeNull();
+
+    fireEvent.click(screen.getByTestId('proposal-market-data-toggle'));
+
+    expect(
+      screen.getByTestId('proposal-update-market-state-table')
+    ).toBeInTheDocument();
+  });
+
+  it('should display suspend market information when showDetails is true', () => {
+    render(<ProposalUpdateMarketState proposal={suspendProposal} />);
+
+    fireEvent.click(screen.getByTestId('proposal-market-data-toggle'));
+
+    expect(screen.getByText('suspendProposal Name')).toBeInTheDocument();
+    expect(screen.getByText('suspendProposal Code')).toBeInTheDocument();
+  });
+
+  it('should display resume market information when showDetails is true', () => {
+    render(<ProposalUpdateMarketState proposal={resumeProposal} />);
+
+    fireEvent.click(screen.getByTestId('proposal-market-data-toggle'));
+
+    expect(screen.getByText('resumeProposal Name')).toBeInTheDocument();
+    expect(screen.getByText('resumeProposal Code')).toBeInTheDocument();
+  });
+
+  it('should display terminate market information when showDetails is true', () => {
+    render(<ProposalUpdateMarketState proposal={terminateProposal} />);
+
+    fireEvent.click(screen.getByTestId('proposal-market-data-toggle'));
+
+    expect(screen.getByText('terminateProposal Name')).toBeInTheDocument();
+    expect(screen.getByText('terminateProposal Code')).toBeInTheDocument();
+    expect(screen.getByText('123 USD')).toBeInTheDocument();
+  });
+});
@@ -0,0 +1,84 @@
+import { useTranslation } from 'react-i18next';
+import {
+  KeyValueTable,
+  KeyValueTableRow,
+  RoundedWrapper,
+} from '@vegaprotocol/ui-toolkit';
+import { Row } from '@vegaprotocol/markets';
+import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
+import { useState } from 'react';
+import { CollapsibleToggle } from '../../../../components/collapsible-toggle';
+import { SubHeading } from '../../../../components/heading';
+
+interface ProposalUpdateMarketStateProps {
+  proposal: ProposalQuery['proposal'];
+}
+
+export const ProposalUpdateMarketState = ({
+  proposal,
+}: ProposalUpdateMarketStateProps) => {
+  const { t } = useTranslation();
+  const [showDetails, setShowDetails] = useState(false);
+  let market;
+  let isTerminate = false;
+
+  if (!proposal) {
+    return null;
+  }
+
+  if (proposal?.terms.change.__typename === 'UpdateMarketState') {
+    market = proposal?.terms?.change?.market;
+    isTerminate =
+      proposal?.terms?.change?.updateType ===
+      'MARKET_STATE_UPDATE_TYPE_TERMINATE';
+  }
+
+  return (
+    <section className="relative" data-testid="proposal-update-market-state">
+      <CollapsibleToggle
+        toggleState={showDetails}
+        setToggleState={setShowDetails}
+        dataTestId="proposal-market-data-toggle"
+      >
+        <SubHeading title={t('MarketDetails')} />
+      </CollapsibleToggle>
+
+      {showDetails && (
+        <RoundedWrapper paddingBottom={true} marginBottomLarge={true}>
+          {proposal?.terms.change.__typename === 'UpdateMarketState' && (
+            <KeyValueTable data-testid="proposal-update-market-state-table">
+              <KeyValueTableRow>
+                {t('marketId')}
+                {market?.id}
+              </KeyValueTableRow>
+              <KeyValueTableRow>
+                {t('marketName')}
+                {market?.tradableInstrument?.instrument?.name}
+              </KeyValueTableRow>
+              <KeyValueTableRow noBorder={!isTerminate}>
+                {t('marketCode')}
+                {market?.tradableInstrument?.instrument?.code}
+              </KeyValueTableRow>
+              {isTerminate && (
+                <Row
+                  field="termination-price"
+                  value={proposal?.terms?.change?.price}
+                  assetSymbol={
+                    market?.tradableInstrument?.instrument?.product
+                      ?.__typename === 'Future' ||
+                    market?.tradableInstrument?.instrument?.product
+                      ?.__typename === 'Perpetual'
+                      ? market?.tradableInstrument?.instrument?.product
+                          ?.quoteName
+                      : undefined
+                  }
+                  decimalPlaces={market?.decimalPlaces}
+                />
+              )}
+            </KeyValueTable>
+          )}
+        </RoundedWrapper>
+      )}
+    </section>
+  );
+};
@@ -0,0 +1 @@
+export * from './proposal-volume-discount-program-details';
@@ -0,0 +1,114 @@
+import { render, screen } from '@testing-library/react';
+import { ProposalVolumeDiscountProgramDetails } from './proposal-volume-discount-program-details';
+import { generateProposal } from '../../test-helpers/generate-proposals';
+
+jest.mock('../../../../contexts/app-state/app-state-context', () => ({
+  useAppState: () => ({
+    appState: {
+      decimals: 2,
+    },
+  }),
+}));
+
+const mockReferralProposal = generateProposal({
+  terms: {
+    change: {
+      __typename: 'UpdateVolumeDiscountProgram',
+      benefitTiers: [
+        {
+          minimumRunningNotionalTakerVolume: '10000',
+          volumeDiscountFactor: '0.05',
+        },
+        {
+          minimumRunningNotionalTakerVolume: '50000',
+          volumeDiscountFactor: '0.1',
+        },
+        {
+          minimumRunningNotionalTakerVolume: '100000',
+          volumeDiscountFactor: '0.15',
+        },
+        {
+          minimumRunningNotionalTakerVolume: '250000',
+          volumeDiscountFactor: '0.2',
+        },
+        {
+          minimumRunningNotionalTakerVolume: '500000',
+          volumeDiscountFactor: '0.25',
+        },
+        {
+          minimumRunningNotionalTakerVolume: '1000000',
+          volumeDiscountFactor: '0.3',
+        },
+        {
+          minimumRunningNotionalTakerVolume: '1500000',
+          volumeDiscountFactor: '0.35',
+        },
+        {
+          minimumRunningNotionalTakerVolume: '2000000',
+          volumeDiscountFactor: '0.4',
+        },
+      ],
+      endOfProgramTimestamp: '1970-01-01T00:00:01.791568493Z',
+      windowLength: 7,
+    },
+  },
+});
+
+describe('ProposalVolumeDiscountProgramDetails', () => {
+  it('should not render if proposal is null', () => {
+    render(<ProposalVolumeDiscountProgramDetails proposal={null} />);
+    expect(
+      screen.queryByTestId('proposal-volume-discount-program-details')
+    ).toBeNull();
+  });
+
+  it('should not render if __typename is not UpdateVolumeDiscountProgram', () => {
+    const updateMarketProposal = generateProposal({
+      terms: {
+        change: {
+          __typename: 'UpdateMarket',
+        },
+      },
+    });
+    render(
+      <ProposalVolumeDiscountProgramDetails proposal={updateMarketProposal} />
+    );
+    expect(
+      screen.queryByTestId('proposal-volume-discount-program-details')
+    ).toBeNull();
+  });
+
+  it('should not render if there are no relevant fields', () => {
+    const incompleteProposal = generateProposal({
+      terms: {
+        change: {
+          __typename: 'UpdateVolumeDiscountProgram',
+        },
+      },
+    });
+
+    render(
+      <ProposalVolumeDiscountProgramDetails proposal={incompleteProposal} />
+    );
+    expect(
+      screen.queryByTestId('proposal-volume-discount-program-details')
+    ).toBeNull();
+  });
+
+  it('should render relevant fields if present', () => {
+    render(
+      <ProposalVolumeDiscountProgramDetails proposal={mockReferralProposal} />
+    );
+    expect(
+      screen.getByTestId('proposal-volume-discount-program-window-length')
+    ).toBeInTheDocument();
+    expect(
+      screen.getByTestId(
+        'proposal-volume-discount-program-end-of-program-timestamp'
+      )
+    ).toBeInTheDocument();
+    expect(
+      screen.getByTestId('proposal-volume-discount-program-benefit-tiers')
+    ).toBeInTheDocument();
+  });
+});
@@ -0,0 +1,130 @@
+import { useTranslation } from 'react-i18next';
+import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
+import {
+  KeyValueTable,
+  KeyValueTableRow,
+  RoundedWrapper,
+  Tooltip,
+} from '@vegaprotocol/ui-toolkit';
+import {
+  formatEndOfProgramTimestamp,
+  formatMinimumRunningNotionalTakerVolume,
+} from '../proposal-referral-program-details';
+import { formatNumberPercentage } from '@vegaprotocol/utils';
+import BigNumber from 'bignumber.js';
+
+interface ProposalReferralProgramDetailsProps {
+  proposal: ProposalQuery['proposal'];
+}
+
+export const formatVolumeDiscountFactor = (value: string) => {
+  return formatNumberPercentage(new BigNumber(value).times(100));
+};
+
+export const ProposalVolumeDiscountProgramDetails = ({
+  proposal,
+}: ProposalReferralProgramDetailsProps) => {
+  const { t } = useTranslation();
+  if (proposal?.terms?.change?.__typename !== 'UpdateVolumeDiscountProgram') {
+    return null;
+  }
+
+  const benefitTiers = proposal?.terms?.change?.benefitTiers;
+  const windowLength = proposal?.terms?.change?.windowLength;
+  const endOfProgramTimestamp = proposal?.terms?.change?.endOfProgramTimestamp;
+
+  if (!benefitTiers && !windowLength && !endOfProgramTimestamp) {
+    return null;
+  }
+
+  return (
+    <div data-testid="proposal-volume-discount-program-details">
+      <RoundedWrapper paddingBottom={true}>
+        {windowLength && (
+          <div data-testid="proposal-volume-discount-program-window-length">
+            <KeyValueTable>
+              <KeyValueTableRow>
+                <Tooltip description={t('WindowLengthDescription')}>
+                  <span>{t('WindowLength')}</span>
+                </Tooltip>
+                {windowLength}
+              </KeyValueTableRow>
+            </KeyValueTable>
+          </div>
+        )}
+
+        {endOfProgramTimestamp && (
+          <div
+            className="mb-6"
+            data-testid="proposal-volume-discount-program-end-of-program-timestamp"
+          >
+            <KeyValueTable>
+              <KeyValueTableRow>
+                <Tooltip description={t('EndOfProgramTimestampDescription')}>
+                  <span>{t('EndOfProgramTimestamp')}</span>
+                </Tooltip>
+                {formatEndOfProgramTimestamp(endOfProgramTimestamp)}
+              </KeyValueTableRow>
+            </KeyValueTable>
+          </div>
+        )}
+
+        {benefitTiers && (
+          <div
+            className="mb-6"
+            data-testid="proposal-volume-discount-program-benefit-tiers"
+          >
+            <h3 className="mb-3 uppercase font-semibold text-lg">
+              {t('BenefitTiers')}
+            </h3>
+            <KeyValueTable>
+              {benefitTiers
+                .sort(
+                  (a, b) =>
+                    Number(a.minimumRunningNotionalTakerVolume) -
+                    Number(b.minimumRunningNotionalTakerVolume)
+                )
+                .map((benefitTier, index) => (
+                  <div className="mb-4" key={index}>
+                    <h4 className="font-semibold uppercase">
+                      Tier {index + 1}
+                    </h4>
+                    {benefitTier.minimumRunningNotionalTakerVolume && (
+                      <KeyValueTableRow>
+                        <Tooltip
+                          description={t(
+                            'BenefitTierMinimumRunningNotionalTakerVolumeDescription'
+                          )}
+                        >
+                          <span>
+                            {t('BenefitTierMinimumRunningNotionalTakerVolume')}
+                          </span>
+                        </Tooltip>
+                        {formatMinimumRunningNotionalTakerVolume(
+                          benefitTier.minimumRunningNotionalTakerVolume
+                        )}
+                      </KeyValueTableRow>
+                    )}
+                    {benefitTier.volumeDiscountFactor && (
+                      <KeyValueTableRow>
+                        <Tooltip
+                          description={t(
+                            'BenefitTierVolumeDiscountFactorDescription'
+                          )}
+                        >
+                          <span>{t('BenefitTierVolumeDiscountFactor')}</span>
+                        </Tooltip>
+                        {formatVolumeDiscountFactor(
+                          benefitTier.volumeDiscountFactor
+                        )}
+                      </KeyValueTableRow>
+                    )}
+                  </div>
+                ))}
+            </KeyValueTable>
+          </div>
+        )}
+      </RoundedWrapper>
+    </div>
+  );
+};
@@ -6,25 +6,32 @@ import { ProposalDescription } from '../proposal-description';
 import { ProposalChangeTable } from '../proposal-change-table';
 import { ProposalJson } from '../proposal-json';
 import { ProposalAssetDetails } from '../proposal-asset-details';
+import { ProposalReferralProgramDetails } from '../proposal-referral-program-details';
+import { ProposalVolumeDiscountProgramDetails } from '../proposal-volume-discount-program-details';
 import { UserVote } from '../vote-details';
 import { ListAsset } from '../list-asset';
 import Routes from '../../../routes';
 import { ProposalMarketData } from '../proposal-market-data';
-import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 import type { MarketInfo } from '@vegaprotocol/markets';
 import type { AssetQuery } from '@vegaprotocol/assets';
 import { removePaginationWrapper } from '@vegaprotocol/utils';
 import { ProposalState } from '@vegaprotocol/types';
 import { ProposalMarketChanges } from '../proposal-market-changes';
+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: ProposalFieldsFragment | ProposalQuery['proposal'];
+  proposal: ProposalQuery['proposal'];
  networkParams: Partial<NetworkParamsResult>;
-  newMarketData?: MarketInfo | null;
+  marketData?: MarketInfo | null;
  parentMarketData?: MarketInfo | null;
  assetData?: AssetQuery | null;
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -39,7 +46,7 @@ export const Proposal = ({
  proposal,
  networkParams,
  restData,
-  newMarketData,
+  marketData,
  parentMarketData,
  assetData,
  originalMarketProposalRestData,
@@ -74,14 +81,15 @@ export const Proposal = ({

  if (networkParams) {
    switch (proposal.terms.change.__typename) {
+      case 'UpdateMarket':
+      case 'UpdateMarketState':
+        minVoterBalance =
+          networkParams.governance_proposal_updateMarket_minVoterBalance;
+        break;
      case 'NewMarket':
        minVoterBalance =
          networkParams.governance_proposal_market_minVoterBalance;
        break;
-      case 'UpdateMarket':
-        minVoterBalance =
-          networkParams.governance_proposal_updateMarket_minVoterBalance;
-        break;
      case 'NewAsset':
        minVoterBalance =
          networkParams.governance_proposal_asset_minVoterBalance;
@@ -98,9 +106,46 @@ 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;
+        break;
+      case 'UpdateReferralProgram':
+        minVoterBalance =
+          networkParams.governance_proposal_referralProgram_minVoterBalance;
+        break;
+      case 'UpdateVolumeDiscountProgram':
+        minVoterBalance =
+          networkParams.governance_proposal_VolumeDiscountProgram_minVoterBalance;
+        break;
    }
  }

+  // 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">
@@ -145,15 +190,21 @@ export const Proposal = ({
        <ProposalDescription description={proposal.rationale.description} />
      </div>

-      {newMarketData && (
+      {marketData && (
        <div className="mb-4">
          <ProposalMarketData
-            marketData={newMarketData}
+            marketData={marketData}
            parentMarketData={parentMarketData ? parentMarketData : undefined}
          />
        </div>
      )}

+      {proposal.terms.change.__typename === 'UpdateMarketState' && (
+        <div className="mb-4">
+          <ProposalUpdateMarketState proposal={proposal} />
+        </div>
+      )}
+
      {proposal.terms.change.__typename === 'UpdateMarket' && (
        <div className="mb-4">
          <ProposalMarketChanges
@@ -180,6 +231,20 @@ export const Proposal = ({
          </div>
        )}

+      {proposal.terms.change.__typename === 'UpdateReferralProgram' && (
+        <div className="mb-4">
+          <ProposalReferralProgramDetails proposal={proposal} />
+        </div>
+      )}
+
+      {proposal.terms.change.__typename === 'UpdateVolumeDiscountProgram' && (
+        <div className="mb-4">
+          <ProposalVolumeDiscountProgramDetails proposal={proposal} />
+        </div>
+      )}
+
+      {governanceTransferDetails}
+
      <div className="mb-10">
        <RoundedWrapper paddingBottom={true}>
          <UserVote
@@ -2,11 +2,10 @@ import { RoundedWrapper } from '@vegaprotocol/ui-toolkit';
 import { ProposalHeader } from '../proposal-detail-header/proposal-header';
 import { ProposalsListItemDetails } from './proposals-list-item-details';
 import { useUserVote } from '../vote-details/use-user-vote';
-import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';

 interface ProposalsListItemProps {
-  proposal?: ProposalFieldsFragment | ProposalQuery['proposal'] | null;
+  proposal?: ProposalQuery['proposal'] | null;
 }

 export const ProposalsListItem = ({ proposal }: ProposalsListItemProps) => {
@@ -16,14 +16,14 @@ import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/propos
 import { ExternalLinks } from '@vegaprotocol/environment';

 interface ProposalsListProps {
-  proposals: Array<ProposalFieldsFragment | ProposalQuery['proposal']>;
+  proposals: Array<ProposalQuery['proposal']>;
  protocolUpgradeProposals: ProtocolUpgradeProposalFieldsFragment[];
  lastBlockHeight?: string;
 }

 interface SortedProposalsProps {
-  open: Array<ProposalFieldsFragment | ProposalQuery['proposal']>;
-  closed: Array<ProposalFieldsFragment | ProposalQuery['proposal']>;
+  open: ProposalQuery['proposal'][];
+  closed: ProposalQuery['proposal'][];
 }

 interface SortedProtocolUpgradeProposalsProps {
@@ -31,7 +31,7 @@ interface SortedProtocolUpgradeProposalsProps {
  closed: ProtocolUpgradeProposalFieldsFragment[];
 }

-export const orderByDate = (arr: ProposalFieldsFragment[]) =>
+export const orderByDate = (arr: ProposalQuery['proposal'][]) =>
  orderBy(
    arr,
    [
@@ -92,12 +92,12 @@ export const ProposalsList = ({
    return {
      open:
        initialSorting.open.length > 0
-          ? orderByDate(initialSorting.open as ProposalFieldsFragment[])
+          ? orderByDate(initialSorting.open as ProposalQuery['proposal'][])
          : [],
      closed:
        initialSorting.closed.length > 0
          ? orderByDate(
-              initialSorting.closed as ProposalFieldsFragment[]
+              initialSorting.closed as ProposalQuery['proposal'][]
            ).reverse()
          : [],
    };
@@ -3,20 +3,17 @@ import { useTranslation } from 'react-i18next';
 import { Heading } from '../../../../components/heading';
 import { ProposalsListItem } from '../proposals-list-item';
 import { ProposalsListFilter } from '../proposals-list-filter';
-import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';

 interface ProposalsListProps {
-  proposals: Array<ProposalQuery['proposal'] | ProposalFieldsFragment>;
+  proposals: ProposalQuery['proposal'][];
 }

 export const RejectedProposalsList = ({ proposals }: ProposalsListProps) => {
  const { t } = useTranslation();
  const [filterString, setFilterString] = useState('');

-  const filterPredicate = (
-    p: ProposalFieldsFragment | ProposalQuery['proposal']
-  ) =>
+  const filterPredicate = (p: ProposalQuery['proposal']) =>
    p?.id?.includes(filterString) ||
    p?.party?.id?.toString().includes(filterString);

@@ -4,7 +4,7 @@ import {
  getProposalDialogTitle,
 } from '@vegaprotocol/proposals';
 import type { ProposalEventFieldsFragment } from '@vegaprotocol/proposals';
-import type { DialogProps } from '@vegaprotocol/wallet';
+import type { DialogProps } from '@vegaprotocol/proposals';

 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/wallet';
+import type { DialogProps, VegaTxState } from '@vegaprotocol/proposals';
 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/wallet';
+import { VegaTxStatus } from '@vegaprotocol/proposals';

 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/wallet';
+import type { DialogProps, VegaTxState } from '@vegaprotocol/proposals';

 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/wallet';
+import type { DialogProps, VegaTxState } from '@vegaprotocol/proposals';

 interface VoteTransactionDialogProps {
  voteState: VoteState;
@@ -19,6 +19,8 @@ export const useProposalNetworkParams = ({
    NetworkParams.governance_proposal_market_requiredMajority,
    NetworkParams.governance_proposal_market_requiredParticipation,
    NetworkParams.governance_proposal_updateAsset_requiredMajority,
+    NetworkParams.governance_proposal_referralProgram_requiredMajority,
+    NetworkParams.governance_proposal_referralProgram_requiredParticipation,
    NetworkParams.governance_proposal_updateAsset_requiredParticipation,
    NetworkParams.governance_proposal_asset_requiredMajority,
    NetworkParams.governance_proposal_asset_requiredParticipation,
@@ -26,19 +28,24 @@ export const useProposalNetworkParams = ({
    NetworkParams.governance_proposal_updateNetParam_requiredParticipation,
    NetworkParams.governance_proposal_freeform_requiredMajority,
    NetworkParams.governance_proposal_freeform_requiredParticipation,
+    NetworkParams.governance_proposal_VolumeDiscountProgram_requiredMajority,
+    NetworkParams.governance_proposal_VolumeDiscountProgram_requiredParticipation,
  ]);

+  const fallback = {
+    requiredMajority: new BigNumber(1),
+    requiredMajorityLP: new BigNumber(0),
+    requiredParticipation: new BigNumber(1),
+    requiredParticipationLP: new BigNumber(0),
+  };
+
  if (!params) {
-    return {
-      requiredMajority: new BigNumber(1),
-      requiredMajorityLP: new BigNumber(0),
-      requiredParticipation: new BigNumber(1),
-      requiredParticipationLP: new BigNumber(0),
-    };
+    return fallback;
  }

  switch (proposal?.terms.change.__typename) {
    case 'UpdateMarket':
+    case 'UpdateMarketState':
      return {
        requiredMajority:
          params.governance_proposal_updateMarket_requiredMajority,
@@ -88,7 +95,23 @@ export const useProposalNetworkParams = ({
          params.governance_proposal_freeform_requiredParticipation
        ),
      };
+    case 'UpdateReferralProgram':
+      return {
+        requiredMajority:
+          params.governance_proposal_referralProgram_requiredMajority,
+        requiredParticipation: new BigNumber(
+          params.governance_proposal_referralProgram_requiredParticipation
+        ),
+      };
+    case 'UpdateVolumeDiscountProgram':
+      return {
+        requiredMajority:
+          params.governance_proposal_VolumeDiscountProgram_requiredMajority,
+        requiredParticipation: new BigNumber(
+          params.governance_proposal_VolumeDiscountProgram_requiredParticipation
+        ),
+      };
    default:
-      throw new Error('Unknown proposal type');
+      return fallback;
  }
 };
@@ -1,4 +1,93 @@
-query Proposal($proposalId: ID!) {
+fragment NewMarketProductField on Proposal {
+  terms {
+    change {
+      ... on NewMarket {
+        instrument {
+          product {
+            __typename
+          }
+        }
+      }
+    }
+  }
+}
+
+fragment UpdateMarketState on Proposal {
+  terms {
+    change {
+      ... on UpdateMarketState {
+        updateType
+        market {
+          decimalPlaces
+          id
+          tradableInstrument {
+            instrument {
+              product {
+                __typename
+                ... on Future {
+                  quoteName
+                }
+                ... on Perpetual {
+                  quoteName
+                }
+              }
+              name
+              code
+            }
+          }
+        }
+        updateType
+        price
+      }
+    }
+  }
+}
+
+fragment UpdateReferralProgram on Proposal {
+  terms {
+    change {
+      ... on UpdateReferralProgram {
+        changes {
+          benefitTiers {
+            minimumEpochs
+            minimumRunningNotionalTakerVolume
+            referralDiscountFactor
+            referralRewardFactor
+          }
+          endOfProgramTimestamp
+          windowLength
+          stakingTiers {
+            minimumStakedTokens
+            referralRewardMultiplier
+          }
+        }
+      }
+    }
+  }
+}
+
+fragment UpdateVolumeDiscountProgram on Proposal {
+  terms {
+    change {
+      ... on UpdateVolumeDiscountProgram {
+        benefitTiers {
+          minimumRunningNotionalTakerVolume
+          volumeDiscountFactor
+        }
+        endOfProgramTimestamp
+        windowLength
+      }
+    }
+  }
+}
+
+query Proposal(
+  $proposalId: ID!
+  $includeNewMarketProductField: Boolean!
+  $includeUpdateMarketState: Boolean!
+  $includeUpdateReferralProgram: Boolean!
+  $includeUpdateVolumeDiscountProgram: Boolean!
+) {
  proposal(id: $proposalId) {
    id
    rationale {
@@ -13,6 +102,11 @@ query Proposal($proposalId: ID!) {
      id
    }
    errorDetails
+    ...NewMarketProductField @include(if: $includeNewMarketProductField)
+    ...UpdateMarketState @include(if: $includeUpdateMarketState)
+    ...UpdateReferralProgram @include(if: $includeUpdateReferralProgram)
+    ...UpdateVolumeDiscountProgram
+      @include(if: $includeUpdateVolumeDiscountProgram)
    terms {
      closingDatetime
      enactmentDatetime
@@ -36,6 +36,8 @@ export const ProposalContainer = () => {
    NetworkParams.governance_proposal_updateAsset_minVoterBalance,
    NetworkParams.governance_proposal_updateNetParam_minVoterBalance,
    NetworkParams.governance_proposal_freeform_minVoterBalance,
+    NetworkParams.governance_proposal_referralProgram_minVoterBalance,
+    NetworkParams.governance_proposal_VolumeDiscountProgram_minVoterBalance,
    NetworkParams.spam_protection_voting_min_tokens,
    NetworkParams.governance_proposal_market_requiredMajority,
    NetworkParams.governance_proposal_updateMarket_requiredMajority,
@@ -44,6 +46,8 @@ export const ProposalContainer = () => {
    NetworkParams.governance_proposal_updateAsset_requiredMajority,
    NetworkParams.governance_proposal_updateNetParam_requiredMajority,
    NetworkParams.governance_proposal_freeform_requiredMajority,
+    NetworkParams.governance_proposal_referralProgram_requiredMajority,
+    NetworkParams.governance_proposal_VolumeDiscountProgram_requiredMajority,
  ]);

  const {
@@ -53,7 +57,13 @@ export const ProposalContainer = () => {
  const { data, loading, error, refetch } = useProposalQuery({
    fetchPolicy: 'network-only',
    errorPolicy: 'ignore',
-    variables: { proposalId: params.proposalId || '' },
+    variables: {
+      proposalId: params.proposalId || '',
+      includeNewMarketProductField: !!FLAGS.PRODUCT_PERPETUALS,
+      includeUpdateMarketState: !!FLAGS.UPDATE_MARKET_STATE,
+      includeUpdateReferralProgram: !!FLAGS.REFERRALS,
+      includeUpdateVolumeDiscountProgram: !!FLAGS.VOLUME_DISCOUNTS,
+    },
    skip: !params.proposalId,
  });

@@ -91,9 +101,9 @@ export const ProposalContainer = () => {
  );

  const {
-    data: newMarketData,
-    loading: newMarketLoading,
-    error: newMarketError,
+    data: marketData,
+    loading: marketLoading,
+    error: marketError,
  } = useDataProvider({
    dataProvider: marketInfoProvider,
    skipUpdates: true,
@@ -109,9 +119,9 @@ export const ProposalContainer = () => {
    error: parentMarketIdError,
  } = useParentMarketIdQuery({
    variables: {
-      marketId: newMarketData?.id || '',
+      marketId: marketData?.id || '',
    },
-    skip: !FLAGS.SUCCESSOR_MARKETS || !isSuccessor || !newMarketData?.id,
+    skip: !FLAGS.SUCCESSOR_MARKETS || !isSuccessor || !marketData?.id,
  });

  const {
@@ -191,7 +201,7 @@ export const ProposalContainer = () => {
    <AsyncRenderer
      loading={
        loading ||
-        newMarketLoading ||
+        marketLoading ||
        assetLoading ||
        networkParamsLoading ||
        parentMarketIdLoading ||
@@ -206,7 +216,7 @@ export const ProposalContainer = () => {
      }
      error={
        error ||
-        newMarketError ||
+        marketError ||
        assetError ||
        networkParamsError ||
        parentMarketIdError ||
@@ -218,7 +228,7 @@ export const ProposalContainer = () => {
      data={{
        ...data,
        ...networkParams,
-        ...(newMarketData ? { newMarketData } : {}),
+        ...(marketData ? { newMarketData: marketData } : {}),
        ...(parentMarketData ? { parentMarketData } : {}),
        ...(assetData ? { assetData } : {}),
        ...(restData ? { restData } : {}),
@@ -235,7 +245,7 @@ export const ProposalContainer = () => {
          proposal={data.proposal}
          networkParams={networkParams}
          restData={restData}
-          newMarketData={newMarketData}
+          marketData={marketData}
          parentMarketData={parentMarketData}
          assetData={assetData}
          originalMarketProposalRestData={originalMarketProposalRestData}
@@ -1,3 +1,86 @@
+fragment NewMarketProductFields on Proposal {
+  terms {
+    change {
+      ... on NewMarket {
+        instrument {
+          product {
+            __typename
+          }
+        }
+      }
+    }
+  }
+}
+
+fragment UpdateMarketStates on Proposal {
+  terms {
+    change {
+      ... on UpdateMarketState {
+        updateType
+        market {
+          decimalPlaces
+          id
+          tradableInstrument {
+            instrument {
+              product {
+                __typename
+                ... on Future {
+                  quoteName
+                }
+                ... on Perpetual {
+                  quoteName
+                }
+              }
+              name
+              code
+            }
+          }
+        }
+        updateType
+        price
+      }
+    }
+  }
+}
+
+fragment UpdateReferralPrograms on Proposal {
+  terms {
+    change {
+      ... on UpdateReferralProgram {
+        changes {
+          benefitTiers {
+            minimumEpochs
+            minimumRunningNotionalTakerVolume
+            referralDiscountFactor
+            referralRewardFactor
+          }
+          endOfProgramTimestamp
+          windowLength
+          stakingTiers {
+            minimumStakedTokens
+            referralRewardMultiplier
+          }
+        }
+      }
+    }
+  }
+}
+
+fragment UpdateVolumeDiscountPrograms on Proposal {
+  terms {
+    change {
+      ... on UpdateVolumeDiscountProgram {
+        benefitTiers {
+          minimumRunningNotionalTakerVolume
+          volumeDiscountFactor
+        }
+        endOfProgramTimestamp
+        windowLength
+      }
+    }
+  }
+}
+
 fragment ProposalFields on Proposal {
  id
  rationale {
@@ -79,11 +162,21 @@ fragment ProposalFields on Proposal {
  }
 }

-query Proposals {
+query Proposals(
+  $includeNewMarketProductFields: Boolean!
+  $includeUpdateMarketStates: Boolean!
+  $includeUpdateReferralPrograms: Boolean!
+  $includeUpdateVolumeDiscountPrograms: Boolean!
+) {
  proposalsConnection {
    edges {
      node {
        ...ProposalFields
+        ...NewMarketProductFields @include(if: $includeNewMarketProductFields)
+        ...UpdateMarketStates @include(if: $includeUpdateMarketStates)
+        ...UpdateReferralPrograms @include(if: $includeUpdateReferralPrograms)
+        ...UpdateVolumeDiscountPrograms
+          @include(if: $includeUpdateVolumeDiscountPrograms)
      }
    }
  }
@@ -3,13 +3,113 @@ import * as Types from '@vegaprotocol/types';
 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
+export type NewMarketProductFieldsFragment = { __typename?: 'Proposal', terms: { __typename?: 'ProposalTerms', change: { __typename?: 'CancelTransfer' } | { __typename?: 'NewAsset' } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', instrument: { __typename?: 'InstrumentConfiguration', product?: { __typename: 'FutureProduct' } | { __typename: 'PerpetualProduct' } | { __typename: 'SpotProduct' } | null } } | { __typename?: 'NewSpotMarket' } | { __typename?: 'NewTransfer' } | { __typename?: 'UpdateAsset' } | { __typename?: 'UpdateMarket' } | { __typename?: 'UpdateMarketState' } | { __typename?: 'UpdateNetworkParameter' } | { __typename?: 'UpdateReferralProgram' } | { __typename?: 'UpdateSpotMarket' } | { __typename?: 'UpdateVolumeDiscountProgram' } } };
+
+export type UpdateMarketStatesFragment = { __typename?: 'Proposal', terms: { __typename?: 'ProposalTerms', change: { __typename?: 'CancelTransfer' } | { __typename?: 'NewAsset' } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket' } | { __typename?: 'NewSpotMarket' } | { __typename?: 'NewTransfer' } | { __typename?: 'UpdateAsset' } | { __typename?: 'UpdateMarket' } | { __typename?: 'UpdateMarketState', updateType: Types.MarketUpdateType, price?: string | null, market: { __typename?: 'Market', decimalPlaces: number, id: string, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, code: string, product: { __typename: 'Future', quoteName: string } | { __typename: 'Perpetual', quoteName: string } | { __typename: 'Spot' } } } } } | { __typename?: 'UpdateNetworkParameter' } | { __typename?: 'UpdateReferralProgram' } | { __typename?: 'UpdateSpotMarket' } | { __typename?: 'UpdateVolumeDiscountProgram' } } };
+
+export type UpdateReferralProgramsFragment = { __typename?: 'Proposal', terms: { __typename?: 'ProposalTerms', change: { __typename?: 'CancelTransfer' } | { __typename?: 'NewAsset' } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket' } | { __typename?: 'NewSpotMarket' } | { __typename?: 'NewTransfer' } | { __typename?: 'UpdateAsset' } | { __typename?: 'UpdateMarket' } | { __typename?: 'UpdateMarketState' } | { __typename?: 'UpdateNetworkParameter' } | { __typename?: 'UpdateReferralProgram', changes: { __typename?: 'ReferralProgram', endOfProgramTimestamp: string, windowLength: number, benefitTiers: Array<{ __typename?: 'BenefitTier', minimumEpochs: number, minimumRunningNotionalTakerVolume: string, referralDiscountFactor: string, referralRewardFactor: string }>, stakingTiers: Array<{ __typename?: 'StakingTier', minimumStakedTokens: string, referralRewardMultiplier: string }> } } | { __typename?: 'UpdateSpotMarket' } | { __typename?: 'UpdateVolumeDiscountProgram' } } };
+
+export type UpdateVolumeDiscountProgramsFragment = { __typename?: 'Proposal', terms: { __typename?: 'ProposalTerms', change: { __typename?: 'CancelTransfer' } | { __typename?: 'NewAsset' } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket' } | { __typename?: 'NewSpotMarket' } | { __typename?: 'NewTransfer' } | { __typename?: 'UpdateAsset' } | { __typename?: 'UpdateMarket' } | { __typename?: 'UpdateMarketState' } | { __typename?: 'UpdateNetworkParameter' } | { __typename?: 'UpdateReferralProgram' } | { __typename?: 'UpdateSpotMarket' } | { __typename?: 'UpdateVolumeDiscountProgram', endOfProgramTimestamp: any, windowLength: number, benefitTiers: Array<{ __typename?: 'VolumeBenefitTier', minimumRunningNotionalTakerVolume: string, volumeDiscountFactor: string }> } } };
+
 export type ProposalFieldsFragment = { __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, datetime: any, rejectionReason?: Types.ProposalRejectionReason | null, errorDetails?: string | null, rationale: { __typename?: 'ProposalRationale', title: string, description: string }, party: { __typename?: 'Party', id: string }, terms: { __typename?: 'ProposalTerms', closingDatetime: any, enactmentDatetime?: any | null, change: { __typename?: 'CancelTransfer' } | { __typename: 'NewAsset', name: string, symbol: string, decimals: number, quantum: string, source: { __typename?: 'BuiltinAsset', maxFaucetAmountMint: string } | { __typename?: 'ERC20', contractAddress: string, withdrawThreshold: string, lifetimeLimit: string } } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', instrument: { __typename?: 'InstrumentConfiguration', name: string, code: string, futureProduct?: { __typename?: 'FutureProduct', settlementAsset: { __typename?: 'Asset', symbol: string } } | null } } | { __typename?: 'NewSpotMarket' } | { __typename?: 'NewTransfer' } | { __typename?: 'UpdateAsset', quantum: string, assetId: string, source: { __typename?: 'UpdateERC20', lifetimeLimit: string, withdrawThreshold: string } } | { __typename?: 'UpdateMarket', marketId: string } | { __typename?: 'UpdateMarketState' } | { __typename?: 'UpdateNetworkParameter', networkParameter: { __typename?: 'NetworkParameter', key: string, value: string } } | { __typename?: 'UpdateReferralProgram' } | { __typename?: 'UpdateSpotMarket' } | { __typename?: 'UpdateVolumeDiscountProgram' } }, votes: { __typename?: 'ProposalVotes', yes: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string }, no: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string } } };

-export type ProposalsQueryVariables = Types.Exact<{ [key: string]: never; }>;
+export type ProposalsQueryVariables = Types.Exact<{
+  includeNewMarketProductFields: Types.Scalars['Boolean'];
+  includeUpdateMarketStates: Types.Scalars['Boolean'];
+  includeUpdateReferralPrograms: Types.Scalars['Boolean'];
+  includeUpdateVolumeDiscountPrograms: Types.Scalars['Boolean'];
+}>;


-export type ProposalsQuery = { __typename?: 'Query', proposalsConnection?: { __typename?: 'ProposalsConnection', edges?: Array<{ __typename?: 'ProposalEdge', node: { __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, datetime: any, rejectionReason?: Types.ProposalRejectionReason | null, errorDetails?: string | null, rationale: { __typename?: 'ProposalRationale', title: string, description: string }, party: { __typename?: 'Party', id: string }, terms: { __typename?: 'ProposalTerms', closingDatetime: any, enactmentDatetime?: any | null, change: { __typename?: 'CancelTransfer' } | { __typename: 'NewAsset', name: string, symbol: string, decimals: number, quantum: string, source: { __typename?: 'BuiltinAsset', maxFaucetAmountMint: string } | { __typename?: 'ERC20', contractAddress: string, withdrawThreshold: string, lifetimeLimit: string } } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', instrument: { __typename?: 'InstrumentConfiguration', name: string, code: string, futureProduct?: { __typename?: 'FutureProduct', settlementAsset: { __typename?: 'Asset', symbol: string } } | null } } | { __typename?: 'NewSpotMarket' } | { __typename?: 'NewTransfer' } | { __typename?: 'UpdateAsset', quantum: string, assetId: string, source: { __typename?: 'UpdateERC20', lifetimeLimit: string, withdrawThreshold: string } } | { __typename?: 'UpdateMarket', marketId: string } | { __typename?: 'UpdateMarketState' } | { __typename?: 'UpdateNetworkParameter', networkParameter: { __typename?: 'NetworkParameter', key: string, value: string } } | { __typename?: 'UpdateReferralProgram' } | { __typename?: 'UpdateSpotMarket' } | { __typename?: 'UpdateVolumeDiscountProgram' } }, votes: { __typename?: 'ProposalVotes', yes: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string }, no: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string } } } } | null> | null } | null };
+export type ProposalsQuery = { __typename?: 'Query', proposalsConnection?: { __typename?: 'ProposalsConnection', edges?: Array<{ __typename?: 'ProposalEdge', node: { __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, datetime: any, rejectionReason?: Types.ProposalRejectionReason | null, errorDetails?: string | null, rationale: { __typename?: 'ProposalRationale', title: string, description: string }, party: { __typename?: 'Party', id: string }, terms: { __typename?: 'ProposalTerms', closingDatetime: any, enactmentDatetime?: any | null, change: { __typename?: 'CancelTransfer' } | { __typename: 'NewAsset', name: string, symbol: string, decimals: number, quantum: string, source: { __typename?: 'BuiltinAsset', maxFaucetAmountMint: string } | { __typename?: 'ERC20', contractAddress: string, withdrawThreshold: string, lifetimeLimit: string } } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', instrument: { __typename?: 'InstrumentConfiguration', name: string, code: string, futureProduct?: { __typename?: 'FutureProduct', settlementAsset: { __typename?: 'Asset', symbol: string } } | null, product?: { __typename: 'FutureProduct' } | { __typename: 'PerpetualProduct' } | { __typename: 'SpotProduct' } | null } } | { __typename?: 'NewSpotMarket' } | { __typename?: 'NewTransfer' } | { __typename?: 'UpdateAsset', quantum: string, assetId: string, source: { __typename?: 'UpdateERC20', lifetimeLimit: string, withdrawThreshold: string } } | { __typename?: 'UpdateMarket', marketId: string } | { __typename?: 'UpdateMarketState', updateType: Types.MarketUpdateType, price?: string | null, market: { __typename?: 'Market', decimalPlaces: number, id: string, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, code: string, product: { __typename: 'Future', quoteName: string } | { __typename: 'Perpetual', quoteName: string } | { __typename: 'Spot' } } } } } | { __typename?: 'UpdateNetworkParameter', networkParameter: { __typename?: 'NetworkParameter', key: string, value: string } } | { __typename?: 'UpdateReferralProgram', changes: { __typename?: 'ReferralProgram', endOfProgramTimestamp: string, windowLength: number, benefitTiers: Array<{ __typename?: 'BenefitTier', minimumEpochs: number, minimumRunningNotionalTakerVolume: string, referralDiscountFactor: string, referralRewardFactor: string }>, stakingTiers: Array<{ __typename?: 'StakingTier', minimumStakedTokens: string, referralRewardMultiplier: string }> } } | { __typename?: 'UpdateSpotMarket' } | { __typename?: 'UpdateVolumeDiscountProgram', endOfProgramTimestamp: any, windowLength: number, benefitTiers: Array<{ __typename?: 'VolumeBenefitTier', minimumRunningNotionalTakerVolume: string, volumeDiscountFactor: string }> } }, votes: { __typename?: 'ProposalVotes', yes: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string }, no: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string } } } } | null> | null } | null };

+export const NewMarketProductFieldsFragmentDoc = gql`
+    fragment NewMarketProductFields on Proposal {
+  terms {
+    change {
+      ... on NewMarket {
+        instrument {
+          product {
+            __typename
+          }
+        }
+      }
+    }
+  }
+}
+    `;
+export const UpdateMarketStatesFragmentDoc = gql`
+    fragment UpdateMarketStates on Proposal {
+  terms {
+    change {
+      ... on UpdateMarketState {
+        updateType
+        market {
+          decimalPlaces
+          id
+          tradableInstrument {
+            instrument {
+              product {
+                __typename
+                ... on Future {
+                  quoteName
+                }
+                ... on Perpetual {
+                  quoteName
+                }
+              }
+              name
+              code
+            }
+          }
+        }
+        updateType
+        price
+      }
+    }
+  }
+}
+    `;
+export const UpdateReferralProgramsFragmentDoc = gql`
+    fragment UpdateReferralPrograms on Proposal {
+  terms {
+    change {
+      ... on UpdateReferralProgram {
+        changes {
+          benefitTiers {
+            minimumEpochs
+            minimumRunningNotionalTakerVolume
+            referralDiscountFactor
+            referralRewardFactor
+          }
+          endOfProgramTimestamp
+          windowLength
+          stakingTiers {
+            minimumStakedTokens
+            referralRewardMultiplier
+          }
+        }
+      }
+    }
+  }
+}
+    `;
+export const UpdateVolumeDiscountProgramsFragmentDoc = gql`
+    fragment UpdateVolumeDiscountPrograms on Proposal {
+  terms {
+    change {
+      ... on UpdateVolumeDiscountProgram {
+        benefitTiers {
+          minimumRunningNotionalTakerVolume
+          volumeDiscountFactor
+        }
+        endOfProgramTimestamp
+        windowLength
+      }
+    }
+  }
+}
+    `;
 export const ProposalFieldsFragmentDoc = gql`
    fragment ProposalFields on Proposal {
  id
@@ -93,16 +193,24 @@ export const ProposalFieldsFragmentDoc = gql`
 }
    `;
 export const ProposalsDocument = gql`
-    query Proposals {
+    query Proposals($includeNewMarketProductFields: Boolean!, $includeUpdateMarketStates: Boolean!, $includeUpdateReferralPrograms: Boolean!, $includeUpdateVolumeDiscountPrograms: Boolean!) {
  proposalsConnection {
    edges {
      node {
        ...ProposalFields
+        ...NewMarketProductFields @include(if: $includeNewMarketProductFields)
+        ...UpdateMarketStates @include(if: $includeUpdateMarketStates)
+        ...UpdateReferralPrograms @include(if: $includeUpdateReferralPrograms)
+        ...UpdateVolumeDiscountPrograms @include(if: $includeUpdateVolumeDiscountPrograms)
      }
    }
  }
 }
-    ${ProposalFieldsFragmentDoc}`;
+    ${ProposalFieldsFragmentDoc}
+${NewMarketProductFieldsFragmentDoc}
+${UpdateMarketStatesFragmentDoc}
+${UpdateReferralProgramsFragmentDoc}
+${UpdateVolumeDiscountProgramsFragmentDoc}`;

 /**
 * __useProposalsQuery__
@@ -116,10 +224,14 @@ export const ProposalsDocument = gql`
 * @example
 * const { data, loading, error } = useProposalsQuery({
 *   variables: {
+ *      includeNewMarketProductFields: // value for 'includeNewMarketProductFields'
+ *      includeUpdateMarketStates: // value for 'includeUpdateMarketStates'
+ *      includeUpdateReferralPrograms: // value for 'includeUpdateReferralPrograms'
+ *      includeUpdateVolumeDiscountPrograms: // value for 'includeUpdateVolumeDiscountPrograms'
 *   },
 * });
 */
-export function useProposalsQuery(baseOptions?: Apollo.QueryHookOptions<ProposalsQuery, ProposalsQueryVariables>) {
+export function useProposalsQuery(baseOptions: Apollo.QueryHookOptions<ProposalsQuery, ProposalsQueryVariables>) {
        const options = {...defaultOptions, ...baseOptions}
        return Apollo.useQuery<ProposalsQuery, ProposalsQueryVariables>(ProposalsDocument, options);
      }
@@ -6,7 +6,7 @@ import { useTranslation } from 'react-i18next';
 import { SplashLoader } from '../../../components/splash-loader';
 import { ProposalsList } from '../components/proposals-list';
 import { useProposalsQuery } from './__generated__/Proposals';
-import { getNodes } from '@vegaprotocol/utils';
+import { getNodes, removePaginationWrapper } from '@vegaprotocol/utils';
 import {
  ProposalState,
  ProtocolUpgradeProposalStatus,
@@ -15,14 +15,13 @@ import type { NodeConnection, NodeEdge } from '@vegaprotocol/utils';
 import type { ProposalFieldsFragment } from './__generated__/Proposals';
 import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
 import { useProtocolUpgradeProposalsQuery } from '@vegaprotocol/proposals';
+import { FLAGS } from '@vegaprotocol/environment';

-export function getNotRejectedProposals<T extends ProposalFieldsFragment>(
-  data?: NodeConnection<NodeEdge<T>> | null
-): T[] {
+export function getNotRejectedProposals(data?: ProposalFieldsFragment[]) {
  return flow([
    (data) =>
-      getNodes<ProposalFieldsFragment>(data, (p) =>
-        p ? p.state !== ProposalState.STATE_REJECTED : false
+      data.filter(
+        (p: ProposalFieldsFragment) => p?.state !== ProposalState.STATE_REJECTED
      ),
  ])(data);
 }
@@ -47,6 +46,12 @@ export const ProposalsContainer = () => {
    pollInterval: 5000,
    fetchPolicy: 'network-only',
    errorPolicy: 'ignore',
+    variables: {
+      includeNewMarketProductFields: !!FLAGS.PRODUCT_PERPETUALS,
+      includeUpdateMarketStates: !!FLAGS.UPDATE_MARKET_STATE,
+      includeUpdateReferralPrograms: !!FLAGS.REFERRALS,
+      includeUpdateVolumeDiscountPrograms: !!FLAGS.VOLUME_DISCOUNTS,
+    },
  });

  const {
@@ -60,7 +65,10 @@ export const ProposalsContainer = () => {
  });

  const proposals = useMemo(
-    () => getNotRejectedProposals(data?.proposalsConnection),
+    () =>
+      getNotRejectedProposals(
+        removePaginationWrapper(data?.proposalsConnection?.edges)
+      ),
    [data]
  );

@@ -6,11 +6,11 @@ import { SplashLoader } from '../../../components/splash-loader';
 import { RejectedProposalsList } from '../components/proposals-list';
 import type { ProposalFieldsFragment } from '../proposals/__generated__/Proposals';
 import { useProposalsQuery } from '../proposals/__generated__/Proposals';
-import type { NodeConnection, NodeEdge } from '@vegaprotocol/utils';
-import { getNodes } from '@vegaprotocol/utils';
+import { removePaginationWrapper } from '@vegaprotocol/utils';
 import flow from 'lodash/flow';
 import orderBy from 'lodash/orderBy';
 import { ProposalState } from '@vegaprotocol/types';
+import { FLAGS } from '@vegaprotocol/environment';

 const orderByDate = (arr: ProposalFieldsFragment[]) =>
  orderBy(
@@ -22,13 +22,11 @@ const orderByDate = (arr: ProposalFieldsFragment[]) =>
    ['desc', 'desc']
  );

-export function getRejectedProposals<T extends ProposalFieldsFragment>(
-  data?: NodeConnection<NodeEdge<ProposalFieldsFragment>> | null
-): T[] {
+export function getRejectedProposals(data?: ProposalFieldsFragment[] | null) {
  return flow([
    (data) =>
-      getNodes<ProposalFieldsFragment>(data, (p) =>
-        p ? p?.state === ProposalState.STATE_REJECTED : false
+      data.filter(
+        (p: ProposalFieldsFragment) => p?.state === ProposalState.STATE_REJECTED
      ),
    orderByDate,
  ])(data);
@@ -36,11 +34,23 @@ export function getRejectedProposals<T extends ProposalFieldsFragment>(

 export const RejectedProposalsContainer = () => {
  const { t } = useTranslation();
-  const { data, loading, error } = useProposalsQuery();
+  const { data, loading, error } = useProposalsQuery({
+    pollInterval: 5000,
+    fetchPolicy: 'network-only',
+    errorPolicy: 'ignore',
+    variables: {
+      includeNewMarketProductFields: !!FLAGS.PRODUCT_PERPETUALS,
+      includeUpdateMarketStates: !!FLAGS.UPDATE_MARKET_STATE,
+      includeUpdateReferralPrograms: !!FLAGS.REFERRALS,
+      includeUpdateVolumeDiscountPrograms: !!FLAGS.VOLUME_DISCOUNTS,
+    },
+  });

  const proposals = useMemo(
    () =>
-      getRejectedProposals<ProposalFieldsFragment>(data?.proposalsConnection),
+      getRejectedProposals(
+        removePaginationWrapper(data?.proposalsConnection?.edges)
+      ),
    [data]
  );

@@ -1,4 +1,4 @@
-import { useMemo, useEffect, useState, useCallback } from 'react';
+import { useMemo, useEffect, useState, useCallback, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 import { AsyncRenderer, Pagination } from '@vegaprotocol/ui-toolkit';
 import { removePaginationWrapper } from '@vegaprotocol/utils';
@@ -86,12 +86,18 @@ export const EpochIndividualRewards = ({
    [epochId, page, refetch, delegationsPagination, pubKey]
  );

+  const prevEpochIdRef = useRef<number | null>(null);
+
  useEffect(() => {
-    // when the epoch changes, we want to refetch the data to update the current page
-    if (data) {
+    if (prevEpochIdRef.current === null) {
+      prevEpochIdRef.current = epochId;
+    } else if (epochId !== prevEpochIdRef.current) {
+      // When the epoch changes, we want to refetch the data to update the current page
      refetchData();
    }
-  }, [epochId, data, refetchData]);
+
+    prevEpochIdRef.current = epochId;
+  }, [epochId, refetchData]);

  return (
    <AsyncRenderer
@@ -3,7 +3,7 @@ import { forwardRef, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
 import { Button, Icon } from '@vegaprotocol/ui-toolkit';
-import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
+import { AgGrid } from '@vegaprotocol/datagrid';
 import { useAppState } from '../../../../contexts/app-state/app-state-context';
 import { BigNumber } from '../../../../lib/bignumber';
 import {
@@ -85,17 +85,17 @@ const TopThirdCellRenderer = (
      }}
      className="grid grid-cols-[60px_1fr] w-full h-full py-4 px-0 text-sm text-white text-center overflow-scroll"
    >
-      <div className="text-xs text-left px-3">
+      <div className="px-3 text-xs text-left">
        {params?.data?.rankingDisplay}
      </div>
-      <div className="whitespace-normal px-3">
+      <div className="px-3 whitespace-normal">
        <div className="mb-4">
          <Button
            data-testid="show-all-validators"
            rightIcon={
              <Icon
                name="arrow-right"
-                className="fill-current mr-2 align-text-top"
+                className="mr-2 align-text-top fill-current"
              />
            }
            className="inline-flex items-center"
@@ -103,7 +103,7 @@ const TopThirdCellRenderer = (
            {t('Reveal top validators')}
          </Button>
        </div>
-        <p className="font-semibold text-white mb-0">
+        <p className="mb-0 font-semibold text-white">
          {t(
            'Validators with too great a stake share will have the staking rewards for their delegators penalised.'
          )}
@@ -1,7 +1,7 @@
 import { forwardRef, useMemo, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
-import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
+import { AgGrid } from '@vegaprotocol/datagrid';
 import { useAppState } from '../../../../contexts/app-state/app-state-context';
 import { BigNumber } from '../../../../lib/bignumber';
 import {
@@ -1,147 +0,0 @@
-.pre-loader {
-  display: flex;
-  width: 100%;
-  min-height: 100vh;
-  justify-content: center;
-  align-items: center;
-}
-.pre-loader .loader-item {
-  width: 10px;
-  height: 10px;
-  background: #000;
-}
-.pre-loader .pre-loader-center {
-  align-items: center;
-  display: flex;
-  flex-direction: column;
-}
-.pre-loader .pre-loader-wrapper {
-  width: 50px;
-  height: 50px;
-  display: flex;
-  flex-wrap: wrap;
-}
-.pre-loader .loader-item:nth-child(0) {
-  animation-delay: 0ms;
-  animation-direction: reverse;
-}
-.pre-loader .loader-item:first-child {
-  animation-delay: -0.1s;
-  animation-direction: alternate;
-}
-.pre-loader .loader-item:nth-child(2) {
-  animation-delay: 0.3s;
-  animation-direction: reverse;
-}
-.pre-loader .loader-item:nth-child(3) {
-  animation-delay: -0.45s;
-  animation-direction: alternate;
-}
-.pre-loader .loader-item:nth-child(4) {
-  animation-delay: 1s;
-  animation-direction: reverse;
-}
-.pre-loader .loader-item:nth-child(5) {
-  animation-delay: -0.75s;
-  animation-direction: alternate;
-}
-.pre-loader .loader-item:nth-child(6) {
-  animation-delay: 0.9s;
-  animation-direction: reverse;
-}
-.pre-loader .loader-item:nth-child(7) {
-  animation-delay: -1.4s;
-  animation-direction: alternate;
-}
-.pre-loader .loader-item:nth-child(8) {
-  animation-delay: 1.6s;
-  animation-direction: reverse;
-}
-.pre-loader .loader-item:nth-child(9) {
-  animation-delay: -0.45s;
-  animation-direction: alternate;
-}
-.pre-loader .loader-item:nth-child(10) {
-  animation-delay: 1.5s;
-  animation-direction: reverse;
-}
-.pre-loader .loader-item:nth-child(11) {
-  animation-delay: -2.75s;
-  animation-direction: alternate;
-}
-.pre-loader .loader-item:nth-child(12) {
-  animation-delay: 1.2s;
-  animation-direction: reverse;
-}
-.pre-loader .loader-item:nth-child(13) {
-  animation-delay: -1.95s;
-  animation-direction: alternate;
-}
-.pre-loader .loader-item:nth-child(14) {
-  animation-delay: 2.8s;
-  animation-direction: reverse;
-}
-.pre-loader .loader-item:nth-child(15) {
-  animation-delay: -0.75s;
-  animation-direction: alternate;
-}
-.pre-loader .loader-item:nth-child(16) {
-  animation-delay: 4s;
-  animation-direction: reverse;
-}
-.pre-loader .loader-item:nth-child(17) {
-  animation-delay: -0.85s;
-  animation-direction: alternate;
-}
-.pre-loader .loader-item:nth-child(18) {
-  animation-delay: 1.8s;
-  animation-direction: reverse;
-}
-.pre-loader .loader-item:nth-child(19) {
-  animation-delay: -1.9s;
-  animation-direction: alternate;
-}
-.pre-loader .loader-item:nth-child(20) {
-  animation-delay: 5s;
-  animation-direction: reverse;
-}
-.pre-loader .loader-item:nth-child(21) {
-  animation-delay: -5.25s;
-  animation-direction: alternate;
-}
-.pre-loader .loader-item:nth-child(22) {
-  animation-delay: 4.4s;
-  animation-direction: reverse;
-}
-.pre-loader .loader-item:nth-child(23) {
-  animation-delay: -5.75s;
-  animation-direction: alternate;
-}
-.pre-loader .loader-item:nth-child(24) {
-  animation-delay: 4.8s;
-  animation-direction: reverse;
-}
-.pre-loader .loader-item:nth-child(25) {
-  animation-delay: -5s;
-  animation-direction: alternate;
-}
-.pre-loader .loader-item {
-  animation: flickering 0.4s linear infinite alternate;
-}
-@keyframes flickering {
-  0% {
-    opacity: 1;
-  }
-  25% {
-    opacity: 1;
-  }
-  26% {
-    opacity: 0;
-  }
-  to {
-    opacity: 0;
-  }
-}
-html.dark .pre-loader .loader-item {
-  background: #fff;
-}
@@ -1,58 +0,0 @@
-.pre-loader {
-  display: flex;
-  width: 100%;
-  min-height: 100vh;
-  justify-content: center;
-  align-items: center;
-  .loader-item {
-    width: 10px;
-    height: 10px;
-    background: black;
-  }
-  .pre-loader-center {
-    align-items: center;
-    display: flex;
-    flex-direction: column;
-  }
-  .pre-loader-wrapper {
-    width: 50px;
-    height: 50px;
-    display: flex;
-    flex-wrap: wrap;
-  }
-  @for $i from 0 through 25 {
-    .loader-item:nth-child(#{$i}) {
-      @if $i % 2 == 0 {
-        animation-delay: #{$i * 50 * random(5)}ms;
-        animation-direction: reverse;
-      } @else {
-        animation-delay: #{$i * -50 * random(5)}ms;
-        animation-direction: alternate;
-      }
-    }
-  }
-  .loader-item {
-    animation: flickering 0.4s linear alternate infinite;
-  }
-  @keyframes flickering {
-    0% {
-      opacity: 1;
-    }
-    25% {
-      opacity: 1;
-    }
-    26% {
-      opacity: 0;
-    }
-    100% {
-      opacity: 0;
-    }
-  }
-}
-html.dark {
-  .pre-loader {
-    .loader-item {
-      background: white;
-    }
-  }
-}
@@ -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();
+      cy.getByTestId('node-url-custom').click({ force: true });
      cy.getByTestId('connect').should('be.disabled');
      cy.get("input[placeholder='https://']")
        .focus()
@@ -58,7 +58,7 @@ describe('Market trading page', () => {
      // 6002-MDET-003
      cy.getByTestId(marketSummaryBlock).within(() => {
        cy.getByTestId(marketPrice).within(() => {
-          cy.getByTestId(itemHeader).should('have.text', 'Price');
+          cy.getByTestId(itemHeader).should('have.text', 'Mark Price');
          cy.getByTestId(itemValue).should('not.be.empty');
        });
      });
@@ -1,28 +0,0 @@
-import { MarketState } from '@vegaprotocol/types';
-
-const oracleBannerDialogTrigger = 'oracle-banner-dialog-trigger';
-const oracleBannerStatus = 'oracle-banner-status';
-const oracleFullProfile = 'oracle-full-profile';
-
-describe('oracle information', { tags: '@smoke' }, () => {
-  before(() => {
-    cy.setOnBoardingViewed();
-    cy.mockTradingPage(
-      MarketState.STATE_ACTIVE,
-      undefined,
-      undefined,
-      'COMPROMISED'
-    );
-    cy.mockSubscription();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@Markets');
-  });
-
-  it('show oracle banner', () => {
-    cy.getByTestId(oracleBannerStatus).should('contain.text', 'COMPROMISED');
-    cy.getByTestId(oracleBannerDialogTrigger)
-      .should('contain.text', 'Show more')
-      .click();
-    cy.getByTestId(oracleFullProfile).should('exist');
-  });
-});
@@ -1,221 +0,0 @@
-import { checkSorting } from '@vegaprotocol/cypress';
-
-const dialogClose = 'dialog-close';
-
-describe('accounts', { tags: '@smoke' }, () => {
-  beforeEach(() => {
-    cy.mockTradingPage();
-    cy.mockWeb3Provider();
-    cy.mockSubscription();
-    cy.setVegaWallet();
-    cy.visit('/#/markets/market-0');
-  });
-
-  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'];
-    cy.getByTestId('usage-breakdown').within(($headers) => {
-      cy.wrap($headers)
-        .get('.ag-header-cell-text')
-        .each(($header, i) => {
-          cy.wrap($header).should('have.text', headers[i]);
-        });
-    });
-    cy.getByTestId(dialogClose).click();
-  });
-
-  describe('sorting by ag-grid columns should work well', () => {
-    before(() => {
-      const dialogs = Cypress.$('[data-testid="dialog-close"]:visible');
-      if (dialogs.length > 0) {
-        dialogs.each((btn) => {
-          cy.wrap(btn).click();
-        });
-      }
-      cy.contains('Loading...').should('not.exist');
-    });
-    // 7001-COLL-010
-    it('sorting by asset', () => {
-      cy.getByTestId('Collateral').click();
-      const marketsSortedDefault = ['tBTC', 'tEURO', 'tDAI', 'tBTC'];
-      const marketsSortedAsc = ['tBTC', 'tBTC', 'tDAI', 'tEURO'];
-      const marketsSortedDesc = Array.from(marketsSortedAsc).reverse();
-      checkSorting(
-        'asset.symbol',
-        marketsSortedDefault,
-        marketsSortedAsc,
-        marketsSortedDesc
-      );
-    });
-
-    it('sorting by total', () => {
-      cy.getByTestId('Collateral').click();
-      const marketsSortedDefault = [
-        '1,000.00002',
-        '1,000.01',
-        '1,000.00',
-        '1,000.00001',
-      ];
-      const marketsSortedAsc = [
-        '1,000.00',
-        '1,000.00001',
-        '1,000.00002',
-        '1,000.01',
-      ];
-      const marketsSortedDesc = Array.from(marketsSortedAsc).reverse();
-
-      checkSorting(
-        'total',
-        marketsSortedDefault,
-        marketsSortedAsc,
-        marketsSortedDesc
-      );
-    });
-
-    it('sorting by used', () => {
-      cy.getByTestId('Collateral').click();
-      // concat actual value with percentage value
-      // as cypress will pick up the entire cell contes
-      // textContent
-      const marketsSortedDefault = [
-        '0.00' + '0.00%',
-        '0.01' + '0.00%',
-        '0.00' + '0.00%',
-        '0.00' + '0.00%',
-      ];
-      const marketsSortedAsc = [
-        '0.00' + '0.00%',
-        '0.00' + '0.00%',
-        '0.00' + '0.00%',
-        '0.01' + '0.00%',
-      ];
-      const marketsSortedDesc = Array.from(marketsSortedAsc).reverse();
-      checkSorting(
-        'used',
-        marketsSortedDefault,
-        marketsSortedAsc,
-        marketsSortedDesc
-      );
-    });
-
-    it('sorting by available', () => {
-      cy.getByTestId('Collateral').click();
-      const marketsSortedDefault = [
-        '1,000.00002',
-        '1,000.00',
-        '1,000.00',
-        '1,000.00001',
-      ];
-      const marketsSortedAsc = [
-        '1,000.00',
-        '1,000.00',
-        '1,000.00001',
-        '1,000.00002',
-      ];
-      const marketsSortedDesc = Array.from(marketsSortedAsc).reverse();
-
-      checkSorting(
-        'available',
-        marketsSortedDefault,
-        marketsSortedAsc,
-        marketsSortedDesc
-      );
-    });
-  });
-});
@@ -1,106 +0,0 @@
-import * as Schema from '@vegaprotocol/types';
-import { mockConnectWallet } from '@vegaprotocol/cypress';
-import {
-  orderPriceField,
-  placeOrderBtn,
-  toggleLimit,
-  toggleLong,
-  toggleMarket,
-  toggleShort,
-} from '../support/deal-ticket';
-
-describe('deal ticket basics', { tags: '@smoke' }, () => {
-  before(() => {
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.clearAllLocalStorage();
-    cy.setOnBoardingViewed();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@Markets');
-  });
-
-  it('must show place order button and connect wallet if wallet is not connected', () => {
-    // 0003-WTXN-001
-    cy.getByTestId('connect-vega-wallet'); // Not connected
-    cy.getByTestId(placeOrderBtn).should('exist');
-    cy.getByTestId('order-connect-wallet').should('exist');
-  });
-
-  it('must be able to select order direction - long/short', function () {
-    // 7002-SORD-004
-    cy.getByTestId(toggleShort).click().next('input').should('be.checked');
-    cy.getByTestId(toggleLong).click().next('input').should('be.checked');
-  });
-
-  it('must be able to select order type - limit/market', function () {
-    // 7002-SORD-005
-    // 7002-SORD-006
-    // 7002-SORD-007
-    cy.getByTestId(toggleLimit).click().next('input').should('be.checked');
-    cy.getByTestId(toggleMarket).click().next('input').should('be.checked');
-  });
-
-  it('order connect vega wallet button should connect', () => {
-    mockConnectWallet();
-    cy.getByTestId(toggleLimit).click();
-    cy.getByTestId(orderPriceField).clear().type('101');
-    cy.getByTestId('order-connect-wallet').click();
-    cy.getByTestId('dialog-content').should('be.visible');
-    cy.getByTestId('connectors-list')
-      .find('[data-testid="connector-jsonRpc"]')
-      .click();
-    cy.wait('@walletReq');
-    cy.getByTestId(placeOrderBtn).should('be.visible');
-    cy.getByTestId(toggleLimit).next('input').should('be.checked');
-    cy.getByTestId(orderPriceField).should('have.value', '101');
-  });
-
-  it('sidebar should be open after reload', () => {
-    cy.mockTradingPage();
-    cy.getByTestId('deal-ticket-form').should('be.visible');
-    cy.getByTestId('Order').click();
-    cy.getByTestId('deal-ticket-form').should('not.exist');
-    cy.reload();
-    cy.getByTestId('deal-ticket-form').should('be.visible');
-  });
-});
-
-describe(
-  'market states not accepting orders',
-  { tags: '@smoke', testIsolation: true },
-  function () {
-    //7002-SORD-062
-    //7002-SORD-063
-    //7002-SORD-066
-
-    const states = [
-      Schema.MarketState.STATE_REJECTED,
-      Schema.MarketState.STATE_CANCELLED,
-      Schema.MarketState.STATE_CLOSED,
-      Schema.MarketState.STATE_SETTLED,
-      Schema.MarketState.STATE_TRADING_TERMINATED,
-    ];
-
-    states.forEach((marketState) => {
-      describe(marketState, function () {
-        beforeEach(function () {
-          cy.mockTradingPage(marketState);
-          cy.mockSubscription();
-          cy.setVegaWallet();
-          cy.visit('/#/markets/market-0');
-        });
-        it('must display that market is not accepting orders', function () {
-          cy.getByTestId('deal-ticket-error-message-summary').should(
-            'have.text',
-            `This market is ${marketState
-              .split('_')
-              .pop()
-              ?.toLowerCase()} and not accepting orders`
-          );
-          // 7002-SORD-060
-          cy.getByTestId('place-order').should('be.enabled');
-        });
-      });
-    });
-  }
-);
@@ -1,134 +0,0 @@
-import {
-  orderPriceField,
-  orderSizeField,
-  orderTIFDropDown,
-  placeOrderBtn,
-  toggleLimit,
-  toggleMarket,
-} from '../support/deal-ticket';
-
-describe('deal ticker order validation', { tags: '@smoke' }, () => {
-  before(() => {
-    cy.setVegaWallet();
-    cy.mockTradingPage();
-    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();
-      }
-    });
-  });
-
-  beforeEach(() => {
-    cy.mockTradingPage();
-    cy.getByTestId('deal-ticket-fee-margin-required').click();
-  });
-
-  describe('limit order', () => {
-    before(() => {
-      cy.getByTestId(toggleLimit).click();
-    });
-
-    it('must see the price unit', function () {
-      // 7002-SORD-018
-      cy.getByTestId(orderPriceField).next().should('have.text', 'DAI');
-    });
-
-    it('must see warning when placing an order with expiry date in past', () => {
-      const expiresAt = new Date(Date.now() - 24 * 60 * 60 * 1000);
-      const expiresAtInputValue = expiresAt.toISOString().substring(0, 16);
-      cy.getByTestId(toggleLimit).click();
-      cy.getByTestId(orderPriceField).clear().type('0.1');
-      cy.getByTestId(orderSizeField).clear().type('1');
-      cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_GTT');
-
-      cy.log('choosing yesterday');
-      cy.getByTestId('date-picker-field').type(expiresAtInputValue);
-
-      cy.getByTestId(placeOrderBtn).click();
-
-      cy.getByTestId('deal-ticket-error-message-expiry').should(
-        'have.text',
-        'The expiry date that you have entered appears to be in the past'
-      );
-    });
-
-    it('must see warning if price has too many digits after decimal place', function () {
-      // 7002-SORD-059
-      cy.getByTestId(toggleLimit).click();
-      cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_GTC');
-      cy.getByTestId(orderSizeField).clear().type('1');
-      cy.getByTestId(orderPriceField).clear().type('1.123456');
-      cy.getByTestId(placeOrderBtn).click();
-      cy.getByTestId('deal-ticket-error-message-price').should(
-        'have.text',
-        'Price accepts up to 5 decimal places'
-      );
-    });
-  });
-
-  describe('market order', () => {
-    before(() => {
-      cy.getByTestId(toggleMarket).click();
-      cy.getByTestId(placeOrderBtn).click();
-    });
-
-    it('must not see the price unit', function () {
-      // 7002-SORD-019
-      cy.getByTestId(orderPriceField).should('not.exist');
-    });
-
-    it('must warn if order size input has too many digits after the decimal place', function () {
-      // 7002-SORD-016
-      cy.getByTestId(orderSizeField).clear().type('1.234');
-      // 7002-SORD-060
-      cy.getByTestId(placeOrderBtn).should('be.enabled');
-      cy.getByTestId('deal-ticket-error-message-size').should(
-        'have.text',
-        'Size must be whole numbers for this market'
-      );
-    });
-
-    it('must warn if order size is set to 0', function () {
-      cy.getByTestId(orderSizeField).clear().type('0');
-      cy.getByTestId(placeOrderBtn).should('be.enabled');
-      cy.getByTestId('deal-ticket-error-message-size').should(
-        'have.text',
-        'Size cannot be lower than 1'
-      );
-    });
-
-    it('must have total margin available', () => {
-      // 7001-COLL-011
-      cy.getByTestId('deal-ticket-fee-total-margin-available').within(() => {
-        cy.get('[data-state="closed"]').should(
-          'have.text',
-          'Total margin available100.01 tDAI'
-        );
-      });
-      cy.getByTestId('deal-ticket-fee-margin-required').click();
-    });
-
-    it('must have current margin allocation', () => {
-      cy.getByTestId('deal-ticket-fee-current-margin-allocation').within(() => {
-        cy.get('[data-state="closed"]:first').should(
-          'have.text',
-          'Current margin allocation'
-        );
-      });
-      cy.getByTestId('deal-ticket-fee-margin-required').click();
-    });
-
-    it('should open usage breakdown dialog when clicked on current margin allocation', () => {
-      cy.getByTestId('deal-ticket-fee-current-margin-allocation').within(() => {
-        cy.get('button').click();
-      });
-      cy.getByTestId('usage-breakdown').should('exist');
-      cy.getByTestId('dialog-close').click();
-      cy.getByTestId('deal-ticket-fee-margin-required').click();
-    });
-  });
-});
@@ -1,186 +0,0 @@
-import {
-  TIFlist,
-  orderTIFDropDown,
-  toggleLimit,
-  toggleMarket,
-} from '../support/deal-ticket';
-
-const tooltipContent = 'tooltip-content';
-const reduceOnly = 'reduce-only';
-const postOnly = 'post-only';
-
-describe('time in force validation', { tags: '@smoke' }, () => {
-  before(() => {
-    cy.setVegaWallet();
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.clearAllLocalStorage();
-    cy.setOnBoardingViewed();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@Markets');
-  });
-
-  it('must have market order set up to IOC by default', function () {
-    // 7002-SORD-030
-    cy.getByTestId(toggleMarket).click();
-    cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-      'have.text',
-      TIFlist.filter((item) => item.code === 'IOC')[0].text
-    );
-  });
-
-  it('must have time in force set to GTC for limit order', function () {
-    // 7002-SORD-031
-    cy.getByTestId(toggleLimit).click();
-    cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-      'have.text',
-      TIFlist.filter((item) => item.code === 'GTC')[0].text
-    );
-  });
-
-  it('selections should be remembered', () => {
-    cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_GTT');
-    cy.getByTestId(toggleMarket).click();
-    cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-      'have.text',
-      TIFlist.filter((item) => item.code === 'IOC')[0].text
-    );
-    cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_FOK');
-    cy.getByTestId(toggleLimit).click();
-    cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-      'have.text',
-      TIFlist.filter((item) => item.code === 'GTT')[0].text
-    );
-    cy.getByTestId(toggleMarket).click();
-    cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-      'have.text',
-      TIFlist.filter((item) => item.code === 'FOK')[0].text
-    );
-  });
-
-  describe('limit order', () => {
-    before(() => {
-      cy.getByTestId(toggleLimit).click();
-    });
-    const validTIF = TIFlist;
-    validTIF.forEach((tif) => {
-      // 7002-SORD-023
-      // 7002-SORD-024
-      // 7002-SORD-025
-      // 7002-SORD-026
-      // 7002-SORD-027
-      // 7002-SORD-028
-
-      it(`must be able to select ${tif.code}`, function () {
-        cy.getByTestId(orderTIFDropDown).select(tif.value);
-        cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-          'have.text',
-          tif.text
-        );
-      });
-    });
-  });
-
-  describe('market order', () => {
-    before(() => {
-      cy.getByTestId(toggleMarket).click();
-    });
-
-    const validTIF = TIFlist.filter((tif) => ['FOK', 'IOC'].includes(tif.code));
-    const invalidTIF = TIFlist.filter(
-      (tif) => !['FOK', 'IOC'].includes(tif.code)
-    );
-
-    validTIF.forEach((tif) => {
-      // 7002-SORD-025
-      // 7002-SORD-026
-
-      it(`must be able to select ${tif.code}`, function () {
-        cy.getByTestId(orderTIFDropDown).select(tif.value);
-        cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-          'have.text',
-          tif.text
-        );
-      });
-    });
-
-    invalidTIF.forEach((tif) => {
-      // 7002-SORD-023
-      // 7002-SORD-024
-      // 7002-SORD-027
-      // 7002-SORD-028
-      it(`must not be able to select ${tif.code}`, function () {
-        cy.getByTestId(orderTIFDropDown).should('not.contain', tif.text);
-      });
-    });
-  });
-
-  describe('post and reduce - market order', () => {
-    before(() => {
-      cy.getByTestId(toggleMarket).click();
-    });
-
-    const validTIF = TIFlist.filter((tif) => ['FOK', 'IOC'].includes(tif.code));
-
-    validTIF.forEach((tif) => {
-      // 7002-SORD-025
-      // 7002-SORD-026
-
-      it(`post and reduce order market for ${tif.code}`, function () {
-        // 7003-SORD-054
-        // 7003-SORD-055
-        // 7003-SORD-056
-        // 7003-SORD-057
-
-        cy.getByTestId(orderTIFDropDown).select(tif.value);
-        cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-          'have.text',
-          tif.text
-        );
-        cy.getByTestId(postOnly).should('be.disabled');
-        cy.getByTestId(reduceOnly).should('be.enabled');
-      });
-    });
-  });
-
-  describe('post and reduce - limit order', () => {
-    before(() => {
-      cy.getByTestId(toggleLimit).click();
-    });
-
-    const validTIFLimit = TIFlist.filter((tif) =>
-      ['GFA', 'GFN', 'GTC', 'GTT'].includes(tif.code)
-    );
-
-    validTIFLimit.forEach((tif) => {
-      it(`post and reduce order for limit ${tif.code}`, function () {
-        // 7003-SORD-054
-        // 7003-SORD-055
-        // 7003-SORD-056
-        // 7003-SORD-057
-        cy.getByTestId(orderTIFDropDown).select(tif.value);
-        cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-          'have.text',
-          tif.text
-        );
-        cy.getByTestId(postOnly).should('be.enabled');
-        cy.getByTestId(reduceOnly).should('be.disabled');
-      });
-    });
-    it(`can see explanation of what post only and reduce only is/does`, function () {
-      // 7003-SORD-058
-      cy.get('[for="post-only"]').should('have.text', 'Post only').realHover();
-      cy.getByTestId(tooltipContent).should(
-        'contain.text',
-        `"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.`
-      );
-      cy.get('[for="reduce-only"]')
-        .should('have.text', 'Reduce only')
-        .realHover();
-      cy.getByTestId(tooltipContent).should(
-        'contain.text',
-        `"Reduce only" can be used only with non-persistent orders, such as "Fill or Kill" or "Immediate or Cancel".`
-      );
-    });
-  });
-});
@@ -9,7 +9,7 @@ import {
  testOrderAmendment,
 } from '../support/order-validation';

-const orderSymbol = 'market.tradableInstrument.instrument.code';
+const orderSymbol = 'instrument-code';
 const orderSize = 'size';
 const orderType = 'type';
 const orderStatus = 'status';
@@ -229,10 +229,7 @@ describe('subscribe orders', { tags: '@smoke' }, () => {
      status: Schema.OrderStatus.STATUS_FILLED,
    });
    cy.getByTestId(`order-status-${orderId}`).should('have.text', 'Filled');
-    cy.get('[col-id="market.tradableInstrument.instrument.code"]').contains(
-      '[title="Future"]',
-      'Futr'
-    );
+    cy.get(`[col-id="${orderSymbol}"]`).contains('[title="Future"]', 'Futr');
  });

  it('must see a rejected order', () => {
@@ -1,25 +0,0 @@
-import { aliasGQLQuery } from '@vegaprotocol/cypress';
-import { partyAssetsQuery } from '@vegaprotocol/mock';
-
-describe('Portfolio page', { tags: '@smoke' }, () => {
-  beforeEach(() => {
-    cy.mockGQL((req) => {
-      aliasGQLQuery(req, 'PartyAssets', partyAssetsQuery());
-    });
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.setVegaWallet();
-  });
-  describe('Ledger entries', () => {
-    it('Download form should be properly rendered', () => {
-      // 7007-LEEN-001
-      cy.visit('/#/portfolio');
-      cy.getByTestId('"Ledger entries"').click();
-      cy.getByTestId('tab-ledger-entries').within(($headers) => {
-        cy.wrap($headers)
-          .getByTestId('ledger-download-button')
-          .should('be.visible');
-      });
-    });
-  });
-});
@@ -1,94 +0,0 @@
-const colHeader = '.ag-header-cell-text';
-const colIdPrice = '[col-id=price]';
-const colIdSize = '[col-id=size]';
-const colIdCreatedAt = '[col-id=createdAt]';
-const tradesTab = 'Trades';
-const tradesTable = 'tab-trades';
-
-describe('trades', { tags: '@smoke' }, () => {
-  before(() => {
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.setOnBoardingViewed();
-    cy.intercept('POST', '/graphql', (req) => {
-      if (req.body.operationName === 'Trades') {
-        req.alias = '@Trades';
-      }
-    });
-    cy.visit('/#/markets/market-0');
-    cy.getByTestId(tradesTab).click();
-    cy.wait('@Trades');
-  });
-
-  it('show trades', () => {
-    // 6005-THIS-001
-    // 6005-THIS-002
-    cy.getByTestId(tradesTab).should('be.visible');
-    cy.getByTestId(tradesTable).should('be.visible');
-    cy.getByTestId(tradesTable).should('not.be.empty');
-  });
-
-  it('show trades prices', () => {
-    // 6005-THIS-003
-    cy.getByTestId(tradesTable)
-      .get(`${colIdPrice} ${colHeader}`)
-      .first()
-      .should('have.text', 'Price');
-    cy.getByTestId(tradesTable)
-      .get(colIdPrice)
-      .each(($tradePrice) => {
-        cy.wrap($tradePrice).invoke('text').should('not.be.empty');
-      });
-  });
-
-  it('show trades sizes', () => {
-    // 6005-THIS-004
-    cy.getByTestId(tradesTable)
-      .get(`${colIdSize} ${colHeader}`)
-      .first()
-      .should('have.text', 'Size');
-    cy.getByTestId(tradesTable)
-      .get(colIdSize)
-      .each(($tradeSize) => {
-        cy.wrap($tradeSize).invoke('text').should('not.be.empty');
-      });
-  });
-
-  it('show trades date and time', () => {
-    // 6005-THIS-005
-    cy.getByTestId(tradesTable) // order table shares identical col id
-      .find(`${colIdCreatedAt} ${colHeader}`)
-      .should('have.text', 'Created at');
-    const dateTimeRegex = /(\d{1,2}):(\d{1,2}):(\d{1,2})/gm;
-    cy.getByTestId(tradesTable)
-      .get(`.ag-center-cols-container ${colIdCreatedAt}`)
-      .each(($tradeDateTime) => {
-        cy.wrap($tradeDateTime).invoke('text').should('match', dateTimeRegex);
-      });
-  });
-
-  it('trades are sorted descending by datetime', () => {
-    // 6005-THIS-006
-    const dateTimes: Date[] = [];
-    cy.getByTestId(tradesTable)
-      .find(colIdCreatedAt)
-      .each(($tradeDateTime, index) => {
-        if (index != 0) {
-          //ignore header
-          dateTimes.push(new Date($tradeDateTime.text()));
-        }
-      })
-      .then(() => {
-        expect(dateTimes).to.deep.equal(
-          dateTimes.sort((a, b) => b.getTime() - a.getTime())
-        );
-      });
-  });
-
-  it('copy price to deal ticket form', () => {
-    // 6005-THIS-007
-    cy.getByTestId('order-type-Limit').click();
-    cy.get(colIdPrice).last().should('be.visible').click();
-    cy.getByTestId('order-price').should('have.value', '171.16898');
-  });
-});
@@ -1,92 +1,11 @@
 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.skip(
-  'account validation',
+describe(
+  'vega wallet - prompt',
  { 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(() => {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Matthew Russell	d353f24f01	chore: fix lint	2023-10-12 16:22:30 -07:00
Matthew Russell	5755347a31	feat: make animation delay negative so it starts immediately	2023-10-12 16:21:06 -07:00
Matthew Russell	ade1dff30d	chore: add ssr-loader component	2023-10-12 15:33:24 -07:00
Matthew Russell	5ca65260c9	chore: remove link of preloader styles	2023-10-12 15:21:59 -07:00
Matthew Russell	c276106cfc	chore: delete pre-loader styles and classes	2023-10-12 14:59:25 -07:00
Matthew Russell	a1ec426a6e	chore: rename app-loader to bootstrapper to avoid confusion	2023-10-12 14:53:35 -07:00
Matthew Russell	e20202f895	feat: add app loader component	2023-10-12 14:51:46 -07:00
Joe Tsanganddaro-maj	58cc074538	test(governance): governance transfer proposal tests (#5011 ) Co-authored-by: daro-maj <119658839+daro-maj@users.noreply.github.com>	2023-10-12 18:48:39 +02:00
Bartłomiej Głownia	852c9bb8f4	feat(trading): display fees discounts (#4800 )	2023-10-12 16:58:57 +02:00
Maciek	efe9b7a0e7	chore(trading): upgrade pennant version (#5023 )	2023-10-12 13:18:17 +00:00
daro-maj	695a059dde	test(trading): add funding spec (#5028 )	2023-10-12 11:58:32 +01:00
Maciek	5d7e4d273a	chore(trading): add timezone note to the ledger entries form (#5018 )	2023-10-12 09:12:54 +00:00
Sam Keen	b137e024c6	feat(governance): volume discount proposals (#5022 )	2023-10-11 18:51:52 +00:00
Ben	6651ee52b4	chore(trading): oracle banner test (#5020 )	2023-10-11 15:54:26 +01:00
m.rayandRado	0d14722c5d	feat(trading): add risk factors leverage and update accordion panel (#5000 ) Co-authored-by: Rado <szpiechrados@gmail.com>	2023-10-11 10:19:43 +01:00
Sam Keen	4968b537b8	feat(governance): referral proposals (#5013 )	2023-10-11 09:11:35 +00:00
Bartłomiej Głownia	5f5c45f3b9	feat(trading): display empty values for funding and countdown if perp market is in auction (#4987 )	2023-10-10 16:59:31 +01:00
MaciekandMatthew Russell	6b10df015d	feat(trading): 4387 market terminate warning banner (#4912 ) Co-authored-by: Matthew Russell <mattrussell36@gmail.com>	2023-10-10 17:50:49 +02:00
Ben	6d7e24732b	chore(trading): transfer form test to jest (#5010 )	2023-10-10 14:37:06 +01:00
Matthew Russell	b33cf04e16	fix(trading): flickering of market loading (#5006 )	2023-10-10 14:20:27 +01:00
Ben	66ebb26b0f	chore(trading): deal ticket tif tests (#5009 )	2023-10-10 13:05:02 +01:00
Ben	51c88d2fce	chore(trading): move trades tests to jest (#5001 )	2023-10-10 11:13:23 +01:00
daro-maj	2786a984b0	test(trading): remove portfolio test (#5007 )	2023-10-10 10:02:09 +01:00
Maciek	39c53a7326	chore(trading): 4858 redesign market header (#4976 )	2023-10-10 10:45:09 +02:00
Radosław Szpiech	3371e8e2cc	Merge pull request #5004 from vegaprotocol/chore/fix-multiline-condition chore(ci): merge main fixes to develop	2023-10-10 10:17:49 +02:00
Rado	5843a36851	Merge remote-tracking branch 'origin/main' into chore/fix-multiline-condition	2023-10-09 17:29:36 +02:00
Radosław Szpiech	68b4909dff	chore(ci): fix badly written condition in workflow (#5002 )	2023-10-09 17:24:18 +02:00
Bartłomiej Głownia	da8e382454	feat(trading): add funding payment history (#4989 )	2023-10-09 16:59:00 +02:00
Ben daro-maj Bartłomiej Głownia Mikołaj Młodzikowski	81ebefc329	chore(trading): accounts test to jest (#4984 ) Co-authored-by: daro-maj <119658839+daro-maj@users.noreply.github.com> Co-authored-by: Bartłomiej Głownia <bglownia@gmail.com> Co-authored-by: Mikołaj Młodzikowski <mikolaj.mlodzikowski@gmail.com>	2023-10-09 10:09:10 +01:00
Bartłomiej Głownia	1ed7d6fda2	feat(positions): add closed markets filter to positions in portfolio (#4982 )	2023-10-09 08:28:21 +02:00
Radosław Szpiech	a2e4f34b0d	Merge pull request #4996 from vegaprotocol/chore/update-develop chore(ci): merge main changes to develop	2023-10-06 16:43:05 +02:00
Rado	3a1bb855aa	Merge remote-tracking branch 'origin/main' into chore/update-develop	2023-10-06 16:14:09 +02:00
Radosław Szpiech	b4ca0a8390	chore(ci): run console-test on PR again (#4995 )	2023-10-06 16:12:13 +02:00
Radosław Szpiech	349c790ecc	Merge pull request #4993 from vegaprotocol/chore/update-develop-with-main chore(ci,governance): update develop with latest main changes	2023-10-06 13:52:19 +02:00
Rado	4c8a15cc01	chore(governance): merge main	2023-10-06 12:57:32 +02:00
Radosław Szpiech	f433a030ff	chore(ci): separate export docker image job in console-test workflow (#4980 )	2023-10-06 10:47:38 +00:00
Joe Tsang	63a6e4ecbd	chore(governance): fix failing link test (#4990 )	2023-10-06 12:00:21 +02:00
Joe Tsang	555f6e2a6d	chore(explorer): fix failing market test (#4992 )	2023-10-06 11:20:12 +02:00
Matthew Russell	c116762865	fix(trading,wallet): set version for vega snap (#4991 )	2023-10-05 14:18:40 -04:00
Joe Tsang	b47bd49e83	test(governance): skip staking test (#4974 )	2023-10-05 14:22:08 +00:00
Ben	4b942cfb7d	chore(ci): add release label on release (#4985 )	2023-10-05 13:28:24 +01:00
Mikołaj Młodzikowski	c27443fc13	feat(ci): add workflow to clean up caches on closed PRs (#4988 )	2023-10-05 12:46:22 +02:00
Bartłomiej Głownia	6dbde76c84	chore(wallet): remove dependency on apollo from wallet lib (#4814 )	2023-10-05 11:25:54 +02:00
daro-maj	f4abd7cef5	test(trading): remove account test (#4983 )	2023-10-05 10:05:02 +02:00
Bartłomiej Głownia	3b978118dc	feat(deal-ticket): fix margin and fees alignment (#4956 )	2023-10-05 07:40:25 +02:00
Ben	bb4cc1e51d	chore(trading): set default sort order (#4978 )	2023-10-05 00:12:47 +01:00
Bartłomiej Głownia	797db6ee93	feat(ui-toolkit): increase checkbox and radio clickable area (#4906 )	2023-10-04 12:50:02 +02:00
Radosław Szpiech	6e7b87d9ef	Merge pull request #4972 from vegaprotocol/chore/merge-main-pull-requests chore(trading): merge main to develop	2023-10-04 12:02:11 +02:00
Madalina Raicu	6965bdf0ca	chore: remove closed markets	2023-10-03 18:40:36 +01:00
Madalina Raicu	f4d46efff5	Merge branch 'main' of github.com:vegaprotocol/frontend-monorepo into chore/merge-main-pull-requests	2023-10-03 18:21:10 +01:00
Art	d510330c6b	feat(governance): governance transfers (#4411 )	2023-10-03 15:35:17 +00:00
Ben	5b5765ef63	chore(trading): add accounts jest test (#4962 )	2023-10-03 15:16:24 +00:00
Bartłomiej Głownia	283f654a4c	chore(trading): upgrade pennant (#4967 )	2023-10-03 13:00:35 +01:00
Radosław Szpiech	6945514b49	chore(ci): quotes and double brackets change (#4965 )	2023-10-03 12:57:17 +01:00
Maciek	f74687d30c	chore(trading): 4947 cant view settled market main (#4964 )	2023-10-03 12:31:05 +01:00
m.ray	2a7574bd8e	fix(governance): add wallet connect project ID (#4966 )	2023-10-03 12:30:24 +01:00
Matthew RussellandMadalina Raicu	872f1d300f	fix(wallet): dont show error state if user rejects connection (#4901 ) Co-authored-by: Madalina Raicu <madalina@raygroup.uk>	2023-10-03 12:21:19 +01:00
Mikołaj Młodzikowski	600ea0eeab	Revert "Update Jenkinsfile" This reverts commit `7c3f7a7ab1`.	2023-10-03 12:30:39 +02:00
Mikołaj Młodzikowski	7c3f7a7ab1	Update Jenkinsfile feat(ci): check jenkins execution	2023-10-03 12:15:03 +02:00
Maciek	539abce8af	chore(trading): cant view settled market (#4958 )	2023-10-03 11:08:30 +01:00
Bartłomiej Głownia	60ca6c2eb6	feat(trading): show fills for all markets (#4951 )	2023-10-03 11:00:26 +01:00
Art	eeff4ffcd4	fix(trading): missing wallet connect button (#4960 )	2023-10-03 10:53:32 +01:00
Radosław Szpiech	73ae00f12c	chore(ci): add missing quote marks that may have caused some workflow fails (#4963 )	2023-10-03 10:44:12 +01:00
Art	ee73e4d5e2	fix(trading): missing wallet connect button (#4959 )	2023-10-03 10:38:37 +01:00
Joe Tsang	14928d318d	chore(governance): add e2e tests for market update proposals (#4945 )	2023-10-02 20:50:47 +01:00
m.ray	a19ea1c939	fix(trading): update filter for market selector to include suspended via governance (#4957 )	2023-10-02 18:00:49 +01:00
m.rayandMatthew Russell	c65c296db2	feat(trading): ethereum oracle spec in oracle panels (#4914 ) Co-authored-by: Matthew Russell <mattrussell36@gmail.com>	2023-10-02 17:48:12 +01:00
Maciek	6c5cd85d96	fix(deal-ticket): prevent empty call estimate position (#4950 )	2023-10-02 18:26:10 +02:00
m.ray	8efadda98c	fix(trading): remove market value proxy and formatting (#4916 )	2023-10-02 16:00:55 +01:00
Maciek	0872a14f44	feat(positions): close position with max possible size (#4940 )	2023-10-02 16:38:22 +02:00
Radosław Szpiech	8b249e1917	chore(ci): fix some minor issues in workflows (#4953 )	2023-10-02 16:12:24 +02:00
Ben	13817e4d57	chore(trading): delete duplicate asset details test (#4954 )	2023-10-02 13:57:54 +00:00
Radosław Szpiech	abb771e2f9	chore(ci): add conditions to run e2e tests (#4946 )	2023-10-02 14:29:59 +02:00
Edd	acf1d50d0f	chore(explorer): ignore errors on oracle page (#4944 )	2023-09-29 17:29:16 +01:00
Matthew Russell	9da704c117	Merge pull request #4943 from vegaprotocol/chore/merge-main chore(ci): merge main to develop	2023-09-29 12:11:25 -04:00
Rado	d262650258	chore: merge main to develop	2023-09-29 17:46:20 +02:00
Radosław Szpiech	30da1663eb	chore(ci): add main develop merge condition to runner (#4941 )	2023-09-29 17:36:18 +02:00
Radosław Szpiech	79cbe62774	chore(ci): add mainnet compatible runner to release mainnet branch push actions (#4939 )	2023-09-29 11:00:20 -04:00
Matthew Russell	df11401b69	Merge pull request #4932 from vegaprotocol/main chore(ci,trading): update develop with mainnet fixes	2023-09-29 10:33:42 -04:00
Maciek	2f0be0bf34	chore(trading): 4774 put connect dialog inside onboarding dialog - main branch (#4920 )	2023-09-29 15:07:18 +02:00
Radosław Szpiech	5b5802104e	chore(ci): trigger lint-pr on repoened and sync (#4937 )	2023-09-29 15:03:58 +02:00
Radosław Szpiech	3a149ddfb2	chore(ci): add mainnet compatible runner to release mainnet branch push actions (#4936 )	2023-09-29 14:01:04 +02:00
Sam Keen	0e519f4d0e	feat(governance): market state update proposals (#4935 )	2023-09-29 10:11:02 +01:00
Maciek	ff2e2574f6	chore(trading): add handle of autosizing selected columns - main branch (#4888 )	2023-09-28 15:14:32 -04:00
Joe Tsang	9b52cecf21	chore(governance): remove explorer market diff test (#4928 )	2023-09-28 17:24:05 +01:00
Radosław Szpiech	478cc9e753	chore(ci): publish main image in dockerhub (#4930 )	2023-09-28 17:38:00 +02:00
Ben	18f1fbd56d	chore(trading): deal ticket order tests move (#4927 )	2023-09-28 17:16:00 +02:00
Matthew Russell	ccb22f02c3	chore(ci): fix conflict in vegacapsule genesis file	2023-09-28 10:44:22 -04:00
Radosław Szpiech	015d8f51c0	chore(ci): sync main to develop (#4924 )	2023-09-28 14:43:02 +02:00
Radosław Szpiech	e2a72cb395	chore(ci): separate lint pr (main) (#4917 )	2023-09-28 14:01:36 +02:00
Radosław Szpiech	0669696b6f	chore(ci): fix node version (develop) (#4910 )	2023-09-28 13:30:50 +02:00
Joe Tsang	56c662e5ba	test(governance): perpetual market e2e test (#4892 )	2023-09-28 11:35:46 +02:00
Radosław Szpiech	7fe269fad6	chore(ci): fix node version (main) (#4911 )	2023-09-28 11:26:15 +02:00
Radosław Szpiech	b761023069	chore(ci): add logic for choosing correct runner for cypress tests depending on base branch (#4918 )	2023-09-28 11:25:44 +02:00
Radosław Szpiech	7453acd632	chore(trading): separate workflow for lint-pr (#4904 )	2023-09-27 14:44:57 -04:00
Sam Keen	1f507facba	feat(governance): show perp or future pills (#4863 )	2023-09-27 14:55:43 +01:00
Radosław Szpiech	9d6b34963a	chore(trading): add possibility to manualy trigger console-test (#4899 ) (#4908 )	2023-09-27 15:46:49 +02:00
Radosław Szpiech	7ac3a68ac9	chore(trading): add possibility to manualy trigger console-test (#4899 )	2023-09-27 15:18:32 +02:00
Radosław Szpiech	2640ccb20a	chore(trading): change runner for mainnet compatible vega version (#4907 )	2023-09-27 14:42:12 +02:00
Matthew Russell	77c0894501	Merge pull request #4905 from vegaprotocol/chore/update-develop-with-mainnet-fixes chore(trading,deal-ticket,market-depth,ci): update develop with mainnet fixes	2023-09-26 16:30:10 -04:00
Matthew Russell	60d7cf3029	Merge branch 'main' into chore/update-develop-with-mainnet-fixes	2023-09-26 15:06:07 -04:00
Matthew Russell	2b8abde938	Merge pull request #4880 from vegaprotocol/chore/update-develop-with-mainnet-fixes chore(trading,governance): update develop with mainnet fixes	2023-09-26 14:06:20 -04:00
Matthew Russell	2005f19d50	fix(trading): prevent deposit sidebar showing on corresponding standalone page (#4840 )	2023-09-26 13:47:47 -04:00
Maciek	d78de10855	chore(trading): remove underlines on tooltips (#4884 )	2023-09-26 13:45:33 -04:00
Matthew Russell	bb402c02f6	chore(trading): make volume bars color match candle color (#4881 )	2023-09-26 12:08:12 -04:00
Bartłomiej Głownia	8a9b1c7874	feat(deal-ticket): amend fee estimates for postOnly orders and when market is in auction (#4843 )	2023-09-26 11:57:47 -04:00
Matthew Russell	a7e8b0eb01	fix(market-depth): ensure scroll bar doesn't show on orderbook (#4882 )	2023-09-26 11:54:42 -04:00
Bartłomiej Głownia	89b3c06107	feat(deal-ticket): show worst case instead of ranges in estimated values (#4870 )	2023-09-26 11:53:45 -04:00
Radosław Szpiech	cd5c73d3fd	chore(trading): temporary disable console-test to unblock CI queue (#4885 )	2023-09-26 10:45:27 +01:00
Joe Tsang	b3a5ab022d	chore(ci): update genesis file (#4887 )	2023-09-26 10:44:55 +01:00
Matthew Russell	ba438549bc	Merge branch 'main' into chore/update-develop-with-mainnet-fixes	2023-09-25 21:30:40 -04:00
Mikołaj Młodzikowski	496d1f5c68	feat(ci): parse if there are any changes	2023-09-25 18:10:01 -04:00
Mikołaj Młodzikowski	e914e7bb70	fix(ci): provide proper ipfs process	2023-09-25 18:09:31 -04:00
Matthew Russell	71a36c2382	fix(trading): remove upgrade banner [main] (#4877 )	2023-09-25 17:27:01 -04:00
Matthew Russell	1c6a307bcd	fix(wallet): reduce time to check for wallet running [main] (#4876 )	2023-09-25 17:26:40 -04:00
Matthew Russell	ef4a740b91	fix(trading): allotment breaking [main] (#4875 )	2023-09-25 17:26:06 -04:00
m.ray Matthew Russell candida-d Bartłomiej Głownia Joe Tsang Joe	a6303456c5	feat(trading): liquidity SLA in market info (#4649 ) Co-authored-by: Matthew Russell <mattrussell36@gmail.com> Co-authored-by: candida-d <62548908+candida-d@users.noreply.github.com> Co-authored-by: Bartłomiej Głownia <bglownia@gmail.com> Co-authored-by: Joe Tsang <30622993+jtsang586@users.noreply.github.com> Co-authored-by: Joe <joe@vega.xyz>	2023-09-25 14:44:55 +01:00
Sam Keen	2d4be5fcb3	fix(governance): mainnet rewards query looping (#4865 )	2023-09-25 09:59:38 +00:00
Sam Keen	9cbd6baccd	fix(governance): removed loop caused by rewards epoch refresh (#4864 )	2023-09-25 09:34:47 +00:00
Maciek	525773773a	chore(trading): 4811 make market table columns resizable (#4856 )	2023-09-25 10:14:18 +02:00
Ben	45d6f43e74	chore(trading): deal ticket test to jest (#4842 )	2023-09-22 15:25:50 +01:00
Art	41760f2956	chore(trading): disable apply code when applied (#4855 )	2023-09-22 12:06:02 +01:00
m.rayandMatthew Russell	835f2b793f	chore(trading): remove static assets console coming from vega.xyz (#4825 ) Co-authored-by: Matthew Russell <mattrussell36@gmail.com>	2023-09-19 23:54:07 -07:00
Matthew Russell	d50b988b4a	Merge branch 'release/mainnet-trading' of github.com:vegaprotocol/frontend-monorepo into release/mainnet-trading	2023-09-18 09:03:44 -07:00
Madalina Raicu	a6aec899c8	chore: update tag metamask snaps to true	2023-09-18 15:08:46 +01:00
				`@@ -0,0 +1 @@`
				`export * from './proposal-referral-program-details';`
				`@@ -0,0 +1 @@`
				`export * from './proposal-update-market-state';`
				`@@ -0,0 +1 @@`
				`export * from './proposal-volume-discount-program-details';`