chore: remove stray log

fix: deposit loading state
feat(deal-ticket): improve no collateral validation (#4122 )
2023-06-20 08:33:42 -07:00 · 2023-06-20 08:33:19 -07:00 · 2023-06-20 08:31:52 -07:00 · 2023-06-20 16:32:27 +02:00 · 2023-06-20 16:17:13 +02:00 · 2023-06-20 14:49:39 +02:00
311 changed files with 9859 additions and 7493 deletions
@@ -14,8 +14,7 @@ What we need to achieve and who for

 ## Tasks

- [ ] What do we need to do first
- [ ] and then what?
- [ ] Etc.
+- [ ]
+- [ ]

 ## Additional details / background info
@@ -22,11 +22,14 @@ So that

 ## Tasks

- [ ] Explore and sketch
+- [ ] UX (if needed)
+- [ ] Design (if needed)
 - [ ] Team and stakeholder review
- [ ] Visual Design
- [ ] Team review
- [ ] Etc.
+- [ ] Specs reviewed and created or adjusted
+- [ ] Implementation
+- [ ] Testing (unit and/or e2e)
+- [ ] Code review
+- [ ] QA review

 ## Sketch

@@ -9,6 +9,11 @@ jobs:
    runs-on: ubuntu-22.04
    timeout-minutes: 30
    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v2

@@ -27,14 +32,16 @@ jobs:

      - name: resolve ipfs hashes for release
        run: |
-          echo "Tag name: ${{ github.event.release.tag_name }}"
          echo "Name: ${{ github.event.release.name }}"
          echo "Description: ${{ github.event.release.body }}"
-          until docker pull vegaprotocol/trading:${{ github.event.release.tag_name }}; do
+          echo "Tag: ${{ github.event.release.tag_name }}"
+          commit="$(git rev-list -n 1 ${{ github.event.release.tag_name }})"
+          echo "Commit: $commit"
+          until docker pull vegaprotocol/trading:$commit; do
            echo "Image not pushed yet, waiting 60 seconds"
            sleep 60
          done
-          docker run --rm vegaprotocol/trading:${{ github.event.release.tag_name }} cat /ipfs-hash > ipfs-hash
+          docker run --rm vegaprotocol/trading:$commit cat /ipfs-hash > ipfs-hash
          curl -L https://dist.ipfs.tech/kubo/v0.20.0/kubo_v0.20.0_linux-amd64.tar.gz -o kubo.tgz
          tar -xzf kubo.tgz
          export PATH="$PATH:$PWD/kubo"
@@ -56,12 +63,12 @@ jobs:
            * https://governance.vega.xyz

            # IPFS releases
-            Tye IPFS hash of this release of the Trading app is:
+            The IPFS hash of this release of the Trading app is:

            CIDv0: ${{ env.IPFS_V0 }}
            CIDv1: ${{ env.IPFS_V1 }}

-            You can always access the latest IPFS release by visiting [vega.trading](https://console.vega.xyz).
+            You can always access the latest IPFS release by visiting [console.vega.xyz](https://console.vega.xyz).

            You can also access Trading directly from an IPFS gateway.
            BEWARE: The Trading interface uses [localStorage](https://developer.mozilla.org/en-US/docs/Web/API/Window/localStorage) to remember your settings, such as which tokens you have imported. You should always use an IPFS gateway that enforces [origin separation](https://ipfs.github.io/public-gateway-checker/).
@@ -6,8 +6,6 @@ on:
      - release/*
      - develop
      - main
-    tags:
-      - v*
  pull_request:
    types:
      - opened
@@ -113,15 +111,19 @@ jobs:
          preview_governance="not deployed"
          preview_trading="not deployed"
          preview_explorer="not deployed"
-          if [[ $affected == *"governance"* ]]; then
+          preview_tools="not deployed"
+          if echo "$affected" | grep -q governance; then
+            echo "Governance is affected"
            projects_e2e+='"governance-e2e" '
            preview_governance=$(printf "https://%s.%s.vega.rocks" "governance" "$branch_slug")
          fi
-          if [[ $affected == *"trading"* ]]; then
+          if echo "$affected" | grep -q trading; then
+            echo "Trading is affected"
            projects_e2e+='"trading-e2e" '
            preview_trading=$(printf "https://%s.%s.vega.rocks" "trading" "$branch_slug")
          fi
-          if [[ $affected == *"explorer"* ]]; then
+          if echo "$affected" | grep -q explorer; then
+            echo "Explorer is affected"
            projects_e2e+='"explorer-e2e" '
            preview_explorer=$(printf "https://%s.%s.vega.rocks" "explorer" "$branch_slug")
          fi
@@ -131,13 +133,43 @@ jobs:
            preview_trading=$(printf "https://%s.%s.vega.rocks" "trading" "$branch_slug")
            preview_explorer=$(printf "https://%s.%s.vega.rocks" "explorer" "$branch_slug")
          fi
+          projects="$(echo $projects_e2e | sed 's|-e2e||g')"
+          if [[ "${{ github.event_name }}" = "pull_request" ]]; then
+            if echo "$affected" | grep -q multisig-signer; then
+              echo "Tools are affected"
+              # tools are only applicable to check previews or deploy from develop to mainnet
+              echo "Deploying tools on preview"
+              preview_tools=$(printf "https://%s.%s.vega.rocks" "tools" "$branch_slug")
+              projects+=' "multisig-signer" '
+            fi
+          elif [[ "${{ github.ref }}" =~ .*develop$ ]]; then
+            if echo "$affected" | grep -q multisig-signer; then
+              echo "Tools are affected"
+              # tools are only applicable to check previews or deploy from develop to mainnet
+              echo "Deploying tools on s3"
+              projects+=' "multisig-signer" '
+            fi
+            if echo "$affected" | grep -q static; then
+              echo "static is affected"
+              echo "Deploying static on s3"
+              projects+=' "static" '
+            fi
+            if echo "$affected" | grep -q ui-toolkit; then
+              echo "ui-toolkit is affected"
+              echo "Deploying ui-toolkit on s3"
+              projects+=' "ui-toolkit" '
+            fi
+          fi
+
          projects_e2e=${projects_e2e%?}
          projects_e2e=[${projects_e2e// /,}]
+          projects=[${projects// /,}]
          echo PROJECTS_E2E=$projects_e2e >> $GITHUB_ENV
-          echo PROJECTS=$(echo $projects_e2e | sed 's|-e2e||g') >> $GITHUB_ENV
+          echo PROJECTS=$projects >> $GITHUB_ENV
          echo PREVIEW_GOVERNANCE=$preview_governance >> $GITHUB_ENV
          echo PREVIEW_TRADING=$preview_trading >> $GITHUB_ENV
          echo PREVIEW_EXPLORER=$preview_explorer >> $GITHUB_ENV
+          echo PREVIEW_TOOLS=$preview_tools >> $GITHUB_ENV

    outputs:
      projects: ${{ env.PROJECTS }}
@@ -145,11 +177,12 @@ jobs:
      preview_governance: ${{ env.PREVIEW_GOVERNANCE }}
      preview_trading: ${{ env.PREVIEW_TRADING }}
      preview_explorer: ${{ env.PREVIEW_EXPLORER }}
+      preview_tools: ${{ env.PREVIEW_TOOLS }}

  cypress:
    needs: lint-test-build
    name: '(CI) cypress'
-    if: ${{ needs.lint-test-build.outputs.projects != '[]' }}
+    if: ${{ needs.lint-test-build.outputs.projects-e2e != '[]' }}
    uses: ./.github/workflows/cypress-run.yml
    secrets: inherit
    with:
@@ -203,6 +236,12 @@ jobs:
              sleep 5
            done
          fi
+          if [[ "${{ needs.lint-test-build.outputs.preview_tools }}" =~ $regex ]]; then
+            until curl -L --fail "${{ needs.lint-test-build.outputs.preview_tools }}"; do
+              echo "waiting for tools preview"
+              sleep 5
+            done
+          fi

      - name: Create comment
        uses: peter-evans/create-or-update-comment@v3
@@ -214,6 +253,7 @@ jobs:
            * governance: ${{ needs.lint-test-build.outputs.preview_governance }}
            * explorer: ${{ needs.lint-test-build.outputs.preview_explorer  }}
            * trading: ${{ needs.lint-test-build.outputs.preview_trading }}
+            * tools: ${{ needs.lint-test-build.outputs.preview_tools }}

  # Report single result at the end, to avoid mess with required checks in PR
  cypress-check:
@@ -20,7 +20,7 @@ jobs:
        project: ${{ fromJSON(inputs.projects) }}
    name: ${{ matrix.project }}
    runs-on: self-hosted-runner
-    timeout-minutes: 60
+    timeout-minutes: 100
    steps:
      # Checks if skip cache was requested
      - name: Set skip-nx-cache flag
@@ -31,6 +31,7 @@ jobs:
        uses: docker/setup-buildx-action@v2

      - name: Log in to the Container registry (ghcr)
+        if: ${{ github.event_name == 'pull_request' }}
        uses: docker/login-action@v2
        with:
          registry: ghcr.io
@@ -39,7 +40,7 @@ jobs:

      - name: Log in to the Container registry (docker hub)
        uses: docker/login-action@v2
-        if: ${{ startsWith(github.ref, 'refs/tags/v') }}
+        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && ( endsWith(github.ref, 'main') || endsWith(github.ref, 'release/testnet') ) }}
        with:
          # registry: registry.hub.docker.com
          username: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -70,18 +71,32 @@ jobs:
            envName="$(echo ${{ github.ref }} | rev | cut -d '/' -f 1 | rev)"
          elif [[ "${{ github.ref }}" =~ .*develop$ ]]; then
            envName="stagnet1"
+            if [[ "${{ matrix.app }}" = "multisig-signer" ]]; then
+              envName="mainnet"
+              bucketName="tools.vega.xyz"
+            fi
+            if [[ "${{ matrix.app }}" = "static" ]]; then
+              envName="mainnet"
+              bucketName="static.vega.xyz"
+            fi
+            if [[ "${{ matrix.app }}" = "ui-toolkit" ]]; then
+              envName="mainnet"
+              bucketName="ui.vega.rocks"
+            fi
          elif [[ "${{ github.ref }}" =~ .*main$ ]]; then
            envName="mainnet"
-          elif [[ "${{ matrix.app}}" = "trading" ]] && [[ "${{ startsWith(github.ref, 'refs/tags/v') && 'true' || 'false' }}" = "true" ]]; then
-            envName="mainnet"
          fi

          if [[ "${envName}" = "mainnet" ]]; then
            domain="vega.xyz"
-            bucketName="${{ matrix.app }}.${domain}"
+            if [[ -z "${bucketName}" ]]; then
+              bucketName="${{ matrix.app }}.${domain}"
+            fi
          elif [[ "${envName}" = "testnet" ]]; then
            domain="fairground.wtf"
-            bucketName="${{ matrix.app }}.${domain}"
+            if [[ -z "${bucketName}" ]]; then
+              bucketName="${{ matrix.app }}.${domain}"
+            fi
          fi

          if [[ -z "${bucketName}" ]]; then
@@ -98,14 +113,15 @@ jobs:
        run: |
          flags=""
          if [[ ! -z "${{ env.ENV_NAME }}" ]]; then
-            if [[ "${{ env.ENV_NAME }}" != "ops-vega" ]]; then
-              flags="--env=${{ env.ENV_NAME }}"
-            fi
+            flags="--env=${{ env.ENV_NAME }}"
          fi

          if [ "${{ matrix.app }}" = "trading" ]; then
            yarn nx export trading $flags || (yarn install && yarn nx export trading $flags)
            DIST_LOCATION=dist/apps/trading/exported
+          elif [ "${{ matrix.app }}" = "ui-toolkit" ]; then
+            NODE_ENV=production yarn nx run ui-toolkit:build-storybook
+            DIST_LOCATION=dist/storybook/ui-toolkit
          else
            yarn nx build ${{ matrix.app }} $flags || (yarn install && yarn nx build ${{ matrix.app }} $flags)
            DIST_LOCATION=dist/apps/${{ matrix.app }}
@@ -140,7 +156,9 @@ jobs:

      - name: Publish dist as docker image (ghcr)
        uses: docker/build-push-action@v3
-        if: ${{ github.event_name == 'pull_request' || (matrix.app == 'trading' && github.event_name == 'push' && !startsWith(github.ref, 'refs/tags/v') ) }}
+        continue-on-error: true
+        id: ghcr-push
+        if: ${{ github.event_name == 'pull_request' }}
        with:
          context: .
          file: docker/node-outside-docker.Dockerfile
@@ -153,7 +171,9 @@ jobs:

      - name: Publish dist as docker image (docker hub)
        uses: docker/build-push-action@v3
-        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
+        continue-on-error: true
+        id: dockerhub-push
+        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && ( endsWith(github.ref, 'main') || endsWith(github.ref, 'release/testnet') ) }}
        with:
          context: .
          file: docker/node-outside-docker.Dockerfile
@@ -162,13 +182,41 @@ jobs:
            APP=${{ matrix.app }}
            ENV_NAME=${{ env.ENV_NAME }}
          tags: |
-            vegaprotocol/${{ matrix.app }}:${{ github.ref_name }}
-            vegaprotocol/${{ matrix.app }}:mainnet
+            vegaprotocol/${{ matrix.app }}:${{ github.sha }}
+            vegaprotocol/${{ matrix.app }}:${{ endsWith(github.ref, 'main') && 'mainnet' || endsWith(github.ref, 'release/testnet') && 'testnet' || '' }}
+
+      - name: Publish dist as docker image (ghcr - retry)
+        uses: docker/build-push-action@v3
+        if: ${{ steps.ghcr-push.outcome == 'failure' }}
+        with:
+          context: .
+          file: docker/node-outside-docker.Dockerfile
+          push: true
+          build-args: |
+            APP=${{ matrix.app }}
+            ENV_NAME=${{ env.ENV_NAME }}
+          tags: |
+            ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:${{ github.event.pull_request.head.sha || github.sha }}
+
+      - name: Publish dist as docker image (docker hub - retry)
+        uses: docker/build-push-action@v3
+        if: ${{ steps.dockerhub-push.outcome == 'failure' }}
+        with:
+          context: .
+          file: docker/node-outside-docker.Dockerfile
+          push: true
+          build-args: |
+            APP=${{ matrix.app }}
+            ENV_NAME=${{ env.ENV_NAME }}
+          tags: |
+            vegaprotocol/${{ matrix.app }}:${{ github.sha }}
+            vegaprotocol/${{ matrix.app }}:${{ endsWith(github.ref, 'main') && 'mainnet' || endsWith(github.ref, 'release/testnet') && 'testnet' || '' }}

      # bucket creation in github.com/vegaprotocol/terraform//frontend
      - name: Publish dist to s3
        uses: jakejarvis/s3-sync-action@master
-        if: ${{ github.event_name == 'push' && !startsWith(github.ref, 'refs/tags/v') && ( matrix.app != 'trading' || (matrix.app == 'trading' && !endsWith(github.ref, 'main') ) ) }}
+        # s3 releases are not happening for trading on mainnet - it's IPFS
+        if: ${{ github.event_name == 'push' && ( matrix.app != 'trading' || (matrix.app == 'trading' && !( endsWith(github.ref, 'main') || endsWith(github.ref, 'release/testnet') ) ) ) }}
        with:
          args: --acl private --follow-symlinks --delete
        env:
@@ -186,22 +234,38 @@ jobs:
          number: ${{ github.event.number }}

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

-          # trigger new deployment as base image is always set to vegaprotocol/trading:mainnet
-          curl -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
-            -H "Content-Type: application/json" \
-            -d '{"query": "mutation{triggerDeploy(siteId:\"f8f2e051-f18e-49e6-b876-0a39369dc0d8\"){id status}}"}' \
-            https://api.fleek.co/graphql
+            # trigger new deployment as base image is always set to vegaprotocol/trading:mainnet
+            curl --fail -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
+              -H "Content-Type: application/json" \
+              -d '{"query": "mutation{triggerDeploy(siteId:\"f8f2e051-f18e-49e6-b876-0a39369dc0d8\"){id status}}"}' \
+              https://api.fleek.co/graphql
+
+          elif echo ${{ github.ref }} | grep -q release/testnet; then
+            # display info about app
+            curl --fail -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
+              -H "Content-Type: application/json" \
+              -d '{"query": "query{getSiteById(siteId:\"79baaeca-1952-4ae7-a256-f668cfc1d68e\"){id latestDeploy{id status}}}"}' \
+              https://api.fleek.co/graphql
+
+            # trigger new deployment as base image is always set to vegaprotocol/trading:mainnet
+            curl --fail -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
+              -H "Content-Type: application/json" \
+              -d '{"query": "mutation{triggerDeploy(siteId:\"79baaeca-1952-4ae7-a256-f668cfc1d68e\"){id status}}"}' \
+              https://api.fleek.co/graphql
+          fi

      - name: Check out ipfs-redirect
-        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
+        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && endsWith(github.ref, 'main') }}
        uses: actions/checkout@v3
        with:
          repository: 'vegaprotocol/ipfs-redirect'
@@ -209,8 +273,8 @@ jobs:
          fetch-depth: '0'
          token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}

-      - name: Update vega.trading DNS to redirect to the new console
-        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
+      - name: Update console.vega.xyz DNS to redirect to the new console
+        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && endsWith(github.ref, 'main') }}
        env:
          GH_TOKEN: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
        run: |
@@ -247,26 +311,38 @@ jobs:
            gh pr merge "${pr_url}" --delete-branch --squash --admin
          )

-          # # Generate console URL
-          # new_console_url_type=ipfs
-          # # new_console_url_type=ipns
-          # new_console_url_domain=cf-ipfs.com
-          # # new_console_url_domain=dweb.link
-          # new_console_url="https://${new_cid}.${new_console_url_type}.${new_console_url_domain}/"
-          # echo "new_console_url=${new_console_url}"
+      - name: Update console.fairground.wtf DNS to redirect to the new console
+        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && endsWith(github.ref, 'testnet') }}
+        run: |
+          curl -L https://dist.ipfs.tech/kubo/v0.20.0/kubo_v0.20.0_linux-amd64.tar.gz -o kubo.tgz
+          tar -xzf kubo.tgz
+          export PATH="$PATH:$PWD/kubo"
+          which ipfs
+          new_hash=$(cat ${{ matrix.app }}-ipfs-hash)
+          new_cid=$(ipfs cid format -v 1 -b base32 $new_hash)

-          # # Update record in DNSimple
-          # # docs: https://developer.dnsimple.com/v2/zones/records/#updateZoneRecord
-          # dnsimple_account_id=84895
-          # dnsimple_zone_name=vega.trading
-          # dnsimple_record_id=44409591
-          # # see: https://dnsimple.com/a/84895/domains/vega.trading/records/44409591/edit
+          # Generate console URL

-          # curl  -H 'Authorization: Bearer ${{ secrets.DNSIMPLE_API_TOKEN }}' \
-          #       -H 'Accept: application/json' \
-          #       -H 'Content-Type: application/json' \
-          #       -X PATCH \
-          #       -d "{
-          #             \"content\": \"${new_console_url}\"
-          #       }" \
-          #       https://api.dnsimple.com/v2/${dnsimple_account_id}/zones/${dnsimple_zone_name}/records/${dnsimple_record_id}
+          new_console_url_type=ipfs
+          # new_console_url_type=ipns
+
+          new_console_url_domain=cf-ipfs.com
+          # new_console_url_domain=dweb.link
+
+          new_console_url="http://${new_cid}.${new_console_url_type}.${new_console_url_domain}/"
+          echo "new_console_url=${new_console_url}"
+
+          # Update record in DNSimple
+          # docs: https://developer.dnsimple.com/v2/zones/records/#updateZoneRecord
+          dnsimple_account_id=84895
+          dnsimple_zone_name=fairground.wtf
+          dnsimple_record_id=45300615
+          # see: https://dnsimple.com/a/84895/domains/fairground.wtf/records/45300615/edit
+          curl --fail -H 'Authorization: Bearer ${{ secrets.DNSIMPLE_API_TOKEN }}' \
+                -H 'Accept: application/json' \
+                -H 'Content-Type: application/json' \
+                -X PATCH \
+                -d "{
+                      \"content\": \"${new_console_url}\"
+                }" \
+                https://api.dnsimple.com/v2/${dnsimple_account_id}/zones/${dnsimple_zone_name}/records/${dnsimple_record_id}
@@ -51,7 +51,7 @@ jobs:
          fetch-depth: '0'
          token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}

-      - name: Update vega.trading DNS to redirect to the new console
+      - name: Update console.vega.xyz DNS to redirect to the new console
        env:
          GH_TOKEN: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
        run: |
@@ -50,3 +50,5 @@ cypress.env.json

 #cypress
 /apps/**/cypress/reports/
+/apps/**/cypress/downloads/
+/apps/**/fixtures/wallet/node**
@@ -1,4 +1,3 @@
-NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
 NX_TENDERMINT_URL=http://localhost:26617
 NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket
 NX_VEGA_URL=http://localhost:3008/graphql
@@ -1,5 +1,4 @@
 # App configuration variables
-NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
 NX_TENDERMINT_URL=https://n04.d.vega.xyz/tm
 NX_TENDERMINT_WEBSOCKET_URL=wss://n04.d.vega.xyz/tm/websocket
 NX_VEGA_URL=https://api.n04.d.vega.xyz/graphql
@@ -1,5 +1,4 @@
 # App configuration variables
-NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
 NX_TENDERMINT_URL=https://mainnet-observer-proxy01.ops.vega.xyz/
 NX_TENDERMINT_WEBSOCKET_URL=wss://mainnet-observer-proxy01.ops.vega.xyz/websocket
 NX_VEGA_URL=https://api.vega.community/graphql
@@ -1,5 +1,4 @@
 # App configuration variables
-NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
 NX_TENDERMINT_URL=https://tm.n07.testnet.vega.xyz/tm
 NX_TENDERMINT_WEBSOCKET_URL=wss://lb.testnet.vega.xyz/tm/websocket
 NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
@@ -12,9 +12,10 @@ NX_BLOCK_EXPLORER=https://be.stagnet1.vega.xyz/rest
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
 NX_VEGA_GOVERNANCE_URL=https://governance.stagnet1.vega.rocks
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.jsoo
+NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_NETWORKS='{"TESTNET":"https://explorer.fairground.wtf","MAINNET":"https://explorer.vega.xyz"}'
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
+NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases/tag/

 # App flags
 NX_EXPLORER_ASSETS=1
@@ -5,7 +5,7 @@ NX_SENTRY_DSN=https://b3a56b03eda842faad731f3ea9dfd1bc@o286262.ingest.sentry.io/
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/mainnet1/mainnet1.toml
 NX_VEGA_URL=https://api.vega.community/graphql
 NX_VEGA_ENV=MAINNET
-NX_BLOCK_EXPLORER=https://be.vega.community/rest/
+NX_BLOCK_EXPLORER=https://be.vega.community/rest
 NX_ETHERSCAN_URL=https://etherscan.io
 NX_VEGA_GOVERNANCE_URL=https://governance.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
@@ -1,2 +1,2 @@
 # .env is stagnet1, so there are no overrides required
-NX_VEGA_NETWORKS='{"TESTNET":"https://explorer.fairground.wtf","MAINNET":"https://explorer.vega.xyz","STAGNET3":"https://stagnet3.explorer.vega.xyz"}'
+NX_VEGA_NETWORKS='{"TESTNET":"https://explorer.fairground.wtf","MAINNET":"https://explorer.vega.xyz","STAGNET1":"https://stagnet1.explorer.vega.xyz"}'
@@ -70,7 +70,7 @@
      "executor": "@nrwl/workspace:run-commands",
      "options": {
        "commands": [
-          "npx openapi-typescript https://raw.githubusercontent.com/vegaprotocol/documentation/main/specs/v0.67.3/blockexplorer.openapi.json --output apps/explorer/src/types/explorer.d.ts --immutable-types"
+          "npx openapi-typescript https://raw.githubusercontent.com/vegaprotocol/documentation/main/specs/v0.71.4/blockexplorer.openapi.json --output apps/explorer/src/types/explorer.d.ts --immutable-types"
        ]
      }
    },
@@ -1,29 +1,13 @@
 import WS from 'jest-websocket-mock';
-import useWebSocket from 'react-use-websocket';
-import {
-  render,
-  screen,
-  fireEvent,
-  act,
-  waitFor,
-} from '@testing-library/react';
-import { TendermintWebsocketContext } from '../../contexts/websocket/tendermint-websocket-context';
+import { render, screen } from '@testing-library/react';
 import { BlocksRefetch } from './blocks-refetch';

 const BlocksRefetchInWebsocketProvider = ({
  callback,
-  mocketLocation,
 }: {
  callback: () => null;
-  mocketLocation: string;
 }) => {
-  const contextShape = useWebSocket(mocketLocation);
-
-  return (
-    <TendermintWebsocketContext.Provider value={{ ...contextShape }}>
-      <BlocksRefetch refetch={callback} />
-    </TendermintWebsocketContext.Provider>
-  );
+  return <BlocksRefetch refetch={callback} />;
 };

 describe('Blocks refetch', () => {
@@ -32,111 +16,8 @@ describe('Blocks refetch', () => {
    const mocket = new WS(mocketLocation, { jsonProtocol: true });
    new WebSocket(mocketLocation);

-    render(
-      <BlocksRefetchInWebsocketProvider
-        callback={() => null}
-        mocketLocation={mocketLocation}
-      />
-    );
-    await mocket.connected;
-    expect(screen.getByTestId('new-blocks')).toHaveTextContent('new blocks');
+    render(<BlocksRefetchInWebsocketProvider callback={() => null} />);
    expect(screen.getByTestId('refresh')).toBeInTheDocument();
    mocket.close();
  });
-
-  it('should initiate callback when the button is clicked', async () => {
-    const mocketLocation = 'wss:localhost:3003';
-    const mocket = new WS(mocketLocation, { jsonProtocol: true });
-    new WebSocket(mocketLocation);
-
-    const callback = jest.fn();
-    render(
-      <BlocksRefetchInWebsocketProvider
-        callback={callback}
-        mocketLocation={mocketLocation}
-      />
-    );
-    await mocket.connected;
-    const button = screen.getByTestId('refresh');
-
-    act(() => {
-      fireEvent.click(button);
-    });
-
-    expect(callback.mock.calls.length).toEqual(1);
-    mocket.close();
-  });
-
-  it('should show new blocks as websocket is correctly updated', async () => {
-    const mocketLocation = 'wss:localhost:3004';
-    const mocket = new WS(mocketLocation, { jsonProtocol: true });
-    new WebSocket(mocketLocation);
-    render(
-      <BlocksRefetchInWebsocketProvider
-        callback={() => null}
-        mocketLocation={mocketLocation}
-      />
-    );
-    await mocket.connected;
-
-    // Ensuring we send an ID equal to the one the client subscribed with.
-    await waitFor(() => expect(mocket.messages.length).toEqual(1));
-    // @ts-ignore id on messages
-    const id = mocket.messages[0].id;
-
-    const newBlockMessage = {
-      id,
-      result: {
-        query: "tm.event = 'NewBlock'",
-      },
-    };
-
-    expect(screen.getByTestId('new-blocks')).toHaveTextContent('0 new blocks');
-
-    act(() => {
-      mocket.send(newBlockMessage);
-    });
-
-    expect(screen.getByTestId('new-blocks')).toHaveTextContent('1 new blocks');
-
-    act(() => {
-      mocket.send(newBlockMessage);
-    });
-
-    expect(screen.getByTestId('new-blocks')).toHaveTextContent('2 new blocks');
-    mocket.close();
-  });
-
-  it('will not show new blocks if websocket has wrong ID', async () => {
-    const mocketLocation = 'wss:localhost:3005';
-    const mocket = new WS(mocketLocation, { jsonProtocol: true });
-    new WebSocket(mocketLocation);
-
-    render(
-      <BlocksRefetchInWebsocketProvider
-        callback={() => null}
-        mocketLocation={mocketLocation}
-      />
-    );
-    await mocket.connected;
-
-    // Ensuring we send an ID equal to the one the client subscribed with.
-    await waitFor(() => expect(mocket.messages.length).toEqual(1));
-
-    const newBlockMessageBadId = {
-      id: 'blahblahblah',
-      result: {
-        query: "tm.event = 'NewBlock'",
-      },
-    };
-
-    expect(screen.getByTestId('new-blocks')).toHaveTextContent('0 new blocks');
-
-    act(() => {
-      mocket.send(newBlockMessageBadId);
-    });
-
-    expect(screen.getByTestId('new-blocks')).toHaveTextContent('0 new blocks');
-    mocket.close();
-  });
 });
@@ -1,36 +1,19 @@
-import { useState, useEffect } from 'react';
-import { useTendermintWebsocket } from '../../hooks/use-tendermint-websocket';
 import { t } from '@vegaprotocol/i18n';
-import { ButtonLink } from '@vegaprotocol/ui-toolkit';
+import { Button, Icon } from '@vegaprotocol/ui-toolkit';

 interface BlocksRefetchProps {
  refetch: () => void;
 }

 export const BlocksRefetch = ({ refetch }: BlocksRefetchProps) => {
-  const [blocksToLoad, setBlocksToLoad] = useState<number>(0);
-
-  const { messages } = useTendermintWebsocket({
-    query: "tm.event = 'NewBlock'",
-  });
-
-  useEffect(() => {
-    if (messages.length > 0) {
-      setBlocksToLoad((prev) => prev + 1);
-    }
-  }, [messages]);
-
  const refresh = () => {
    refetch();
-    setBlocksToLoad(0);
  };

  return (
-    <div className="mb-4">
-      <span data-testid="new-blocks">{blocksToLoad} new blocks - </span>
-      <ButtonLink onClick={refresh} data-testid="refresh">
-        {t('refresh to see latest')}
-      </ButtonLink>
-    </div>
+    <Button onClick={refresh} data-testid="refresh" size="xs">
+      <Icon name="refresh" className="!align-baseline mr-2" size={3} />
+      {t('Load new')}
+    </Button>
  );
 };
@@ -1,5 +1,6 @@
 import { t } from '@vegaprotocol/i18n';
 import type { MarketInfoWithData } from '@vegaprotocol/markets';
+import { PriceMonitoringBoundsInfoPanel } from '@vegaprotocol/markets';
 import {
  LiquidityInfoPanel,
  LiquidityMonitoringParametersInfoPanel,
@@ -39,133 +40,69 @@ export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
    return [];
  };

-  const oraclePanels = isEqual(
+  const showTwoOracles = isEqual(
    getSigners(settlementData),
    getSigners(terminationData)
-  )
-    ? [
-        {
-          title: t('Settlement Oracle'),
-          content: (
-            <OracleInfoPanel
-              noBorder={false}
-              market={market}
-              type="settlementData"
-            />
-          ),
-        },
-        {
-          title: t('Termination Oracle'),
-          content: (
-            <OracleInfoPanel
-              noBorder={false}
-              market={market}
-              type="termination"
-            />
-          ),
-        },
-      ]
-    : [
-        {
-          title: t('Oracle'),
-          content: (
-            <OracleInfoPanel
-              noBorder={false}
-              market={market}
-              type="settlementData"
-            />
-          ),
-        },
-      ];
+  );

-  const panels = [
-    {
-      title: t('Key details'),
-      content: <KeyDetailsInfoPanel noBorder={false} market={market} />,
-    },
-    {
-      title: t('Instrument'),
-      content: <InstrumentInfoPanel noBorder={false} market={market} />,
-    },
-    {
-      title: t('Settlement asset'),
-      content: <SettlementAssetInfoPanel market={market} noBorder={false} />,
-    },
-    {
-      title: t('Metadata'),
-      content: <MetadataInfoPanel noBorder={false} market={market} />,
-    },
-    {
-      title: t('Risk model'),
-      content: <RiskModelInfoPanel noBorder={false} market={market} />,
-    },
-    {
-      title: t('Risk parameters'),
-      content: <RiskParametersInfoPanel noBorder={false} market={market} />,
-    },
-    {
-      title: t('Risk factors'),
-      content: <RiskFactorsInfoPanel noBorder={false} market={market} />,
-    },
-    ...(market.priceMonitoringSettings?.parameters?.triggers || []).map(
-      (trigger, i) => ({
-        title: t(`Price monitoring trigger ${i + 1}`),
-        content: <MarketInfoTable noBorder={false} data={trigger} />,
-      })
-    ),
-    ...(market.data?.priceMonitoringBounds || []).map((trigger, i) => ({
-      title: t(`Price monitoring bound ${i + 1}`),
-      content: (
-        <>
-          <MarketInfoTable
-            noBorder={false}
-            data={{
-              maxValidPrice: trigger.maxValidPrice,
-              minValidPrice: trigger.minValidPrice,
-            }}
-            decimalPlaces={market.decimalPlaces}
-          />
-          <MarketInfoTable
-            noBorder={false}
-            data={{ referencePrice: trigger.referencePrice }}
-            decimalPlaces={
-              market.tradableInstrument.instrument.product.settlementAsset
-                .decimals
-            }
-          />
-        </>
-      ),
-    })),
-    {
-      title: t('Liquidity monitoring parameters'),
-      content: (
-        <LiquidityMonitoringParametersInfoPanel
-          noBorder={false}
-          market={market}
-        />
-      ),
-    },
-    {
-      title: t('Liquidity'),
-      content: <LiquidityInfoPanel market={market} noBorder={false} />,
-    },
-    {
-      title: t('Liquidity price range'),
-      content: (
-        <LiquidityPriceRangeInfoPanel market={market} noBorder={false} />
-      ),
-    },
-    ...oraclePanels,
-  ];
+  const headerClassName = 'font-alpha calt text-xl mt-4 border-b-2 pb-2';

  return (
-    <>
-      {panels.map((p) => (
-        <div key={p.title} className="mb-3">
-          <h2 className="font-alpha calt text-xl">{p.title}</h2>
-          {p.content}
-        </div>
+    <div>
+      <h2 className={headerClassName}>{t('Key details')}</h2>
+      <KeyDetailsInfoPanel market={market} />
+      <h2 className={headerClassName}>{t('Instrument')}</h2>
+      <InstrumentInfoPanel market={market} />
+      <h2 className={headerClassName}>{t('Settlement asset')}</h2>
+      <SettlementAssetInfoPanel market={market} />
+      <h2 className={headerClassName}>{t('Metadata')}</h2>
+      <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('Risk factors')}</h2>
+      <RiskFactorsInfoPanel market={market} />
+      {(market.data?.priceMonitoringBounds || []).map((trigger, i) => (
+        <>
+          <h2 className={headerClassName}>
+            {t('Price monitoring bounds %s', [(i + 1).toString()])}
+          </h2>
+          <PriceMonitoringBoundsInfoPanel
+            market={market}
+            triggerIndex={i + 1}
+          />
+        </>
      ))}
-    </>
+      {(market.priceMonitoringSettings?.parameters?.triggers || []).map(
+        (trigger, i) => (
+          <>
+            <h2 className={headerClassName}>
+              {t('Price monitoring settings %s', [(i + 1).toString()])}
+            </h2>
+            <MarketInfoTable data={trigger} key={i} />
+          </>
+        )
+      )}
+      <h2 className={headerClassName}>{t('Liquidity monitoring')}</h2>
+      <LiquidityMonitoringParametersInfoPanel market={market} />
+      <h2 className={headerClassName}>{t('Liquidity')}</h2>
+      <LiquidityInfoPanel market={market} />
+      <h2 className={headerClassName}>{t('Liquidity price range')}</h2>
+      <LiquidityPriceRangeInfoPanel market={market} />
+      {showTwoOracles ? (
+        <>
+          <h2 className={headerClassName}>{t('Settlement oracle')}</h2>
+          <OracleInfoPanel market={market} type="settlementData" />
+          <h2 className={headerClassName}>{t('Termination oracle')}</h2>
+          <OracleInfoPanel market={market} type="termination" />
+        </>
+      ) : (
+        <>
+          <h2 className={headerClassName}>{t('Oracle')}</h2>
+          <OracleInfoPanel market={market} type="settlementData" />
+        </>
+      )}
+    </div>
  );
 };
@@ -5,12 +5,13 @@ export const ErrorCodes = new Map([
  [51, 'Transaction failed validation'],
  [60, 'Transaction could not be decoded'],
  [70, 'Error'],
+  [71, 'Partial success/error'],
  [80, 'Unknown command'],
  [89, 'Rejected as spam'],
  [0, 'Success'],
 ]);

-export const successCodes = new Set([0]);
+export const successCodes = new Set([0, 71]);

 interface ChainResponseCodeProps {
  code: number;
@@ -29,11 +30,12 @@ export const ChainResponseCode = ({
  error,
 }: ChainResponseCodeProps) => {
  const isSuccess = successCodes.has(code);
-
+  const successColour =
+    code === 71 ? 'fill-vega-orange' : 'fill-vega-green-600';
  const icon = isSuccess ? (
-    <Icon name="tick-circle" className="fill-vega-green-550" />
+    <Icon name="tick-circle" className={successColour} />
  ) : (
-    <Icon name="cross" className="fill-vega-pink-550" />
+    <Icon name="cross" className="fill-vega-pink-600" />
  );
  const label = ErrorCodes.get(code) || 'Unknown response code';

@@ -0,0 +1,24 @@
+import { t } from '@vegaprotocol/i18n';
+
+export interface FilterLabelProps {
+  filters: Set<string>;
+}
+
+/**
+ * Renders the list (currently limited to 1) of filters set by the
+ * Transaction Filter
+ */
+export function FilterLabel({ filters }: FilterLabelProps) {
+  if (!filters || filters.size !== 1) {
+    return <span className="uppercase">{t('Filter')}</span>;
+  }
+
+  return (
+    <div>
+      <span className="uppercase">{t('Filters')}:</span>&nbsp;
+      <code className="bg-vega-light-150 px-2 rounded-md capitalize">
+        {Array.from(filters)[0]}
+      </code>
+    </div>
+  );
+}
@@ -0,0 +1,164 @@
+import { t } from '@vegaprotocol/i18n';
+import {
+  DropdownMenu,
+  DropdownMenuCheckboxItem,
+  DropdownMenuContent,
+  DropdownMenuItemIndicator,
+  DropdownMenuSeparator,
+  DropdownMenuSub,
+  DropdownMenuSubTrigger,
+  DropdownMenuTrigger,
+  DropdownMenuSubContent,
+  Icon,
+  Button,
+} from '@vegaprotocol/ui-toolkit';
+import type { Dispatch, SetStateAction } from 'react';
+import { FilterLabel } from './tx-filter-label';
+
+// All possible transaction types. Should be generated.
+export type FilterOption =
+  | 'Amend LiquidityProvision Order'
+  | 'Amend Order'
+  | 'Batch Market Instructions'
+  | 'Cancel LiquidityProvision Order'
+  | 'Cancel Order'
+  | 'Cancel Transfer Funds'
+  | 'Chain Event'
+  | 'Delegate'
+  | 'Ethereum Key Rotate Submission'
+  | 'Issue Signatures'
+  | 'Key Rotate Submission'
+  | 'Liquidity Provision Order'
+  | 'Node Signature'
+  | 'Node Vote'
+  | 'Proposal'
+  | 'Protocol Upgrade'
+  | 'Register new Node'
+  | 'State Variable Proposal'
+  | 'Submit Oracle Data'
+  | 'Submit Order'
+  | 'Transfer Funds'
+  | 'Undelegate'
+  | 'Validator Heartbeat'
+  | 'Vote on Proposal'
+  | 'Withdraw';
+
+// Alphabetised list of transaction types to appear at the top level
+export const PrimaryFilterOptions: FilterOption[] = [
+  'Amend LiquidityProvision Order',
+  'Amend Order',
+  'Batch Market Instructions',
+  'Cancel LiquidityProvision Order',
+  'Cancel Order',
+  'Cancel Transfer Funds',
+  'Delegate',
+  'Liquidity Provision Order',
+  'Proposal',
+  'Submit Oracle Data',
+  'Submit Order',
+  'Transfer Funds',
+  'Undelegate',
+  'Vote on Proposal',
+  'Withdraw',
+];
+
+// Alphabetised list of transaction types to nest under a 'More...' submenu
+export const SecondaryFilterOptions: FilterOption[] = [
+  'Chain Event',
+  'Ethereum Key Rotate Submission',
+  'Issue Signatures',
+  'Key Rotate Submission',
+  'Node Signature',
+  'Node Vote',
+  'Protocol Upgrade',
+  'Register new Node',
+  'State Variable Proposal',
+  'Validator Heartbeat',
+];
+
+export const AllFilterOptions: FilterOption[] = [
+  ...PrimaryFilterOptions,
+  ...SecondaryFilterOptions,
+];
+
+export interface TxFilterProps {
+  filters: Set<FilterOption>;
+  setFilters: Dispatch<SetStateAction<Set<FilterOption>>>;
+}
+
+/**
+ * Renders a structured dropdown menu of all of the available transaction
+ * types. It allows a user to select one transaction type to view. Later
+ * it will support multiple selection, but until the API supports that it is
+ * one or all.
+ * @param filters null or Set of tranaction types
+ * @param setFilters A function to update the filters prop
+ * @returns
+ */
+export const TxsFilter = ({ filters, setFilters }: TxFilterProps) => {
+  return (
+    <DropdownMenu
+      modal={false}
+      trigger={
+        <DropdownMenuTrigger className="ml-2">
+          <Button size="xs">
+            <FilterLabel filters={filters} />
+          </Button>
+        </DropdownMenuTrigger>
+      }
+    >
+      <DropdownMenuContent>
+        {filters.size > 1 ? null : (
+          <>
+            <DropdownMenuCheckboxItem
+              onCheckedChange={() => setFilters(new Set(AllFilterOptions))}
+            >
+              {t('Clear filters')} <Icon name="cross" />
+            </DropdownMenuCheckboxItem>
+            <DropdownMenuSeparator />
+          </>
+        )}
+        {PrimaryFilterOptions.map((f) => (
+          <DropdownMenuCheckboxItem
+            key={f}
+            checked={filters.has(f)}
+            onCheckedChange={() => {
+              // NOTE: These act like radio buttons until the API supports multiple filters
+              setFilters(new Set([f]));
+            }}
+            id={`radio-${f}`}
+          >
+            {f}
+            <DropdownMenuItemIndicator>
+              <Icon name="tick-circle" />
+            </DropdownMenuItemIndicator>
+          </DropdownMenuCheckboxItem>
+        ))}
+        <DropdownMenuSub>
+          <DropdownMenuSubTrigger>
+            {t('More Types')}
+            <Icon name="chevron-right" />
+          </DropdownMenuSubTrigger>
+          <DropdownMenuSubContent>
+            {SecondaryFilterOptions.map((f) => (
+              <DropdownMenuCheckboxItem
+                key={f}
+                checked={filters.has(f)}
+                onCheckedChange={(checked) => {
+                  // NOTE: These act like radio buttons until the API supports multiple filters
+                  setFilters(new Set([f]));
+                }}
+                id={`radio-${f}`}
+              >
+                {f}
+                <DropdownMenuItemIndicator>
+                  <Icon name="tick-circle" className="inline" />
+                </DropdownMenuItemIndicator>
+              </DropdownMenuCheckboxItem>
+            ))}
+          </DropdownMenuSubContent>
+        </DropdownMenuSub>
+      </DropdownMenuContent>
+    </DropdownMenu>
+  );
+};
@@ -160,6 +160,7 @@ export const TxOrderType = ({ orderType, command }: TxOrderTypeProps) => {
        vote={command?.voteSubmission?.value === 'VALUE_YES'}
        yesText="Proposal vote"
        noText="Proposal vote"
+        useVoteColour={false}
      />
    );
  }
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect, useRef } from 'react';
 import { FixedSizeList as List } from 'react-window';
 import InfiniteLoader from 'react-window-infinite-loader';
 import { t } from '@vegaprotocol/i18n';
@@ -69,6 +69,17 @@ export const TxsInfiniteList = ({
 }: TxsInfiniteListProps) => {
  const { screenSize } = useScreenDimensions();
  const isStacked = ['xs', 'sm'].includes(screenSize);
+  const infiniteLoaderRef = useRef<InfiniteLoader>(null);
+  const hasMountedRef = useRef(false);
+
+  useEffect(() => {
+    if (hasMountedRef.current) {
+      if (infiniteLoaderRef.current) {
+        infiniteLoaderRef.current.resetloadMoreItemsCache(true);
+      }
+    }
+    hasMountedRef.current = true;
+  }, [loadMoreTxs]);

  if (!txs) {
    if (!areTxsLoading) {
@@ -110,6 +121,7 @@ export const TxsInfiniteList = ({
          isItemLoaded={isItemLoaded}
          itemCount={itemCount}
          loadMoreItems={loadMoreItems}
+          ref={infiniteLoaderRef}
        >
          {({ onItemsRendered, ref }) => (
            <List
@@ -34,4 +34,17 @@ describe('Vote TX icon', () => {
    const no = render(<VoteIcon vote={false} />);
    expect(no.getByRole('img')).toHaveAttribute('aria-label', 'delete icon');
  });
+
+  it('useVoteColour prop can be used to override coloured background', () => {
+    const no = render(<VoteIcon vote={false} />);
+    expect(no.container.children[0]).toHaveClass('bg-vega-pink-550');
+
+    const monochromeNo = render(
+      <VoteIcon vote={false} useVoteColour={false} />
+    );
+    expect(monochromeNo.container.children[0]).not.toHaveClass(
+      'bg-vega-pink-550'
+    );
+    expect(monochromeNo.container.children[0]).toHaveClass('bg-vega-dark-200');
+  });
 });
@@ -8,6 +8,32 @@ export interface VoteIconProps {
  yesText?: string;
  // Defaults to 'Against', but can be any text
  noText?: string;
+  // If set to false the background will not be coloured
+  useVoteColour?: boolean;
+}
+
+function getBgColour(useVoteColour: boolean, vote: boolean) {
+  if (useVoteColour === false) {
+    return 'bg-vega-dark-200';
+  }
+
+  return vote ? 'bg-vega-green-550' : 'bg-vega-pink-550';
+}
+
+function getFillColour(useVoteColour: boolean, vote: boolean) {
+  if (useVoteColour === false) {
+    return 'white';
+  }
+
+  return vote ? 'vega-green-300' : 'vega-pink-300';
+}
+
+function getTextColour(useVoteColour: boolean, vote: boolean) {
+  if (useVoteColour === false) {
+    return 'white';
+  }
+
+  return vote ? 'vega-green-200' : 'vega-pink-200';
 }

 /**
@@ -18,14 +44,15 @@ export interface VoteIconProps {
 */
 export function VoteIcon({
  vote,
+  useVoteColour = true,
  yesText = 'For',
  noText = 'Against',
 }: VoteIconProps) {
  const label = vote ? yesText : noText;
-  const bg = vote ? 'bg-vega-green-550' : 'bg-vega-pink-550';
  const icon: IconName = vote ? 'tick-circle' : 'delete';
-  const fill = vote ? 'vega-green-300' : 'vega-pink-300';
-  const text = vote ? 'vega-green-200' : 'vega-pink-200';
+  const bg = getBgColour(useVoteColour, vote);
+  const fill = getFillColour(useVoteColour, vote);
+  const text = getTextColour(useVoteColour, vote);

  return (
    <div
@@ -33,7 +33,7 @@ export const getTxsDataUrl = ({ limit, filters }: IGetTxsDataUrl) => {
  // Hacky fix for param as array
  let urlAsString = url.toString();
  if (filters) {
-    urlAsString += '&' + filters;
+    urlAsString += '&' + filters.replace(' ', '%20');
  }

  return urlAsString;
@@ -65,6 +65,14 @@ export const useTxsData = ({ limit, filters }: IUseTxsData) => {
    }
  }, [setTxsState, data]);

+  useEffect(() => {
+    setTxsState((prev) => ({
+      txsData: [],
+      hasMoreTxs: true,
+      lastCursor: '',
+    }));
+  }, [filters]);
+
  const loadTxs = useCallback(() => {
    return refetch({
      limit: limit,
@@ -5,17 +5,43 @@ import { TxsInfiniteList } from '../../../components/txs';
 import { useTxsData } from '../../../hooks/use-txs-data';
 import { useDocumentTitle } from '../../../hooks/use-document-title';

-const BE_TXS_PER_REQUEST = 20;
+import { useState } from 'react';
+import { AllFilterOptions, TxsFilter } from '../../../components/txs/tx-filter';
+
+const BE_TXS_PER_REQUEST = 15;

 export const TxsList = () => {
  useDocumentTitle(['Transactions']);

-  const { hasMoreTxs, loadTxs, error, txsData, refreshTxs, loading } =
-    useTxsData({ limit: BE_TXS_PER_REQUEST });
  return (
-    <section className="md:p-2 lg:p-4 xl:p-6">
+    <section className="md:p-2 lg:p-4 xl:p-6 relative">
      <RouteTitle>{t('Transactions')}</RouteTitle>
-      <BlocksRefetch refetch={refreshTxs} />
+      <TxsListFiltered />
+    </section>
+  );
+};
+
+export const TxsListFiltered = () => {
+  const [filters, setFilters] = useState(new Set(AllFilterOptions));
+
+  const f =
+    filters && filters.size === 1
+      ? `filters[cmd.type]=${Array.from(filters)[0]}`
+      : '';
+
+  const { hasMoreTxs, loadTxs, error, txsData, refreshTxs, loading } =
+    useTxsData({
+      limit: BE_TXS_PER_REQUEST,
+      filters: f,
+    });
+
+  return (
+    <>
+      <menu className="mb-2">
+        <BlocksRefetch refetch={refreshTxs} />
+        <TxsFilter filters={filters} setFilters={setFilters} />
+      </menu>
+
      <TxsInfiniteList
        hasMoreTxs={hasMoreTxs}
        areTxsLoading={loading}
@@ -24,6 +50,6 @@ export const TxsList = () => {
        error={error}
        className="mb-28"
      />
-    </section>
+    </>
  );
 };
@@ -26,6 +26,7 @@ module.exports = defineConfig({
    viewportWidth: 1440,
    viewportHeight: 900,
    numTestsKeptInMemory: 5,
+    downloadsFolder: 'cypress/downloads',
    testIsolation: false,
  },
  env: {
@@ -48,7 +49,7 @@ module.exports = defineConfig({
    vegaTokenContractAddress: '0xF41bD86d462D36b997C0bbb4D97a0a3382f205B7',
    vegaTokenAddress: '0x67175Da1D5e966e40D11c4B2519392B2058373de',
    txTimeout: { timeout: 70000 },
-    epochTimeout: { timeout: 6000 },
+    epochTimeout: { timeout: 10000 },
    blockConfirmations: 3,
    grepTags: '@regression @smoke @slow',
    grepFilterSpecs: true,
@@ -80,8 +80,18 @@ describe(
          .find('p')
          .should('have.text', proposalDescription);
      });
+      // 3001-VOTE-008
+      getProposalInformationFromTable('ID')
+        .invoke('text')
+        .should('not.be.empty')
+        .and('have.length', 64);
+      // 3001-VOTE-009
+      getProposalInformationFromTable('Proposed by')
+        .invoke('text')
+        .should('not.be.empty')
+        .and('have.length', 64);
      cy.getByTestId(proposalTermsToggle).click();
-      // 3001-VOTE-052
+      // 3001-VOTE-052 3001-VOTE-010
      cy.get('code.language-json')
        .should('exist')
        .within(() => {
@@ -93,8 +103,6 @@ describe(
    it('Newly created freeform proposal details - shows proposed and closing dates', function () {
      const proposalTitle = generateFreeFormProposalTitle();
      const proposalTimeStamp = createTenDigitUnixTimeStampForSpecifiedDays(3);
-      // const currentDate = new Date(createTenDigitUnixTimeStampForSpecifiedDays(0) * 1000)
-      // const proposedDate = new Date(currentDate.getTime() + 60000)

      submitUniqueRawProposal({
        proposalTitle: proposalTitle,
@@ -14,6 +14,7 @@ import {
  createUpdateNetworkProposalTxBody,
  createFreeFormProposalTxBody,
 } from '../../support/proposal.functions';
+import { ensureSpecifiedUnstakedTokensAreAssociated } from '../../support/staking.functions';
 import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
 import { vegaWalletSetSpecifiedApprovalAmount } from '../../support/wallet-teardown.functions';

@@ -43,6 +44,7 @@ context(
      waitForSpinner();
      cy.connectVegaWallet();
      ethereumWalletConnect();
+      ensureSpecifiedUnstakedTokensAreAssociated('1');
      navigateTo(navigation.proposals);
    });

@@ -11,7 +11,6 @@ import {
  governanceProposalType,
  submitUniqueRawProposal,
  voteForProposal,
-  waitForProposalSubmitted,
  waitForProposalSync,
 } from '../../support/governance.functions';

@@ -46,11 +45,7 @@ const connectToVegaWalletButton = '[data-testid="connect-to-vega-wallet-btn"]';
 const newProposalSubmitButton = '[data-testid="proposal-submit"]';
 const viewProposalButton = '[data-testid="view-proposal-btn"]';
 const rawProposalData = '[data-testid="proposal-data"]';
-const minVoteButton = '[data-testid="min-vote"]';
-const maxVoteButton = '[data-testid="max-vote"]';
 const voteButtons = '[data-testid="vote-buttons"]';
-const votingDate = '[data-testid="voting-date"]';
-const voteTwoMinExtraNote = '[data-testid="voting-2-mins-extra"]';
 const rejectProposalsLink = '[href="/proposals/rejected"]';
 const feedbackError = '[data-testid="Error"]';
 const noOpenProposals = '[data-testid="no-open-proposals"]';
@@ -106,8 +101,7 @@ context(
        .and('have.text', 'There are no enacted or rejected proposals');
    });

-    // 3002-PROP-002
-    // 3002-PROP-003
+    // 3002-PROP-002 3002-PROP-003 3001-VOTE-012 3007-PNE-020 3004-PMAC-004 3005-PASN-004 3008-PFRO-016 3003-PMAN-004
    it('Proposal form - shows how many vega tokens are required to make a proposal', function () {
      // 3002-PROP-005
      goToMakeNewProposal(governanceProposalType.NEW_MARKET);
@@ -116,23 +110,14 @@ context(
      ).should('be.visible');
    });

-    // Skipping as currently unable to propose using forms other than raw
-    // 3002-PROP-011
-    it.skip('Able to submit a valid freeform proposal - with minimum required tokens associated', function () {
-      goToMakeNewProposal(governanceProposalType.FREEFORM);
-      cy.get(minVoteButton).should('be.visible'); // 3002-PROP-008
-      cy.get(maxVoteButton).should('be.visible');
-      cy.get(votingDate).should('not.be.empty');
-      cy.get(voteTwoMinExtraNote).should(
-        'contain.text',
-        'we add 2 minutes of extra time'
-      );
-      enterUniqueFreeFormProposalBody('50', generateFreeFormProposalTitle());
-      // 3002-PROP-012
-      // 3002-PROP-016
-      waitForProposalSubmitted();
+    // 3002-PROP-011 3008-PFRO-005
+    it('Able to submit a valid freeform proposal - with minimum required tokens associated', function () {
+      ensureSpecifiedUnstakedTokensAreAssociated('1');
+      verifyUnstakedBalance(1);
+      createRawProposal();
    });

+    // 3008-PFRO-002 3008-PFRO-004
    it('Able to submit a valid freeform proposal - with minimum required tokens associated - but also staked', function () {
      ensureSpecifiedUnstakedTokensAreAssociated('2');
      verifyUnstakedBalance(2);
@@ -148,10 +133,6 @@ context(
    it.skip('Creating a proposal - proposal rejected - when closing time sooner than system default', function () {
      goToMakeNewProposal(governanceProposalType.FREEFORM);
      enterUniqueFreeFormProposalBody('0.1', generateFreeFormProposalTitle());
-
-      cy.contains('Awaiting network confirmation', epochTimeout).should(
-        'not.exist'
-      );
      cy.get('input:invalid')
        .invoke('prop', 'validationMessage')
        .should('equal', 'Value must be greater than or equal to 1.');
@@ -280,6 +261,20 @@ context(
      closeDialog();
    });

+    // 3007-PNE-022 3007-PNE-023 3004-PMAC-006 3004-PMAC-007 3005-PASN-006 3005-PASN-007
+    // 3006-PASC-006 3006-PASC-007 3008-PFRO-018 3008-PFRO-019 3003-PMAN-006 3003-PMAN-007
+    it('Unable to submit proposal without valid json', function () {
+      goToMakeNewProposal(governanceProposalType.RAW);
+      cy.get(newProposalSubmitButton).click();
+      cy.getByTestId('input-error-text').should('have.text', 'Required');
+      cy.get(rawProposalData).type('Not a valid json string');
+      cy.get(newProposalSubmitButton).click();
+      cy.getByTestId('input-error-text').should(
+        'have.text',
+        'Must be valid JSON'
+      );
+    });
+
    // 1005-PROP-009
    it('Unable to vote on a freeform proposal - when some but not enough vega associated', function () {
      const proposalTitle = generateFreeFormProposalTitle();
@@ -1,18 +1,26 @@
 import {
  closeDialog,
+  dissociateFromSecondWalletKey,
  navigateTo,
  navigation,
  turnTelemetryOff,
  waitForSpinner,
 } from '../../support/common.functions';
+import {
+  getDownloadedProposalJsonPath,
+  submitUniqueRawProposal,
+} from '../../support/governance.functions';
 import {
  getProposalInformationFromTable,
  goToMakeNewProposal,
  governanceProposalType,
  voteForProposal,
-  waitForProposalSubmitted,
 } from '../../support/governance.functions';
-import { ensureSpecifiedUnstakedTokensAreAssociated } from '../../support/staking.functions';
+import {
+  ensureSpecifiedUnstakedTokensAreAssociated,
+  stakingPageAssociateTokens,
+  stakingPageDisassociateAllTokens,
+} from '../../support/staking.functions';
 import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
 import {
  vegaWalletSetSpecifiedApprovalAmount,
@@ -26,15 +34,11 @@ const proposalType = '[data-testid="proposal-type"]';
 const proposalDetails = '[data-testid="proposal-details"]';
 const newProposalSubmitButton = '[data-testid="proposal-submit"]';
 const proposalVoteDeadline = '[data-testid="proposal-vote-deadline"]';
-const proposalValidationDeadline =
-  '[data-testid="proposal-validation-deadline"]';
 const proposalParameterSelect = '[data-testid="proposal-parameter-select"]';
 const proposalMarketSelect = '[data-testid="proposal-market-select"]';
 const newProposalTitle = '[data-testid="proposal-title"]';
 const newProposalDescription = '[data-testid="proposal-description"]';
 const newProposalTerms = '[data-testid="proposal-terms"]';
-const currentParameterValue =
-  '[data-testid="selected-proposal-param-current-value"]';
 const newProposedParameterValue =
  '[data-testid="selected-proposal-param-new-value"]';
 const minVoteDeadline = '[data-testid="min-vote"]';
@@ -54,11 +58,10 @@ const proposalTermsSection = 'proposal';
 const vegaWalletPublicKey = Cypress.env('vegaWalletPublicKey');
 const fUSDCId =
  '816af99af60d684502a40824758f6b5377e6af48e50a9ee8ef478ecb879ea8bc';
-const epochTimeout = Cypress.env('epochTimeout');
 const proposalTimeout = { timeout: 14000 };

 // 3001-VOTE-007
-context.skip(
+context(
  'Governance flow - form validations for different governance proposals',
  { tags: '@slow' },
  function () {
@@ -79,28 +82,10 @@ context.skip(
      navigateTo(navigation.proposals);
    });

-    it('Able to submit valid update network parameter proposal', function () {
-      goToMakeNewProposal(governanceProposalType.NETWORK_PARAMETER);
-      // 3002-PROP-006
-      cy.get(newProposalTitle).type('Test update network parameter proposal');
-      // 3002-PROP-007
-      cy.get(newProposalDescription).type('E2E test for proposals');
-
-      cy.get(proposalParameterSelect).find('option').should('have.length', 117);
-      cy.get(proposalParameterSelect).select(
-        // 3007-PNEC-002
-        'governance_proposal_asset_minEnact'
-      );
-      cy.get(currentParameterValue).should('have.value', '2s');
-      cy.get(newProposedParameterValue).type('5s'); // 3007-PNEC-003
-      cy.get(newProposalSubmitButton).should('be.visible').click();
-      waitForProposalSubmitted();
-    });
-
    it('Unable to submit network parameter with missing/invalid fields', function () {
      navigateTo(navigation.proposals);
      goToMakeNewProposal(governanceProposalType.NETWORK_PARAMETER);
-      cy.get(newProposalSubmitButton).should('be.visible').click();
+      cy.get(proposalDownloadBtn).click();
      cy.get(inputError).should('have.length', 3);
      cy.get(newProposalTitle).type(
        'Invalid update network parameter proposal'
@@ -111,62 +96,78 @@ context.skip(
      );
      cy.get(newProposedParameterValue).type('0');
      cy.get(proposalVoteDeadline).clear().type('0');
-      cy.get(newProposalSubmitButton).click();
-      cy.contains('Awaiting network confirmation', epochTimeout).should(
-        'not.exist'
-      );
-      cy.get(proposalVoteDeadline).clear().type('9000');
-      cy.get(newProposalSubmitButton).click();
-      cy.contains('Awaiting network confirmation', epochTimeout).should(
-        'not.exist'
-      );
-    });
-
-    it('Able to download network param proposal json', function () {
-      const downloadFolder = './cypress/downloads/';
-      goToMakeNewProposal(governanceProposalType.NETWORK_PARAMETER);
-      cy.log('Download proposal file');
      cy.get(proposalDownloadBtn)
-        .should('be.visible')
        .click()
        .then(() => {
-          const filename =
-            downloadFolder +
-            'vega-network-param-proposal-' +
-            getFormattedTime() +
-            '.json';
-          cy.readFile(filename, proposalTimeout)
-            .its('terms.updateNetworkParameter')
-            .should('exist');
+          cy.wrap(
+            getDownloadedProposalJsonPath('vega-network-param-proposal-')
+          ).then((filePath) => {
+            goToMakeNewProposal(governanceProposalType.RAW);
+            submitUniqueRawProposal({ proposalBody: filePath, submit: false });
+          });
        });
+      cy.get(newProposalSubmitButton).click();
+      validateDialogContentMsg('PROPOSAL_ERROR_CLOSE_TIME_TOO_SOON');
+    });

+    // 3007-PNEC-001 3007-PNEC-003
+    it('Able to download and submit network param proposal', function () {
+      goToMakeNewProposal(governanceProposalType.NETWORK_PARAMETER);
+      // 3007-PNEC-006
+      cy.get(newProposalTitle)
+        .siblings()
+        .should('contain.text', '(100 characters or less)');
+      // 3007-PNEC-004 3007-PNEC-005
+      cy.get(newProposalTitle).type('Test update network parameter proposal');
+      // 3007-PNEC-009
+      cy.get(newProposalDescription)
+        .siblings()
+        .should('contain.text', '(20,000 characters or less)');
+      // 3007-PNEC-007 3007-PNEC-008
      cy.get(newProposalDescription).type('E2E test for downloading proposals');
+      // 3007-PNEC-010
      cy.get(proposalParameterSelect).select(
        'governance_proposal_asset_minClose'
      );
+      // 3007-PNEC-011
      cy.get(newProposedParameterValue).type('10s');
-
+      // 3007-PNEC-012
+      cy.get(proposalVoteDeadline).clear().type('2');
+      // 3007-PNEC-013 3007-PNEC-014
+      cy.getByTestId('voting-date').invoke('text').should('not.be.empty');
+      // 3007-PNEC-015
+      cy.get(maxEnactDeadline).click();
+      // 3007-PNEC-016
+      cy.getByTestId('enactment-date').invoke('text').should('not.be.empty');
+      // 3007-PNEC-017
+      cy.contains(
+        'Time till enactment (must be equal to or after vote close)'
+      ).should('be.visible');
+      // 3007-PNE-018
      cy.log('Download updated proposal file');
      cy.get(proposalDownloadBtn)
        .should('be.visible')
        .click()
        .then(() => {
-          const filename =
-            downloadFolder +
-            'vega-network-param-proposal-' +
-            getFormattedTime() +
-            '.json';
-          cy.get(proposalDownloadBtn).should('be.visible').click();
-          cy.readFile(filename, proposalTimeout).then((jsonFile) => {
-            cy.wrap(jsonFile)
-              .its('rationale.description')
-              .should('eq', 'E2E test for downloading proposals');
-            cy.wrap(jsonFile)
-              .its('terms.updateNetworkParameter.changes.key')
-              .should('eq', 'governance.proposal.asset.minClose');
-            cy.wrap(jsonFile)
-              .its('terms.updateNetworkParameter.changes.value')
-              .should('eq', '10s');
+          cy.wrap(
+            getDownloadedProposalJsonPath('vega-network-param-proposal-')
+          ).then((filePath) => {
+            cy.readFile(String(filePath), { timeout: 14000 }).then(
+              (jsonFile) => {
+                cy.wrap(jsonFile)
+                  .its('rationale.description')
+                  .should('eq', 'E2E test for downloading proposals');
+                cy.wrap(jsonFile)
+                  .its('terms.updateNetworkParameter.changes.key')
+                  .should('eq', 'governance.proposal.asset.minClose');
+                cy.wrap(jsonFile)
+                  .its('terms.updateNetworkParameter.changes.value')
+                  .should('eq', '10s');
+              }
+            );
+            // 3007-PNE-019
+            goToMakeNewProposal(governanceProposalType.RAW);
+            submitUniqueRawProposal({ proposalBody: filePath });
          });
        });
    });
@@ -186,38 +187,58 @@ context.skip(
        'have.text',
        'Proposal will fail if enactment is earlier than the voting deadline'
      );
+      cy.get(proposalDownloadBtn)
+        .should('be.visible')
+        .click()
+        .then(() => {
+          cy.wrap(
+            getDownloadedProposalJsonPath('vega-network-param-proposal-')
+          ).then((filePath) => {
+            goToMakeNewProposal(governanceProposalType.RAW);
+            submitUniqueRawProposal({ proposalBody: filePath, submit: false });
+          });
+        });
      cy.get(newProposalSubmitButton).click();
-      cy.get(feedbackError).should(
-        'have.text',
+      validateFeedBackMsg(
        'Invalid params: proposal_submission.terms.closing_timestamp (cannot be after enactment time)'
      );
-      closeDialog();
-      cy.get(minVoteDeadline).click();
-      cy.get(enactmentDeadlineError).should('not.exist');
    });

    // 3003-PMAN-001
-    it('Able to submit valid new market proposal', function () {
-      goToMakeNewProposal(governanceProposalType.NEW_MARKET);
-      cy.get(newProposalTitle).type('Test new market proposal');
-      cy.get(newProposalDescription).type('E2E test for proposals');
-      cy.fixture('/proposals/new-market').then((newMarketProposal) => {
-        const newMarketPayload = JSON.stringify(newMarketProposal);
-        cy.get(newProposalTerms).type(newMarketPayload, {
-          parseSpecialCharSequences: false,
-          delay: 2,
+    it(
+      'Able to submit valid new market proposal',
+      { tags: '@smoke' },
+      function () {
+        goToMakeNewProposal(governanceProposalType.NEW_MARKET);
+        cy.get(newProposalTitle).type('Test new market proposal');
+        cy.get(newProposalDescription).type('E2E test for proposals');
+        cy.fixture('/proposals/new-market').then((newMarketProposal) => {
+          const newMarketPayload = JSON.stringify(newMarketProposal);
+          cy.get(newProposalTerms).type(newMarketPayload, {
+            parseSpecialCharSequences: false,
+            delay: 2,
+          });
        });
-      });
-      cy.get(newProposalSubmitButton).should('be.visible').click();
-      waitForProposalSubmitted();
-    });
+        cy.get(proposalDownloadBtn)
+          .should('be.visible')
+          .click()
+          .then(() => {
+            cy.wrap(
+              getDownloadedProposalJsonPath('vega-new-market-proposal-')
+            ).then((filePath) => {
+              goToMakeNewProposal(governanceProposalType.RAW);
+              submitUniqueRawProposal({ proposalBody: filePath }); // 3003-PMAN-003
+            });
+          });
+      }
+    );

    it('Unable to submit new market proposal with missing/invalid fields', function () {
      const errorMsg =
        'Invalid params: the transaction does not use a valid Vega command: unknown field "invalid" in vega.NewMarket';

      goToMakeNewProposal(governanceProposalType.NEW_MARKET);
-      cy.get(newProposalSubmitButton).should('be.visible').click();
+      cy.get(proposalDownloadBtn).should('be.visible').click();
      cy.get(inputError).should('have.length', 3);
      cy.get(newProposalTitle).type('Test new market proposal');
      cy.get(newProposalDescription).type('E2E test for proposals');
@@ -229,14 +250,28 @@ context.skip(
          delay: 2,
        });
      });
+      cy.get(proposalDownloadBtn)
+        .should('be.visible')
+        .click()
+        .then(() => {
+          cy.wrap(
+            getDownloadedProposalJsonPath('vega-new-market-proposal-')
+          ).then((filePath) => {
+            goToMakeNewProposal(governanceProposalType.RAW);
+            submitUniqueRawProposal({ proposalBody: filePath, submit: false });
+          });
+        });
      cy.get(newProposalSubmitButton).should('be.visible').click();
      cy.contains('Transaction failed', proposalTimeout).should('be.visible');
-      cy.get(feedbackError).should('have.text', errorMsg);
+      validateFeedBackMsg(errorMsg);
    });

    // Will fail if run after 'Able to submit update market proposal and vote for proposal'
    // 3002-PROP-022
    it('Unable to submit update market proposal without equity-like share in the market', function () {
+      cy.get('[data-testid="manage-vega-wallet"]:visible').click();
+      cy.get('[data-testid="select-keypair-button"]').eq(0).click(); // switch to second wallet pub key
+      stakingPageAssociateTokens('1');
      goToMakeNewProposal(governanceProposalType.UPDATE_MARKET);
      cy.get(newProposalTitle).type('Test update market proposal - rejected');
      cy.get(newProposalDescription).type('E2E test for proposals');
@@ -248,12 +283,25 @@ context.skip(
          delay: 2,
        });
      });
+      cy.get(proposalDownloadBtn)
+        .should('be.visible')
+        .click()
+        .then(() => {
+          cy.wrap(
+            getDownloadedProposalJsonPath('vega-update-market-proposal-')
+          ).then((filePath) => {
+            goToMakeNewProposal(governanceProposalType.RAW);
+            submitUniqueRawProposal({ proposalBody: filePath, submit: false });
+          });
+        });
      cy.get(newProposalSubmitButton).should('be.visible').click();
      cy.contains('Proposal rejected', proposalTimeout).should('be.visible');
-      cy.getByTestId('dialog-content')
-        .find('p')
-        .should('have.text', 'PROPOSAL_ERROR_INSUFFICIENT_EQUITY_LIKE_SHARE');
-      ensureSpecifiedUnstakedTokensAreAssociated('1');
+      validateDialogContentMsg('PROPOSAL_ERROR_INSUFFICIENT_EQUITY_LIKE_SHARE');
+      closeDialog();
+      ethereumWalletConnect();
+      stakingPageDisassociateAllTokens();
+      cy.get('[data-testid="manage-vega-wallet"]:visible').click();
+      cy.get('[data-testid="select-keypair-button"]').eq(0).click();
    });

    // 3002-PROP-020
@@ -275,15 +323,25 @@ context.skip(
          delay: 2,
        });
      });
+      cy.get(proposalDownloadBtn)
+        .should('be.visible')
+        .click()
+        .then(() => {
+          cy.wrap(
+            getDownloadedProposalJsonPath('vega-update-market-proposal-')
+          ).then((filePath) => {
+            goToMakeNewProposal(governanceProposalType.RAW);
+            submitUniqueRawProposal({ proposalBody: filePath, submit: false });
+          });
+        });
      cy.get(newProposalSubmitButton).should('be.visible').click();
      cy.contains('Transaction failed', proposalTimeout).should('be.visible');
-      cy.get(feedbackError).should(
-        'have.text',
+      validateFeedBackMsg(
        'Network error: the network blocked the transaction through the spam protection: party has insufficient associated governance tokens in their staking account to submit proposal request (ABCI code 89)'
      );
    });

-    // 3001-VOTE-092 3004-PMAC-001
+    // 3001-VOTE-092 3004-PMAC-001 3004-PMAC-003
    it('Able to submit update market proposal and vote for proposal', function () {
      vegaWalletFaucetAssetsWithoutCheck(
        fUSDCId,
@@ -313,11 +371,20 @@ context.skip(
          delay: 2,
        });
      });
-      cy.get(newProposalSubmitButton).should('be.visible').click();
-      waitForProposalSubmitted();
+      cy.get(proposalDownloadBtn)
+        .should('be.visible')
+        .click()
+        .then(() => {
+          cy.wrap(
+            getDownloadedProposalJsonPath('vega-update-market-proposal-')
+          ).then((filePath) => {
+            goToMakeNewProposal(governanceProposalType.RAW);
+            submitUniqueRawProposal({ proposalBody: filePath });
+          });
+        });
      navigateTo(navigation.proposals);
      cy.get('@EnactedMarketId').then((marketId) => {
-        cy.contains(String(marketId))
+        cy.contains(String(marketId).slice(0, 6))
          .parentsUntil(proposalListItem)
          .last()
          .within(() => {
@@ -341,12 +408,13 @@ context.skip(
        'contain.text',
        'Currently expected to pass'
      );
+      cy.getByTestId('vote-breakdown-toggle').click();
      getProposalInformationFromTable('Expected to pass')
        .contains('👍 by token vote')
        .should('be.visible');
    });

-    // 3001-VOTE-026 3001-VOTE-027  3001-VOTE-028 3001-VOTE-095 3001-VOTE-096 3005-PASN-001
+    // 3001-VOTE-026 3001-VOTE-027 3001-VOTE-028 3001-VOTE-095 3001-VOTE-096 3005-PASN-001
    it('Able to submit new asset proposal using min deadlines', function () {
      const proposalTitle = 'Test new asset proposal';
      goToMakeNewProposal(governanceProposalType.NEW_ASSET);
@@ -362,25 +430,23 @@ context.skip(
      cy.get(minVoteDeadline).click();
      cy.get(minValidationDeadline).click();
      cy.get(minEnactDeadline).click();
+      cy.get(proposalDownloadBtn)
+        .should('be.visible')
+        .click()
+        .then(() => {
+          cy.wrap(
+            getDownloadedProposalJsonPath('vega-new-asset-proposal-')
+          ).then((filePath) => {
+            goToMakeNewProposal(governanceProposalType.RAW);
+            submitUniqueRawProposal({ proposalBody: filePath, submit: false }); // 3005-PASN-003
+          });
+        });
      cy.get(newProposalSubmitButton).should('be.visible').click();
-      cy.contains('Awaiting network confirmation', epochTimeout).should(
-        'be.visible'
-      );
-      cy.contains('Proposal waiting for node vote', proposalTimeout).should(
-        'be.visible'
-      );
      closeDialog();
      cy.get(newProposalSubmitButton).should('be.visible').click();
      // cannot submit a proposal with ERC20 address already in use
      cy.contains('Proposal rejected', proposalTimeout).should('be.visible');
-      cy.getByTestId('dialog-content')
-        .last()
-        .within(() => {
-          cy.get('p').should(
-            'have.text',
-            'PROPOSAL_ERROR_ERC20_ADDRESS_ALREADY_IN_USE'
-          );
-        });
+      validateDialogContentMsg('PROPOSAL_ERROR_ERC20_ADDRESS_ALREADY_IN_USE');
      closeDialog();
      navigateTo(navigation.proposals);
      cy.contains(proposalTitle)
@@ -389,6 +455,7 @@ context.skip(
        .within(() => {
          cy.getByTestId(viewProposalBtn).click();
        });
+      cy.getByTestId('proposal-terms-toggle').click();
      cy.getByTestId(proposalTermsSection).within(() => {
        cy.contains('USDT Coin').should('be.visible');
        cy.contains('USDT').should('be.visible');
@@ -397,15 +464,8 @@ context.skip(

    it('Unable to submit new asset proposal with missing/invalid fields', function () {
      goToMakeNewProposal(governanceProposalType.NEW_ASSET);
-      cy.get(newProposalSubmitButton).should('be.visible').click();
+      cy.get(proposalDownloadBtn).should('be.visible').click();
      cy.get(inputError).should('have.length', 3);
-      cy.get(newProposalTitle).type('Invalid new asset proposal');
-      cy.get(newProposalDescription).type('Invalid E2E test for proposals');
-      cy.get(proposalValidationDeadline).clear().type('2');
-      cy.get(newProposalSubmitButton).click();
-      cy.contains('Awaiting network confirmation', epochTimeout).should(
-        'not.exist'
-      );
    });

    it('Able to submit update asset proposal using min deadline', function () {
@@ -416,8 +476,17 @@ context.skip(
      enterUpdateAssetProposalDetails();
      cy.get(minVoteDeadline).click();
      cy.get(minEnactDeadline).click();
-      cy.get(newProposalSubmitButton).should('be.visible').click();
-      waitForProposalSubmitted();
+      cy.get(proposalDownloadBtn)
+        .should('be.visible')
+        .click()
+        .then(() => {
+          cy.wrap(
+            getDownloadedProposalJsonPath('vega-update-asset-proposal-')
+          ).then((filePath) => {
+            goToMakeNewProposal(governanceProposalType.RAW);
+            submitUniqueRawProposal({ proposalBody: filePath });
+          });
+        });
      navigateTo(navigation.proposals);
      cy.get(openProposals).within(() => {
        cy.get(proposalType)
@@ -425,7 +494,7 @@ context.skip(
          .parentsUntil(proposalListItem)
          .last()
          .within(() => {
-            cy.get(proposalDetails).should('contain.text', assetId); // 3001-VOTE-029
+            cy.get(proposalDetails).should('contain.text', assetId.slice(0, 6)); // 3001-VOTE-029
            cy.getByTestId(viewProposalBtn).click();
          });
      });
@@ -433,37 +502,97 @@ context.skip(
        .invoke('text')
        .should('not.be.empty');
      // 3001-VOTE-030 3001-VOTE-031
-      cy.getByTestId(proposalTermsSection).within(() => {
-        cy.contains('UpdateAsset').should('be.visible');
-        cy.contains('UpdateERC20').should('be.visible');
-        cy.contains('"lifetimeLimit": "10"').should('be.visible');
+      cy.getByTestId('proposal-terms-toggle').click();
+      cy.getByTestId('proposal-terms').within(() => {
+        getProposalInformationFromTable('assetId').should('have.text', assetId);
+        getProposalInformationFromTable('lifetimeLimit').should(
+          'have.text',
+          '10'
+        );
      });
    });

+    // 3006-PASC-001 3006-PASC-003
    it('Able to submit update asset proposal using max deadline', function () {
      goToMakeNewProposal(governanceProposalType.UPDATE_ASSET);
      enterUpdateAssetProposalDetails();
      cy.get(maxVoteDeadline).click();
      cy.get(maxEnactDeadline).click();
-      cy.get(newProposalSubmitButton).should('be.visible').click();
-      waitForProposalSubmitted();
+      cy.get(proposalDownloadBtn)
+        .should('be.visible')
+        .click()
+        .then(() => {
+          cy.wrap(
+            getDownloadedProposalJsonPath('vega-update-asset-proposal-')
+          ).then((filePath) => {
+            goToMakeNewProposal(governanceProposalType.RAW);
+            submitUniqueRawProposal({ proposalBody: filePath });
+          });
+        });
    });

    it('Unable to submit edit asset proposal with missing/invalid fields', function () {
      goToMakeNewProposal(governanceProposalType.UPDATE_ASSET);
-      cy.get(newProposalSubmitButton).should('be.visible').click();
+      cy.get(proposalDownloadBtn).should('be.visible').click();
      cy.get(inputError).should('have.length', 3);
    });

-    function getFormattedTime() {
-      const now = new Date();
-      const day = now.getDate().toString().padStart(2, '0');
-      const month = now.toLocaleString('en-US', { month: 'short' });
-      const year = now.getFullYear().toString();
-      const hours = now.getHours().toString().padStart(2, '0');
-      const minutes = now.getMinutes().toString().padStart(2, '0');
+    it('Able to download and submit freeform proposal', function () {
+      goToMakeNewProposal(governanceProposalType.FREEFORM);
+      // 3008-PFRO-006
+      cy.get(newProposalTitle)
+        .siblings()
+        .should('contain.text', '(100 characters or less)'); // 3008-PFRO-007
+      // 3008-PFRO-005
+      cy.get(newProposalTitle).type('Test freeform proposal form');
+      // 3008-PFRO-009
+      cy.get(newProposalDescription)
+        .siblings()
+        .should('contain.text', '(20,000 characters or less)'); // 3008-PFRO-010
+      // 3008-PFRO-008 3002-PROP-012 3002-PROP-016
+      cy.get(newProposalDescription).type(
+        'E2E test for downloading freeform proposal'
+      );
+      // 3008-PFRO-012
+      cy.get(minVoteDeadline).should('exist'); // 3002-PROP-008
+      cy.get(maxVoteDeadline).should('exist');
+      // 3008-PFRO-011
+      cy.get(proposalVoteDeadline).clear().type('2');
+      // 3008-PFRO-013 3008-PFRO-014
+      cy.getByTestId('voting-date').invoke('text').should('not.be.empty');
+      // 3008-PFRO-015
+      cy.log('Download updated proposal file');
+      cy.get(proposalDownloadBtn)
+        .should('be.visible')
+        .click()
+        .then(() => {
+          cy.wrap(
+            getDownloadedProposalJsonPath('vega-freeform-proposal-')
+          ).then((filePath) => {
+            // 3008-PFRO-019
+            goToMakeNewProposal(governanceProposalType.RAW);
+            submitUniqueRawProposal({ proposalBody: filePath });
+          });
+        });
+    });

-      return `${day}-${month}-${year}-${hours}-${minutes}`;
+    after('Disassociate from second wallet key if present', function () {
+      cy.reload();
+      waitForSpinner();
+      ethereumWalletConnect();
+      dissociateFromSecondWalletKey();
+    });
+
+    function validateDialogContentMsg(expectedMsg: string) {
+      cy.getByTestId('dialog-content')
+        .last()
+        .within(() => {
+          cy.get('p').should('have.text', expectedMsg);
+        });
+    }
+
+    function validateFeedBackMsg(expectedMsg: string) {
+      cy.get(feedbackError).should('have.text', expectedMsg);
    }

    function enterUpdateAssetProposalDetails() {
@@ -86,11 +86,12 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
  });

  it('Newly created proposals list - shows title and portion of summary', function () {
-    const proposalPath = '/proposals/new-market-raw.json';
-    const enactmentTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(3);
+    const proposalPath = 'src/fixtures/proposals/new-market-raw.json';
+    const proposalTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(3);
    submitUniqueRawProposal({
      proposalBody: proposalPath,
-      enactmentTimestamp: enactmentTimestamp,
+      enactmentTimestamp: proposalTimestamp,
+      closingTimestamp: proposalTimestamp,
    }); // 3001-VOTE-052
    // 3001-VOTE-008
    // 3001-VOTE-034
@@ -29,13 +29,17 @@ context('rewards - flow', { tags: '@slow' }, function () {
    turnTelemetryOff();
    cy.visit('/');
    waitForSpinner();
-    depositAsset(vegaAssetAddress, '1000', 18);
    ethereumWalletConnect();
    cy.connectVegaWallet();
+    depositAsset(vegaAssetAddress, '1000', 18);
+    cy.getByTestId('currency-title', txTimeout).should(
+      'contain.text',
+      'Collateral'
+    );
    vegaWalletTeardown();
    cy.associateTokensToVegaWallet('6000');
-    cy.VegaWalletTopUpRewardsPool(30, 200);
    navigateTo(navigation.validators);
+    cy.VegaWalletTopUpRewardsPool();
    cy.get(vegaWalletUnstakedBalance, txTimeout).should(
      'contain',
      '6,000.0',
@@ -54,7 +54,7 @@ context(
  'Staking Tab - with eth and vega wallets connected',
  { tags: '@slow' },
  function () {
-    // 2001-STKE-002, 2001-STKE-032
+    // 1002-STKE-002, 1002-STKE-032
    before('visit staking tab and connect vega wallet', function () {
      cy.visit('/');
      ethereumWalletConnect();
@@ -77,25 +77,41 @@ context(
        }
      );

+      // 1002-STKE-035 1002-STKE-036
+      it('Unable to stake against a validator with less than minimum and more than associated amount', function () {
+        ensureSpecifiedUnstakedTokensAreAssociated('3');
+        verifyUnstakedBalance(3.0);
+        verifyEthWalletTotalAssociatedBalance('3.0');
+        verifyEthWalletAssociatedBalance('3.0');
+        cy.get('button').contains('Select a validator to nominate').click();
+        clickOnValidatorFromList(0);
+        cy.getByTestId(stakeAddStakeRadioButton, epochTimeout).click({
+          force: true,
+        });
+        cy.getByTestId(stakeTokenAmountInputBox).type('0.001');
+        cy.getByTestId(stakeTokenSubmitButton).should('be.disabled');
+        cy.getByTestId(stakeTokenAmountInputBox).clear().type('4');
+        cy.getByTestId(stakeTokenSubmitButton).should('be.disabled');
+      });
      it('Able to stake against a validator - using vega from wallet', function () {
        ensureSpecifiedUnstakedTokensAreAssociated('3');
        verifyUnstakedBalance(3.0);
        verifyEthWalletTotalAssociatedBalance('3.0');
        verifyEthWalletAssociatedBalance('3.0');
        cy.get('button').contains('Select a validator to nominate').click();
-        // 2001-STKE-031
+        // 1002-STKE-031
        clickOnValidatorFromList(0);
-        // 2001-STKE-033, 2001-STKE-034, 2001-STKE-037
+        // 1002-STKE-033, 1002-STKE-034, 1002-STKE-037
        stakingValidatorPageAddStake('2');
        verifyUnstakedBalance(1.0);
-        // 2001-STKE-039
+        // 1002-STKE-039
        verifyStakedBalance(2.0);
-        verifyNextEpochValue(2.0); // 2001-STKE-016 2001-STKE-038
-        verifyThisEpochValue(2.0); // 2001-STKE-013
+        verifyNextEpochValue(2.0); // 1002-STKE-016 1002-STKE-038
+        verifyThisEpochValue(2.0); // 1002-STKE-013
        closeStakingDialog();
        navigateTo(navigation.validators);

-        // 2002-SINC-007
+        // 2002-SINC-007 1002-STKE-015 1002-STKE-017 1002-STKE-052
        validateValidatorListTotalStakeAndShare('0', '3,002.00', '50.02%');
      });

@@ -109,6 +125,7 @@ context(
        cy.getByTestId(userStake, epochTimeout)
          .first()
          .should('have.text', '2.00');
+        waitForBeginningOfEpoch();
        cy.getByTestId('total-stake').first().realHover();
        cy.getByTestId('staked-by-user-tooltip')
          .first()
@@ -217,7 +234,7 @@ context(
          });
      });

-      // 2001-STKE-041
+      // 1002-STKE-041 1002-STKE-053
      it(
        'Able to remove part of a stake against a validator',
        { tags: '@smoke' },
@@ -230,11 +247,11 @@ context(
          verifyUnstakedBalance(1.0);
          closeStakingDialog();
          navigateTo(navigation.validators);
-          // 2001-STKE-040
+          // 1002-STKE-040
          clickOnValidatorFromList(0);
-          // 2001-STKE-044, 2001-STKE-048
+          // 1002-STKE-044, 1002-STKE-048
          stakingValidatorPageRemoveStake('1');
-          // 2001-STKE-049
+          // 1002-STKE-049
          verifyNextEpochValue(2.0);
          verifyUnstakedBalance(2.0);
          verifyStakedBalance(2.0);
@@ -254,7 +271,7 @@ context(
        }
      );

-      // 2001-STKE-045
+      // 1002-STKE-045
      it('Able to remove a full stake against a validator', function () {
        stakingPageAssociateTokens('3');
        verifyUnstakedBalance(3.0);
@@ -302,6 +319,7 @@ context(
          .and('be.visible');
      });

+      // 1002-STKE-046 1002-STKE-047
      it('Unable to remove a stake greater than staked amount next epoch for a validator', function () {
        stakingPageAssociateTokens('3');
        verifyUnstakedBalance(3.0);
@@ -379,6 +397,9 @@ context(
      });

      it('Disassociating some tokens - prioritizes unstaked tokens', function () {
+        vegaWalletSetSpecifiedApprovalAmount('1000');
+        cy.reload();
+        ethereumWalletConnect();
        stakingPageAssociateTokens('3');
        verifyUnstakedBalance(3.0);
        cy.get('button').contains('Select a validator to nominate').click();
@@ -401,7 +422,7 @@ context(
      });

      it('Associating wallet tokens - when some already staked - auto stakes tokens to staked validator', function () {
-        // 2001-STKE-004
+        // 1002-STKE-004
        stakingPageAssociateTokens('3');
        verifyUnstakedBalance(3.0);
        cy.get('button').contains('Select a validator to nominate').click();
@@ -415,7 +436,7 @@ context(
      });

      it('Associating vesting contract tokens - when some already staked - auto stakes tokens to staked validator', function () {
-        // 2001-STKE-004
+        // 1002-STKE-004
        stakingPageAssociateTokens('3', { type: 'contract' });
        verifyUnstakedBalance(3.0);
        cy.get('button').contains('Select a validator to nominate').click();
@@ -429,7 +450,7 @@ context(
      });

      it('Associating vesting contract tokens - when wallet tokens already staked - auto stakes tokens to staked validator', function () {
-        // 2001-STKE-004
+        // 1002-STKE-004
        stakingPageAssociateTokens('3', { type: 'wallet' });
        verifyUnstakedBalance(3.0);
        cy.get('button').contains('Select a validator to nominate').click();
@@ -443,7 +464,7 @@ context(
      });

      it('Associating tokens - with multiple validators already staked - auto stakes to staked validators - abiding by existing stake ratio', function () {
-        // 2001-STKE-004
+        // 1002-STKE-004
        stakingPageAssociateTokens('6');
        verifyUnstakedBalance(6.0);
        cy.get('button').contains('Select a validator to nominate').click();
@@ -485,6 +506,7 @@ context(
      });

      afterEach('Teardown Wallet', function () {
+        navigateTo(navigation.home);
        vegaWalletTeardown();
      });

@@ -495,7 +517,7 @@ context(
      }

      function verifyThisEpochValue(amount: number) {
-        cy.getByTestId('stake-this-epoch', epochTimeout) // 2001-STKE-013
+        cy.getByTestId('stake-this-epoch', epochTimeout) // 1002-STKE-013
          .contains(amount, epochTimeout)
          .should('be.visible');
      }
@@ -24,7 +24,6 @@ const ethWalletContainer = '[data-testid="ethereum-wallet"]';
 const vegaWalletAssociatedBalance = '[data-testid="currency-value"]';
 const vegaWalletUnstakedBalance =
  '[data-testid="vega-wallet-balance-unstaked"]';
-const currencyTitle = '[data-testid="currency-title"]:visible';
 const txTimeout = Cypress.env('txTimeout');
 const vegaWalletPublicKeyShort = Cypress.env('vegaWalletPublicKeyShort');
 const ethWalletAssociateButton = '[data-testid="associate-btn"]:visible';
@@ -39,7 +38,7 @@ const associatedKey = '[data-testid="associated-key"]';
 const associatedAmount = '[data-testid="associated-amount"]';
 const associateCompleteText = '[data-testid="transaction-complete-body"]';
 const disassociationWarning = '[data-testid="disassociation-warning"]';
-const vegaWallet = '[data-testid="vega-wallet"]';
+const vegaWallet = 'aside [data-testid="vega-wallet"]';

 context(
  'Token association flow - with eth and vega wallets connected',
@@ -65,43 +64,38 @@ context(
        }
      );

-      it('Able to associate tokens - from wallet', function () {
-        //1004-ASSO-003
-        //1004-ASSO-005
-        //1004-ASSO-009
-        //1004-ASSO-030
-        //1004-ASSO-012
-        //1004-ASSO-013
-        //1004-ASSO-014
-        //1004-ASSO-015
-        //1004-ASSO-030
-        //0005-ETXN-006
-        //0005-ETXN-003
-        //0005-ETXN-005
-        stakingPageAssociateTokens('2', { skipConfirmation: true });
-
-        cy.get(currencyTitle, txTimeout).should('have.length.above', 4);
-        validateWalletCurrency('Associated', '0.00');
-        validateWalletCurrency('Pending association', '2.00');
-        validateWalletCurrency('Total associated after pending', '2.00');
-        cy.get(currencyTitle, txTimeout).should('have.length.at.least', 6);
-
-        // 0005-ETXN-002
-        verifyEthWalletAssociatedBalance('2.0');
-
-        verifyEthWalletTotalAssociatedBalance('2.0');
-
-        cy.get(vegaWallet)
-          .first()
-          .within(() => {
+      it(
+        'Able to associate tokens - from wallet',
+        { tags: '@smoke' },
+        function () {
+          //1004-ASSO-003
+          //1004-ASSO-005
+          //1004-ASSO-009
+          //1004-ASSO-030
+          //1004-ASSO-012
+          //1004-ASSO-013
+          //1004-ASSO-014
+          //1004-ASSO-015
+          //1004-ASSO-030
+          //0005-ETXN-006
+          //0005-ETXN-003
+          //0005-ETXN-005
+          stakingPageAssociateTokens('2', { skipConfirmation: true });
+          validateWalletCurrency('Associated', '0.00');
+          validateWalletCurrency('Pending association', '2.00');
+          validateWalletCurrency('Total associated after pending', '2.00');
+          // 0005-ETXN-002
+          verifyEthWalletAssociatedBalance('2.0');
+          verifyEthWalletTotalAssociatedBalance('2.0');
+          cy.get(vegaWallet).within(() => {
            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
              'contain',
              2.0
            );
          });
-
-        cy.get(vegaWalletUnstakedBalance, txTimeout).should('contain', 2.0);
-      });
+          cy.get(vegaWalletUnstakedBalance, txTimeout).should('contain', 2.0);
+        }
+      );

      it('Able to disassociate all associated tokens - manually', function () {
        // 1004-ASSO-025
@@ -114,12 +108,11 @@ context(
        verifyEthWalletAssociatedBalance('2.0');
        verifyEthWalletTotalAssociatedBalance('6,002.00');
        cy.get('button').contains('Select a validator to nominate').click();
+        cy.getByTestId('epoch-countdown').should('be.visible');
        stakingPageDisassociateTokens('2');
-        cy.get(currencyTitle, txTimeout).should('have.length.above', 4);
        validateWalletCurrency('Associated', '2.00');
        validateWalletCurrency('Pending association', '2.00');
        validateWalletCurrency('Total associated after pending', '0.00');
-        cy.get(currencyTitle, txTimeout).should('have.length.at.least', 6);
        cy.get(
          '[data-testid="eth-wallet-associated-balances"]:visible',
          txTimeout
@@ -132,38 +125,26 @@ context(
        stakingPageAssociateTokens('1001', { approve: true });
        verifyEthWalletAssociatedBalance('1,001.00');
        verifyEthWalletTotalAssociatedBalance('7,001.00');
-        cy.get(vegaWallet)
-          .last()
-          .within(() => {
-            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-              'contain',
-              '1,001.00'
-            );
-          });
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should(
+            'contain',
+            '1,001.00'
+          );
+        });
      });

      it('Able to disassociate a partial amount of tokens currently associated', function () {
        stakingPageAssociateTokens('2');
-        cy.get(vegaWallet)
-          .first()
-          .within(() => {
-            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-              'contain',
-              2.0
-            );
-          });
-
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 2.0);
+        });
        cy.get('button').contains('Select a validator to nominate').click();
+        cy.getByTestId('epoch-countdown').should('be.visible');
        stakingPageDisassociateTokens('1');
        verifyEthWalletAssociatedBalance('1.0');
-        cy.get(vegaWallet)
-          .first()
-          .within(() => {
-            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-              'contain',
-              1.0
-            );
-          });
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 1.0);
+        });
      });

      it('Able to disassociate all tokens - using max', function () {
@@ -171,15 +152,11 @@ context(
        const warningText =
          'Warning: Any tokens that have been nominated to a node will sacrifice rewards they are due for the current epoch. If you do not wish to sacrifice these, you should remove stake from a node at the end of an epoch before disassociation.';
        stakingPageAssociateTokens('2');
-        cy.get(vegaWallet)
-          .first()
-          .within(() => {
-            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-              'contain',
-              2.0
-            );
-          });
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 2.0);
+        });
        cy.get('button').contains('Select a validator to nominate').click();
+        cy.getByTestId('epoch-countdown').should('be.visible');
        cy.get(ethWalletDissociateButton).click();
        cy.get(disassociationWarning).should('contain', warningText);
        stakingPageDisassociateAllTokens();
@@ -197,14 +174,9 @@ context(
              'not.exist'
            );
          });
-        cy.get(vegaWallet)
-          .first()
-          .within(() => {
-            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-              'contain',
-              0.0
-            );
-          });
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 0.0);
+        });
      });

      it('Able to associate and disassociate vesting contract tokens', function () {
@@ -219,32 +191,22 @@ context(
          type: 'contract',
          skipConfirmation: true,
        });
-
-        cy.get(currencyTitle, txTimeout).should('have.length.above', 4);
        validateWalletCurrency('Associated', '0.00');
        validateWalletCurrency('Pending association', '2.00');
        validateWalletCurrency('Total associated after pending', '2.00');
-        cy.get(currencyTitle, txTimeout).should('have.length.at.least', 6);
        verifyEthWalletAssociatedBalance('2.0');
        verifyEthWalletTotalAssociatedBalance('2.0');
-        cy.get(vegaWallet)
-          .first()
-          .within(() => {
-            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-              'contain',
-              2.0
-            );
-          });
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 2.0);
+        });
        cy.get(vegaWalletUnstakedBalance, txTimeout).should('contain', 2.0);
        stakingPageDisassociateTokens('1', {
          type: 'contract',
          skipConfirmation: true,
        });
-        cy.get(currencyTitle, txTimeout).should('have.length.above', 4);
        validateWalletCurrency('Associated', '2.00');
        validateWalletCurrency('Pending association', '1.00');
        validateWalletCurrency('Total associated after pending', '1.00');
-        cy.get(currencyTitle, txTimeout).should('have.length.at.least', 6);
        verifyEthWalletAssociatedBalance('1.0');
        verifyEthWalletTotalAssociatedBalance('1.0');
      });
@@ -256,6 +218,7 @@ context(
        // 1004-ASSO-022
        stakingPageAssociateTokens('21', { type: 'wallet' });
        cy.get('button').contains('Select a validator to nominate').click();
+        cy.getByTestId('epoch-countdown').should('be.visible');
        stakingPageAssociateTokens('37', { type: 'contract' });
        cy.get(vestingContractSection)
          .first()
@@ -275,28 +238,18 @@ context(
            );
            cy.get(associatedAmount, txTimeout).should('contain', 21);
          });
-        cy.get(vegaWallet)
-          .first()
-          .within(() => {
-            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-              'contain',
-              58
-            );
-          });
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 58);
+        });
        stakingPageDisassociateTokens('6', { type: 'contract' });
        cy.get(vestingContractSection)
          .first()
          .within(() => {
            cy.get(associatedAmount, txTimeout).should('contain', 31);
          });
-        cy.get(vegaWallet)
-          .first()
-          .within(() => {
-            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-              'contain',
-              52
-            );
-          });
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 52);
+        });
        navigateTo(navigation.validators);
        stakingPageDisassociateTokens('9', { type: 'wallet' });
        cy.get(vegaInWalletSection)
@@ -304,14 +257,9 @@ context(
          .within(() => {
            cy.get(associatedAmount, txTimeout).should('contain', 12);
          });
-        cy.get(vegaWallet)
-          .first()
-          .within(() => {
-            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-              'contain',
-              43
-            );
-          });
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 43);
+        });
      });

      it('Not able to associate more tokens than owned', function () {
@@ -328,11 +276,9 @@ context(
      // 1004-ASSO-004
      it('Pending association outside of app is shown', function () {
        vegaWalletAssociate('2');
-        cy.get(currencyTitle, txTimeout).should('have.length.above', 4);
        validateWalletCurrency('Associated', '0.00');
        validateWalletCurrency('Pending association', '2.00');
        validateWalletCurrency('Total associated after pending', '2.00');
-        cy.get(currencyTitle, txTimeout).should('have.length.at.least', 6);
        validateWalletCurrency('Associated', '2.00');
      });

@@ -341,11 +287,9 @@ context(
        cy.wrap(validateWalletCurrency('Associated', '2.00')).then(() => {
          vegaWalletDisassociate('2');
        });
-        cy.get(currencyTitle, txTimeout).should('have.length.above', 4);
        validateWalletCurrency('Associated', '2.00');
        validateWalletCurrency('Pending association', '2.00');
        validateWalletCurrency('Total associated after pending', '0.00');
-        cy.get(currencyTitle, txTimeout).should('have.length.at.least', 6);
        validateWalletCurrency('Associated', '0.00');
      });

@@ -364,14 +308,9 @@ context(
          Cypress.env('vegaWalletPublicKey2')
        );
        stakingPageAssociateTokens('2');
-        cy.get(vegaWallet)
-          .first()
-          .within(() => {
-            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-              'contain',
-              2.0
-            );
-          });
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 2.0);
+        });
        cy.get(associateCompleteText).should(
          'have.text',
          `Vega key ${Cypress.env(
@@ -55,6 +55,10 @@ context(
      navigateTo(navigation.withdraw);
      cy.connectVegaWallet();
      ethereumWalletConnect();
+      cy.getByTestId('currency-title', txTimeout).should(
+        'contain.text',
+        usdtName
+      );
    });

    it('Able to open withdrawal form with vega wallet connected', function () {
@@ -69,7 +73,10 @@ context(
    it('Unable to submit withdrawal with invalid fields', function () {
      cy.getByTestId(withdraw).should('be.visible').click();
      cy.getByTestId(withdrawalForm, txTimeout).within(() => {
-        cy.get('select').select(usdtSelectValue, { force: true });
+        cy.getByTestId('select-asset').click();
+        cy.get('select')
+          .select(usdtSelectValue, { force: true })
+          .should('have.value', usdtSelectValue);
        cy.getByTestId(balanceAvailable, txTimeout).should('exist');
        cy.getByTestId(submitWithdrawalButton).click();
        cy.getByTestId(formValidationError).should('have.length', 1);
@@ -89,68 +96,75 @@ context(
      });
    });

-    it('Able to withdraw asset: -eth wallet connected -withdraw funds button', function () {
-      // fill in withdrawal form
-      cy.getByTestId(withdraw).should('be.visible').click();
-      cy.getByTestId(withdrawalForm, txTimeout).within(() => {
-        cy.get('select').select(usdtSelectValue, { force: true });
-        cy.getByTestId(balanceAvailable, txTimeout).should('exist');
-        cy.getByTestId(withdrawalThreshold).should(
-          'have.text',
-          '100,000.00000T'
-        );
-        cy.getByTestId(delayTime).should('have.text', 'None');
-        cy.getByTestId(amountInput).click().type('120');
-        cy.getByTestId(submitWithdrawalButton).click();
-      });
-      // assert withdrawal request
-      cy.getByTestId(toast)
-        .first(txTimeout)
-        .should('contain.text', 'Funds unlocked')
-        .within(() => {
-          cy.getByTestId('external-link').should('exist');
-          cy.getByTestId(toastPanel).should(
-            'contain.text',
-            'Withdraw 120.00 tUSDC'
+    it(
+      'Able to withdraw asset: -eth wallet connected -withdraw funds button',
+      { tags: '@smoke' },
+      function () {
+        // fill in withdrawal form
+        cy.getByTestId(withdraw).should('be.visible').click();
+        cy.getByTestId(withdrawalForm, txTimeout).within(() => {
+          cy.getByTestId('select-asset').click();
+          cy.get('select')
+            .select(usdtSelectValue, { force: true })
+            .should('have.value', usdtSelectValue);
+          cy.getByTestId(balanceAvailable, txTimeout).should('exist');
+          cy.getByTestId(withdrawalThreshold).should(
+            'have.text',
+            '100,000.00000T'
          );
-          cy.getByTestId(toastCompleteWithdrawal).click();
-          cy.getByTestId(toastClose).click();
+          cy.getByTestId(delayTime).should('have.text', 'None');
+          cy.getByTestId(amountInput).click().type('120');
+          cy.getByTestId(submitWithdrawalButton).click();
        });
-      // withdrawal complete
-      cy.getByTestId(toast)
-        .first(txTimeout)
-        .should('contain.text', 'The withdrawal has been approved.')
-        .within(() => {
-          cy.getByTestId(toastPanel).should(
-            'contain.text',
-            'Withdraw 120.00 tUSDC'
-          );
-        });
-      cy.getByTestId(toast)
-        .last(txTimeout)
-        .should('contain.text', 'Transaction confirmed')
-        .within(() => {
-          cy.getByTestId('external-link').should('exist');
-        });
-      // withdrawal history for complete withdrawal displayed
-      cy.get(tableWithdrawnStatus)
-        .eq(1, txTimeout)
-        .should('have.text', 'Completed')
-        .parent()
-        .within(() => {
-          cy.get(tableAssetSymbol).should('have.text', usdcSymbol);
-          cy.get(tableAmount).should('have.text', '120.00');
-          cy.get(tableReceiverAddress)
-            .find('a')
-            .should('have.attr', 'href')
-            .and('contain', 'https://sepolia.etherscan.io/address/');
-          cy.get(tableWithdrawnTimeStamp).should('not.be.empty');
-          cy.get(tableTxHash)
-            .find('a')
-            .should('have.attr', 'href')
-            .and('contain', 'https://sepolia.etherscan.io/tx/');
-        });
-    });
+        // assert withdrawal request
+        cy.getByTestId(toast)
+          .first(txTimeout)
+          .should('contain.text', 'Funds unlocked')
+          .within(() => {
+            cy.getByTestId('external-link').should('exist');
+            cy.getByTestId(toastPanel).should(
+              'contain.text',
+              'Withdraw 120.00 tUSDC'
+            );
+            cy.getByTestId(toastCompleteWithdrawal).click();
+            cy.getByTestId(toastClose).click();
+          });
+        // withdrawal complete
+        cy.getByTestId(toast)
+          .first(txTimeout)
+          .should('contain.text', 'The withdrawal has been approved.')
+          .within(() => {
+            cy.getByTestId(toastPanel).should(
+              'contain.text',
+              'Withdraw 120.00 tUSDC'
+            );
+          });
+        cy.getByTestId(toast)
+          .last(txTimeout)
+          .should('contain.text', 'Transaction confirmed')
+          .within(() => {
+            cy.getByTestId('external-link').should('exist');
+          });
+        // withdrawal history for complete withdrawal displayed
+        cy.get(tableWithdrawnStatus)
+          .eq(1, txTimeout)
+          .should('have.text', 'Completed')
+          .parent()
+          .within(() => {
+            cy.get(tableAssetSymbol).should('have.text', usdcSymbol);
+            cy.get(tableAmount).should('have.text', '120.00');
+            cy.get(tableReceiverAddress)
+              .find('a')
+              .should('have.attr', 'href')
+              .and('contain', 'https://sepolia.etherscan.io/address/');
+            cy.get(tableWithdrawnTimeStamp).should('not.be.empty');
+            cy.get(tableTxHash)
+              .find('a')
+              .should('have.attr', 'href')
+              .and('contain', 'https://sepolia.etherscan.io/tx/');
+          });
+      }
+    );

    it('Able to withdraw asset: -eth wallet not connected', function () {
      const ethWalletAddress = Cypress.env('ethWalletPublicKey');
@@ -159,7 +173,10 @@ context(
      // fill in withdrawal form
      cy.getByTestId(withdraw).should('be.visible').click();
      cy.getByTestId(withdrawalForm, txTimeout).within(() => {
-        cy.get('select').select(usdtSelectValue, { force: true });
+        cy.getByTestId('select-asset').click();
+        cy.get('select')
+          .select(usdtSelectValue, { force: true })
+          .should('have.value', usdtSelectValue);
        cy.getByTestId(ethAddressInput).should('be.empty');
        cy.getByTestId(amountInput).click().type('110');
        cy.getByTestId(submitWithdrawalButton).click();
@@ -219,7 +236,10 @@ context(
    it('Should be able to see withdrawal details from toast', function () {
      cy.getByTestId(withdraw).click();
      cy.getByTestId(withdrawalForm, txTimeout).within(() => {
-        cy.get('select').select(usdtSelectValue, { force: true });
+        cy.getByTestId('select-asset').click();
+        cy.get('select')
+          .select(usdtSelectValue, { force: true })
+          .should('have.value', usdtSelectValue);
        cy.getByTestId(balanceAvailable, txTimeout).should('exist');
        cy.getByTestId(withdrawalThreshold).should(
          'have.text',
@@ -274,7 +294,10 @@ context(
      cy.connectPublicKey(vegaWalletPubKey);
      cy.getByTestId(withdraw).should('be.visible').click();
      cy.getByTestId(withdrawalForm, txTimeout).within(() => {
-        cy.get('select').select(usdtSelectValue, { force: true });
+        cy.getByTestId('select-asset').click();
+        cy.get('select')
+          .select(usdtSelectValue, { force: true })
+          .should('have.value', usdtSelectValue);
        cy.getByTestId(balanceAvailable, txTimeout).should('exist');
        cy.getByTestId(amountInput).click().type('100');
        cy.pause();
@@ -11,7 +11,6 @@ import {
 import { mockNetworkUpgradeProposal } from '../../support/proposal.functions';

 const proposalDocumentationLink = '[data-testid="proposal-documentation-link"]';
-const newProposalLink = '[data-testid="new-proposal-link"]';
 const governanceDocsUrl = 'https://vega.xyz/governance';
 const connectToVegaWalletButton = '[data-testid="connect-to-vega-wallet-btn"]';

@@ -32,6 +31,14 @@ context(
      verifyPageHeader('Proposals');
    });

+    // 3002-PROP-023 3004-PMAC-002 3005-PASN-002 3006-PASC-002 3007-PNEC-002 3008-PFRO-003
+    it('should have button for link to more information on proposals', function () {
+      const proposalsUrl = 'https://docs.vega.xyz/mainnet/tutorials/proposals';
+      cy.getByTestId('new-proposal-link')
+        .find('a')
+        .should('have.attr', 'href', proposalsUrl);
+    });
+
    it('should be able to see a working link for - find out more about Vega governance', function () {
      // 3001-VOTE-001
      cy.get(proposalDocumentationLink)
@@ -54,17 +61,62 @@ context(
        });
    });

-    it.skip('should be able to see button for - new proposal', function () {
-      // 3001-VOTE-002
-      cy.get(newProposalLink)
-        .should('be.visible')
-        .and('have.text', 'New proposal')
-        .and('have.attr', 'href')
-        .and('equal', '/proposals/propose');
+    // 3007-PNE-021
+    it('should have documentation links for network parameter proposal', function () {
+      goToMakeNewProposal(governanceProposalType.NETWORK_PARAMETER);
+      cy.getByTestId('proposal-docs-link')
+        .find('a')
+        .should('have.attr', 'href')
+        .and('contain', '/tutorials/proposals/network-parameter-proposal');
    });

-    it.skip('should be able to see a connect wallet button - if vega wallet disconnected and user is submitting new proposal', function () {
-      goToMakeNewProposal(governanceProposalType.NETWORK_PARAMETER);
+    // 3003-PMAN-002 3003-PMAN-005
+    it('should have documentation links for new market proposal', function () {
+      goToMakeNewProposal(governanceProposalType.NEW_MARKET);
+      cy.getByTestId('proposal-docs-link')
+        .find('a')
+        .should('have.attr', 'href')
+        .and('contain', '/tutorials/proposals/new-market-proposal');
+    });
+
+    // 3004-PMAC-005
+    it('should have documentation links for update market proposal', function () {
+      goToMakeNewProposal(governanceProposalType.UPDATE_MARKET);
+      cy.getByTestId('proposal-docs-link')
+        .find('a')
+        .should('have.attr', 'href')
+        .and('contain', '/tutorials/proposals/update-market-proposal');
+    });
+
+    // 3005-PASN-002 005-PASN-005
+    it('should have documentation links for new asset proposal', function () {
+      goToMakeNewProposal(governanceProposalType.NEW_ASSET);
+      cy.getByTestId('proposal-docs-link')
+        .find('a')
+        .should('have.attr', 'href')
+        .and('contain', '/tutorials/proposals/new-asset-proposal');
+    });
+
+    // 3006-PASC-002 3006-PASC-005
+    it('should have documentation links for update asset proposal', function () {
+      goToMakeNewProposal(governanceProposalType.UPDATE_ASSET);
+      cy.getByTestId('proposal-docs-link')
+        .find('a')
+        .should('have.attr', 'href')
+        .and('contain', '/tutorials/proposals/update-asset-proposal');
+    });
+
+    // 3008-PFRO-003 3008-PFRO-017
+    it('should have documentation links for freeform proposal', function () {
+      goToMakeNewProposal(governanceProposalType.FREEFORM);
+      cy.getByTestId('proposal-docs-link')
+        .find('a')
+        .should('have.attr', 'href')
+        .and('contain', '/tutorials/proposals/freeform-proposal');
+    });
+
+    it('should be able to see a connect wallet button - if vega wallet disconnected and user is submitting new proposal', function () {
+      goToMakeNewProposal(governanceProposalType.RAW);
      cy.get(connectToVegaWalletButton)
        .should('be.visible')
        .and('have.text', 'Connect Vega wallet');
@@ -5,7 +5,10 @@ import {
  verifyPageHeader,
  verifyTabHighlighted,
 } from '../../support/common.functions';
-import { clickOnValidatorFromList } from '../../support/staking.functions';
+import {
+  clickOnValidatorFromList,
+  waitForBeginningOfEpoch,
+} from '../../support/staking.functions';

 const guideLink = '[data-testid="staking-guide-link"]';
 const validatorTitle = '[data-testid="validator-node-title"]';
@@ -37,206 +40,213 @@ context('Validators Page - verify elements on page', function () {
  });

  describe('with wallets disconnected', { tags: '@smoke' }, function () {
-    describe('description section', function () {
-      it('Should have validators tab highlighted', function () {
-        verifyTabHighlighted(navigation.validators);
-      });
-
-      it('Should have validators ON VEGA header visible', function () {
-        verifyPageHeader('Validators');
-      });
-
-      it('Should have Staking Guide link visible', function () {
-        // 2001-STKE-003
-        cy.get(guideLink)
-          .should('be.visible')
-          .and('have.text', 'Read more about staking on Vega')
-          .and(
-            'have.attr',
-            'href',
-            'https://docs.vega.xyz/mainnet/concepts/vega-chain/#staking-on-vega'
-          );
-      });
+    it('Should have validators tab highlighted', function () {
+      verifyTabHighlighted(navigation.validators);
    });
-    describe(
-      'Should be able to see validator list from the staking page',
-      { tags: '@regression' },
-      function () {
-        // 2001-STKE-050
-        it('Should be able to see validator names', function () {
-          cy.get('[col-id="validator"] > div > span')
-            .should('have.length.at.least', 1)
-            .each(($name) => {
-              cy.wrap($name).should('not.be.empty');
-            });
-        });

-        it('Should be able to see validator stake', function () {
-          cy.getByTestId('total-stake')
-            .should('have.length.at.least', 1)
-            .each(($stake) => {
-              cy.wrap($stake).should('not.be.empty');
-            });
-        });
+    it('Should have validators ON VEGA header visible', function () {
+      verifyPageHeader('Validators');
+    });

-        it('Should be able to see validator stake tooltip', function () {
-          cy.getByTestId('total-stake').first().realHover();
+    it('Should have Staking Guide link visible', function () {
+      // 1002-STKE-003
+      cy.get(guideLink)
+        .should('be.visible')
+        .and('have.text', 'Read more about staking on Vega')
+        .and(
+          'have.attr',
+          'href',
+          'https://docs.vega.xyz/mainnet/concepts/vega-chain/#staking-on-vega'
+        );
+    });

-          cy.get(stakedByOperatorToolTip)
-            .invoke('text')
-            .should('contain', 'Staked by operator: 3,000.00');
-          cy.get(stakedByDelegatesToolTip)
-            .invoke('text')
-            .should('contain', 'Staked by delegates: 0.00');
-          cy.get(totalStakedToolTip)
-            .invoke('text')
-            .should('contain', 'Total stake: 3,000.00');
-        });
-
-        it('Should be able to see validator normalised voting power', function () {
-          cy.getByTestId('normalised-voting-power')
-            .should('have.length.at.least', 1)
-            .each(($vPower) => {
-              cy.wrap($vPower).should('not.be.empty');
-            });
-        });
-
-        it('Should be able to see validator normalised voting power tooltip', function () {
-          cy.getByTestId('normalised-voting-power').first().realHover();
-
-          cy.get(unnormalisedVotingPowerToolTip)
-            .invoke('text')
-            .should('contain', 'Unnormalised voting power: 20.00%');
-          cy.get(normalisedVotingPowerToolTip)
-            .invoke('text')
-            .should('contain', 'Normalised voting power: 50.00%');
-        });
-
-        // 2002-SINC-018
-        it('Should be able to see validator total penalties', function () {
-          cy.getByTestId('total-penalty')
-            .should('have.length.at.least', 1)
-            .each(($penalties) => {
-              cy.wrap($penalties).should('contain.text', '0%');
-            });
-        });
-
-        it('Should be able to see validator penalties tooltip', function () {
-          cy.getByTestId('total-penalty').realHover();
-
-          cy.get(performancePenaltyToolTip)
-            .invoke('text')
-            .should('contain', 'Performance penalty: 0.00%');
-          cy.get(overstakedPenaltyToolTip)
-            .invoke('text')
-            .should('contain', 'Overstaked penalty: 60.00%'); // value not asserted due to #2886
-          cy.get(totalPenaltyToolTip)
-            .invoke('text')
-            .should('contain', 'Total penalties: 60.00%');
-        });
-
-        it('Should be able to see validator pending stake', function () {
-          cy.getByTestId('total-pending-stake')
-            .should('have.length.at.least', 1)
-            .each(($pendingStake) => {
-              cy.wrap($pendingStake).should('contain.text', '0.00');
-            });
-        });
-      }
-    );
-
-    // 2001-STKE-050
-    describe(
-      'Should be able to see static information about a validator',
-      { tags: '@smoke' },
-      function () {
-        before('connect wallets and click on validator', function () {
-          cy.connectVegaWallet();
-          clickOnValidatorFromList(0);
-        });
-
-        // 2001-STKE-006
-        it('Should be able to see validator name', function () {
-          cy.get(validatorTitle).should('not.be.empty');
-        });
-
-        // 2001-STKE-007
-        it('Should be able to see validator id', function () {
-          cy.get(validatorId).should('not.be.empty');
-        });
-
-        // 2001-STKE-008
-        it('Should be able to see validator public key', function () {
-          cy.get(validatorPubKey).should('not.be.empty');
-        });
-
-        // 2001-STKE-010
-        it('Should be able to see Ethereum address', function () {
-          cy.get(ethAddressLink)
-            .should('not.be.empty')
-            .and('have.attr', 'href');
-        });
-        // TODO validators missing url for more information about them 2001-STKE-09
-
-        it('Should be able to see validator status', function () {
-          cy.get(validatorStatus).should('have.text', 'Consensus');
-        });
-
-        // 2001-STKE-012
-        it('Should be able to see total stake', function () {
-          cy.get(totalStake).invoke('text').should('match', stakeNumberRegex);
-        });
-
-        it('Should be able to see pending stake', function () {
-          cy.get(pendingStake).invoke('text').should('match', stakeNumberRegex);
-        });
-
-        it('Should be able to see staked by operator', function () {
-          cy.get(stakedByOperator)
-            .invoke('text')
-            .should('match', stakeNumberRegex);
-        });
-
-        it('Should be able to see staked by delegates', function () {
-          cy.get(stakedByDelegates)
-            .invoke('text')
-            .should('match', stakeNumberRegex);
-        });
-
-        // 2001-STKE-051
-        it('Should be able to see stake share in percentage', function () {
-          cy.get(stakeShare)
-            .invoke('text')
-            .then(($stakePercentage) => {
-              // The pattern must start at a word boundary (\b).
-              // The pattern cannot be immediately preceded by a dot ((?<!\.)).
-              // The pattern can be one of the following:
-              // A percentage value of zero (0%), or
-              // A non-zero percentage value that can be:
-              // A single digit (\d) between 0 and 9, or
-              // A two-digit number between 0 and 99 (\d{1,2}), or
-              // The number 100.
-              // The pattern can optionally include a decimal point and one or more digits after the decimal point ((?:(?<!100)\.\d+)?). However, if the number is 100, it cannot have a decimal point.
-              // The pattern must end with a percentage sign (%).
-
-              cy.wrap($stakePercentage).should(
-                'match',
-                /\b(?<!\.)(?:0+(?:\.0+)?%|(?:\d|\d{1,2}|100)(?:(?<!100)\.\d+)?)%/
-              );
-            });
-        });
-
-        // 2001-STKE-011 2002-SINC-001 2002-SINC-002
-        it('Should be able to see epoch information', function () {
-          const epochTitle = 'h3';
-          const nextEpochInfo = 'p';
-
-          cy.get(epochCountDown).within(() => {
-            cy.get(epochTitle).should('not.be.empty');
-            cy.get(nextEpochInfo).should('contain.text', 'Next epoch');
-          });
-        });
-      }
-    );
+    // 1002-STKE-032
+    it('Should have button to connect vega wallet in validator page', function () {
+      clickOnValidatorFromList(0);
+      cy.getByTestId('connect-to-vega-wallet-btn').should('be.visible');
+      cy.visit('/validators');
+    });
  });
+  // 1002-STKE-020 1002-STKE-021 1002-STKE-022 1002-STKE-023 1002-STKE-024
+  describe(
+    'Should be able to see validator list from the staking page',
+    { tags: '@regression' },
+    function () {
+      // 1002-STKE-050
+      it('Should be able to see validator names', function () {
+        cy.get('[col-id="validator"] > div > span')
+          .should('have.length.at.least', 1)
+          .each(($name) => {
+            cy.wrap($name).should('not.be.empty');
+          });
+      });
+
+      it('Should be able to see validator stake', function () {
+        cy.getByTestId('total-stake')
+          .should('have.length.at.least', 1)
+          .each(($stake) => {
+            cy.wrap($stake).should('not.be.empty');
+          });
+      });
+
+      it('Should be able to see validator stake tooltip', function () {
+        waitForBeginningOfEpoch();
+        cy.getByTestId('total-stake').first().realHover();
+
+        cy.get(stakedByOperatorToolTip)
+          .invoke('text')
+          .should('contain', 'Staked by operator: 3,000.00');
+        cy.get(stakedByDelegatesToolTip)
+          .invoke('text')
+          .should('contain', 'Staked by delegates: 0.00');
+        cy.get(totalStakedToolTip)
+          .invoke('text')
+          .should('contain', 'Total stake: 3,000.00');
+      });
+
+      it('Should be able to see validator normalised voting power', function () {
+        cy.getByTestId('normalised-voting-power')
+          .should('have.length.at.least', 1)
+          .each(($vPower) => {
+            cy.wrap($vPower).should('not.be.empty');
+          });
+      });
+
+      it('Should be able to see validator normalised voting power tooltip', function () {
+        waitForBeginningOfEpoch();
+        cy.getByTestId('normalised-voting-power').first().realHover();
+
+        cy.get(unnormalisedVotingPowerToolTip)
+          .invoke('text')
+          .should('contain', 'Unnormalised voting power: 20.00%');
+        cy.get(normalisedVotingPowerToolTip)
+          .invoke('text')
+          .should('contain', 'Normalised voting power: 50.00%');
+      });
+
+      // 2002-SINC-018
+      it('Should be able to see validator total penalties', function () {
+        cy.getByTestId('total-penalty')
+          .should('have.length.at.least', 1)
+          .each(($penalties) => {
+            cy.wrap($penalties).should('contain.text', '0%');
+          });
+      });
+
+      it('Should be able to see validator penalties tooltip', function () {
+        waitForBeginningOfEpoch();
+        cy.getByTestId('total-penalty').realHover();
+
+        cy.get(performancePenaltyToolTip)
+          .invoke('text')
+          .should('contain', 'Performance penalty: 0.00%');
+        cy.get(overstakedPenaltyToolTip)
+          .invoke('text')
+          .should('contain', 'Overstaked penalty: 60.00%'); // value not asserted due to #2886
+        cy.get(totalPenaltyToolTip)
+          .invoke('text')
+          .should('contain', 'Total penalties: 60.00%');
+      });
+
+      it('Should be able to see validator pending stake', function () {
+        cy.getByTestId('total-pending-stake')
+          .should('have.length.at.least', 1)
+          .each(($pendingStake) => {
+            cy.wrap($pendingStake).should('contain.text', '0.00');
+          });
+      });
+    }
+  );
+
+  // 1002-STKE-050
+  describe(
+    'Should be able to see static information about a validator',
+    { tags: '@smoke' },
+    function () {
+      before('connect wallets and click on validator', function () {
+        cy.connectVegaWallet();
+        clickOnValidatorFromList(0);
+      });
+
+      // 1002-STKE-006
+      it('Should be able to see validator name', function () {
+        cy.get(validatorTitle).should('not.be.empty');
+      });
+
+      // 1002-STKE-007
+      it('Should be able to see validator id', function () {
+        cy.get(validatorId).should('not.be.empty');
+      });
+
+      // 1002-STKE-008
+      it('Should be able to see validator public key', function () {
+        cy.get(validatorPubKey).should('not.be.empty');
+      });
+
+      // 1002-STKE-010
+      it('Should be able to see Ethereum address', function () {
+        cy.get(ethAddressLink).should('not.be.empty').and('have.attr', 'href');
+      });
+      // TODO validators missing url for more information about them 1002-STKE-09
+
+      it('Should be able to see validator status', function () {
+        cy.get(validatorStatus).should('have.text', 'Consensus');
+      });
+
+      // 1002-STKE-012
+      it('Should be able to see total stake', function () {
+        cy.get(totalStake).invoke('text').should('match', stakeNumberRegex);
+      });
+
+      it('Should be able to see pending stake', function () {
+        cy.get(pendingStake).invoke('text').should('match', stakeNumberRegex);
+      });
+
+      it('Should be able to see staked by operator', function () {
+        cy.get(stakedByOperator)
+          .invoke('text')
+          .should('match', stakeNumberRegex);
+      });
+
+      it('Should be able to see staked by delegates', function () {
+        cy.get(stakedByDelegates)
+          .invoke('text')
+          .should('match', stakeNumberRegex);
+      });
+
+      // 1002-STKE-051
+      it('Should be able to see stake share in percentage', function () {
+        cy.get(stakeShare)
+          .invoke('text')
+          .then(($stakePercentage) => {
+            // The pattern must start at a word boundary (\b).
+            // The pattern cannot be immediately preceded by a dot ((?<!\.)).
+            // The pattern can be one of the following:
+            // A percentage value of zero (0%), or
+            // A non-zero percentage value that can be:
+            // A single digit (\d) between 0 and 9, or
+            // A two-digit number between 0 and 99 (\d{1,2}), or
+            // The number 100.
+            // The pattern can optionally include a decimal point and one or more digits after the decimal point ((?:(?<!100)\.\d+)?). However, if the number is 100, it cannot have a decimal point.
+            // The pattern must end with a percentage sign (%).
+
+            cy.wrap($stakePercentage).should(
+              'match',
+              /\b(?<!\.)(?:0+(?:\.0+)?%|(?:\d|\d{1,2}|100)(?:(?<!100)\.\d+)?)%/
+            );
+          });
+      });
+
+      // 1002-STKE-011 2002-SINC-001 2002-SINC-002
+      it('Should be able to see epoch information', function () {
+        const epochTitle = 'h3';
+        const nextEpochInfo = 'p';
+
+        cy.get(epochCountDown).within(() => {
+          cy.get(epochTitle).should('not.be.empty');
+          cy.get(nextEpochInfo).should('contain.text', 'Next epoch');
+        });
+      });
+    }
+  );
 });
@@ -337,6 +337,7 @@ context(
                .parent()
                .siblings()
                .invoke('text')
+                .should('have.length.at.least', 4)
                .then(parseFloat)
                .should('be.gte', parseFloat(expectedAmount));

@@ -1,8 +1,11 @@
+import { stakingPageDisassociateAllTokens } from './staking.functions';
+
 const tokenDropDown = 'state-trigger';
 const txTimeout = Cypress.env('txTimeout');

 export enum navigation {
  section = 'nav',
+  home = '[href="/"]',
  vesting = '[href="/token/redeem"]',
  validators = '[href="/validators"]',
  rewards = '[href="/rewards"]',
@@ -18,6 +21,7 @@ export function convertTokenValueToNumber(subject: string) {
 }

 const topLevelRoutes = [
+  navigation.home,
  navigation.proposals,
  navigation.validators,
  navigation.rewards,
@@ -97,3 +101,25 @@ export function turnTelemetryOff() {
    win.localStorage.setItem('vega_telemetry_on', 'false')
  );
 }
+
+export function dissociateFromSecondWalletKey() {
+  const secondWalletKey = Cypress.env('vegaWalletPublicKey2Short');
+  cy.getByTestId('vega-in-wallet')
+    .first()
+    .within(() => {
+      cy.getByTestId('eth-wallet-associated-balances')
+        .last()
+        .within(() => {
+          cy.getByTestId('associated-key')
+            .invoke('text')
+            .as('associatedPubKey');
+        });
+    });
+  cy.get('@associatedPubKey').then((associatedPubKey) => {
+    if (associatedPubKey == secondWalletKey) {
+      cy.get('[data-testid="manage-vega-wallet"]:visible').click();
+      cy.get('[data-testid="select-keypair-button"]').eq(0).click();
+      stakingPageDisassociateAllTokens();
+    }
+  });
+}
@@ -59,11 +59,11 @@ export function submitUniqueRawProposal(proposalFields: {
  submit?: boolean;
 }) {
  goToMakeNewProposal(governanceProposalType.RAW);
-  let proposalBodyPath = '/proposals/raw.json';
+  let proposalBodyPath = 'src/fixtures/proposals/raw.json';
  if (proposalFields.proposalBody) {
    proposalBodyPath = proposalFields.proposalBody;
  }
-  cy.fixture(proposalBodyPath).then((rawProposal) => {
+  cy.readFile(proposalBodyPath).then((rawProposal) => {
    if (proposalFields.proposalTitle) {
      rawProposal.rationale.title = proposalFields.proposalTitle;
      cy.wrap(proposalFields.proposalTitle).as('proposalTitle');
@@ -73,7 +73,10 @@ export function submitUniqueRawProposal(proposalFields: {
    }
    if (proposalFields.closingTimestamp) {
      rawProposal.terms.closingTimestamp = proposalFields.closingTimestamp;
-    } else {
+    } else if (
+      !proposalFields.closingTimestamp &&
+      !proposalFields.proposalBody
+    ) {
      const minTimeStamp = createTenDigitUnixTimeStampForSpecifiedDays(2);
      rawProposal.terms.closingTimestamp = minTimeStamp;
    }
@@ -106,7 +109,7 @@ export function enterUniqueFreeFormProposalBody(
    'this is a e2e freeform proposal description'
  );
  cy.get(proposalVoteDeadline).clear().click().type(timestamp);
-  cy.getByTestId('proposal-submit').should('be.visible').click();
+  cy.getByTestId('proposal-download-json').should('be.visible').click();
 }

 export function getProposalFromTitle(proposalTitle: string) {
@@ -188,6 +191,7 @@ export function goToMakeNewProposal(proposalType: governanceProposalType) {
  }
 }

+// 3001-VOTE-013 3001-VOTE-014
 export function waitForProposalSubmitted() {
  cy.contains('Awaiting network confirmation', epochTimeout).should(
    'be.visible'
@@ -222,6 +226,23 @@ export function createFreeformProposal(proposalTitle: string) {
  navigateTo(navigation.proposals);
 }

+export function getDownloadedProposalJsonPath(proposalType: string) {
+  const downloadPath = './cypress/downloads/';
+  const filepath = downloadPath + proposalType + getFormattedTime() + '.json';
+  return filepath;
+}
+
+function getFormattedTime() {
+  const now = new Date();
+  const day = now.getDate().toString().padStart(2, '0');
+  const month = now.toLocaleString('en-US', { month: 'short' });
+  const year = now.getFullYear().toString();
+  const hours = now.getHours().toString().padStart(2, '0');
+  const minutes = now.getMinutes().toString().padStart(2, '0');
+
+  return `${day}-${month}-${year}-${hours}-${minutes}`;
+}
+
 export enum governanceProposalType {
  NETWORK_PARAMETER = 'Network parameter',
  NEW_MARKET = 'New market',
@@ -236,8 +236,8 @@ export function validateWalletCurrency(
  currencyTitle: string,
  expectedAmount: string
 ) {
-  cy.get("[data-testid='currency-title']")
-    .contains(currencyTitle)
+  cy.get("[data-testid='currency-title']", txTimeout)
+    .contains(currencyTitle, txTimeout)
    .parent()
    .parent()
    .within(() => {
@@ -19,7 +19,7 @@ const ethStakingBridgeContractAddress = Cypress.env(
 );
 const ethProviderUrl = Cypress.env('ethProviderUrl');
 const getAccount = (number = 0) => `m/44'/60'/0'/0/${number}`;
-const transactionTimeout = 100000;
+const transactionTimeout = { timeout: 100000, log: false };
 const Erc20BridgeAddress = '0x9708FF7510D4A7B9541e1699d15b53Ecb1AFDc54';

 const provider = new ethers.providers.JsonRpcProvider({ url: ethProviderUrl });
@@ -43,10 +43,7 @@ export async function depositAsset(
  const faucet = new Token(assetEthAddress, signer);
  cy.wrap(
    faucet.approve(Erc20BridgeAddress, amount + '0'.repeat(decimalPlaces + 1)),
-    {
-      timeout: transactionTimeout,
-      log: false,
-    }
+    transactionTimeout
  ).then(() => {
    const collateralBridge = new CollateralBridge(Erc20BridgeAddress, signer);
    cy.wrap(
@@ -55,7 +52,7 @@ export async function depositAsset(
        amount + '0'.repeat(decimalPlaces),
        '0x' + vegaWalletPubKey
      ),
-      { timeout: transactionTimeout, log: false }
+      transactionTimeout
    );
  });
 }
@@ -79,13 +76,13 @@ export async function vegaWalletTeardown() {
        }
      });
      cy.get(vegaWalletContainer).within(() => {
-        cy.get(associatedAmountInWallet, {
-          timeout: transactionTimeout,
-        })
-          .should('have.length', 1, { timeout: transactionTimeout })
-          .contains('0.00', {
-            timeout: transactionTimeout,
-          });
+        cy.get(associatedAmountInWallet, transactionTimeout).should(
+          'have.length',
+          1
+        );
+        cy.get(associatedAmountInWallet)
+          .first(transactionTimeout)
+          .should('have.text', '0.00');
      });
    });
 }
@@ -109,7 +106,7 @@ async function vegaWalletTeardownStaking(stakingBridgeContract: StakingBridge) {
  cy.highlight('Tearing down staking tokens from vega wallet if present');
  cy.wrap(
    stakingBridgeContract.stake_balance(ethWalletPubKey, vegaWalletPubKey),
-    { timeout: transactionTimeout }
+    transactionTimeout
  ).then((stakeBalance) => {
    if (Number(stakeBalance) != 0) {
      cy.get(vegaWalletContainer).within(() => {
@@ -122,31 +119,25 @@ async function vegaWalletTeardownStaking(stakingBridgeContract: StakingBridge) {
                String(stakeBalance),
                vegaWalletPubKey
              ),
-              { timeout: transactionTimeout }
+              transactionTimeout
            );
            cy.wrap(
              vestingContract.stake_balance(ethWalletPubKey, vegaWalletPubKey),
-              {
-                timeout: transactionTimeout,
-                log: false,
-              }
+              transactionTimeout
            ).then((vestingAmount) => {
              if (Number(vestingAmount) != 0) {
-                cy.contains('Associated', {
-                  timeout: transactionTimeout,
-                })
+                cy.contains('Associated', transactionTimeout)
                  .parent()
                  .parent()
                  .within(() => {
-                    cy.getByTestId('currency-value', {
-                      timeout: transactionTimeout,
-                    })
-                      .should('have.length', 1)
+                    cy.getByTestId('currency-value', transactionTimeout)
+                      .first()
                      .invoke('text')
                      .as('displayedAmount');
-                    cy.get('@displayedAmount', {
-                      timeout: transactionTimeout,
-                    }).should('not.eq', $associatedAmount);
+                    cy.get('@displayedAmount', transactionTimeout).should(
+                      'not.eq',
+                      $associatedAmount
+                    );
                  });
              }
            });
@@ -158,14 +149,14 @@ async function vegaWalletTeardownStaking(stakingBridgeContract: StakingBridge) {

 async function vegaWalletTeardownVesting(vestingContract: TokenVesting) {
  cy.highlight('Tearing down vesting tokens from vega wallet if present');
-  cy.wrap(vestingContract.stake_balance(ethWalletPubKey, vegaWalletPubKey), {
-    timeout: transactionTimeout,
-    log: false,
-  }).then((vestingAmount) => {
+  cy.wrap(
+    vestingContract.stake_balance(ethWalletPubKey, vegaWalletPubKey),
+    transactionTimeout
+  ).then((vestingAmount) => {
    if (Number(vestingAmount) != 0) {
      cy.wrap(
        vestingContract.remove_stake(String(vestingAmount), vegaWalletPubKey),
-        { timeout: transactionTimeout }
+        transactionTimeout
      );
    }
  });
@@ -6,7 +6,7 @@ NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","TESTNET":"https:/
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
-NX_VEGA_EXPLORER_URL=https://dev.explorer.vega.xyz
+NX_VEGA_EXPLORER_URL=#
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-devnet1-k8s.ops.vega.xyz
@@ -3,7 +3,7 @@ NX_VEGA_ENV=MAINNET
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/mainnet1/mainnet1.toml
 NX_VEGA_URL=https://api.vega.community/graphql
 NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.vega.xyz"}'
-NX_ETHEREUM_PROVIDER_URL=https://eth-mainnet.gateway.pokt.network/v1/lb/6684b914570bbfa533ba9324
+NX_ETHEREUM_PROVIDER_URL=https://mainnet.infura.io/v3/3ba145ccc2884bcd91213d8dc989ca76
 NX_ETHERSCAN_URL=https://etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996
@@ -7,7 +7,7 @@ NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","TESTNET":"https:/
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
-NX_VEGA_EXPLORER_URL=https://dev.explorer.vega.xyz
+NX_VEGA_EXPLORER_URL=https://explorer.validators-testnet.vega.rocks/
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_REST_URL=https://api-validators-testnet.vega.rocks/api/v2/
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996
@@ -0,0 +1 @@
+export * from './multisig-incorrect-notice';
@@ -0,0 +1,52 @@
+import { render, screen } from '@testing-library/react';
+import { useEthereumConfig } from '@vegaprotocol/web3';
+import { useEnvironment } from '@vegaprotocol/environment';
+import { MultisigIncorrectNotice } from './multisig-incorrect-notice';
+
+jest.mock('@vegaprotocol/web3', () => ({
+  useEthereumConfig: jest.fn(),
+}));
+
+jest.mock('@vegaprotocol/environment', () => ({
+  useEnvironment: jest.fn(),
+}));
+
+describe('MultisigIncorrectNotice', () => {
+  it('renders correctly when config is provided', () => {
+    (useEthereumConfig as jest.Mock).mockReturnValue({
+      config: {
+        multisig_control_contract: {
+          address: '0x1234',
+        },
+      },
+    });
+
+    (useEnvironment as unknown as jest.Mock).mockReturnValue({
+      ETHERSCAN_URL: 'https://etherscan.io',
+    });
+
+    render(<MultisigIncorrectNotice />);
+
+    expect(screen.getByTestId('multisig-contract-link')).toHaveAttribute(
+      'href',
+      'https://etherscan.io/address/0x1234'
+    );
+    expect(screen.getByTestId('multisig-contract-link')).toHaveAttribute(
+      'title',
+      '0x1234'
+    );
+    expect(
+      screen.getByTestId('multisig-validators-learn-more')
+    ).toBeInTheDocument();
+  });
+
+  it('does not render when config is not provided', () => {
+    (useEthereumConfig as jest.Mock).mockReturnValue({
+      config: null,
+    });
+
+    const { container } = render(<MultisigIncorrectNotice />);
+
+    expect(container.firstChild).toBeNull();
+  });
+});
@@ -0,0 +1,49 @@
+import { useTranslation } from 'react-i18next';
+import { Callout, Intent, Link } from '@vegaprotocol/ui-toolkit';
+import { useEthereumConfig } from '@vegaprotocol/web3';
+import { useEnvironment, DocsLinks } from '@vegaprotocol/environment';
+import type { EthereumConfig } from '@vegaprotocol/web3';
+
+export const MultisigIncorrectNotice = () => {
+  const { t } = useTranslation();
+  const { config } = useEthereumConfig();
+  const { ETHERSCAN_URL } = useEnvironment();
+
+  if (!config) {
+    return null;
+  }
+
+  const contract = config[
+    'multisig_control_contract' as keyof EthereumConfig
+  ] as {
+    address: string;
+  };
+
+  return (
+    <div className="mb-10">
+      <Callout intent={Intent.Warning}>
+        <div>
+          <Link
+            title={contract.address}
+            href={`${ETHERSCAN_URL}/address/${contract.address}`}
+            target="_blank"
+            data-testid="multisig-contract-link"
+          >
+            {t('multisigContractLink')}
+          </Link>{' '}
+          {t('multisigContractIncorrect')}
+        </div>
+
+        <div className="mt-2">
+          <Link
+            href={DocsLinks?.VALIDATOR_SCORES_REWARDS}
+            target="_blank"
+            data-testid="multisig-validators-learn-more"
+          >
+            {t('learnMore')}
+          </Link>
+        </div>
+      </Callout>
+    </div>
+  );
+};
@@ -3,32 +3,32 @@ import { usePendingBalancesStore } from './use-pending-balances-manager';
 import type { Contract } from 'ethers';
 import { useListenForPendingEthEvents } from './use-listen-for-pending-eth-events';
 import { prepend0x } from '@vegaprotocol/smart-contracts';
+import { useWeb3React } from '@web3-react/core';

 export const useListenForStakingEvents = (
  contract: Contract | undefined,
  vegaPublicKey: string | null,
  numberOfConfirmations: number
 ) => {
+  const { account } = useWeb3React();
  const { addPendingTxs, removePendingTx, resetPendingTxs } =
    usePendingBalancesStore((state) => ({
      addPendingTxs: state.addPendingTxs,
      removePendingTx: state.removePendingTx,
      resetPendingTxs: state.resetPendingTxs,
    }));
-  const addFilter = useMemo(
-    () =>
-      vegaPublicKey && contract
-        ? contract.filters.Stake_Deposited(null, null, prepend0x(vegaPublicKey))
-        : null,
-    [contract, vegaPublicKey]
-  );
-  const removeFilter = useMemo(
-    () =>
-      vegaPublicKey && contract
-        ? contract.filters.Stake_Removed(null, null, prepend0x(vegaPublicKey))
-        : null,
-    [contract, vegaPublicKey]
-  );
+  const addFilter = useMemo(() => {
+    if (!account || !vegaPublicKey || !contract) return null;
+    return contract.filters.Stake_Deposited(
+      null,
+      null,
+      prepend0x(vegaPublicKey)
+    );
+  }, [contract, vegaPublicKey, account]);
+  const removeFilter = useMemo(() => {
+    if (!account || !vegaPublicKey || !contract) return null;
+    return contract.filters.Stake_Removed(null, null, prepend0x(vegaPublicKey));
+  }, [contract, vegaPublicKey, account]);

  /**
   * Listen for all add stake events
@@ -116,7 +116,7 @@
  "Showing tranches with <{{trancheMinimum}} VEGA, click to hide these tranches": "Showing tranches with ≤{{trancheMinimum}} $VEGA, click to hide these tranches",
  "Not showing tranches with <{{trancheMinimum}} VEGA, click to show all tranches": "Not showing tranches with ≤{{trancheMinimum}} $VEGA, click to show all tranches",
  "the holder": "the holder",
-  "We couldn't seem to load your data.": "We couldn't seem to load your data.",
+  "Your data couldn't be loaded": "Your data couldn't be loaded",
  "Vesting VEGA": "Vesting VEGA",
  "All the tokens in this tranche are locked and can not be redeemed yet.": "All the tokens in this tranche are locked and can not be redeemed yet.",
  "Redeem unlocked VEGA from tranche {{id}}": "Redeem unlocked $VEGA from tranche {{id}}",
@@ -728,7 +728,7 @@
  "ThisWillSetEnactmentDeadlineTo": "This will set the enactment date to",
  "ThisWillSetValidationDeadlineTo": "This will set the validation deadline to",
  "Hours": "hours",
-  "ThisWillAdd2MinutesToAllowTimeToConfirmInWallet": "Note: we add 2 minutes of extra time when you choose the minimum value. This gives you time to confirm the proposal in your wallet.",
+  "ThisWillAdd2MinutesToAllowTimeToConfirmInWallet": "Note: 2 minutes of extra time are added when you choose the minimum value. This gives you time to confirm the proposal in your wallet.",
  "ProposalWillFailIfEnactmentIsEarlierThanVotingDeadline": "Proposal will fail if enactment is earlier than the voting deadline",
  "SelectAMarketToChange": "Select a market to change",
  "MarketName": "Market name",
@@ -821,5 +821,10 @@
  "disclaimer2": "The Vega Governance App is free, public and open source software.  Software upgrades may contain bugs or security vulnerabilities that might result in loss of functionality.",
  "disclaimer3": "The Vega Governance App uses data obtained from nodes on the Vega Blockchain. The developers of the Vega Governance App do not operate or run the Vega Blockchain or any other blockchain.",
  "disclaimer4": "The Vega Governance App is provided “as is”.  The developers of the Vega Governance App make no representations or warranties of any kind, whether express or implied, statutory or otherwise regarding the Vega Governance App.  They disclaim all warranties of merchantability, quality, fitness for purpose.  They disclaim all warranties that the Vega Governance App is free of harmful components or errors.",
-  "disclaimer5": "No developer of the Vega Governance App accepts any responsibility for, or liability to users in connection with their use of the Vega Governance App."
+  "disclaimer5": "No developer of the Vega Governance App accepts any responsibility for, or liability to users in connection with their use of the Vega Governance App.",
+  "multisigContractLink": "Ethereum Multisig Contract",
+  "multisigContractIncorrect": "is incorrectly configured. Validator and delegator rewards will be penalised until this is resolved.",
+  "learnMore": "Learn more",
+  "AllValidators": "All validators",
+  "AllProposals": "All proposals"
 }
@@ -0,0 +1,70 @@
+import {
+  getMultisigStatusInfo,
+  MultisigStatus,
+} from './get-multisig-status-info';
+import type { PreviousEpochQuery } from '../routes/staking/__generated__/PreviousEpoch';
+
+const createNode = (id: string, multisigScore: string) => ({
+  node: {
+    id,
+    stakedTotal: '1000',
+    rewardScore: { multisigScore },
+  },
+});
+
+describe('getMultisigStatus', () => {
+  it('should return MultisigStatus.noNodes when no nodes are present', () => {
+    const result = getMultisigStatusInfo({
+      epoch: { id: '1', validatorsConnection: { edges: [] } },
+    } as PreviousEpochQuery);
+    expect(result).toEqual({
+      multisigStatus: MultisigStatus.noNodes,
+      showMultisigStatusError: true,
+    });
+  });
+
+  it('should return MultisigStatus.correct when all nodes have multisigScore of 1', () => {
+    const result = getMultisigStatusInfo({
+      epoch: {
+        id: '1',
+        validatorsConnection: {
+          edges: [createNode('1', '1'), createNode('2', '1')],
+        },
+      },
+    } as PreviousEpochQuery);
+    expect(result).toEqual({
+      multisigStatus: MultisigStatus.correct,
+      showMultisigStatusError: false,
+    });
+  });
+
+  it('should return MultisigStatus.nodeNeedsRemoving when all nodes have multisigScore of 0', () => {
+    const result = getMultisigStatusInfo({
+      epoch: {
+        id: '1',
+        validatorsConnection: {
+          edges: [createNode('1', '0'), createNode('2', '0')],
+        },
+      },
+    } as PreviousEpochQuery);
+    expect(result).toEqual({
+      multisigStatus: MultisigStatus.nodeNeedsRemoving,
+      showMultisigStatusError: true,
+    });
+  });
+
+  it('should return MultisigStatus.nodeNeedsAdding when some nodes have multisigScore of 0 and others have 1', () => {
+    const result = getMultisigStatusInfo({
+      epoch: {
+        id: '1',
+        validatorsConnection: {
+          edges: [createNode('1', '0'), createNode('2', '1')],
+        },
+      },
+    } as PreviousEpochQuery);
+    expect(result).toEqual({
+      multisigStatus: MultisigStatus.nodeNeedsAdding,
+      showMultisigStatusError: true,
+    });
+  });
+});
@@ -0,0 +1,42 @@
+import { removePaginationWrapper } from '@vegaprotocol/utils';
+import type { PreviousEpochQuery } from '../routes/staking/__generated__/PreviousEpoch';
+
+export enum MultisigStatus {
+  'correct' = 'correct',
+  'nodeNeedsAdding' = 'nodeNeedsAdding',
+  'nodeNeedsRemoving' = 'nodeNeedsRemoving ',
+  'noNodes' = 'noNodes',
+}
+
+export const getMultisigStatusInfo = (
+  previousEpochData: PreviousEpochQuery
+) => {
+  let status = MultisigStatus.noNodes;
+
+  const allNodesInPreviousEpoch = removePaginationWrapper(
+    previousEpochData?.epoch.validatorsConnection?.edges
+  );
+
+  const hasZero = allNodesInPreviousEpoch.some(
+    (node) => Number(node?.rewardScore?.multisigScore) === 0
+  );
+  const hasOne = allNodesInPreviousEpoch.some(
+    (node) => Number(node?.rewardScore?.multisigScore) === 1
+  );
+
+  if (hasZero && hasOne) {
+    // If any individual node has 0 it means that node is missing from the multisig and needs to be added
+    status = MultisigStatus.nodeNeedsAdding;
+  } else if (hasZero) {
+    // If all nodes have 0 it means there is an incorrect address in the multisig that needs to be removed
+    status = MultisigStatus.nodeNeedsRemoving;
+  } else if (allNodesInPreviousEpoch.length > 0) {
+    // If all nodes have 1 it means the multisig is correct
+    status = MultisigStatus.correct;
+  }
+
+  return {
+    showMultisigStatusError: status !== MultisigStatus.correct,
+    multisigStatus: status,
+  };
+};
@@ -1,3 +1,4 @@
+import { MemoryRouter } from 'react-router-dom';
 import { render, screen } from '@testing-library/react';
 import { generateProposal } from '../../test-helpers/generate-proposals';
 import { Proposal } from './proposal';
@@ -41,19 +42,35 @@ jest.mock('../list-asset', () => ({
  ListAsset: () => <div data-testid="proposal-list-asset"></div>,
 }));

+const renderComponent = (proposal: ProposalQuery['proposal']) => {
+  render(
+    <MemoryRouter>
+      <Proposal
+        restData={{}}
+        proposal={proposal as ProposalQuery['proposal']}
+      />
+    </MemoryRouter>
+  );
+};
+
 it('Renders with data-testid', async () => {
  const proposal = generateProposal();
-  render(
-    <Proposal restData={{}} proposal={proposal as ProposalQuery['proposal']} />
-  );
+  renderComponent(proposal);
+
  expect(await screen.findByTestId('proposal')).toBeInTheDocument();
 });

+it('Renders with a link back to "all proposals"', async () => {
+  const proposal = generateProposal();
+  renderComponent(proposal);
+
+  expect(await screen.findByTestId('all-proposals-link')).toBeInTheDocument();
+});
+
 it('renders each section', async () => {
  const proposal = generateProposal();
-  render(
-    <Proposal restData={{}} proposal={proposal as ProposalQuery['proposal']} />
-  );
+  renderComponent(proposal);
+
  expect(await screen.findByTestId('proposal-header')).toBeInTheDocument();
  expect(screen.getByTestId('proposal-change-table')).toBeInTheDocument();
  expect(screen.getByTestId('proposal-json')).toBeInTheDocument();
@@ -80,8 +97,7 @@ it('renders whitelist section if proposal is new asset and source is erc20', asy
      },
    },
  });
-  render(
-    <Proposal restData={{}} proposal={proposal as ProposalQuery['proposal']} />
-  );
+  renderComponent(proposal);
+
  expect(screen.getByTestId('proposal-list-asset')).toBeInTheDocument();
 });
@@ -2,7 +2,7 @@ import {
  NetworkParams,
  useNetworkParams,
 } from '@vegaprotocol/network-parameters';
-import { AsyncRenderer, RoundedWrapper } from '@vegaprotocol/ui-toolkit';
+import { AsyncRenderer, Icon, RoundedWrapper } from '@vegaprotocol/ui-toolkit';
 import { ProposalHeader } from '../proposal-detail-header/proposal-header';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
@@ -13,6 +13,10 @@ import { ProposalTerms } from '../proposal-terms';
 import { ProposalVotesTable } from '../proposal-votes-table';
 import { VoteDetails } from '../vote-details';
 import { ListAsset } from '../list-asset';
+import { Link } from 'react-router-dom';
+import Routes from '../../../routes';
+import React from 'react';
+import { useTranslation } from 'react-i18next';

 export enum ProposalType {
  PROPOSAL_NEW_MARKET = 'PROPOSAL_NEW_MARKET',
@@ -29,6 +33,7 @@ export interface ProposalProps {
 }

 export const Proposal = ({ proposal, restData }: ProposalProps) => {
+  const { t } = useTranslation();
  const { params, loading, error } = useNetworkParams([
    NetworkParams.governance_proposal_market_minVoterBalance,
    NetworkParams.governance_proposal_updateMarket_minVoterBalance,
@@ -81,6 +86,15 @@ export const Proposal = ({ proposal, restData }: ProposalProps) => {
  return (
    <AsyncRenderer data={params} loading={loading} error={error}>
      <section data-testid="proposal">
+        <div
+          className="flex items-center gap-1"
+          data-testid="all-proposals-link"
+        >
+          <Icon name={'chevron-left'} />
+          <Link className="underline" to={Routes.PROPOSALS}>
+            {t('AllProposals')}
+          </Link>
+        </div>
        <ProposalHeader proposal={proposal} isListItem={false} />

        <div className="my-10">
@@ -102,7 +116,8 @@ export const Proposal = ({ proposal, restData }: ProposalProps) => {
        </div>

        {proposal.terms.change.__typename !== 'NewMarket' &&
-          proposal.terms.change.__typename !== 'UpdateMarket' && (
+          proposal.terms.change.__typename !== 'UpdateMarket' &&
+          proposal.terms.change.__typename !== 'NewFreeform' && (
            <div className="mb-4">
              <ProposalTerms data={proposal.terms} />
            </div>
@@ -146,7 +146,7 @@ describe('Proposal form vote, validation and enactment deadline', () => {
  it('should show the correct datetimes', () => {
    renderComponent();
    // Should be adding 2 mins to the vote deadline as the minimum is set by
-    // default, and we add 2 mins for wallet confirmation
+    // default, and 2 mins are added for wallet confirmation
    expect(screen.getByTestId('voting-date')).toHaveTextContent(
      '2022-01-01T01:02:00.000Z'
    );
@@ -1,11 +1,10 @@
 import { captureMessage } from '@sentry/minimal';
-
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { VoteValue } from '@vegaprotocol/types';
 import { useEffect, useState } from 'react';
 import { useUserVoteQuery } from './__generated__/Vote';
-import type { FinalizedVote } from '@vegaprotocol/proposals';
 import { removePaginationWrapper } from '@vegaprotocol/utils';
+import type { FinalizedVote } from '@vegaprotocol/proposals';

 export enum VoteState {
  NotCast = 'NotCast',
@@ -45,21 +44,23 @@ export function useUserVote(
  );

  useEffect(() => {
-    if (finalizedVote?.vote.value) {
+    if (finalizedVote?.vote.value && finalizedVote.pubKey === pubKey) {
      setUserVote(finalizedVote);
-    } else if (data?.party?.votesConnection?.edges) {
-      // This sets the vote (if any) when the user first loads the page
-      setUserVote(
-        removePaginationWrapper(data?.party?.votesConnection?.edges).find(
-          ({ proposalId: pId }) => proposalId === pId
-        )
-      );
+    } else if (data?.party?.votesConnection?.edges && pubKey) {
+      const vote = removePaginationWrapper(
+        data?.party?.votesConnection?.edges
+      ).find(({ proposalId: pId }) => proposalId === pId);
+
+      if (vote) {
+        setUserVote({ ...vote, pubKey });
+      }
    }
  }, [
    finalizedVote?.vote.value,
    data?.party?.votesConnection?.edges,
    finalizedVote,
    proposalId,
+    pubKey,
  ]);

  // If user vote changes update the vote state
@@ -94,6 +95,8 @@ export function useUserVote(
  return {
    voteState,
    userVote,
-    voteDatetime: userVote ? new Date(userVote.vote.datetime) : null,
+    voteDatetime: userVote?.vote?.datetime
+      ? new Date(userVote.vote.datetime)
+      : null,
  };
 }
@@ -48,15 +48,22 @@ export const EpochIndividualRewards = ({
    return removePaginationWrapper(data.party.rewardsConnection.edges);
  }, [data]);

+  const epochRewardSummaries = useMemo(() => {
+    if (!data?.epochRewardSummaries) return [];
+
+    return removePaginationWrapper(data.epochRewardSummaries.edges);
+  }, [data]);
+
  const epochIndividualRewardSummaries = useMemo(() => {
    if (!data?.party) return [];
    return generateEpochIndividualRewardsList({
      rewards,
      epochId,
+      epochRewardSummaries,
      page,
      size: EPOCHS_PAGE_SIZE,
    });
-  }, [data?.party, epochId, page, rewards]);
+  }, [data?.party, epochId, epochRewardSummaries, page, rewards]);

  const refetchData = useCallback(
    async (toPage?: number) => {
@@ -65,7 +65,11 @@ describe('generateEpochIndividualRewardsList', () => {

  it('should return an empty array if no rewards are provided', () => {
    expect(
-      generateEpochIndividualRewardsList({ rewards: [], epochId: 1 })
+      generateEpochIndividualRewardsList({
+        rewards: [],
+        epochId: 1,
+        epochRewardSummaries: [],
+      })
    ).toEqual([
      {
        epoch: 1,
@@ -78,6 +82,7 @@ describe('generateEpochIndividualRewardsList', () => {
    const result = generateEpochIndividualRewardsList({
      rewards: [rewardWrongType],
      epochId: 1,
+      epochRewardSummaries: [],
    });

    expect(result).toEqual([
@@ -92,6 +97,15 @@ describe('generateEpochIndividualRewardsList', () => {
    const result = generateEpochIndividualRewardsList({
      rewards: [reward1],
      epochId: 1,
+      epochRewardSummaries: [
+        {
+          __typename: 'EpochRewardSummary',
+          epoch: 1,
+          assetId: 'usd',
+          amount: '100000',
+          rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
+        },
+      ],
    });

    expect(result[0]).toEqual({
@@ -134,7 +148,11 @@ describe('generateEpochIndividualRewardsList', () => {

  it('should return an array sorted by epoch descending', () => {
    const rewards = [reward1, reward2, reward3, reward4];
-    const result1 = generateEpochIndividualRewardsList({ rewards, epochId: 2 });
+    const result1 = generateEpochIndividualRewardsList({
+      rewards,
+      epochId: 2,
+      epochRewardSummaries: [],
+    });

    expect(result1[0].epoch).toEqual(2);
    expect(result1[1].epoch).toEqual(1);
@@ -143,6 +161,7 @@ describe('generateEpochIndividualRewardsList', () => {
    const result2 = generateEpochIndividualRewardsList({
      rewards: reorderedRewards,
      epochId: 2,
+      epochRewardSummaries: [],
    });

    expect(result2[0].epoch).toEqual(2);
@@ -151,7 +170,11 @@ describe('generateEpochIndividualRewardsList', () => {

  it('correctly calculates the total value of rewards for an asset', () => {
    const rewards = [reward1, reward4];
-    const result = generateEpochIndividualRewardsList({ rewards, epochId: 1 });
+    const result = generateEpochIndividualRewardsList({
+      rewards,
+      epochId: 1,
+      epochRewardSummaries: [],
+    });

    expect(result[0].rewards[0].totalAmount).toEqual('200');
  });
@@ -159,7 +182,11 @@ describe('generateEpochIndividualRewardsList', () => {
  it('returns data in the expected shape', () => {
    // Just sanity checking the whole structure here
    const rewards = [reward1, reward2, reward3, reward4];
-    const result = generateEpochIndividualRewardsList({ rewards, epochId: 2 });
+    const result = generateEpochIndividualRewardsList({
+      rewards,
+      epochId: 2,
+      epochRewardSummaries: [],
+    });

    expect(result).toEqual([
      {
@@ -273,6 +300,7 @@ describe('generateEpochIndividualRewardsList', () => {
    const resultPageOne = generateEpochIndividualRewardsList({
      rewards,
      epochId: 3,
+      epochRewardSummaries: [],
      page: 1,
      size: 2,
    });
@@ -386,6 +414,7 @@ describe('generateEpochIndividualRewardsList', () => {
    const resultPageTwo = generateEpochIndividualRewardsList({
      rewards,
      epochId: 3,
+      epochRewardSummaries: [],
      page: 2,
      size: 2,
    });
@@ -429,4 +458,69 @@ describe('generateEpochIndividualRewardsList', () => {
      },
    ]);
  });
+
+  it('correctly calculates the percentage of two or more rewards by referencing the total rewards amount', () => {
+    const result = generateEpochIndividualRewardsList({
+      rewards: [
+        // reward1 is 100 usd, which is 10% of the total rewards amount
+        reward1,
+        {
+          rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
+          amount: '200',
+          percentageOfTotal: '0.2',
+          receivedAt: new Date(),
+          asset: { id: 'usd', symbol: 'USD', name: 'USD', decimals: 6 },
+          party: { id: 'blah' },
+          epoch: { id: '1' },
+        },
+      ],
+      epochId: 1,
+      epochRewardSummaries: [
+        {
+          __typename: 'EpochRewardSummary',
+          epoch: 1,
+          assetId: 'usd',
+          amount: '1000',
+          rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
+        },
+      ],
+    });
+
+    expect(result[0]).toEqual({
+      epoch: 1,
+      rewards: [
+        {
+          asset: 'USD',
+          decimals: 6,
+          totalAmount: '300',
+          rewardTypes: {
+            [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
+              amount: '0',
+              percentageOfTotal: '0',
+            },
+            [AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES]: {
+              amount: '0',
+              percentageOfTotal: '0',
+            },
+            [AccountType.ACCOUNT_TYPE_GLOBAL_REWARD]: {
+              amount: '300',
+              percentageOfTotal: '30',
+            },
+            [AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES]: {
+              amount: '0',
+              percentageOfTotal: '0',
+            },
+            [AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES]: {
+              amount: '0',
+              percentageOfTotal: '0',
+            },
+            [AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS]: {
+              amount: '0',
+              percentageOfTotal: '0',
+            },
+          },
+        },
+      ],
+    });
+  });
 });
@@ -1,6 +1,9 @@
 import { BigNumber } from '../../../lib/bignumber';
 import { RowAccountTypes } from '../shared-rewards-table-assets/shared-rewards-table-assets';
-import type { RewardFieldsFragment } from '../home/__generated__/Rewards';
+import type {
+  EpochRewardSummaryFieldsFragment,
+  RewardFieldsFragment,
+} from '../home/__generated__/Rewards';
 import type { AccountType } from '@vegaprotocol/types';
 import { calculateEpochOffset } from '../../../lib/epoch-pagination';

@@ -32,11 +35,13 @@ const emptyRowAccountTypes = accountTypes.map((type) => [
 export const generateEpochIndividualRewardsList = ({
  rewards,
  epochId,
+  epochRewardSummaries,
  page = 1,
  size = 10,
 }: {
  rewards: RewardFieldsFragment[];
  epochId: number;
+  epochRewardSummaries: EpochRewardSummaryFieldsFragment[];
  page?: number;
  size?: number;
 }) => {
@@ -54,6 +59,7 @@ export const generateEpochIndividualRewardsList = ({
  const epochIndividualRewards = rewards.reduce((acc, reward) => {
    const epochId = reward.epoch.id;
    const assetName = reward.asset.name;
+    const assetId = reward.asset.id;
    const assetDecimals = reward.asset.decimals;
    const rewardType = reward.rewardType;
    const amount = reward.amount;
@@ -70,6 +76,14 @@ export const generateEpochIndividualRewardsList = ({

    const epoch = acc.get(epochId);

+    // matchingTotalReward is the total awarded for all users for the reward type in the epoch of the asset
+    const matchingTotalRewardAmount = epochRewardSummaries.find(
+      (summary) =>
+        summary.epoch === Number(epochId) &&
+        summary.assetId === assetId &&
+        summary.rewardType === rewardType
+    )?.amount;
+
    let asset = epoch?.rewards.find((r) => r.asset === assetName);

    if (!asset) {
@@ -86,22 +100,24 @@ export const generateEpochIndividualRewardsList = ({
      asset.rewardTypes[rewardType] = { amount, percentageOfTotal };
    } else {
      const previousAmount = asset.rewardTypes[rewardType]?.amount;
-      const previousPercentageOfTotal =
-        asset.rewardTypes[rewardType]?.percentageOfTotal;
+      const newAmount = previousAmount
+        ? new BigNumber(previousAmount).plus(amount).toString()
+        : amount;

      asset.rewardTypes[rewardType] = {
-        amount: previousAmount
-          ? new BigNumber(previousAmount).plus(amount).toString()
-          : amount,
-        percentageOfTotal: previousPercentageOfTotal
-          ? new BigNumber(previousPercentageOfTotal)
-              .plus(percentageOfTotal)
+        amount: newAmount,
+        percentageOfTotal: matchingTotalRewardAmount
+          ? new BigNumber(newAmount)
+              .dividedBy(matchingTotalRewardAmount)
+              .multipliedBy(100)
              .toString()
-          : percentageOfTotal,
+          : // this should never be reached, if there's an individual reward there should
+            // always be a reward total from the api too, but set it as a fallback just in case
+            percentageOfTotal,
      };
    }

-    // totalAmount is the sum of all rewardTypes amounts
+    // totalAmount is the sum of all individual rewardTypes amounts
    asset.totalAmount = Object.values(asset.rewardTypes).reduce(
      (sum, rewardType) => {
        return new BigNumber(sum).plus(rewardType.amount).toString();
@@ -22,6 +22,13 @@ fragment DelegationFields on Delegation {
  epoch
 }

+fragment EpochRewardSummaryFields on EpochRewardSummary {
+  epoch
+  assetId
+  amount
+  rewardType
+}
+
 query Rewards(
  $partyId: ID!
  $fromEpoch: Int
@@ -50,13 +57,16 @@ query Rewards(
      }
    }
  }
-}
-
-fragment EpochRewardSummaryFields on EpochRewardSummary {
-  epoch
-  assetId
-  amount
-  rewardType
+  epochRewardSummaries(
+    filter: { fromEpoch: $fromEpoch, toEpoch: $toEpoch }
+    pagination: $rewardsPagination
+  ) {
+    edges {
+      node {
+        ...EpochRewardSummaryFields
+      }
+    }
+  }
 }

 query EpochAssetsRewards(
@@ -7,6 +7,8 @@ export type RewardFieldsFragment = { __typename?: 'Reward', rewardType: Types.Ac

 export type DelegationFieldsFragment = { __typename?: 'Delegation', amount: string, epoch: number };

+export type EpochRewardSummaryFieldsFragment = { __typename?: 'EpochRewardSummary', epoch: number, assetId: string, amount: string, rewardType: Types.AccountType };
+
 export type RewardsQueryVariables = Types.Exact<{
  partyId: Types.Scalars['ID'];
  fromEpoch?: Types.InputMaybe<Types.Scalars['Int']>;
@@ -16,9 +18,7 @@ export type RewardsQueryVariables = Types.Exact<{
 }>;


-export type RewardsQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, rewardsConnection?: { __typename?: 'RewardsConnection', edges?: Array<{ __typename?: 'RewardEdge', node: { __typename?: 'Reward', rewardType: Types.AccountType, amount: string, percentageOfTotal: string, receivedAt: any, asset: { __typename?: 'Asset', id: string, symbol: string, name: string, decimals: number }, party: { __typename?: 'Party', id: string }, epoch: { __typename?: 'Epoch', id: string } } } | null> | null } | null, delegationsConnection?: { __typename?: 'DelegationsConnection', edges?: Array<{ __typename?: 'DelegationEdge', node: { __typename?: 'Delegation', amount: string, epoch: number } } | null> | null } | null } | null };
-
-export type EpochRewardSummaryFieldsFragment = { __typename?: 'EpochRewardSummary', epoch: number, assetId: string, amount: string, rewardType: Types.AccountType };
+export type RewardsQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, rewardsConnection?: { __typename?: 'RewardsConnection', edges?: Array<{ __typename?: 'RewardEdge', node: { __typename?: 'Reward', rewardType: Types.AccountType, amount: string, percentageOfTotal: string, receivedAt: any, asset: { __typename?: 'Asset', id: string, symbol: string, name: string, decimals: number }, party: { __typename?: 'Party', id: string }, epoch: { __typename?: 'Epoch', id: string } } } | null> | null } | null, delegationsConnection?: { __typename?: 'DelegationsConnection', edges?: Array<{ __typename?: 'DelegationEdge', node: { __typename?: 'Delegation', amount: string, epoch: number } } | null> | null } | null } | null, epochRewardSummaries?: { __typename?: 'EpochRewardSummaryConnection', edges?: Array<{ __typename?: 'EpochRewardSummaryEdge', node: { __typename?: 'EpochRewardSummary', epoch: number, assetId: string, amount: string, rewardType: Types.AccountType } } | null> | null } | null };

 export type EpochAssetsRewardsQueryVariables = Types.Exact<{
  epochRewardSummariesFilter?: Types.InputMaybe<Types.RewardSummaryFilter>;
@@ -102,9 +102,20 @@ export const RewardsDocument = gql`
      }
    }
  }
+  epochRewardSummaries(
+    filter: {fromEpoch: $fromEpoch, toEpoch: $toEpoch}
+    pagination: $rewardsPagination
+  ) {
+    edges {
+      node {
+        ...EpochRewardSummaryFields
+      }
+    }
+  }
 }
    ${RewardFieldsFragmentDoc}
-${DelegationFieldsFragmentDoc}`;
+${DelegationFieldsFragmentDoc}
+${EpochRewardSummaryFieldsFragmentDoc}`;

 /**
 * __useRewardsQuery__
@@ -23,6 +23,9 @@ import { useRefreshAfterEpoch } from '../../../hooks/use-refresh-after-epoch';
 import { DocsLinks } from '@vegaprotocol/environment';
 import { ConnectToSeeRewards } from '../connect-to-see-rewards';
 import { EpochTotalRewards } from '../epoch-total-rewards/epoch-total-rewards';
+import { usePreviousEpochQuery } from '../../staking/__generated__/PreviousEpoch';
+import { getMultisigStatusInfo } from '../../../lib/get-multisig-status-info';
+import { MultisigIncorrectNotice } from '../../../components/multisig-incorrect-notice';

 type RewardsView = 'total' | 'individual';

@@ -41,12 +44,25 @@ export const RewardsPage = () => {

  useRefreshAfterEpoch(epochData?.epoch.timestamps.expiry, refetch);

+  const { data: previousEpochData } = usePreviousEpochQuery({
+    variables: {
+      epochId: (Number(epochData?.epoch.id) - 1).toString(),
+    },
+    skip: !epochData?.epoch.id,
+  });
+
+  const multisigStatus = previousEpochData
+    ? getMultisigStatusInfo(previousEpochData)
+    : undefined;
+
  const {
    params,
    loading: paramsLoading,
    error: paramsError,
  } = useNetworkParams([NetworkParams.reward_staking_delegation_payoutDelay]);

+  console.log('params', params);
+
  const payoutDuration = useMemo(() => {
    if (!params) {
      return 0;
@@ -78,14 +94,18 @@ export const RewardsPage = () => {
            )}
          </p>

-          {payoutDuration ? (
+          {multisigStatus?.showMultisigStatusError ? (
+            <MultisigIncorrectNotice />
+          ) : null}
+
+          {!multisigStatus?.showMultisigStatusError && payoutDuration ? (
            <div className="my-8">
              <Callout
                title={t('rewardsCallout', {
                  duration: formatDistance(new Date(0), payoutDuration),
                })}
                headingLevel={3}
-                intent={Intent.Warning}
+                intent={Intent.Primary}
              >
                <p className="mb-0">{t('rewardsCalloutDetail')}</p>
              </Callout>
@@ -7,6 +7,8 @@ import { ValidatorTables } from './validator-tables';
 import { useRefreshAfterEpoch } from '../../../hooks/use-refresh-after-epoch';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { ENV } from '../../../config';
+import { getMultisigStatusInfo } from '../../../lib/get-multisig-status-info';
+import { MultisigIncorrectNotice } from '../../../components/multisig-incorrect-notice';

 export const EpochData = () => {
  // errorPolicy due to vegaprotocol/vega issue 5898
@@ -46,12 +48,20 @@ export const EpochData = () => {
    userStakingRefetch();
  });

+  const multisigStatus = previousEpochData
+    ? getMultisigStatusInfo(previousEpochData)
+    : undefined;
+
  return (
    <AsyncRenderer
      loading={nodesLoading || userStakingLoading}
      error={nodesError || userStakingError}
      data={nodesData}
    >
+      {multisigStatus?.showMultisigStatusError ? (
+        <MultisigIncorrectNotice />
+      ) : null}
+
      {nodesData?.epoch &&
        nodesData.epoch.timestamps.start &&
        nodesData?.epoch.timestamps.expiry && (
@@ -107,7 +107,7 @@ export const StakingNode = ({ data, previousEpochData }: StakingNodeProps) => {
      <div className="flex items-center gap-1">
        <Icon name={'chevron-left'} />
        <Link className="underline" to={Routes.VALIDATORS}>
-          {t('All validators')}
+          {t('AllValidators')}
        </Link>
      </div>
      <Heading
@@ -5,4 +5,4 @@ NX_VEGA_ENV=DEVNET
 NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://trading.stagnet1.vega.rocks\"}
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_VEGA_EXPLORER_URL=https://dev.explorer.vega.xyz
+NX_VEGA_EXPLORER_URL=#
@@ -7,31 +7,30 @@ import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import {
  getFeeLevels,
  sumLiquidityCommitted,
-  marketLiquidityDataProvider,
  lpAggregatedDataProvider,
 } from '@vegaprotocol/liquidity';
-import type { MarketLpQuery } from '@vegaprotocol/liquidity';
+import { marketWithDataProvider } from '@vegaprotocol/markets';
+import type { MarketWithData } from '@vegaprotocol/markets';

 import { Market } from './market';
 import { Header } from './header';
 import { LPProvidersGrid } from './providers';

-const formatMarket = (data: MarketLpQuery) => {
+const formatMarket = (market: MarketWithData) => {
  return {
-    name: data?.market?.tradableInstrument.instrument.name,
+    name: market?.tradableInstrument.instrument.name,
    symbol:
-      data?.market?.tradableInstrument.instrument.product.settlementAsset
-        .symbol,
+      market?.tradableInstrument.instrument.product.settlementAsset.symbol,
    settlementAsset:
-      data?.market?.tradableInstrument.instrument.product.settlementAsset,
-    targetStake: data?.market?.data?.targetStake,
-    tradingMode: data?.market?.data?.marketTradingMode,
-    trigger: data?.market?.data?.trigger,
+      market?.tradableInstrument.instrument.product.settlementAsset,
+    targetStake: market?.data?.targetStake,
+    tradingMode: market?.data?.marketTradingMode,
+    trigger: market?.data?.trigger,
  };
 };

 export const lpDataProvider = makeDerivedDataProvider(
-  [marketLiquidityDataProvider, lpAggregatedDataProvider],
+  [marketWithDataProvider, lpAggregatedDataProvider],
  ([market, lpAggregatedData]) => ({
    market: { ...formatMarket(market) },
    liquidityProviders: lpAggregatedData || [],
@@ -3,3 +3,6 @@ NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/maste
 NX_VEGA_URL=https://api.vega.community/graphql
 NX_VEGA_NETWORKS='{"TESTNET":"https://multisig-signer.fairground.wtf","MAINNET":"https://multisig-signer.vega.xyz"}'
 NX_VEGA_ENV=MAINNET
+
+
+
@@ -1,3 +1,5 @@
 # Static

-A static CDN for Vega assets
+A static CDN for Vega assets: `static.vega.xyz`
+
+prepare assets by running: `yarn nx build static`
@@ -26,27 +26,27 @@
  animation-direction: reverse;
 }
 .pre-loader .loader-item:first-child {
-  animation-delay: -50ms;
+  animation-delay: -0.1s;
  animation-direction: alternate;
 }
 .pre-loader .loader-item:nth-child(2) {
-  animation-delay: 0.2s;
+  animation-delay: 0.3s;
  animation-direction: reverse;
 }
 .pre-loader .loader-item:nth-child(3) {
-  animation-delay: -0.6s;
+  animation-delay: -0.45s;
  animation-direction: alternate;
 }
 .pre-loader .loader-item:nth-child(4) {
-  animation-delay: 0.4s;
+  animation-delay: 1s;
  animation-direction: reverse;
 }
 .pre-loader .loader-item:nth-child(5) {
-  animation-delay: -0.5s;
+  animation-delay: -0.75s;
  animation-direction: alternate;
 }
 .pre-loader .loader-item:nth-child(6) {
-  animation-delay: 0.3s;
+  animation-delay: 0.9s;
  animation-direction: reverse;
 }
 .pre-loader .loader-item:nth-child(7) {
@@ -54,11 +54,11 @@
  animation-direction: alternate;
 }
 .pre-loader .loader-item:nth-child(8) {
-  animation-delay: 2s;
+  animation-delay: 1.6s;
  animation-direction: reverse;
 }
 .pre-loader .loader-item:nth-child(9) {
-  animation-delay: -0.9s;
+  animation-delay: -0.45s;
  animation-direction: alternate;
 }
 .pre-loader .loader-item:nth-child(10) {
@@ -66,7 +66,7 @@
  animation-direction: reverse;
 }
 .pre-loader .loader-item:nth-child(11) {
-  animation-delay: -0.55s;
+  animation-delay: -2.75s;
  animation-direction: alternate;
 }
 .pre-loader .loader-item:nth-child(12) {
@@ -74,21 +74,57 @@
  animation-direction: reverse;
 }
 .pre-loader .loader-item:nth-child(13) {
-  animation-delay: -0.65s;
+  animation-delay: -1.95s;
  animation-direction: alternate;
 }
 .pre-loader .loader-item:nth-child(14) {
-  animation-delay: 0.7s;
+  animation-delay: 2.8s;
  animation-direction: reverse;
 }
 .pre-loader .loader-item:nth-child(15) {
-  animation-delay: -3.75s;
+  animation-delay: -0.75s;
  animation-direction: alternate;
 }
 .pre-loader .loader-item:nth-child(16) {
-  animation-delay: 1.6s;
+  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;
 }
@@ -0,0 +1,58 @@
+.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;
+    }
+  }
+}
@@ -0,0 +1,177 @@
+// #region consts
+const assetColId = '[col-id="asset.symbol"]';
+const assetDetailsDialog = 'dialog-content';
+const assetRow = 'key-value-table-row';
+const contractAddress = '7_value';
+const dialogCloseBtn = 'close-asset-details-dialog';
+const dialogCloseX = 'dialog-close';
+const dialogTitle = 'dialog-title';
+
+const indicesWithLabelTooltips = [4, 5, 6, 7, 8, 9, 11, 12, 13, 14];
+const indicesWithValueTooltips = [1, 6];
+
+const labelValueToolTipPairs = [
+  {
+    label: 'ID',
+    value: 'asset-id',
+  },
+  {
+    label: 'Type',
+    value: 'ERC20',
+    valueToolTip: 'An asset originated from an Ethereum ERC20 Token',
+  },
+  {
+    label: 'Name',
+    value: 'Euro',
+  },
+  {
+    label: 'Symbol',
+    value: 'tEURO',
+  },
+  {
+    label: 'Decimals',
+    value: '5',
+    labelTooltip: 'Number of decimal / precision handled by this asset',
+  },
+  {
+    label: 'Quantum',
+    value: '0.00001',
+    labelTooltip: 'The minimum economically meaningful amount of the asset',
+  },
+  {
+    label: 'Status',
+    value: 'Enabled',
+    labelTooltip: 'The status of the asset in the Vega network',
+    valueToolTip: 'Asset can be used on the Vega network',
+  },
+  {
+    label: 'Contract address',
+    value: '0x0158031158Bb4dF2AD02eAA31e8963E84EA978a4 ',
+    labelTooltip:
+      'The address of the contract for the token, on the ethereum network',
+  },
+  {
+    label: 'Withdrawal threshold',
+    value: '0.0005',
+    labelTooltip:
+      "The maximum you can withdraw instantly. There's no limit on the size of a withdrawal, but all withdrawals over the threshold will have a delay time added to them",
+  },
+  {
+    label: 'Lifetime limit',
+    value: '1,230.00',
+    labelTooltip:
+      'The lifetime deposit limit per address. Note: this is a temporary measure that can be changed or removed through governance',
+  },
+  { label: '', value: '' },
+  {
+    label: 'Infrastructure fee account balance',
+    value: '0.00001',
+    labelTooltip: 'The infrastructure fee account in this asset',
+  },
+  {
+    label: 'Global reward pool account balance',
+    value: '0.00002',
+    labelTooltip: 'The global rewards acquired in this asset',
+  },
+  {
+    label: 'Maker paid fees account balance',
+    value: '0.00003',
+    labelTooltip:
+      'The rewards acquired based on the fees paid to makers in this asset',
+  },
+  {
+    label: 'Maker received fees account balance',
+    value: '0.00004',
+    labelTooltip:
+      'The rewards acquired based on fees received for being a maker on trades',
+  },
+  {
+    label: 'Liquidity provision fee reward account balance',
+    value: '0.00005',
+    labelTooltip:
+      'The rewards acquired based on the liquidity provision fees in this asset',
+  },
+  {
+    label: 'Market proposer reward account balance',
+    value: '0.00006',
+    labelTooltip:
+      'The rewards acquired based on the market proposer reward in this asset',
+  },
+];
+//endregion
+
+beforeEach(() => {
+  cy.mockTradingPage();
+  cy.mockSubscription();
+  cy.setVegaWallet();
+});
+
+const visitPortfolioAndClickAsset = (assetName: string) => {
+  cy.visit('/#/portfolio');
+  cy.get(assetColId).contains(assetName).click();
+};
+
+const testTooltip = (index: number, testId: string, tooltip: string) => {
+  cy.getByTestId(`${index}_${testId}`).realHover();
+  cy.get('[role="tooltip"]').find('div').should('have.text', tooltip);
+  cy.getByTestId(dialogTitle).click();
+};
+
+describe('assets', { tags: '@smoke', testIsolation: true }, () => {
+  it('asset details', () => {
+    visitPortfolioAndClickAsset('tBTC');
+
+    cy.getByTestId(assetRow).each((element, index) => {
+      if (index === 10) {
+        return;
+      }
+      const { label, value, labelTooltip, valueToolTip } =
+        labelValueToolTipPairs[index];
+      // 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
+      cy.getByTestId(`${index}_label`).should('have.text', label);
+      cy.getByTestId(`${index}_value`).should('have.text', value);
+
+      // 6501-ASSE-012
+      if (indicesWithLabelTooltips.includes(index)) {
+        if (labelTooltip) {
+          testTooltip(index, 'label', labelTooltip);
+        }
+      }
+      if (indicesWithValueTooltips.includes(index)) {
+        if (valueToolTip) {
+          testTooltip(index, 'value', valueToolTip);
+        }
+      }
+    });
+    // 6501-ASSE-013
+    cy.getByTestId(dialogCloseX).click();
+    cy.document().then((doc) => {
+      expect(doc.querySelector(assetDetailsDialog)).to.not.exist;
+    });
+  });
+
+  it('ERC20 Contract address', () => {
+    visitPortfolioAndClickAsset('tBTC');
+    cy.getByTestId(contractAddress).within(() => {
+      // 6501-ASSE-014
+      cy.getByTestId('external-link')
+        .should('have.attr', 'target', '_blank')
+        .should('have.text', '0x0158031158Bb4dF2AD02eAA31e8963E84EA978a4');
+    });
+    // 6501-ASSE-013
+    cy.getByTestId(dialogCloseBtn).click();
+    cy.document().then((doc) => {
+      expect(doc.querySelector(assetDetailsDialog)).to.not.exist;
+    });
+  });
+});
@@ -41,6 +41,7 @@ const submitTransferBtn = '[type="submit"]';
 const transferForm = 'transfer-form';
 const depositSubmit = 'deposit-submit';
 const approveSubmit = 'approve-submit';
+const dialogContent = 'dialog-content';

 // Because the tests are run on a live network to optimize time, the tests are interdependent and must be run in the given order.
 describe('capsule - without MultiSign', { tags: '@slow' }, () => {
@@ -113,6 +114,8 @@ describe('capsule - without MultiSign', { tags: '@slow' }, () => {
  });

  it('can key to key transfers', function () {
+    // 1003-TRAN-023
+    // 1003-TRAN-006
    cy.get('main[data-testid="/portfolio"]').should('exist');

    cy.getByTestId(collateralTab).click();
@@ -198,7 +201,7 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {
      .first()
      .should('contain.text', 'Operational')
      .next()
-      .should('contain.text', new URL(Cypress.env('VEGA_URL')).origin)
+      .should('contain.text', new URL(Cypress.env('VEGA_URL')).hostname)
      .next()
      .then(($el) => {
        const blockHeight = parseInt($el.text());
@@ -342,6 +345,7 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {
    // 1002-WITH-019
    // 1002-WITH-020
    // 1002-WITH-021
+    const ethWalletAddress = Cypress.env('ETHEREUM_WALLET_ADDRESS');

    cy.visit('/#/portfolio');
    cy.get('main[data-testid="/portfolio"]').should('exist');
@@ -380,6 +384,31 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {
        'View in block explorerYou can save your withdrawal details for extra security.'
      )
      .and('contain.text', 'Withdraw 1.00 tBTCComplete withdrawal');
+    cy.getByTestId('toast-withdrawal-details').click();
+    cy.getByTestId(dialogContent)
+      .last()
+      .within(() => {
+        cy.getByTestId('dialog-title').should(
+          'contain.text',
+          'Save withdrawal details'
+        );
+        cy.getByTestId('copy-button').should('be.visible');
+        cy.getByTestId('assetSource_value').should(
+          'have.text',
+          '0xb63D135B0a6854EEb765d69ca36210cC70BECAE0'
+        );
+        cy.getByTestId('amount_value').should('have.text', '100000');
+        cy.getByTestId('nonce_value').invoke('text').should('not.be.empty');
+        cy.getByTestId('signatures_value')
+          .invoke('text')
+          .should('not.be.empty');
+        cy.getByTestId('targetAddress_value').should(
+          'have.text',
+          ethWalletAddress
+        );
+        cy.getByTestId('creation_value').invoke('text').should('not.be.empty');
+      });
+    cy.getByTestId('close-withdrawal-approval-dialog').click();

    cy.get('.ag-center-cols-container')
      .find('[col-id="status"]')
@@ -450,3 +450,17 @@ describe('Closed markets', { tags: '@smoke' }, () => {
      .should('have.text', 'View on Explorer');
  });
 });
+
+describe('no closed markets', { tags: '@smoke', testIsolation: true }, () => {
+  before(() => {
+    cy.mockTradingPage();
+    cy.mockSubscription();
+    cy.visit('/#/markets/all');
+    cy.get('[data-testid="Closed markets"]').click();
+  });
+
+  it('can see no markets message', () => {
+    // 6001-MARK-034
+    cy.getByTestId('tab-closed-markets').should('contain.text', 'No markets');
+  });
+});
@@ -1,7 +1,8 @@
 const dialogContent = 'dialog-content';
 const nodeHealth = 'node-health';
+const statusIncidentsLink = 'footer [data-testid=external-link]';

-describe.skip('home', { tags: '@regression' }, () => {
+describe('home', { tags: '@regression' }, () => {
  before(() => {
    cy.clearAllLocalStorage();
    cy.mockTradingPage();
@@ -12,34 +13,17 @@ describe.skip('home', { tags: '@regression' }, () => {
  describe('footer', () => {
    it('shows current block height', () => {
      // 0006-NETW-004
-      // 0006-NETW-005
      // 0006-NETW-008
      // 0006-NETW-009
-      // 0006-NETW-011
-
-      cy.intercept('POST', 'http://localhost:3008/graphql', (req) => {
-        req.on('response', (res) => {
-          res.setDelay(3001);
-        });
-      });

      cy.getByTestId(nodeHealth)
        .children()
        .first()
-        .should('contain.text', 'Warning delay ( >3 sec)');
-
-      cy.intercept('POST', 'http://localhost:3008/graphql', (req) => {
-        req.on('response', (res) => {
-          res.setDelay(1);
-        });
-      });
-
-      cy.getByTestId(nodeHealth)
-        .children()
-        .first()
-        .should('contain.text', 'Operational', { timeout: 10000 })
+        .should('contain.text', 'Operational', {
+          timeout: 10000,
+        })
        .next()
-        .should('contain.text', new URL(Cypress.env('VEGA_URL')).origin)
+        .should('contain.text', new URL(Cypress.env('VEGA_URL')).hostname)
        .next()
        .should('contain.text', '100'); // all mocked queries have x-block-height header set to 100
    });
@@ -82,12 +66,9 @@ describe.skip('home', { tags: '@regression' }, () => {
        .focus()
        .type(new URL(Cypress.env('VEGA_URL')).origin + '/graphql');
      cy.getByTestId('connect').click();
-      cy.getByTestId(nodeHealth)
-        .children()
-        .first()
-        .should('contain.text', 'Operational');
    });
  });
+
  describe('Network switcher', () => {
    before(() => {
      cy.mockTradingPage();
@@ -97,10 +78,21 @@ describe.skip('home', { tags: '@regression' }, () => {

    // 0006-NETW-002
    // 0006-NETW-003
-    it('switch to fairground network', () => {
-      cy.getByTestId('network-switcher').click();
+    // 0006-NETW-011
+    it('switch to fairground network and check status & incidents link', () => {
+      cy.getByTestId('navigation')
+        .find('[data-testid="network-switcher"]')
+        .click();
      cy.getByTestId('network-item').contains('Fairground testnet').click();
      cy.get('[aria-haspopup="menu"]').should('contain.text', 'Fairground');
+      cy.url().should('include', 'fairground.wtf');
+      cy.contains('Continue').click();
+      cy.get(statusIncidentsLink)
+        .children('span')
+        .should('have.text', 'Mainnet status & incidents');
+      cy.get(statusIncidentsLink)
+        .should('have.attr', 'href')
+        .and('contain', 'https://blog.vega.xyz/tagged/vega-incident-reports');
    });
  });
 });
@@ -0,0 +1,208 @@
+import { aliasGQLQuery } from '@vegaprotocol/cypress';
+import type { MarketsQuery } from '@vegaprotocol/markets';
+import * as Schema from '@vegaprotocol/types';
+
+const rowSelector =
+  '[data-testid="tab-all-markets"] .ag-center-cols-container .ag-row';
+const colInstrumentCode = '[col-id="tradableInstrument.instrument.code"]';
+
+describe('markets all table', { tags: '@smoke' }, () => {
+  beforeEach(() => {
+    cy.clearLocalStorage().then(() => {
+      cy.mockTradingPage(
+        Schema.MarketState.STATE_ACTIVE,
+        Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
+        Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
+      );
+      cy.mockSubscription();
+      cy.visit('/#/markets/all');
+    });
+  });
+
+  it('can see table headers', () => {
+    cy.wait('@Markets');
+    cy.wait('@MarketsData');
+    const headers = [
+      'Market',
+      'Description',
+      'Trading mode',
+      'Status',
+      'Best bid',
+      'Best offer',
+      'Mark price',
+      'Settlement asset',
+      '',
+    ];
+    cy.getByTestId('tab-all-markets').within(($headers) => {
+      cy.wrap($headers)
+        .get('.ag-header-cell-text')
+        .each(($header, i) => {
+          cy.wrap($header).should('have.text', headers[i]);
+        });
+    });
+  });
+
+  it('markets tab should be rendered properly', () => {
+    cy.get('[data-testid="All markets"]').should(
+      'have.attr',
+      'data-state',
+      'active'
+    );
+    cy.get('[data-testid="Proposed markets"]').should(
+      'have.attr',
+      'data-state',
+      'inactive'
+    );
+    cy.get('[data-testid="Closed markets"]').should(
+      'have.attr',
+      'data-state',
+      'inactive'
+    );
+  });
+  it('renders markets correctly', () => {
+    // 6001-MARK-035
+    cy.get(rowSelector)
+      .first()
+      .find(colInstrumentCode)
+      .should('have.text', 'SOLUSD');
+
+    //  6001-MARK-036
+    cy.get(rowSelector)
+      .first()
+      .find('[col-id="tradableInstrument.instrument.name"]')
+      .should('have.text', 'SUSPENDED MARKET');
+
+    //  6001-MARK-037
+    cy.get(rowSelector)
+      .first()
+      .find('[col-id="tradingMode"]')
+      .should('have.text', 'Continuous');
+
+    //  6001-MARK-038
+    cy.get(rowSelector)
+      .first()
+      .find('[col-id="state"]')
+      .should('have.text', 'Active');
+
+    //  6001-MARK-039
+    cy.get(rowSelector)
+      .first()
+      .find('[col-id="data.bestBidPrice"]')
+      .should('have.text', '0.00');
+
+    //  6001-MARK-040
+    cy.get(rowSelector)
+      .first()
+      .find('[col-id="data.bestOfferPrice"]')
+      .should('have.text', '0.00');
+
+    //  6001-MARK-041
+    cy.get(rowSelector)
+      .first()
+      .find('[col-id="data.markPrice"]')
+      .should('have.text', '84.41');
+
+    //  6001-MARK-042
+    cy.get(rowSelector)
+      .first()
+      .find(
+        '[col-id="tradableInstrument.instrument.product.settlementAsset.symbol"]'
+      )
+      .should('have.text', 'XYZalpha');
+
+    // 6001-MARK-043
+    cy.get(rowSelector)
+      .first()
+      .find(
+        '[col-id="tradableInstrument.instrument.product.settlementAsset.symbol"] button'
+      )
+      .click();
+    cy.getByTestId('dialog-title').should('have.text', 'Asset details - tEURO');
+    cy.getByTestId('close-asset-details-dialog').click();
+  });
+
+  it('can open row actions', () => {
+    // 6001-MARK-044
+    cy.get('.ag-pinned-right-cols-container')
+      .find('[col-id="market-actions"]')
+      .first()
+      .find('button')
+      .click();
+
+    // 6001-MARK-045
+    const dropdownContent = '[data-testid="market-actions-content"]';
+    const dropdownContentItem = '[role="menuitem"]';
+    cy.get(dropdownContent)
+      .find(dropdownContentItem)
+      .eq(0)
+      // Cannot click the copy button as it falls back to window.prompt, blocking the test.
+      .should('have.text', 'Copy Market ID');
+
+    // 6001-MARK-046
+    cy.get(dropdownContent)
+      .find(dropdownContentItem)
+      .eq(1)
+      .find('a')
+      .then(($el) => {
+        const href = $el.attr('href');
+        expect(/\/markets\/market-1/.test(href || '')).to.equal(true);
+      })
+      .should('have.text', 'View on Explorer');
+
+    // 6001-MARK-047
+    cy.get(dropdownContent)
+      .find(dropdownContentItem)
+      .eq(2)
+      .should('have.text', 'View asset');
+    cy.getByTestId('market-actions-content').click();
+  });
+
+  it('able to open and sort full market list - market page', () => {
+    // 6001-MARK-064
+    const ExpectedSortedMarkets = [
+      'AAPL.MF21',
+      'BTCUSD.MF21',
+      'ETHBTC.QM21',
+      'SOLUSD',
+    ];
+    cy.get('[data-testid="All markets"]').click({ force: true });
+    cy.url().should('eq', Cypress.config('baseUrl') + '/#/markets/all');
+    cy.contains('AAPL.MF21').should('be.visible');
+    cy.get('.ag-header-cell-label').contains('Market').click(); // sort by market name
+    for (let i = 0; i < ExpectedSortedMarkets.length; i++) {
+      cy.get(`[row-index=${i}]`)
+        .find(colInstrumentCode)
+        .should('have.text', ExpectedSortedMarkets[i]);
+    }
+  });
+
+  it('can drag and drop columns', () => {
+    // 6001-MARK-065
+    cy.get('.ag-overlay-loading-wrapper').should('not.be.visible');
+    cy.get(colInstrumentCode)
+      .realMouseDown()
+      .realMouseMove(700, 15)
+      .realMouseUp();
+    cy.get(colInstrumentCode).should(($element) => {
+      const attributeValue = $element.attr('aria-colindex');
+      expect(attributeValue).not.to.equal('1');
+    });
+  });
+});
+
+describe('no all markets', { tags: '@smoke', testIsolation: true }, () => {
+  before(() => {
+    cy.mockTradingPage();
+    const markets: MarketsQuery = {};
+    cy.mockGQL((req) => {
+      aliasGQLQuery(req, 'Markets', markets);
+    });
+    cy.mockSubscription();
+    cy.visit('/#/markets/all');
+  });
+
+  it('can see no markets message', () => {
+    // 6001-MARK-048
+    cy.getByTestId('tab-all-markets').should('contain.text', 'No markets');
+  });
+});
@@ -1,15 +1,18 @@
 import { MarketTradingModeMapping } from '@vegaprotocol/types';
 import { MarketState } from '@vegaprotocol/types';

-const marketInfoBtn = 'Info';
-const row = 'key-value-table-row';
-const marketTitle = 'accordion-title';
-const externalLink = 'external-link';
 const accordionContent = 'accordion-content';
+const blockExplorerLink = 'block-explorer-link';
+const dialogClose = 'dialog-close';
+const dialogContent = 'dialog-content';
+const externalLink = 'external-link';
+const githubLink = 'github-link';
+const liquidityLink = 'view-liquidity-link';
+const marketInfoBtn = 'Info';
+const marketTitle = 'accordion-title';
 const providerName = 'provider-name';
-const oracleBannerStatus = 'oracle-banner-status';
-const oracleBannerDialogTrigger = 'oracle-banner-dialog-trigger';
-const oracleFullProfile = 'oracle-full-profile';
+const row = 'key-value-table-row';
+const verifiedProofs = 'verified-proofs';

 describe('market info is displayed', { tags: '@smoke' }, () => {
  beforeEach(() => {
@@ -17,12 +20,7 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
  });

  before(() => {
-    cy.mockTradingPage(
-      MarketState.STATE_ACTIVE,
-      undefined,
-      undefined,
-      'COMPROMISED'
-    );
+    cy.mockTradingPage(MarketState.STATE_ACTIVE);
    cy.mockSubscription();
    cy.visit('/#/markets/market-0');
    cy.wait('@Markets');
@@ -30,16 +28,8 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
    cy.wait('@MarketInfo');
  });

-  it('show oracle banner', () => {
-    cy.getByTestId(marketTitle).contains('Oracle').click();
-    cy.getByTestId(oracleBannerStatus).should('contain.text', 'COMPROMISED');
-    cy.getByTestId(oracleBannerDialogTrigger)
-      .should('contain.text', 'Show more')
-      .click();
-    cy.getByTestId(oracleFullProfile).should('exist');
-  });
-
  it('current fees displayed', () => {
+    // 6002-MDET-101
    cy.getByTestId(marketTitle).contains('Current fees').click();
    validateMarketDataRow(0, 'Maker Fee', '0.02%');
    validateMarketDataRow(1, 'Infrastructure Fee', '0.05%');
@@ -48,6 +38,7 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
  });

  it('market price', () => {
+    // 6002-MDET-102
    cy.getByTestId(marketTitle).contains('Market price').click();
    validateMarketDataRow(0, 'Mark Price', '46,126.90058');
    validateMarketDataRow(1, 'Best Bid Price', '44,126.90058 ');
@@ -55,12 +46,9 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
    validateMarketDataRow(3, 'Quote Unit', 'BTC');
  });

-  // TODO: fix this test
-  // New volume check logic, added by https://github.com/vegaprotocol/frontend-monorepo/pull/3870 has caused the
-  // 24hr volume assertion to fail as it now reads 'Unknown'
-  it.skip('market volume displayed', () => {
+  it('market volume displayed', () => {
+    // 6002-MDET-103
    cy.getByTestId(marketTitle).contains('Market volume').click();
-    validateMarketDataRow(0, '24 Hour Volume', '1');
    validateMarketDataRow(1, 'Open Interest', '-');
    validateMarketDataRow(2, 'Best Bid Volume', '1');
    validateMarketDataRow(3, 'Best Offer Volume', '3');
@@ -69,11 +57,13 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
  });

  it('insurance pool displayed', () => {
+    // 6002-MDET-104
    cy.getByTestId(marketTitle).contains('Insurance pool').click();
    validateMarketDataRow(0, 'Balance', '0');
  });

  it('key details displayed', () => {
+    // 6002-MDET-201
    cy.getByTestId(marketTitle).contains('Key details').click();

    validateMarketDataRow(0, 'Name', 'BTCUSD Monthly (30 Jun 2022)');
@@ -89,6 +79,7 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
  });

  it('instrument displayed', () => {
+    // 6002-MDET-202
    cy.getByTestId(marketTitle).contains('Instrument').click();

    validateMarketDataRow(0, 'Market Name', 'BTCUSD Monthly (30 Jun 2022)');
@@ -97,7 +88,30 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
    validateMarketDataRow(3, 'Quote Name', 'BTC');
  });

+  it('oracle displayed', () => {
+    // 6002-MDET-203
+    cy.getByTestId(marketTitle).contains('Oracle').click();
+
+    cy.getByTestId(accordionContent)
+      .getByTestId(providerName)
+      .and('contain', 'Another oracle');
+
+    cy.getByTestId(providerName).should('be.visible').click();
+    cy.getByTestId(dialogContent)
+      .eq(1)
+      .within(() => {
+        cy.getByTestId(blockExplorerLink).contains('Block explorer');
+        cy.getByTestId(githubLink).contains('Oracle repository');
+      });
+    cy.getByTestId(dialogClose).click();
+
+    cy.getByTestId(accordionContent)
+      .getByTestId(verifiedProofs)
+      .and('contain', '1');
+  });
+
  it('settlement asset displayed', () => {
+    // 6002-MDET-206
    cy.getByTestId(marketTitle).contains('Settlement asset').click();
    cy.window().then((win) => {
      cy.stub(win, 'prompt').returns('DISABLED WINDOW PROMPT');
@@ -116,9 +130,12 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
    );
    validateMarketDataRow(8, 'Withdrawal threshold', '0.0005');
    validateMarketDataRow(9, 'Lifetime limit', '1,230');
+    validateMarketDataRow(10, 'Infrastructure fee account balance', '0.00001');
+    validateMarketDataRow(11, 'Global reward pool account balance', '0.00002');
  });

  it('metadata displayed', () => {
+    // 6002-MDET-207
    cy.getByTestId(marketTitle).contains('Metadata').click();

    validateMarketDataRow(0, 'Formerly', '076BB86A5AA41E3E');
@@ -129,18 +146,21 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
  });

  it('risk model displayed', () => {
+    // 6002-MDET-208
    cy.getByTestId(marketTitle).contains('Risk model').click();
    validateMarketDataRow(0, 'Tau', '0.0001140771161');
    validateMarketDataRow(1, 'Risk Aversion Parameter', '0.01');
  });

  it('risk parameters displayed', () => {
+    // 6002-MDET-209
    cy.getByTestId(marketTitle).contains('Risk parameters').click();
    validateMarketDataRow(0, 'R', '0.016');
    validateMarketDataRow(1, 'Sigma', '0.3');
  });

  it('risk factors displayed', () => {
+    // 6002-MDET-210
    cy.getByTestId(marketTitle).contains('Risk factors').click();

    validateMarketDataRow(0, 'Short', '0.008571790367285281');
@@ -148,6 +168,7 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
  });

  it('price monitoring bounds displayed', () => {
+    // 6002-MDET-211
    cy.getByTestId(marketTitle).contains('Price monitoring bounds 1').click();
    cy.get('p.col-span-1').contains('99.99999% probability price bounds');
    cy.get('p.col-span-1').contains('Within 43,200 seconds');
@@ -156,6 +177,7 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
  });

  it('liquidity monitoring parameters displayed', () => {
+    // 6002-MDET-212
    cy.getByTestId(marketTitle)
      .contains('Liquidity monitoring parameters')
      .click();
@@ -166,6 +188,7 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
  });

  it('liquidity displayed', () => {
+    // 6002-MDET-213
    cy.getByTestId(marketTitle)
      .contains(/Liquidity(?! m)/)
      .click();
@@ -173,14 +196,14 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
    validateMarketDataRow(0, 'Target Stake', '10.00 tBTC');
    validateMarketDataRow(1, 'Supplied Stake', '0.01 tBTC');
    validateMarketDataRow(2, 'Market Value Proxy', '20.00 tBTC');
-
-    cy.getByTestId('view-liquidity-link').should(
+    cy.getByTestId(liquidityLink).should(
      'have.text',
      'View liquidity provision table'
    );
  });

  it('liquidity price range displayed', () => {
+    // 6002-MDET-214
    cy.getByTestId(marketTitle).contains('Liquidity price range').click();

    validateMarketDataRow(0, 'Liquidity Price Range', '2.00% of mid price');
@@ -188,29 +211,8 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
    validateMarketDataRow(2, 'Highest Price', '47,049.438 BTC');
  });

-  it('oracle displayed', () => {
-    cy.getByTestId(marketTitle).contains('Oracle').click();
-
-    cy.getByTestId(accordionContent)
-      .getByTestId(providerName)
-      .and('contain', 'Another oracle');
-
-    cy.getByTestId(providerName).should('be.visible').click();
-
-    cy.getByTestId('dialog-content')
-      .eq(1)
-      .within(() => {
-        cy.getByTestId('block-explorer-link').contains('Block explorer');
-        cy.getByTestId('github-link').contains('Oracle repository');
-      });
-    cy.getByTestId('dialog-close').click();
-
-    cy.getByTestId(accordionContent)
-      .getByTestId('verified-proofs')
-      .and('contain', '1');
-  });
-
  it('proposal displayed', () => {
+    // 6002-MDET-301
    cy.getByTestId(marketTitle).contains('Proposal').click();

    cy.getByTestId(accordionContent)
@@ -0,0 +1,326 @@
+import { checkSorting } from '@vegaprotocol/cypress';
+import * as Schema from '@vegaprotocol/types';
+
+const liquidityTab = 'Liquidity';
+const rowSelector =
+  '[data-testid="tab-liquidity"] .ag-center-cols-container .ag-row';
+const rowSelectorLiquidityActive =
+  '[data-testid="tab-active"] .ag-center-cols-container .ag-row';
+const rowSelectorLiquidityInactive =
+  '[data-testid="tab-inactive"] .ag-center-cols-container .ag-row';
+const marketSummaryBlock = 'header-summary';
+const itemValue = 'item-value';
+const itemHeader = 'item-header';
+const colCommitmentAmount = '[col-id="commitmentAmount"]';
+const colAverageEntryValuation = '[col-id="averageEntryValuation"]';
+const colEquityLikeShare = '[col-id="equityLikeShare"]';
+const colFee = '[col-id="fee"]';
+const colCommitmentAmount_1 = '[col-id="commitmentAmount_1"]';
+const colBalance = '[col-id="balance"]';
+const colStatus = '[col-id="status"]';
+const colCreatedAt = '[col-id="createdAt"] button';
+const colUpdatedAt = '[col-id="updatedAt"] button';
+
+const headers = [
+  'Party',
+  'Commitment (tDAI)',
+  'Share',
+  'Proposed fee',
+  'Market valuation at entry',
+  'Obligation',
+  'Supplied',
+  'Status',
+  'Created',
+  'Updated',
+];
+
+describe('liquidity table - trading', { tags: '@smoke' }, () => {
+  before(() => {
+    cy.mockSubscription();
+    cy.mockTradingPage(
+      Schema.MarketState.STATE_ACTIVE,
+      Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
+      Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
+    );
+    cy.visit('/#/markets/market-0');
+    cy.wait('@MarketData');
+    cy.getByTestId(liquidityTab).click();
+    cy.wait('@LiquidityProvisions');
+  });
+
+  it('can see table headers', () => {
+    // 5002-LIQP-001
+    cy.getByTestId('tab-liquidity').within(($headers) => {
+      cy.wrap($headers)
+        .get('.ag-header-cell-text')
+        .each(($header, i) => {
+          cy.wrap($header).should('have.text', headers[i]);
+        });
+    });
+  });
+
+  it('renders liquidity table correctly', () => {
+    // 5002-LIQP-002
+    cy.get(rowSelector)
+      .first()
+      .find('[col-id="party.id"]')
+      .should(
+        'have.text',
+        '69464e35bcb8e8a2900ca0f87acaf252d50cf2ab2fc73694845a16b7c8a0dc6f'
+      );
+
+    cy.get(rowSelector)
+      .first()
+      .find(colCommitmentAmount)
+      .should('have.text', '4,000.00');
+
+    cy.get(rowSelector)
+      .first()
+      .find(colEquityLikeShare)
+      .should('have.text', '100.00%');
+
+    cy.get(rowSelector).first().find(colFee).should('have.text', '0.09%');
+
+    cy.get(rowSelector)
+      .first()
+      .find(colAverageEntryValuation)
+      .should('have.text', '685,852.93692');
+
+    cy.get(rowSelector)
+      .first()
+      .find(colCommitmentAmount_1)
+      .should('have.text', '4,000.00');
+
+    cy.get(rowSelector)
+      .first()
+      .find(colBalance)
+      .scrollIntoView()
+      .should('have.text', '4,000.00');
+
+    cy.get(rowSelector).first().find(colStatus).should('have.text', 'Active');
+
+    cy.get(rowSelector).first().find(colCreatedAt).should('not.be.empty');
+    cy.get(rowSelector).first().find(colUpdatedAt).should('not.be.empty');
+  });
+  it.skip('liquidity status column should be sorted properly', () => {
+    // 5002-LIQP-003
+    const liquidityColDefault = ['Active', 'Pending'];
+    const liquidityColAsc = ['Active', 'Pending'];
+    const liquidityColDesc = ['Pending', 'Active'];
+    checkSorting(
+      'status',
+      liquidityColDefault,
+      liquidityColAsc,
+      liquidityColDesc
+    );
+  });
+});
+
+describe('liquidity table view', { tags: '@smoke' }, () => {
+  before(() => {
+    cy.mockSubscription();
+    cy.mockTradingPage(
+      Schema.MarketState.STATE_ACTIVE,
+      Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
+      Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
+    );
+    cy.visit('/#/liquidity/market-0');
+    cy.wait('@LiquidityProvisions');
+  });
+
+  it('can see header title', () => {
+    // 5002-LIQP-004
+    // 5002-LIQP-005
+    cy.getByTestId('header-title')
+      .should('contain.text', 'BTCUSD.MF21 liquidity provision')
+      .and('contain.text', 'Go to trading');
+  });
+
+  it('can see target stake', () => {
+    // 5002-LIQP-006
+    cy.getByTestId(marketSummaryBlock).within(() => {
+      cy.getByTestId('target-stake').within(() => {
+        cy.getByTestId(itemHeader).should('have.text', 'Target stake');
+        cy.getByTestId(itemValue).should('have.text', '10.00 tDAI').realHover();
+      });
+    });
+    cy.getByTestId('tooltip-content').should(
+      'contain.text',
+      `The market's liquidity requirement which is derived from the maximum open interest observed over a rolling time window.The market's liquidity requirement which is derived from the maximum open interest observed over a rolling time window.`
+    );
+  });
+
+  it('can see supplied stake', () => {
+    // 5002-LIQP-007
+    cy.getByTestId(marketSummaryBlock).within(() => {
+      cy.getByTestId('supplied-stake').within(() => {
+        cy.getByTestId(itemHeader).should('have.text', 'Supplied stake');
+        cy.getByTestId(itemValue).should('have.text', '0.01 tDAI').realHover();
+      });
+    });
+    cy.getByTestId('tooltip-content').should(
+      'contain.text',
+      'The current amount of liquidity supplied for this market.'
+    );
+  });
+
+  it('can see liquidity supplied', () => {
+    //// 5002-LIQP-008
+    cy.getByTestId(marketSummaryBlock).within(() => {
+      cy.getByTestId('liquidity-supplied').within(() => {
+        cy.getByTestId(itemHeader).should('have.text', 'Liquidity supplied');
+        cy.getByTestId('indicator').should('be.visible');
+        cy.getByTestId(itemValue).should('have.text', '0.10%').realHover();
+      });
+    });
+  });
+
+  it('can see market id', () => {
+    // 5002-LIQP-009
+    cy.getByTestId(marketSummaryBlock).within(() => {
+      cy.getByTestId('liquidity-market-id').within(() => {
+        cy.getByTestId(itemHeader).should('have.text', 'Market ID');
+        cy.getByTestId(itemValue).should('have.text', 'market-0');
+      });
+    });
+  });
+
+  it('can see market id', () => {
+    // 5002-LIQP-010
+    cy.getByTestId(marketSummaryBlock).within(() => {
+      cy.getByTestId('liquidity-learn-more').within(() => {
+        cy.getByTestId(itemHeader).should('have.text', 'Learn more');
+        cy.getByTestId(itemValue).should('have.text', 'Providing liquidity');
+        cy.getByTestId('external-link')
+          .should('have.attr', 'href')
+          .and(
+            'include',
+            'https://docs.vega.xyz/testnet/concepts/liquidity/provision'
+          );
+      });
+    });
+  });
+
+  describe('liquidity table view', { tags: '@smoke' }, () => {
+    it('can see table headers', () => {
+      cy.getByTestId('tab-active').within(($headers) => {
+        cy.wrap($headers)
+          .get('.ag-header-cell-text')
+          .each(($header, i) => {
+            cy.wrap($header).should('have.text', headers[i]);
+          });
+      });
+    });
+
+    it('renders liquidity active table correctly', () => {
+      // 5002-LIQP-011
+      cy.get(rowSelectorLiquidityActive)
+        .first()
+        .find('[col-id="party.id"]')
+        .should(
+          'have.text',
+          '69464e35bcb8e8a2900ca0f87acaf252d50cf2ab2fc73694845a16b7c8a0dc6f'
+        );
+
+      cy.get(rowSelectorLiquidityActive)
+        .first()
+        .find(colCommitmentAmount)
+        .should('have.text', '4,000.00');
+
+      cy.get(rowSelectorLiquidityActive)
+        .first()
+        .find(colEquityLikeShare)
+        .should('have.text', '100.00%');
+
+      cy.get(rowSelectorLiquidityActive)
+        .first()
+        .find(colFee)
+        .should('have.text', '0.09%');
+
+      cy.get(rowSelectorLiquidityActive)
+        .first()
+        .find(colAverageEntryValuation)
+        .should('have.text', '685,852.93692');
+
+      cy.get(rowSelectorLiquidityActive)
+        .first()
+        .find(colCommitmentAmount_1)
+        .should('have.text', '4,000.00');
+
+      cy.get(rowSelectorLiquidityActive)
+        .first()
+        .find(colBalance)
+        .should('have.text', '4,000.00');
+
+      cy.get(rowSelectorLiquidityActive)
+        .first()
+        .find(colStatus)
+        .should('have.text', 'Active');
+
+      cy.get(rowSelectorLiquidityActive)
+        .first()
+        .find(colCreatedAt)
+        .should('not.be.empty');
+      cy.get(rowSelectorLiquidityActive)
+        .first()
+        .find(colUpdatedAt)
+        .should('not.be.empty');
+    });
+
+    it('renders liquidity inactive table correctly', () => {
+      //// 5002-LIQP-012
+      cy.getByTestId('Inactive').click();
+      cy.get(rowSelectorLiquidityInactive)
+        .first()
+        .find('[col-id="party.id"]')
+        .should(
+          'have.text',
+          'cc464e35bcb8e8a2900ca0f87acaf252d50cf2ab2fc73694845a16b7c8a0dc6f'
+        );
+
+      cy.get(rowSelectorLiquidityInactive)
+        .first()
+        .find(colCommitmentAmount)
+        .should('have.text', '4,000.00');
+
+      cy.get(rowSelectorLiquidityInactive)
+        .first()
+        .find(colEquityLikeShare)
+        .should('have.text', '100.00%');
+
+      cy.get(rowSelectorLiquidityInactive)
+        .first()
+        .find(colFee)
+        .should('have.text', '0.40%');
+
+      cy.get(rowSelectorLiquidityInactive)
+        .first()
+        .find(colAverageEntryValuation)
+        .should('have.text', '685,852.93692');
+
+      cy.get(rowSelectorLiquidityInactive)
+        .first()
+        .find(colCommitmentAmount_1)
+        .should('have.text', '4,000.00');
+
+      cy.get(rowSelectorLiquidityInactive)
+        .first()
+        .find(colBalance)
+        .should('have.text', '2,000.00');
+
+      cy.get(rowSelectorLiquidityInactive)
+        .first()
+        .find(colStatus)
+        .should('have.text', 'Pending');
+
+      cy.get(rowSelectorLiquidityInactive)
+        .first()
+        .find(colCreatedAt)
+        .should('not.be.empty');
+      cy.get(rowSelectorLiquidityInactive)
+        .first()
+        .find(colUpdatedAt)
+        .should('not.be.empty');
+    });
+  });
+});
@@ -25,6 +25,7 @@ describe('markets selector', { tags: '@smoke' }, () => {
    cy.wait('@MarketsCandles');
  });

+  // 6001-MARK-066
  it('can toggle the sidebar', () => {
    cy.getByTestId('market-selector').should('be.visible');
    cy.getByTestId('sidebar-toggle').click();
@@ -40,26 +41,26 @@ describe('markets selector', { tags: '@smoke' }, () => {
      {
        code: 'SOLUSD',
        markPrice: '84.41XYZalpha',
-        change: '+200.00%',
-        vol: '324h vol',
+        change: '',
+        vol: '0.0024h vol',
      },
      {
        code: 'ETHBTC.QM21',
        markPrice: '46,126.90058tBTC',
-        change: '+200.00%',
-        vol: '324h vol',
+        change: '',
+        vol: '0.0024h vol',
      },
      {
        code: 'BTCUSD.MF21',
        markPrice: '46,126.90058tDAI',
-        change: '+200.00%',
-        vol: '324h vol',
+        change: '',
+        vol: '0.0024h vol',
      },
      {
        code: 'AAPL.MF21',
        markPrice: '46,126.90058tUSDC',
-        change: '+200.00%',
-        vol: '324h vol',
+        change: '',
+        vol: '0.0024h vol',
      },
    ];
    cy.getByTestId(list)
@@ -67,6 +68,7 @@ describe('markets selector', { tags: '@smoke' }, () => {
      .each((item, i) => {
        const market = data[i];
        // 6001-MARK-021
+        // 6001-MARK-022
        expect(item.find('h3').text()).equals(market.code);
        expect(
          item.find('[data-testid="market-selector-data-row"]').eq(0).text()
@@ -80,12 +82,23 @@ describe('markets selector', { tags: '@smoke' }, () => {
          market.change
        );
        // 6001-MARK-025
-        expect(item.find('[data-testid="sparkline-svg"]')).to.exist;
+        expect(item.find('[data-testid="sparkline-svg"]')).to.not.exist;
      });
  });

-  // 6001-MARK-27
+  it('can see all markets link', () => {
+    // 6001-MARK-026
+    cy.getByTestId('market-selector').within(() => {
+      cy.getByTestId('all-markets-link')
+        .should('be.visible')
+        .and('have.text', 'All markets')
+        .and('have.attr', 'href')
+        .and('contain', '#/markets/all');
+    });
+  });
+
  it('can use the filter options', () => {
+    // 6001-MARK-027
    // product type
    cy.getByTestId('product-Spot').click();
    cy.getByTestId(list).contains('Spot markets coming soon.');
@@ -94,7 +107,7 @@ describe('markets selector', { tags: '@smoke' }, () => {
    cy.getByTestId('product-Future').click();
    cy.getByTestId(list).find('a').should('have.length', 4);

-    // 6001-MARK-29
+    // 6001-MARK-029
    cy.getByTestId(searchInput).clear().type('btc');
    cy.getByTestId(list).find('a').should('have.length', 2);
    cy.getByTestId(list).find('a').eq(1).contains('BTCUSD.MF21');
@@ -103,4 +116,29 @@ describe('markets selector', { tags: '@smoke' }, () => {
    cy.getByTestId(searchInput).clear();
    cy.getByTestId(list).find('a').should('have.length', 4);
  });
+
+  it('can sort by by top gaining and top losing market', () => {
+    // 6001-MARK-030
+    // 6001-MARK-031
+    // 6001-MARK-032
+    // 6001-MARK-033
+    cy.getByTestId(' sort-trigger').click();
+    cy.getByTestId('sort-item-Gained')
+      .contains('Top gaining')
+      .should('be.visible');
+    cy.getByTestId('sort-item-Lost')
+      .contains('Top losing')
+      .should('be.visible');
+    cy.getByTestId('sort-item-New')
+      .contains('New markets')
+      .should('be.visible');
+  });
+
+  it('can filter by settlement asset', () => {
+    // 6001-MARK-028
+    cy.getByTestId('asset-trigger').click();
+    cy.getByTestId('asset-id-asset-3').contains('tBTC').click();
+    cy.getByTestId(list).find('a').should('have.length', 1);
+    cy.getByTestId(list).find('a').eq(0).contains('ETHBTC.QM21');
+  });
 });
@@ -1,17 +1,25 @@
 import * as Schema from '@vegaprotocol/types';

-const marketSummaryBlock = 'header-summary';
-const marketExpiry = 'market-expiry';
-const marketPrice = 'market-price';
-const marketChange = 'market-change';
-const marketVolume = 'market-volume';
-const marketMode = 'market-trading-mode';
-const marketState = 'market-state';
-const marketSettlement = 'market-settlement-asset';
-const percentageValue = 'price-change-percentage';
-const priceChangeValue = 'price-change';
+const expirtyTooltip = 'expiry-tooltip';
+const externalLink = 'external-link';
 const itemHeader = 'item-header';
 const itemValue = 'item-value';
+const link = 'link';
+const liquidityLink = 'view-liquidity-link';
+const liquiditySupplied = 'liquidity-supplied';
+const liquiditySuppliedTooltip = 'liquidity-supplied-tooltip';
+const marketChange = 'market-change';
+const marketExpiry = 'market-expiry';
+const marketMode = 'market-trading-mode';
+const marketName = 'header-title';
+const marketPrice = 'market-price';
+const marketSettlement = 'market-settlement-asset';
+const marketState = 'market-state';
+const marketSummaryBlock = 'header-summary';
+const marketVolume = 'market-volume';
+const percentageValue = 'price-change-percentage';
+const priceChangeValue = 'price-change';
+const tradingModeTooltip = 'trading-mode-tooltip';

 describe('Market trading page', () => {
  before(() => {
@@ -31,10 +39,12 @@ describe('Market trading page', () => {
    // 7002-SORD-001
    // 7002-SORD-002
    it('must display market name', () => {
-      cy.getByTestId('header-title').should('not.be.empty');
+      // 6002-MDET-001
+      cy.getByTestId(marketName).should('not.be.empty');
    });

    it('must see market expiry', () => {
+      // 6002-MDET-002
      cy.getByTestId(marketSummaryBlock).within(() => {
        cy.getByTestId(marketExpiry).within(() => {
          cy.getByTestId(itemHeader).should('have.text', 'Expiry');
@@ -44,6 +54,7 @@ describe('Market trading page', () => {
    });

    it('must see market price', () => {
+      // 6002-MDET-003
      cy.getByTestId(marketSummaryBlock).within(() => {
        cy.getByTestId(marketPrice).within(() => {
          cy.getByTestId(itemHeader).should('have.text', 'Price');
@@ -53,6 +64,7 @@ describe('Market trading page', () => {
    });

    it('must see market change', () => {
+      // 6002-MDET-004
      cy.getByTestId(marketSummaryBlock).within(() => {
        cy.getByTestId(marketChange).within(() => {
          cy.getByTestId(itemHeader).should('have.text', 'Change (24h)');
@@ -63,6 +75,7 @@ describe('Market trading page', () => {
    });

    it('must see market volume', () => {
+      // 6002-MDET-005
      cy.getByTestId(marketSummaryBlock).within(() => {
        cy.getByTestId(marketVolume).within(() => {
          cy.getByTestId(itemHeader).should('have.text', 'Volume (24h)');
@@ -72,16 +85,21 @@ describe('Market trading page', () => {
    });

    it('must see market mode', () => {
+      // 6002-MDET-006
      cy.getByTestId(marketSummaryBlock).within(() => {
        cy.getByTestId(marketMode).within(() => {
          cy.getByTestId(itemHeader).should('have.text', 'Trading mode');
-          cy.getByTestId(itemValue).should('not.be.empty');
+          cy.getByTestId(itemValue).should(
+            'have.text',
+            'Monitoring auction - liquidity (target not met)'
+          );
        });
      });
    });

-    it('must see market state', () => {
-      //7002-SORD-061
+    it('must see market status', () => {
+      // 6002-MDET-007
+      // 7002-SORD-061
      cy.getByTestId(marketSummaryBlock).within(() => {
        cy.getByTestId(marketState).within(() => {
          cy.getByTestId(itemHeader).should('have.text', 'Status');
@@ -91,6 +109,7 @@ describe('Market trading page', () => {
    });

    it('must see market settlement', () => {
+      // 6002-MDET-008
      cy.getByTestId(marketSummaryBlock).within(() => {
        cy.getByTestId(marketSettlement).within(() => {
          cy.getByTestId(itemHeader).should('have.text', 'Settlement asset');
@@ -98,15 +117,12 @@ describe('Market trading page', () => {
        });
      });
    });
-
-    it('must see market mode', () => {
+    it('must see market liquidity supplied', () => {
+      // 6002-MDET-009
      cy.getByTestId(marketSummaryBlock).within(() => {
-        cy.getByTestId(marketMode).within(() => {
-          cy.getByTestId(itemHeader).should('have.text', 'Trading mode');
-          cy.getByTestId(itemValue).should(
-            'have.text',
-            'Monitoring auction - liquidity (target not met)'
-          );
+        cy.getByTestId(liquiditySupplied).within(() => {
+          cy.getByTestId(itemHeader).should('have.text', 'Liquidity supplied');
+          cy.getByTestId(itemValue).should('not.be.empty');
        });
      });
    });
@@ -121,14 +137,14 @@ describe('Market trading page', () => {
            .realHover();
        });
      });
-      cy.getByTestId('expiry-tooltip')
+      cy.getByTestId(expirtyTooltip)
        .eq(0)
        .should(
          'contain.text',
          'This market expires when triggered by its oracle, not on a set date.'
        )
        .within(() => {
-          cy.getByTestId('link')
+          cy.getByTestId(link)
            .should('have.attr', 'href')
            .and('include', Cypress.env('EXPLORER_URL'));
        });
@@ -154,15 +170,14 @@ describe('Market trading page', () => {
            .realHover();
        });
      });
-
-      cy.getByTestId('trading-mode-tooltip')
+      cy.getByTestId(tradingModeTooltip)
        .should(
          'contain.text',
          'This market is in auction until it reaches sufficient liquidity.'
        )
        .eq(0)
        .within(() => {
-          cy.getByTestId('external-link')
+          cy.getByTestId(externalLink)
            .should('have.attr', 'href')
            .and('include', Cypress.env('TRADING_MODE_LINK'));

@@ -174,5 +189,27 @@ describe('Market trading page', () => {
          }
        });
    });
+
+    it('should see liquidity supplied tooltip', () => {
+      cy.getByTestId(marketSummaryBlock).within(() => {
+        cy.getByTestId(liquiditySupplied).within(() => {
+          cy.getByTestId(itemValue).realHover();
+        });
+      });
+      cy.getByTestId(liquiditySuppliedTooltip)
+        .should('contain.text', 'Supplied stake')
+        .and('contain.text', 'Target stake')
+        .first()
+        .within(() => {
+          cy.getByTestId(liquidityLink).should(
+            'have.text',
+            'View liquidity provision table'
+          );
+          cy.getByTestId(externalLink).should(
+            'have.text',
+            'Learn about providing liquidity'
+          );
+        });
+    });
  });
 });
@@ -0,0 +1,224 @@
+import { aliasGQLQuery, checkSorting } from '@vegaprotocol/cypress';
+import type { ProposalsListQuery } from '@vegaprotocol/proposals';
+
+const rowSelector =
+  '[data-testid="tab-proposed-markets"] .ag-center-cols-container .ag-row';
+const colMarketId = '[col-id="market"]';
+
+describe('markets proposed table', { tags: '@smoke' }, () => {
+  before(() => {
+    cy.mockTradingPage();
+    cy.mockSubscription();
+    cy.visit('/#/markets/all');
+    cy.get('[data-testid="Proposed markets"]').click();
+  });
+
+  it('can see table headers', () => {
+    const headers = [
+      'Market',
+      'Description',
+      'Settlement asset',
+      'State',
+      'Voting',
+      'Closing date',
+      'Enactment date',
+      '',
+    ];
+    cy.getByTestId('tab-proposed-markets').within(($headers) => {
+      cy.wrap($headers)
+        .get('.ag-header-cell-text')
+        .each(($header, i) => {
+          cy.wrap($header).should('have.text', headers[i]);
+        });
+    });
+  });
+
+  it('renders markets correctly', () => {
+    // 6001-MARK-049
+    cy.get(rowSelector).first().find(colMarketId).should('have.text', 'ETHUSD');
+
+    //  6001-MARK-050
+    cy.get(rowSelector)
+      .first()
+      .find('[col-id="description"]')
+      .should('have.text', 'ETHUSD');
+
+    //  6001-MARK-051
+    cy.get(rowSelector)
+      .first()
+      .find('[col-id="asset"]')
+      .should('have.text', 'tDAI TEST');
+
+    //  6001-MARK-052
+    //  6001-MARK-053
+    cy.get(rowSelector)
+      .first()
+      .find('[col-id="state"]')
+      .should('have.text', 'Open');
+
+    //  6001-MARK-054
+    cy.get(rowSelector)
+      .first()
+      .find('[col-id="voting"]')
+      .should('have.text', '');
+
+    //  6001-MARK-056
+    cy.get(rowSelector)
+      .first()
+      .find('[col-id="closing-date"]')
+      .should('not.be.empty');
+
+    //  6001-MARK-057
+    cy.get(rowSelector)
+      .first()
+      .find('[col-id="enactment-date"]')
+      .should('not.be.empty');
+  });
+
+  it('can open row actions', () => {
+    // 6001-MARK-058
+    cy.get('.ag-pinned-right-cols-container')
+      .find('[col-id="proposal-actions"]')
+      .first()
+      .find('button')
+      .click();
+
+    const dropdownContent = '[data-testid="market-actions-content"]';
+    const dropdownContentItem = '[role="menuitem"]';
+
+    // 6001-MARK-059
+    cy.get(dropdownContent)
+      .find(dropdownContentItem)
+      .eq(0)
+      .find('a')
+      .should('have.text', 'View proposal')
+      .and(
+        'have.attr',
+        'href',
+        `${Cypress.env(
+          'VEGA_TOKEN_URL'
+        )}/proposals/e9ec6d5c46a7e7bcabf9ba7a893fa5a5eeeec08b731f06f7a6eb7bf0e605b829`
+      );
+    cy.getByTestId('market-actions-content').click();
+  });
+
+  // 6001-MARK-060
+  it('can see proposed market link', () => {
+    cy.getByTestId('tab-proposed-markets')
+      .find('[data-testid="external-link"]')
+      .should('have.length', 11)
+      .last()
+      .should('have.text', 'Propose a new market')
+      .and(
+        'have.attr',
+        'href',
+        `${Cypress.env('VEGA_TOKEN_URL')}/proposals/propose/new-market`
+      );
+  });
+  it('proposed markets tab should be sorted properly', () => {
+    // 6001-MARK-062
+    cy.get('[data-testid="Proposed markets"]').click({ force: true });
+    const marketColDefault = [
+      'ETHUSD',
+      'LINKUSD',
+      'ETHUSD',
+      'ETHDAI.MF21',
+      'AAPL.MF21',
+      'BTCUSD.MF21',
+      'TSLA.QM21',
+      'AAVEDAI.MF21',
+      'ETHBTC.QM21',
+      'UNIDAI.MF21',
+    ];
+    const marketColAsc = [
+      'AAPL.MF21',
+      'AAVEDAI.MF21',
+      'BTCUSD.MF21',
+      'ETHBTC.QM21',
+      'ETHDAI.MF21',
+      'ETHUSD',
+      'ETHUSD',
+      'LINKUSD',
+      'TSLA.QM21',
+      'UNIDAI.MF21',
+    ];
+    const marketColDesc = [
+      'UNIDAI.MF21',
+      'TSLA.QM21',
+      'LINKUSD',
+      'ETHUSD',
+      'ETHUSD',
+      'ETHDAI.MF21',
+      'ETHBTC.QM21',
+      'BTCUSD.MF21',
+      'AAVEDAI.MF21',
+      'AAPL.MF21',
+    ];
+    checkSorting('market', marketColDefault, marketColAsc, marketColDesc);
+
+    const stateColDefault = [
+      'Open',
+      'Passed',
+      'Waiting for Node Vote',
+      'Open',
+      'Passed',
+      'Open',
+      'Passed',
+      'Open',
+      'Waiting for Node Vote',
+      'Open',
+    ];
+    const stateColAsc = [
+      'Open',
+      'Open',
+      'Open',
+      'Open',
+      'Open',
+      'Passed',
+      'Passed',
+      'Passed',
+      'Waiting for Node Vote',
+      'Waiting for Node Vote',
+    ];
+    const stateColDesc = [
+      'Waiting for Node Vote',
+      'Waiting for Node Vote',
+      'Passed',
+      'Passed',
+      'Passed',
+      'Open',
+      'Open',
+      'Open',
+      'Open',
+      'Open',
+    ];
+    checkSorting('state', stateColDefault, stateColAsc, stateColDesc);
+  });
+
+  it('can drag and drop columns', () => {
+    // 6001-MARK-063
+    cy.get(colMarketId).realMouseDown().realMouseMove(700, 15).realMouseUp();
+    cy.get(colMarketId).should(($element) => {
+      const attributeValue = $element.attr('aria-colindex');
+      expect(attributeValue).not.to.equal('1');
+    });
+  });
+});
+
+describe('no markets proposed', { tags: '@smoke', testIsolation: true }, () => {
+  before(() => {
+    cy.mockTradingPage();
+    const proposal: ProposalsListQuery = {};
+    cy.mockGQL((req) => {
+      aliasGQLQuery(req, 'ProposalsList', proposal);
+    });
+    cy.mockSubscription();
+    cy.visit('/#/markets/all');
+    cy.get('[data-testid="Proposed markets"]').click();
+  });
+
+  it('can see no markets message', () => {
+    // 6001-MARK-061
+    cy.getByTestId('tab-proposed-markets').should('contain.text', 'No markets');
+  });
+});
@@ -1,5 +1,5 @@
 import * as Schema from '@vegaprotocol/types';
-import { aliasGQLQuery, checkSorting } from '@vegaprotocol/cypress';
+import { aliasGQLQuery } from '@vegaprotocol/cypress';
 import { marketsQuery } from '@vegaprotocol/mock';
 import { getDateTimeFormat } from '@vegaprotocol/utils';

@@ -16,147 +16,7 @@ describe('markets table', { tags: '@smoke' }, () => {
    });
  });

-  it('renders markets correctly', () => {
-    cy.wait('@Markets');
-    cy.wait('@MarketsData');
-    cy.get('[data-testid^="market-link-"]').should('not.be.empty');
-    cy.getByTestId('price').invoke('text').should('not.be.empty');
-    cy.getByTestId('settlement-asset').should('not.be.empty');
-    cy.getByTestId('price-change-percentage').should('not.be.empty');
-    cy.getByTestId('price-change').should('not.be.empty');
-  });
-
-  it('able to open and sort full market list - market page', () => {
-    const ExpectedSortedMarkets = [
-      'AAPL.MF21',
-      'BTCUSD.MF21',
-      'ETHBTC.QM21',
-      'SOLUSD',
-    ];
-    cy.url().should('eq', Cypress.config('baseUrl') + '/#/markets/all');
-    cy.contains('AAPL.MF21').should('be.visible');
-    cy.get('.ag-header-cell-label').contains('Market').click(); // sort by market name
-    for (let i = 0; i < ExpectedSortedMarkets.length; i++) {
-      cy.get(`[row-index=${i}]`)
-        .find('[col-id="tradableInstrument.instrument.code"]')
-        .should('have.text', ExpectedSortedMarkets[i]);
-    }
-  });
-
-  it('proposed markets tab should be rendered properly', () => {
-    cy.get('[data-testid="All markets"]').should(
-      'have.attr',
-      'data-state',
-      'active'
-    );
-    cy.get('[data-testid="Proposed markets"]').should(
-      'have.attr',
-      'data-state',
-      'inactive'
-    );
-    cy.get('[data-testid="Proposed markets"]').click();
-    cy.get('[data-testid="Proposed markets"]').should(
-      'have.attr',
-      'data-state',
-      'active'
-    );
-    cy.getByTestId('tab-proposed-markets').should('be.visible');
-    cy.get('.ag-body-viewport .ag-center-cols-container .ag-row').should(
-      'have.length',
-      10
-    );
-    cy.getByTestId('tab-proposed-markets')
-      .find('[data-testid="external-link"]')
-      .should('have.length', 11)
-      .last()
-      .should('have.text', 'Propose a new market')
-      .and(
-        'have.attr',
-        'href',
-        `${Cypress.env('VEGA_TOKEN_URL')}/proposals/propose/new-market`
-      );
-  });
-
-  it('proposed markets tab should be sorted properly', () => {
-    cy.get('[data-testid="Proposed markets"]').click();
-    const marketColDefault = [
-      'ETHUSD',
-      'LINKUSD',
-      'ETHUSD',
-      'ETHDAI.MF21',
-      'AAPL.MF21',
-      'BTCUSD.MF21',
-      'TSLA.QM21',
-      'AAVEDAI.MF21',
-      'ETHBTC.QM21',
-      'UNIDAI.MF21',
-    ];
-    const marketColAsc = [
-      'AAPL.MF21',
-      'AAVEDAI.MF21',
-      'BTCUSD.MF21',
-      'ETHBTC.QM21',
-      'ETHDAI.MF21',
-      'ETHUSD',
-      'ETHUSD',
-      'LINKUSD',
-      'TSLA.QM21',
-      'UNIDAI.MF21',
-    ];
-    const marketColDesc = [
-      'UNIDAI.MF21',
-      'TSLA.QM21',
-      'LINKUSD',
-      'ETHUSD',
-      'ETHUSD',
-      'ETHDAI.MF21',
-      'ETHBTC.QM21',
-      'BTCUSD.MF21',
-      'AAVEDAI.MF21',
-      'AAPL.MF21',
-    ];
-    checkSorting('market', marketColDefault, marketColAsc, marketColDesc);
-
-    const stateColDefault = [
-      'Open',
-      'Passed',
-      'Waiting for Node Vote',
-      'Open',
-      'Passed',
-      'Open',
-      'Passed',
-      'Open',
-      'Waiting for Node Vote',
-      'Open',
-    ];
-    const stateColAsc = [
-      'Open',
-      'Open',
-      'Open',
-      'Open',
-      'Open',
-      'Passed',
-      'Passed',
-      'Passed',
-      'Waiting for Node Vote',
-      'Waiting for Node Vote',
-    ];
-    const stateColDesc = [
-      'Waiting for Node Vote',
-      'Waiting for Node Vote',
-      'Passed',
-      'Passed',
-      'Passed',
-      'Open',
-      'Open',
-      'Open',
-      'Open',
-      'Open',
-    ];
-    checkSorting('state', stateColDefault, stateColAsc, stateColDesc);
-  });
-
-  it.skip('opening auction subsets should be properly displayed', () => {
+  it('opening auction subsets should be properly displayed', () => {
    cy.mockTradingPage(
      Schema.MarketState.STATE_ACTIVE,
      Schema.MarketTradingMode.TRADING_MODE_OPENING_AUCTION
@@ -0,0 +1,27 @@
+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.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');
+  });
+});
@@ -0,0 +1,102 @@
+const orderbookTab = 'Orderbook';
+const orderbookTable = 'tab-orderbook';
+const askPrice = 'price-9894585';
+const bidPrice = 'price-9889001';
+const askVolume = 'ask-vol-9894585';
+const bidVolume = 'bid-vol-9889001';
+const askCumulative = 'cumulative-vol-9894585';
+const bidCumulative = 'cumulative-vol-9889001';
+const midPrice = 'middle-mark-price-4612690000';
+const priceResolution = 'resolution';
+const dealTicketPrice = 'order-price';
+const resPrice = 'price-990';
+
+describe('order book', { tags: '@smoke' }, () => {
+  before(() => {
+    cy.mockTradingPage();
+    cy.mockSubscription();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@Markets');
+  });
+
+  beforeEach(() => {
+    cy.mockTradingPage();
+  });
+
+  it('show order book', () => {
+    // 6003-ORDB-001
+    // 6003-ORDB-002
+    cy.getByTestId(orderbookTab).click();
+    cy.getByTestId(orderbookTable).should('be.visible');
+    cy.getByTestId(orderbookTable).should('not.be.empty');
+  });
+
+  it('show orders prices', () => {
+    // 6003-ORDB-003
+    cy.getByTestId(askPrice).should('have.text', '98.94585');
+    cy.getByTestId(bidPrice).should('have.text', '98.89001');
+  });
+
+  it('show prices volumes', () => {
+    // 6003-ORDB-004
+    cy.getByTestId(askVolume).should('have.text', '1');
+    cy.getByTestId(bidVolume).should('have.text', '1');
+  });
+
+  it('show prices cumulative volumes', () => {
+    // 6003-ORDB-005
+    cy.getByTestId(askCumulative).should('have.text', '39');
+    cy.getByTestId(bidCumulative).should('have.text', '7');
+  });
+
+  it('show mid price', () => {
+    // 6003-ORDB-006
+    cy.getByTestId(midPrice).should('have.text', '46,126.90');
+  });
+
+  it('sort prices descending', () => {
+    // 6003-ORDB-007
+    const prices: number[] = [];
+    cy.getByTestId(orderbookTable).within(() => {
+      cy.get('[data-testid*=price]')
+        .each(($el) => {
+          prices.push(Number($el.text()));
+        })
+        .then(() => {
+          expect(prices).to.deep.equal(prices.sort((a, b) => b - a));
+        });
+    });
+  });
+
+  it('copy price to deal ticket form', () => {
+    // 6003-ORDB-009
+    cy.getByTestId(askPrice).click();
+    cy.getByTestId(dealTicketPrice).should('have.value', '98.94585');
+  });
+
+  it('change price resolution', () => {
+    // 6003-ORDB-008
+    const resolutions = [
+      '0.00000',
+      '0.0000',
+      '0.000',
+      '0.00',
+      '0.0',
+      '0',
+      '10',
+      '100',
+      '1,000',
+      '10,000',
+    ];
+    cy.getByTestId(priceResolution)
+      .find('option')
+      .each(($el, index) => {
+        expect($el.text()).to.equal(resolutions[index]);
+      });
+
+    cy.getByTestId(priceResolution).select('0.0');
+    cy.getByTestId(resPrice).should('have.text', '99.0');
+    cy.getByTestId(askPrice).should('not.exist');
+    cy.getByTestId(bidPrice).should('not.exist');
+  });
+});
@@ -19,6 +19,8 @@ describe('accounts', { tags: '@smoke' }, () => {
    // 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();
@@ -33,28 +35,23 @@ describe('accounts', { tags: '@smoke' }, () => {
    cy.getByTestId('tab-accounts')
      .get(tradingAccountRowId)
      .find('[col-id="used"]')
-      .should('have.text', '1.010.00%');
+      .should('have.text', '1.01' + '1.00%');

    cy.getByTestId('tab-accounts')
      .get(tradingAccountRowId)
      .find('[col-id="available"]')
-      .should('have.text', '100,000.00');
+      .should('have.text', '100.00');

    cy.getByTestId('tab-accounts')
      .get(tradingAccountRowId)
      .find('[col-id="total"]')
-      .should('have.text', '100,001.01');
+      .should('have.text', '101.01');

    cy.getByTestId('tab-accounts')
      .get(tradingAccountRowId)
      .find('[col-id="accounts-actions"]')
      .should('have.text', '');

-    cy.getByTestId('tab-accounts')
-      .get(tradingAccountRowId)
-      .find('[col-id="total"]')
-      .should('have.text', '100,001.01');
-
    cy.getByTestId('tab-accounts')
      .get('[col-id="accounts-actions"]')
      .find('[data-testid="dropdown-menu"]')
@@ -62,6 +59,7 @@ describe('accounts', { tags: '@smoke' }, () => {
      .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 });
  });
@@ -99,7 +97,7 @@ describe('accounts', { tags: '@smoke' }, () => {
      'Liquidity provision fee reward account balance',
      'Market proposer reward account balance',
    ];
-    cy.getByTestId('asset').contains('tEURO').click();
+    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]);
@@ -110,8 +108,8 @@ describe('accounts', { tags: '@smoke' }, () => {

  it('should open usage breakdown dialog when clicked on used', () => {
    // 7001-COLL-009
-    cy.getByTestId('breakdown').contains('1.01').click();
-    const headers = ['Market', 'Account type', 'Balance'];
+    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')
@@ -122,25 +120,6 @@ describe('accounts', { tags: '@smoke' }, () => {
    cy.getByTestId(dialogClose).click();
  });

-  it('sorting usage breakdown columns should work well', () => {
-    // 7001-COLL-010
-    cy.getByTestId('breakdown').contains('1.01').click();
-    cy.getByTestId('usage-breakdown')
-      .find('[col-id="type"]')
-      .eq(1)
-      .should('have.text', 'Margin');
-    cy.getByTestId('usage-breakdown')
-      .find('[col-id="type"]')
-      .eq(2)
-      .should('have.text', 'Margin');
-    cy.getByTestId('usage-breakdown')
-      .find('[col-id="type"]')
-      .eq(3)
-      .should('have.text', 'General');
-
-    cy.getByTestId(dialogClose).click();
-  });
-
  describe('sorting by ag-grid columns should work well', () => {
    before(() => {
      const dialogs = Cypress.$('[data-testid="dialog-close"]:visible');
@@ -150,11 +129,12 @@ describe('accounts', { tags: '@smoke' }, () => {
        });
      }
    });
+    // 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 = ['tEURO', 'tDAI', 'tBTC', 'tBTC'];
+      const marketsSortedDesc = Array.from(marketsSortedAsc).reverse();
      checkSorting(
        'asset.symbol',
        marketsSortedDefault,
@@ -166,23 +146,14 @@ describe('accounts', { tags: '@smoke' }, () => {
    it('sorting by total', () => {
      cy.getByTestId('Collateral').click();
      const marketsSortedDefault = [
-        '1,000.00002',
+        '1,000.00',
        '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 = [
-        '1,000.01',
-        '1,000.00002',
-        '1,000.00001',
        '1,000.00',
      ];
+      const marketsSortedAsc = ['1,000.00', '1,000.00', '1,000.00', '1,000.01'];
+      const marketsSortedDesc = Array.from(marketsSortedAsc).reverse();
+
      checkSorting(
        'total',
        marketsSortedDefault,
@@ -193,24 +164,22 @@ describe('accounts', { tags: '@smoke' }, () => {

    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.000.00%',
-        '0.010.00%',
-        '0.000.00%',
-        '0.000.00%',
+        '0.00' + '0.00%',
+        '0.01' + '0.00%',
+        '0.00' + '0.00%',
+        '0.00' + '0.00%',
      ];
      const marketsSortedAsc = [
-        '0.000.00%',
-        '0.000.00%',
-        '0.000.00%',
-        '0.010.00%',
-      ];
-      const marketsSortedDesc = [
-        '0.010.00%',
-        '0.000.00%',
-        '0.000.00%',
-        '0.000.00%',
+        '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,
@@ -222,23 +191,13 @@ describe('accounts', { tags: '@smoke' }, () => {
    it('sorting by total', () => {
      cy.getByTestId('Collateral').click();
      const marketsSortedDefault = [
-        '1,000.00002',
+        '1,000.00',
        '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 = [
-        '1,000.01',
-        '1,000.00002',
-        '1,000.00001',
        '1,000.00',
      ];
+      const marketsSortedAsc = ['1,000.00', '1,000.00', '1,000.00', '1,000.01'];
+      const marketsSortedDesc = Array.from(marketsSortedAsc).reverse();

      checkSorting(
        'total',
@@ -81,14 +81,15 @@ describe(
          cy.visit('/#/markets/market-0');
        });
        it('must display that market is not accepting orders', function () {
-          cy.getByTestId('dealticket-error-message-summary').should(
+          cy.getByTestId('deal-ticket-error-message-summary').should(
            'have.text',
            `This market is ${marketState
              .split('_')
              .pop()
              ?.toLowerCase()} and not accepting orders`
          );
-          cy.getByTestId('place-order').should('be.disabled');
+          // 7002-SORD-060
+          cy.getByTestId('place-order').should('be.enabled');
        });
      });
    });
@@ -45,7 +45,7 @@ describe('deal ticker order validation', { tags: '@smoke' }, () => {

      cy.getByTestId(placeOrderBtn).click();

-      cy.getByTestId('dealticket-error-message-expiry').should(
+      cy.getByTestId('deal-ticket-error-message-expiry').should(
        'have.text',
        'The expiry date that you have entered appears to be in the past'
      );
@@ -57,7 +57,7 @@ describe('deal ticker order validation', { tags: '@smoke' }, () => {
      cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_GTC');
      cy.getByTestId(orderSizeField).clear().type('1');
      cy.getByTestId(orderPriceField).clear().type('1.123456');
-      cy.getByTestId('dealticket-error-message-price-limit').should(
+      cy.getByTestId('deal-ticket-error-message-price-limit').should(
        'have.text',
        'Price accepts up to 5 decimal places'
      );
@@ -77,8 +77,9 @@ describe('deal ticker order validation', { tags: '@smoke' }, () => {
    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');
-      cy.getByTestId(placeOrderBtn).should('be.disabled');
-      cy.getByTestId('dealticket-error-message-size-market').should(
+      // 7002-SORD-060
+      cy.getByTestId(placeOrderBtn).should('be.enabled');
+      cy.getByTestId('deal-ticket-error-message-size-market').should(
        'have.text',
        'Size must be whole numbers for this market'
      );
@@ -86,24 +87,38 @@ describe('deal ticker order validation', { tags: '@smoke' }, () => {

    it('must warn if order size is set to 0', function () {
      cy.getByTestId(orderSizeField).clear().type('0');
-      cy.getByTestId(placeOrderBtn).should('be.disabled');
-      cy.getByTestId('dealticket-error-message-size-market').should(
+      cy.getByTestId(placeOrderBtn).should('be.enabled');
+      cy.getByTestId('deal-ticket-error-message-size-market').should(
        'have.text',
        'Size cannot be lower than 1'
      );
    });
+
    it('must have total margin available', () => {
      // 7001-COLL-011
-      cy.getByTestId('tab-ticket')
-        .find('.text-xs')
-        .eq(5)
-        .within(() => {
-          cy.get('[data-state="closed"]').should(
-            'have.text',
-            'Total margin available'
-          );
-          cy.get('.text-neutral-500').should('have.text', '100,000.01 tDAI');
-        });
+      cy.getByTestId('deal-ticket-fee-total-margin-available').within(() => {
+        cy.get('[data-state="closed"]').should(
+          'have.text',
+          'Total margin available100.01 tDAI'
+        );
+      });
+    });
+
+    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'
+        );
+      });
+    });
+
+    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();
    });
  });
 });
@@ -1,6 +1,10 @@
 import * as Schema from '@vegaprotocol/types';
 import { aliasGQLQuery } from '@vegaprotocol/cypress';
-import { accountsQuery, amendGeneralAccountBalance } from '@vegaprotocol/mock';
+import {
+  accountsQuery,
+  amendGeneralAccountBalance,
+  amendMarginAccountBalance,
+} from '@vegaprotocol/mock';
 import type { OrderSubmission } from '@vegaprotocol/wallet';
 import { createOrder } from '../support/create-order';

@@ -12,8 +16,9 @@ describe(
      beforeEach(() => {
        cy.setVegaWallet();
        cy.mockTradingPage();
-        const accounts = accountsQuery();
-        amendGeneralAccountBalance(accounts, 'market-0', '0');
+        let accounts = accountsQuery();
+        accounts = amendMarginAccountBalance(accounts, 'market-0', '1000');
+        accounts = amendGeneralAccountBalance(accounts, 'market-0', '0');
        cy.mockGQL((req) => {
          aliasGQLQuery(req, 'Accounts', accounts);
        });
@@ -23,13 +28,19 @@ describe(
      });

      it('should show an error if your balance is zero', () => {
-        cy.getByTestId('place-order').should('be.disabled');
+        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('dealticket-error-message-zero-balance').should(
+        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'
+            ' in your wallet to trade in this market. See all your collateral.Make a deposit'
        );
        cy.getByTestId('deal-ticket-deposit-dialog-button').should('exist');
      });
@@ -39,8 +50,9 @@ describe(
      beforeEach(() => {
        cy.setVegaWallet();
        cy.mockTradingPage();
-        const accounts = accountsQuery();
-        amendGeneralAccountBalance(accounts, 'market-0', '1');
+        let accounts = accountsQuery();
+        accounts = amendMarginAccountBalance(accounts, 'market-0', '1000');
+        accounts = amendGeneralAccountBalance(accounts, 'market-0', '1');
        cy.mockGQL((req) => {
          aliasGQLQuery(req, 'Accounts', accounts);
        });
@@ -53,11 +65,11 @@ describe(
        // 7002-SORD-003

        // warning should show immediately
-        cy.getByTestId('dealticket-warning-margin').should(
+        cy.getByTestId('deal-ticket-warning-margin').should(
          'contain.text',
          'You may not have enough margin available to open this position'
        );
-        cy.getByTestId('dealticket-warning-margin').should(
+        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.'
        );
@@ -34,10 +34,10 @@ describe('suspended market validation', { tags: '@regression' }, () => {

  it('should show warning for market order', function () {
    cy.getByTestId(toggleMarket).click();
-    cy.getByTestId(placeOrderBtn).should('not.be.disabled');
+    // 7002-SORD-060
+    cy.getByTestId(placeOrderBtn).should('be.enabled');
    cy.getByTestId(placeOrderBtn).click();
-    cy.getByTestId(placeOrderBtn).should('be.disabled');
-    cy.getByTestId('dealticket-error-message-type').should(
+    cy.getByTestId('deal-ticket-error-message-type').should(
      'have.text',
      'This market is in auction until it reaches sufficient liquidity. Only limit orders are permitted when market is in auction'
    );
@@ -48,7 +48,7 @@ describe('suspended market validation', { tags: '@regression' }, () => {
    cy.getByTestId(orderPriceField).clear().type('0.1');
    cy.getByTestId(orderSizeField).clear().type('1');
    cy.getByTestId(placeOrderBtn).should('be.enabled');
-    cy.getByTestId('dealticket-warning-auction').should(
+    cy.getByTestId('deal-ticket-warning-auction').should(
      'have.text',
      'Any orders placed now will not trade until the auction ends'
    );
@@ -59,8 +59,8 @@ describe('suspended market validation', { tags: '@regression' }, () => {
    cy.getByTestId(orderTIFDropDown).select(
      TIFlist.filter((item) => item.code === 'FOK')[0].value
    );
-    cy.getByTestId(placeOrderBtn).should('be.disabled');
-    cy.getByTestId('dealticket-error-message-tif').should(
+    cy.getByTestId(placeOrderBtn).should('be.enabled');
+    cy.getByTestId('deal-ticket-error-message-tif').should(
      'have.text',
      'This market is in auction until it reaches sufficient liquidity. Until the auction ends, you can only place GFA, GTT, or GTC limit orders'
    );
@@ -3,6 +3,18 @@ import { aliasGQLQuery } from '@vegaprotocol/cypress';
 import { marketsDataQuery } from '@vegaprotocol/mock';
 import { positionsQuery } from '@vegaprotocol/mock';

+// #region consts
+const closePosition = 'close-position';
+const dialogCloseX = 'dialog-close';
+const dialogContent = 'dialog-content';
+const dropDownMenu = 'dropdown-menu';
+const marketActionsContent = 'market-actions-content';
+const positions = 'Positions';
+const tabPositions = 'tab-positions';
+const toastContent = 'toast-content';
+const tooltipContent = 'tooltip-content';
+// #endregion
+
 beforeEach(() => {
  cy.mockTradingPage();
  cy.mockSubscription();
@@ -11,8 +23,9 @@ beforeEach(() => {

 describe('positions', { tags: '@smoke', testIsolation: true }, () => {
  it('renders positions on trading page', () => {
-    cy.visit('/#/markets/market-0');
-    cy.getByTestId('Positions').click();
+    visitAndClickPositions();
+    // 7004-POSI-001
+    // 7004-POSI-002
    validatePositionsDisplayed();
  });

@@ -35,183 +48,306 @@ describe('positions', { tags: '@smoke', testIsolation: true }, () => {
      }
      aliasGQLQuery(req, 'Positions', positions);
    });
-    cy.visit('/#/portfolio');
-    cy.getByTestId('Positions').click();
+    visitAndClickPositions();
+    // 7004-POSI-001
+    // 7004-POSI-002
    validatePositionsDisplayed(true);
  });
-  describe('renders position among some graphql errors', () => {
-    it('rows should be displayed despite errors', () => {
-      const errors = [
-        {
-          message:
-            'no market data for market: 9c55fb644c6f7de5422d40d691a62bffd5898384c70135bab29ba1e3e2e5280a',
-          path: ['marketsConnection', 'edges'],
-          extensions: {
-            code: 13,
-            type: 'Internal',
-          },
+
+  it('Close my position', () => {
+    visitAndClickPositions();
+    cy.getByTestId(closePosition).first().click();
+    // 7004-POSI-010
+    cy.getByTestId(toastContent).should(
+      'contain.text',
+      'Awaiting confirmation'
+    );
+  });
+});
+describe('positions', { tags: '@regression', testIsolation: true }, () => {
+  it('rows should be displayed despite errors', () => {
+    const errors = [
+      {
+        message:
+          'no market data for market: 9c55fb644c6f7de5422d40d691a62bffd5898384c70135bab29ba1e3e2e5280a',
+        path: ['marketsConnection', 'edges'],
+        extensions: {
+          code: 13,
+          type: 'Internal',
        },
-      ];
-      const marketData = marketsDataQuery();
-      const edges = marketData.marketsConnection?.edges.map((market) => {
-        const replace =
-          market.node.data?.market.id === 'market-2' ? null : market.node.data;
-        return { ...market, node: { ...market.node, data: replace } };
-      });
-      const overrides = {
-        ...marketData,
-        marketsConnection: { ...marketData.marketsConnection, edges },
-      };
-      cy.mockGQL((req) => {
-        aliasGQLQuery(req, 'MarketsData', overrides, errors);
-      });
-      cy.visit('/#/markets/market-0');
-      const emptyCells = [
-        'notional',
-        'markPrice',
-        'currentLeverage',
-        'averageEntryPrice',
-      ];
-      cy.getByTestId('tab-positions')
-        .first()
-        .within(() => {
-          cy.get(
-            '[row-id="02eceaba4df2bef76ea10caf728d8a099a2aa846cced25737cccaa9812342f65-market-2"]'
-          )
-            .eq(1)
-            .within(() => {
-              emptyCells.forEach((cell) => {
-                cy.get(`[col-id="${cell}"]`).should('contain.text', '-');
-              });
+      },
+    ];
+    const marketData = marketsDataQuery();
+    const edges = marketData.marketsConnection?.edges.map((market) => {
+      const replace =
+        market.node.data?.market.id === 'market-2' ? null : market.node.data;
+      return { ...market, node: { ...market.node, data: replace } };
+    });
+    const overrides = {
+      ...marketData,
+      marketsConnection: { ...marketData.marketsConnection, edges },
+    };
+    cy.mockGQL((req) => {
+      aliasGQLQuery(req, 'MarketsData', overrides, errors);
+    });
+    cy.visit('/#/markets/market-0');
+    const emptyCells = [
+      'notional',
+      'markPrice',
+      'currentLeverage',
+      'averageEntryPrice',
+    ];
+    cy.getByTestId(tabPositions)
+      .first()
+      .within(() => {
+        cy.get(
+          '[row-id="02eceaba4df2bef76ea10caf728d8a099a2aa846cced25737cccaa9812342f65-market-2"]'
+        )
+          .eq(1)
+          .within(() => {
+            emptyCells.forEach((cell) => {
+              cy.get(`[col-id="${cell}"]`).should('contain.text', '-');
            });
-        });
-    });
-    it('error message should be displayed', () => {
-      const errors = [
-        {
-          message:
-            'no market data for asset: 9c55fb644c6f7de5422d40d691a62bffd5898384c70135bab29ba1e3e2e5280a',
-          path: ['assets', 'edges'],
-          extensions: {
-            code: 13,
-            type: 'Internal',
-          },
+          });
+      });
+  });
+
+  it('error message should be displayed', () => {
+    const errors = [
+      {
+        message:
+          'no market data for asset: 9c55fb644c6f7de5422d40d691a62bffd5898384c70135bab29ba1e3e2e5280a',
+        path: ['assets', 'edges'],
+        extensions: {
+          code: 13,
+          type: 'Internal',
        },
-      ];
-      const marketData = marketsDataQuery();
-      const edges = marketData.marketsConnection?.edges.map((market) => {
-        const replace =
-          market.node.data?.market.id === 'market-2' ? null : market.node.data;
-        return { ...market, node: { ...market.node, data: replace } };
+      },
+    ];
+    const overrides = {
+      marketsConnection: { edges: [] },
+    };
+    cy.mockGQL((req) => {
+      aliasGQLQuery(req, 'MarketsData', overrides, errors);
+    });
+    cy.visit('/#/markets/market-0');
+    cy.getByTestId(tabPositions).contains('no market data');
+  });
+
+  it('sorting by Market', () => {
+    visitAndClickPositions();
+    const marketsSortedDefault = [
+      'ACTIVE MARKET',
+      'Apple Monthly (30 Jun 2022)',
+      'ETHBTC Quarterly (30 Jun 2022)',
+      'SUSPENDED MARKET',
+    ];
+    const marketsSortedAsc = [
+      'ACTIVE MARKET',
+      'Apple Monthly (30 Jun 2022)',
+      'ETHBTC Quarterly (30 Jun 2022)',
+      'SUSPENDED MARKET',
+    ];
+    const marketsSortedDesc = [
+      'SUSPENDED MARKET',
+      'ETHBTC Quarterly (30 Jun 2022)',
+      'Apple Monthly (30 Jun 2022)',
+      'ACTIVE MARKET',
+    ];
+    cy.getByTestId(positions).click();
+    // 7004-POSI-003
+    checkSorting(
+      'marketName',
+      marketsSortedDefault,
+      marketsSortedAsc,
+      marketsSortedDesc
+    );
+  });
+
+  it('Resize column', () => {
+    let elementWidth: number;
+    visitAndClickPositions();
+    cy.get('.ag-overlay-loading-wrapper').should('not.be.visible');
+    cy.get('.ag-header-container').within(() => {
+      cy.get(`[col-id="marketName"]`)
+        .find('.ag-header-cell-resize')
+        .realMouseDown()
+        .realMouseMove(250, 0)
+        .realMouseUp();
+    });
+
+    // 7004-POSI-006
+    cy.get(`[col-id="marketName"]`)
+      .invoke('width')
+      .should('be.greaterThan', 250);
+    cy.get(`[col-id="marketName"]`)
+      .invoke('width')
+      .then((width) => {
+        elementWidth = width as number;
+      })
+      .then(() => {
+        let localStorageCopy: Record<string, string>;
+        cy.window().then((win) => {
+          localStorageCopy = { ...win.localStorage };
+        });
+
+        cy.reload();
+        cy.window().then((win) => {
+          Object.keys(localStorageCopy).forEach((key) => {
+            win.localStorage.setItem(key, localStorageCopy[key]);
+          });
+        });
+
+        // 7004-POSI-012
+        cy.get('[col-id="marketName"]')
+          .invoke('width')
+          .should('equal', elementWidth);
      });
-      const overrides = {
-        ...marketData,
-        marketsConnection: { ...marketData.marketsConnection, edges },
-      };
-      cy.mockGQL((req) => {
-        aliasGQLQuery(req, 'MarketsData', overrides, errors);
-      });
-      cy.visit('/#/markets/market-0');
-      cy.get('.pointer-events-none.absolute.inset-0').contains(
-        'Something went wrong:'
+  });
+
+  it('Scroll horizontally', () => {
+    visitAndClickPositions();
+
+    cy.get('.ag-header-container').within(() => {
+      cy.get(`[col-id="marketName"]`)
+        .find('.ag-header-cell-resize')
+        .realMouseDown()
+        .realMouseMove(400, 0)
+        .realMouseUp();
+    });
+    cy.get('[col-id="marketName"]').should('be.visible');
+    cy.get('.ag-body-horizontal-scroll-viewport').realMouseWheel({
+      deltaX: 500,
+    });
+    // 7004-POSI-004
+    cy.get('[col-id="updatedAt"]').should('be.visible');
+  });
+
+  it('Drag and drop columns', () => {
+    visitAndClickPositions();
+    cy.get('.ag-overlay-loading-wrapper').should('not.be.visible');
+    cy.get('[col-id="marketName"]')
+      .realMouseDown()
+      .realMouseMove(700, 15)
+      .realMouseUp();
+
+    // 7004-POSI-005
+    cy.get('[col-id="marketName"]').should(($element) => {
+      const attributeValue = $element.attr('aria-colindex');
+      expect(attributeValue).not.to.equal('1');
+    });
+  });
+
+  it('I can see warnings', () => {
+    visitAndClickPositions();
+
+    cy.get('[col-id="openVolume"]').within(() => {
+      cy.get('[aria-label="warning-sign icon"]')
+        .should('be.visible')
+        .realHover();
+    });
+    // 7004-POSI-011
+    cy.getByTestId(tooltipContent).should('be.visible');
+  });
+
+  it('Positive and Negative color change', () => {
+    cy.visit('/#/markets/market-0');
+    cy.getByTestId(positions).click();
+    // 7004-POSI-007
+    cy.get('.ag-center-cols-container').within(() => {
+      assertPNLColor(
+        '[col-id="realisedPNL"]',
+        'text-vega-green',
+        'text-vega-pink'
+      );
+    });
+    cy.get('.ag-center-cols-container').within(() => {
+      assertPNLColor(
+        '[col-id="unrealisedPNL"]',
+        'text-vega-green',
+        'text-vega-pink'
+      );
+    });
+    cy.get('.ag-center-cols-container').within(() => {
+      assertPNLColor(
+        '[col-id="openVolume"]',
+        'text-vega-green',
+        'text-vega-pink'
      );
    });
  });

-  describe('sorting by ag-grid columns should work well', () => {
-    it('sorting by Market', () => {
-      cy.visit('/#/markets/market-0');
-      const marketsSortedDefault = [
-        'ACTIVE MARKET',
-        'Apple Monthly (30 Jun 2022)',
-        'SUSPENDED MARKET',
-      ];
-      const marketsSortedAsc = ['ACTIVE MARKET', 'Apple Monthly (30 Jun 2022)'];
-      const marketsSortedDesc = [
-        'SUSPENDED MARKET',
-        'Apple Monthly (30 Jun 2022)',
-        'ACTIVE MARKET',
-      ];
-      cy.getByTestId('Positions').click();
-      checkSorting(
-        'marketName',
-        marketsSortedDefault,
-        marketsSortedAsc,
-        marketsSortedDesc
-      );
-    });
-    it('sorting by notional', () => {
-      cy.visit('/#/markets/market-0');
-      const marketsSortedDefault = [
-        '276,761.40348',
-        '46,126.90058',
-        '1,688.20',
-      ];
-      const marketsSortedAsc = ['1,688.20', '46,126.90058', '276,761.40348'];
-      const marketsSortedDesc = ['276,761.40348', '46,126.90058', '1,688.20'];
-      cy.getByTestId('Positions').click();
-      checkSorting(
-        'notional',
-        marketsSortedDefault,
-        marketsSortedAsc,
-        marketsSortedDesc
-      );
-    });
-    it('sorting by unrealisedPNL', () => {
-      cy.visit('/#/markets/market-0');
-      const marketsSortedDefault = ['8.95', '-0.22519', '8.95'];
-      const marketsSortedAsc = ['-0.22519', '8.95', '8.95'];
-      const marketsSortedDesc = ['8.95', '8.95', '-0.22519'];
-      cy.getByTestId('Positions').click();
-      checkSorting(
-        'unrealisedPNL',
-        marketsSortedDefault,
-        marketsSortedAsc,
-        marketsSortedDesc
-      );
+  it('View settlement asset', () => {
+    visitAndClickPositions();
+    cy.get('[col-id="asset"]').within(() => {
+      cy.get('button[type="button"]').first().click();
    });
+    // 7004-POSI-008
+    cy.getByTestId(dialogContent).should('be.visible');
+    cy.getByTestId(dialogCloseX).click();
+    cy.getByTestId(dropDownMenu).first().click();
+    cy.getByTestId(marketActionsContent).click();
+    // 7004-POSI-009
+    cy.getByTestId(dialogContent).should('be.visible');
  });
-
-  function validatePositionsDisplayed(multiKey = false) {
-    cy.getByTestId('tab-positions').should('be.visible');
-    cy.getByTestId('tab-positions').within(() => {
+});
+function validatePositionsDisplayed(multiKey = false) {
+  cy.getByTestId('tab-positions').should('be.visible');
+  cy.getByTestId('tab-positions')
+    .get('.ag-center-cols-container .ag-row')
+    .first()
+    .within(() => {
      cy.get('[col-id="marketName"]')
        .should('be.visible')
-        .each(($marketSymbol) => {
-          cy.wrap($marketSymbol).invoke('text').should('not.be.empty');
-        });
+        .invoke('text')
+        .should('not.be.empty');

-      cy.get('.ag-center-cols-container [col-id="openVolume"]').each(
-        ($openVolume) => {
-          cy.wrap($openVolume).invoke('text').should('not.be.empty');
-        }
-      );
+      cy.get('[col-id="openVolume"]').should('not.be.empty');

      // includes average entry price, mark price, realised PNL & leverage
-      cy.getByTestId('flash-cell').each(($prices) => {
-        cy.wrap($prices).invoke('text').should('not.be.empty');
-      });
+      cy.getByTestId('flash-cell').should('not.be.empty');

      if (!multiKey) {
-        cy.get('[col-id="currentLeverage"]').should('contain.text', '2.846.1');
+        cy.get('[col-id="currentLeverage"]').should('contain.text', '2,767.3');
        cy.get('[col-id="marginAccountBalance"]') // margin allocated
          .should('contain.text', '0.01');
      }

-      cy.get('[col-id="unrealisedPNL"]').each(($unrealisedPnl) => {
-        cy.wrap($unrealisedPnl).invoke('text').should('not.be.empty');
-      });
-
+      cy.get('[col-id="unrealisedPNL"]').should('not.be.empty');
      cy.get('[col-id="notional"]').should('contain.text', '276,761.40348'); // Total tDAI position
      cy.get('[col-id="realisedPNL"]').should('contain.text', '2.30'); // Total Realised PNL
      cy.get('[col-id="unrealisedPNL"]').should('contain.text', '8.95'); // Total Unrealised PNL
-
-      cy.get('.ag-header-row [col-id="notional"]')
-        .should('contain.text', 'Notional')
-        .realHover();
-      cy.get('.ag-popup').should('contain.text', 'Mark price x open volume');
    });

-    cy.getByTestId('close-position').should('be.visible').and('have.length', 3);
-  }
-});
+  cy.get('.ag-header-row [col-id="notional"]')
+    .should('contain.text', 'Notional')
+    .realHover();
+  cy.get('.ag-popup').should('contain.text', 'Mark price x open volume');
+
+  cy.getByTestId('close-position').should('be.visible').and('have.length', 3);
+}
+function assertPNLColor(
+  pnlSelector: string,
+  positiveClass: string,
+  negativeClass: string
+) {
+  cy.get(pnlSelector).each(($el) => {
+    const value = parseFloat($el.text());
+
+    if (value > 0) {
+      cy.wrap($el).invoke('attr', 'class').should('contain', positiveClass);
+    } else if (value < 0) {
+      cy.wrap($el).invoke('attr', 'class').should('contain', negativeClass);
+    } else if (value == 0) {
+      cy.wrap($el)
+        .invoke('attr', 'class')
+        .should('not.contain', negativeClass, positiveClass);
+    } else {
+      throw new Error('Unexpected value');
+    }
+  });
+}
+function visitAndClickPositions() {
+  cy.visit('/#/markets/market-0');
+  cy.getByTestId(positions).click();
+}
@@ -1,32 +1,79 @@
-beforeEach(() => {
-  cy.mockTradingPage();
-  cy.mockSubscription();
-  cy.visit('/#/markets/market-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' }, () => {
-  const colIdPrice = 'price';
-  const colIdSize = 'size';
-  const colIdCreatedAt = 'createdAt';
+  beforeEach(() => {
+    cy.mockTradingPage();
+    cy.mockSubscription();
+  });
+  before(() => {
+    cy.mockTradingPage();
+    cy.mockSubscription();
+    cy.visit('/#/markets/market-0');
+    cy.getByTestId(tradesTab).click();
+  });

-  it('renders trades', () => {
-    cy.getByTestId('Trades').click();
-    cy.getByTestId('tab-trades').should('be.visible');
+  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');
+  });

-    cy.get(`[col-id=${colIdPrice}]`).each(($tradePrice) => {
+  it('show trades prices', () => {
+    // 6005-THIS-003
+    cy.get(`${colIdPrice} ${colHeader}`).first().should('have.text', 'Price');
+    cy.get(colIdPrice).each(($tradePrice) => {
      cy.wrap($tradePrice).invoke('text').should('not.be.empty');
    });
-    cy.get(`[col-id=${colIdSize}]`).each(($tradeSize) => {
+  });
+
+  it('show trades sizes', () => {
+    // 6005-THIS-004
+    cy.get(`${colIdSize} ${colHeader}`).first().should('have.text', 'Size');
+    cy.get(colIdSize).each(($tradeSize) => {
      cy.wrap($tradeSize).invoke('text').should('not.be.empty');
    });
+  });

+  it('show trades date and time', () => {
+    // 6005-THIS-005
+    cy.get(`${colIdCreatedAt} ${colHeader}`).should('have.text', 'Created at');
    const dateTimeRegex =
      /(\d{1,2})\/(\d{1,2})\/(\d{4}), (\d{1,2}):(\d{1,2}):(\d{1,2})/gm;
-    cy.get(`[col-id=${colIdCreatedAt}]`).each(($tradeDateTime, index) => {
+    cy.get(colIdCreatedAt).each(($tradeDateTime, index) => {
      if (index != 0) {
        //ignore header
        cy.wrap($tradeDateTime).invoke('text').should('match', dateTimeRegex);
      }
    });
  });
+
+  it('trades are sorted descending by datetime', () => {
+    // 6005-THIS-006
+    const dateTimes: Date[] = [];
+    cy.get(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.get(colIdPrice).last().click();
+    cy.getByTestId('order-price').should('have.value', '171.16898');
+  });
 });
@@ -1,95 +1,141 @@
 import { selectAsset } from '../support/helpers';
-
-const formFieldError = 'input-error-text';
-const toAddressField = '[name="toAddress"]';
+// #region consts
 const amountField = 'input[name="amount"]';
-const submitTransferBtn = '[type="submit"]';
-const transferForm = 'transfer-form';
-const errorText = 'input-error-text';
-const openTransferDialog = 'open-transfer-dialog';
+const amountShortName = 'input[name="amount"] + div + span.text-xs';
+const assetSelection = 'select-asset';
+const assetBalance = 'asset-balance';
+const assetOption = 'rich-select-option';
 const closeDialog = 'dialog-close';
+const dialogTitle = 'dialog-title';
 const dialogTransferText = 'dialog-transfer-text';
+const dropdownMenu = 'dropdown-menu';
+const errorText = 'input-error-text';
+const formFieldError = 'input-error-text';
+const includeTransferFeeRadioBtn = 'include-transfer-fee';
+const keyID = '[data-testid="dialog-transfer-text"] > .rounded-md';
+const manageVegaWallet = 'manage-vega-wallet';
+const openTransferDialog = 'open-transfer-dialog';
+const submitTransferBtn = '[type="submit"]';
+const toAddressField = '[name="toAddress"]';
+const totalTransferfee = 'total-transfer-fee';
+const transfer = 'transfer';
+const transferAmount = 'transfer-amount';
+const transferForm = 'transfer-form';
+const transferFee = 'transfer-fee';
+const walletTransfer = 'wallet-transfer';

-const ASSET_SEPOLIA_TBTC = 2;
 const ASSET_EURO = 1;
+const ASSET_SEPOLIA_TBTC = 2;

-const toastContent = 'toast-content';
 const collateralTab = 'Collateral';
 const toastCloseBtn = 'toast-close';
+const toastContent = 'toast-content';
+// #endregion

+describe('transfer fees', { tags: '@regression', testIsolation: true }, () => {
+  beforeEach(() => {
+    cy.mockWeb3Provider();
+    cy.mockTradingPage();
+    cy.mockSubscription();
+    cy.setVegaWallet();
+
+    cy.visit('/#/portfolio');
+    cy.getByTestId('Trading').first().click();
+    cy.getByTestId(collateralTab).click();
+    cy.getByTestId(dropdownMenu).first().click();
+    cy.getByTestId(transfer).click();
+
+    cy.wait('@Accounts');
+    cy.wait('@Assets');
+    cy.mockVegaWalletTransaction();
+  });
+
+  it('transfer fees tooltips', () => {
+    // 1003-TRAN-015
+    // 1003-TRAN-016
+    // 1003-TRAN-017
+    // 1003-TRAN-018
+    // 1003-TRAN-019
+    cy.getByTestId(transferForm);
+    cy.contains('Enter manually').click();
+
+    cy.getByTestId(transferForm)
+      .find(toAddressField)
+      .type('7f9cf07d3a9905b1a61a1069f7a758855da428bc0f4a97de87f48644bfc25535');
+    selectAsset(ASSET_SEPOLIA_TBTC);
+    cy.getByTestId(transferForm)
+      .find(amountField)
+      .type('1', { delay: 100, force: true });
+
+    /// Check Include Transfer Fee tooltip
+    cy.get('label[for="include-transfer-fee"] div').realHover();
+    cy.get('[data-side="bottom"] div')
+      .should('be.visible')
+      .should('not.be.empty');
+    cy.getByTestId(dialogTitle).click();
+
+    //Check Transfer Fee tooltip
+    cy.contains('div', 'Transfer fee').realHover();
+    cy.get('[data-side="bottom"] div')
+      .should('be.visible')
+      .should('not.be.empty');
+    cy.getByTestId(dialogTitle).click();
+
+    //Check Amount to be transferred tooltip
+    cy.contains('div', 'Amount to be transferred').realHover();
+    cy.get('[data-side="bottom"] div')
+      .should('be.visible')
+      .should('not.be.empty');
+    cy.getByTestId(dialogTitle).click();
+
+    //Check Total amount (with fee) tooltip
+    cy.contains('div', 'Total amount (with fee)').realHover();
+    cy.get('[data-side="bottom"] div')
+      .should('be.visible')
+      .should('not.be.empty');
+  });
+
+  it('transfer fees', () => {
+    // 1003-TRAN-020
+    // 1003-TRAN-021
+    // 1003-TRAN-022
+    // 1003-TRAN-023
+    cy.getByTestId(transferForm);
+    cy.contains('Enter manually').click();
+
+    cy.getByTestId(transferForm)
+      .find(toAddressField)
+      .type('7f9cf07d3a9905b1a61a1069f7a758855da428bc0f4a97de87f48644bfc25535');
+    selectAsset(ASSET_SEPOLIA_TBTC);
+    cy.getByTestId(includeTransferFeeRadioBtn).should('be.disabled');
+
+    cy.getByTestId(transferForm)
+      .find(amountField)
+      .type('1', { delay: 100, force: true });
+
+    cy.getByTestId(transferFee)
+      .should('be.visible')
+      .should('contain.text', '0.01');
+    cy.getByTestId(transferAmount)
+      .should('be.visible')
+      .should('contain.text', '1.00');
+    cy.getByTestId(totalTransferfee)
+      .should('be.visible')
+      .should('contain.text', '1.01');
+    cy.getByTestId(includeTransferFeeRadioBtn).click();
+    cy.getByTestId(transferFee)
+      .should('be.visible')
+      .should('contain.text', '0.01');
+    cy.getByTestId(transferAmount)
+      .should('be.visible')
+      .should('contain.text', '0.99');
+    cy.getByTestId(totalTransferfee)
+      .should('be.visible')
+      .should('contain.text', '1.00');
+  });
+});
 describe(
-  'transfer form validation and transfer from options',
-  { tags: '@smoke' },
-  () => {
-    before(() => {
-      cy.mockWeb3Provider();
-      cy.mockTradingPage();
-      cy.mockSubscription();
-      cy.setVegaWallet();
-
-      cy.visit('/#/portfolio');
-      cy.getByTestId(collateralTab).click();
-      cy.getByTestId(openTransferDialog).click();
-
-      cy.wait('@Accounts');
-      cy.wait('@Assets');
-    });
-
-    it('empty fields', () => {
-      cy.getByTestId(transferForm).find(submitTransferBtn).click();
-
-      cy.getByTestId(formFieldError).should('contain.text', 'Required');
-      // only 2 despite 3 fields because the ethereum address will be auto populated
-      cy.getByTestId(formFieldError).should('have.length', 3);
-    });
-    it('min amount', () => {
-      // 1002-WITH-010
-      selectAsset(ASSET_SEPOLIA_TBTC);
-      cy.get(amountField).clear().type('0');
-      cy.getByTestId(transferForm).find(submitTransferBtn).click();
-      cy.getByTestId(errorText).should(
-        'contain.text',
-        'Value is below minimum'
-      );
-    });
-    it('max amount', () => {
-      selectAsset(ASSET_EURO); // Will be above maximum because the vega wallet doesn't have any collateral
-      cy.get(amountField).clear().type('1001', { delay: 100 });
-      cy.getByTestId(transferForm).find(submitTransferBtn).click();
-      cy.getByTestId(errorText).should(
-        'contain.text',
-        'You cannot transfer more than your available collateral'
-      );
-    });
-
-    it('can start transfer from vega wallet', () => {
-      cy.getByTestId(closeDialog).click();
-      cy.getByTestId('manage-vega-wallet').click();
-      cy.getByTestId('wallet-transfer').should('have.text', 'Transfer').click();
-      cy.getByTestId(dialogTransferText).should(
-        'contain.text',
-        'Transfer funds to another Vega key from 02ecea…342f65 If you are at all unsure, stop and seek advice.'
-      );
-    });
-
-    it('can start transfer from trading collateral table', () => {
-      cy.getByTestId(closeDialog).click();
-      cy.getByTestId('Trading').first().click();
-      cy.getByTestId(collateralTab).click();
-      cy.getByTestId(openTransferDialog).should('not.exist');
-      cy.getByTestId('Portfolio').eq(0).click();
-      cy.getByTestId(collateralTab).click();
-      cy.getByTestId(openTransferDialog).click();
-      cy.getByTestId(dialogTransferText).should(
-        'contain.text',
-        'Transfer funds to another Vega key from 02ecea…342f65 If you are at all unsure, stop and seek advice.'
-      );
-    });
-  }
-);
-
-describe(
-  'withdraw actions',
+  'transfer form validation',
  { tags: '@regression', testIsolation: true },
  () => {
    beforeEach(() => {
@@ -99,43 +145,141 @@ describe(
      cy.setVegaWallet();

      cy.visit('/#/portfolio');
-      cy.getByTestId(collateralTab).click();
-      cy.getByTestId(openTransferDialog).click();
+      cy.getByTestId(manageVegaWallet).click();
+      cy.getByTestId(walletTransfer).click();

      cy.wait('@Accounts');
      cy.wait('@Assets');
-      cy.mockVegaWalletTransaction();
    });

-    it('key to key transfers by select key', function () {
-      cy.getByTestId(transferForm).should('be.visible');
-      cy.getByTestId(transferForm).find(toAddressField).select(1);
-      selectAsset(ASSET_SEPOLIA_TBTC);
-      cy.getByTestId(transferForm).find(amountField).type('1', { delay: 100 });
-      cy.getByTestId(transferForm).find(submitTransferBtn).click();
-      cy.getByTestId(toastContent).should(
-        'contain.text',
-        'Awaiting confirmation'
-      );
-      cy.getByTestId(toastCloseBtn).click();
+    it('transfer Text', () => {
+      // 1003-TRAN-003
+      cy.getByTestId(dialogTransferText)
+        .should('exist')
+        .get(keyID)
+        .invoke('text')
+        .should('match', /[\w.]{6}…[\w.]{6}/);
    });

-    it('key to key transfers by enter manual key', function () {
+    it('invalid vega key validation', () => {
+      //1003-TRAN-013
+      //1003-TRAN-004
      cy.getByTestId(transferForm).should('be.visible');
      cy.contains('Enter manually').click();
-      cy.getByTestId(transferForm)
-        .find(toAddressField)
-        .type(
-          '7f9cf07d3a9905b1a61a1069f7a758855da428bc0f4a97de87f48644bfc25535'
-        );
-      selectAsset(ASSET_SEPOLIA_TBTC);
-      cy.getByTestId(transferForm).find(amountField).type('1', { delay: 100 });
+      cy.getByTestId(transferForm).find(toAddressField).type('asd');
      cy.getByTestId(transferForm).find(submitTransferBtn).click();
-      cy.getByTestId(toastContent).should(
+      cy.getByTestId(formFieldError).should('contain.text', 'Invalid Vega key');
+      cy.contains('label', 'Vega key').should('be.visible');
+      cy.contains('label', 'Asset').should('be.visible');
+      cy.contains('label', 'Amount').should('be.visible');
+    });
+
+    it('empty fields', () => {
+      // 1003-TRAN-012
+      cy.getByTestId(transferForm).find(submitTransferBtn).click();
+      cy.getByTestId(formFieldError).should('contain.text', 'Required');
+      cy.getByTestId(formFieldError).should('have.length', 3);
+    });
+
+    it('min amount', () => {
+      // 1002-WITH-010
+      // 1003-TRAN-014
+      selectAsset(ASSET_SEPOLIA_TBTC);
+      cy.get(amountField).clear().type('0');
+      cy.getByTestId(transferForm).find(submitTransferBtn).click();
+      cy.getByTestId(errorText).should(
        'contain.text',
-        'Awaiting confirmation'
+        'Value is below minimum'
      );
-      cy.getByTestId(toastCloseBtn).click();
+    });
+
+    it('max amount', () => {
+      // 1003-TRAN-002
+      // 1003-TRAN-011
+      // 1003-TRAN-002
+      selectAsset(ASSET_EURO); // Will be above maximum because the vega wallet doesn't have any collateral
+      cy.get(amountField).clear().type('1001', { delay: 100 });
+      cy.getByTestId(transferForm).find(submitTransferBtn).click();
+      cy.getByTestId(errorText).should(
+        'contain.text',
+        'You cannot transfer more than your available collateral'
+      );
+      cy.getByTestId(closeDialog).click();
    });
  }
 );
+describe('withdraw actions', { tags: '@smoke', testIsolation: true }, () => {
+  beforeEach(() => {
+    cy.mockWeb3Provider();
+    cy.mockTradingPage();
+    cy.mockSubscription();
+    cy.setVegaWallet();
+
+    cy.visit('/#/portfolio');
+    cy.getByTestId(collateralTab).click();
+    cy.getByTestId(openTransferDialog).click();
+
+    cy.wait('@Accounts');
+    cy.wait('@Assets');
+    cy.mockVegaWalletTransaction();
+  });
+
+  it('key to key transfers by select key', () => {
+    // 1003-TRAN-001
+    // 1003-TRAN-006
+    // 1003-TRAN-007
+    // 1003-TRAN-008
+    // 1003-TRAN-009
+    // 1003-TRAN-010
+    // 1003-TRAN-023
+    cy.getByTestId(transferForm).should('be.visible');
+    cy.getByTestId(transferForm).find(toAddressField).select(1);
+
+    cy.getByTestId(assetSelection).click();
+    cy.getByTestId(assetOption);
+    cy.getByTestId(assetBalance).should('not.be.empty');
+    cy.getByTestId(assetOption).should('have.length.gt', 4);
+
+    let optionText: string;
+    cy.getByTestId(assetOption)
+      .eq(2)
+      .invoke('text')
+      .then((text: string) => {
+        optionText = text;
+        cy.getByTestId(assetOption).eq(2).click();
+        cy.getByTestId(assetSelection).should('have.text', optionText);
+      });
+
+    cy.getByTestId(transferForm)
+      .find(amountField)
+      .type('1', { delay: 100, force: true });
+
+    cy.getByTestId(transferForm).find(amountShortName).should('not.be.empty');
+
+    cy.getByTestId(transferForm).find(submitTransferBtn).click();
+    cy.getByTestId(toastContent).should(
+      'contain.text',
+      'Awaiting confirmation'
+    );
+    cy.getByTestId(toastCloseBtn).click();
+  });
+
+  it('key to key transfers by enter manual key', () => {
+    //1003-TRAN-005
+    cy.getByTestId(transferForm).should('be.visible');
+    cy.contains('Enter manually').click();
+    cy.getByTestId(transferForm)
+      .find(toAddressField)
+      .type('7f9cf07d3a9905b1a61a1069f7a758855da428bc0f4a97de87f48644bfc25535');
+    selectAsset(ASSET_SEPOLIA_TBTC);
+    cy.getByTestId(transferForm)
+      .find(amountField)
+      .type('1', { delay: 100, force: true });
+    cy.getByTestId(transferForm).find(submitTransferBtn).click();
+    cy.getByTestId(toastContent).should(
+      'contain.text',
+      'Awaiting confirmation'
+    );
+    cy.getByTestId(toastCloseBtn).click();
+  });
+});
@@ -30,6 +30,9 @@ import {
  withdrawalsQuery,
  protocolUpgradeProposalsQuery,
  blockStatisticsQuery,
+  networkParamQuery,
+  liquidityProvisionsQuery,
+  liquidityProviderFeeShareQuery,
 } from '@vegaprotocol/mock';
 import type { PartialDeep } from 'type-fest';
 import type { MarketDataQuery, MarketsQuery } from '@vegaprotocol/markets';
@@ -157,9 +160,16 @@ const mockTradingPage = (
  );
  aliasGQLQuery(req, 'Trades', tradesQuery());
  aliasGQLQuery(req, 'Chart', chartQuery());
+  aliasGQLQuery(req, 'LiquidityProvisions', liquidityProvisionsQuery());
+  aliasGQLQuery(
+    req,
+    'LiquidityProviderFeeShare',
+    liquidityProviderFeeShareQuery
+  );
  aliasGQLQuery(req, 'Candles', candlesQuery());
  aliasGQLQuery(req, 'Withdrawals', withdrawalsQuery());
  aliasGQLQuery(req, 'NetworkParams', networkParamsQuery());
+  aliasGQLQuery(req, 'NetworkParam', networkParamQuery);
  aliasGQLQuery(req, 'EstimateFees', estimateFeesQuery());
  aliasGQLQuery(req, 'EstimatePosition', estimatePositionQuery());
  aliasGQLQuery(req, 'ProposalsList', proposalListQuery());
@@ -9,7 +9,7 @@ NX_VEGA_EXPLORER_URL=https://dev.explorer.vega.xyz
 NX_VEGA_NETWORKS={\"MAINNET\":\"https://console.vega.xyz\",\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://trading.stagnet1.vega.rocks\"}
 NX_VEGA_TOKEN_URL=https://governance.fairground.wtf
 NX_VEGA_WALLET_URL=http://localhost:1789
-NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
+NX_VEGA_DOCS_URL=#
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega-dev-releases/releases
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
@@ -14,4 +14,4 @@ NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/annou
 NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
 NX_VEGA_CONSOLE_URL=https://console.vega.xyz
 # TAG name of the current app version - TODO: bump to the latest upon release
-NX_APP_VERSION=v0.20.13-core-0.71.4
+NX_APP_VERSION=v0.20.18-core-0.71.8
@@ -11,14 +11,12 @@ import {
  formatNumberPercentage,
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
-import { updateGridData } from '@vegaprotocol/datagrid';
 import {
  NetworkParams,
  useNetworkParams,
 } from '@vegaprotocol/network-parameters';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import {
-  AsyncRenderer,
  Tab,
  Tabs,
  Link as UiToolkitLink,
@@ -26,14 +24,13 @@ import {
  ExternalLink,
 } from '@vegaprotocol/ui-toolkit';
 import { useVegaWallet } from '@vegaprotocol/wallet';
-import { memo, useCallback, useEffect, useRef, useState } from 'react';
+import { memo, useEffect, useRef, useState } from 'react';

 import { Header, HeaderStat, HeaderTitle } from '../../components/header';

 import type { AgGridReact } from 'ag-grid-react';
-import type { IGetRowsParams } from 'ag-grid-community';

-import type { LiquidityProvisionData, Filter } from '@vegaprotocol/liquidity';
+import type { Filter } from '@vegaprotocol/liquidity';
 import { Link, useParams } from 'react-router-dom';
 import { Links, Routes } from '../../pages/client-router';

@@ -74,21 +71,12 @@ export const LiquidityContainer = ({
 }) => {
  const gridRef = useRef<AgGridReact | null>(null);
  const { data: market } = useMarket(marketId);
-  const dataRef = useRef<LiquidityProvisionData[] | null>(null);

  // To be removed when liquidityProvision subscriptions are working
  useReloadLiquidityData(marketId);

-  const update = useCallback(
-    ({ data }: { data: LiquidityProvisionData[] | null }) => {
-      return updateGridData(dataRef, data, gridRef);
-    },
-    [gridRef]
-  );
-
-  const { data, loading, error } = useDataProvider({
+  const { data, error } = useDataProvider({
    dataProvider: lpAggregatedDataProvider,
-    update,
    variables: { marketId: marketId || '', filter },
    skip: !marketId,
  });
@@ -103,36 +91,16 @@ export const LiquidityContainer = ({
  ]);
  const stakeToCcyVolume = params.market_liquidity_stakeToCcyVolume;

-  const getRows = useCallback(
-    async ({ successCallback, startRow, endRow }: IGetRowsParams) => {
-      const rowsThisBlock = dataRef.current
-        ? dataRef.current.slice(startRow, endRow)
-        : [];
-      const lastRow = dataRef.current ? dataRef.current.length : 0;
-      successCallback(rowsThisBlock, lastRow);
-    },
-    []
-  );
-
  return (
    <div className="h-full relative">
      <LiquidityTable
        ref={gridRef}
-        datasource={{ getRows }}
-        rowModelType="infinite"
+        rowData={data}
        symbol={symbol}
        assetDecimalPlaces={assetDecimalPlaces}
        stakeToCcyVolume={stakeToCcyVolume}
+        overlayNoRowsTemplate={error ? error.message : t('No data')}
      />
-      <div className="pointer-events-none absolute inset-0">
-        <AsyncRenderer
-          loading={loading}
-          error={error}
-          data={data}
-          noDataMessage={t('No liquidity provisions')}
-          noDataCondition={(data) => !data?.length}
-        />
-      </div>
    </div>
  );
 };
@@ -182,6 +150,7 @@ const LiquidityViewHeader = memo(({ marketId }: { marketId?: string }) => {
      <HeaderStat
        heading={t('Target stake')}
        description={tooltipMapping['targetStake']}
+        testId="target-stake"
      >
        <div>
          {targetStake
@@ -195,6 +164,7 @@ const LiquidityViewHeader = memo(({ marketId }: { marketId?: string }) => {
      <HeaderStat
        heading={t('Supplied stake')}
        description={tooltipMapping['suppliedStake']}
+        testId="supplied-stake"
      >
        <div>
          {suppliedStake
@@ -210,10 +180,10 @@ const LiquidityViewHeader = memo(({ marketId }: { marketId?: string }) => {

        {formatNumberPercentage(percentage, 2)}
      </HeaderStat>
-      <HeaderStat heading={t('Market ID')}>
+      <HeaderStat heading={t('Market ID')} testId="liquidity-market-id">
        <div className="break-word">{marketId}</div>
      </HeaderStat>
-      <HeaderStat heading={t('Learn more')}>
+      <HeaderStat heading={t('Learn more')} testId="liquidity-learn-more">
        {DocsLinks ? (
          <ExternalLink href={DocsLinks.LIQUIDITY}>
            {t('Providing liquidity')}
@@ -6,25 +6,32 @@ import { MemoryRouter } from 'react-router-dom';
 import type { MockedResponse } from '@apollo/client/testing';
 import { MockedProvider } from '@apollo/client/testing';
 import type {
+  MarketCandlesQuery,
+  MarketCandlesQueryVariables,
  MarketDataUpdateFieldsFragment,
  MarketDataUpdateSubscription,
 } from '@vegaprotocol/markets';
+import { MarketCandlesDocument } from '@vegaprotocol/markets';
 import { MarketDataUpdateDocument } from '@vegaprotocol/markets';
 import {
  AuctionTrigger,
+  Interval,
  MarketState,
  MarketTradingMode,
 } from '@vegaprotocol/types';
 import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
+import { subDays } from 'date-fns';

 describe('MarketSelectorItem', () => {
+  const yesterday = new Date();
+  yesterday.setHours(yesterday.getHours() - 20);
  const market = createMarketFragment({
    id: 'market-0',
    decimalPlaces: 2,
    // @ts-ignore fragment doesn't contain candles
    candles: [
-      { close: '5', volume: '50' },
-      { close: '10', volume: '50' },
+      { close: '5', volume: '50', periodStart: yesterday.toISOString() },
+      { close: '10', volume: '50', periodStart: yesterday.toISOString() },
    ],
    tradableInstrument: {
      instrument: {
@@ -36,6 +43,7 @@ describe('MarketSelectorItem', () => {
      },
    },
  });
+
  const marketData: MarketDataUpdateFieldsFragment = {
    __typename: 'ObservableMarketData',
    marketId: market.id,
@@ -63,26 +71,32 @@ describe('MarketSelectorItem', () => {
    trigger: AuctionTrigger.AUCTION_TRIGGER_UNSPECIFIED,
    priceMonitoringBounds: null,
  };
-  const mock: MockedResponse<MarketDataUpdateSubscription> = {
-    request: {
-      query: MarketDataUpdateDocument,
-      variables: {
-        marketId: market.id,
-      },
+
+  const candles = [
+    {
+      open: '5',
+      close: '5',
+      high: '5',
+      low: '5',
+      volume: '50',
+      periodStart: yesterday.toISOString(),
    },
-    result: {
-      data: {
-        marketsData: [marketData],
-      },
+    {
+      open: '10',
+      close: '10',
+      high: '10',
+      low: '10',
+      volume: '50',
+      periodStart: yesterday.toISOString(),
    },
-  };
+  ];

  const mockOnSelect = jest.fn();

-  const renderJsx = () => {
+  const renderJsx = (mocks: MockedResponse[]) => {
    return render(
      <MemoryRouter>
-        <MockedProvider mocks={[mock]}>
+        <MockedProvider mocks={mocks}>
          <MarketSelectorItem
            market={market}
            currentMarketId={market.id}
@@ -94,11 +108,66 @@ describe('MarketSelectorItem', () => {
    );
  };

+  let dateSpy: jest.SpyInstance;
+  const ts = 1685577600000; // 2023-06-01
+
+  beforeAll(() => {
+    dateSpy = jest.spyOn(Date, 'now').mockImplementation(() => ts);
+  });
+
+  afterAll(() => {
+    dateSpy.mockRestore();
+  });
+
  it('renders market information', async () => {
    const symbol =
      market.tradableInstrument.instrument.product.settlementAsset.symbol;

-    renderJsx();
+    const mock: MockedResponse<MarketDataUpdateSubscription> = {
+      request: {
+        query: MarketDataUpdateDocument,
+        variables: {
+          marketId: market.id,
+        },
+      },
+      result: {
+        data: {
+          marketsData: [marketData],
+        },
+      },
+    };
+
+    const since = subDays(Date.now(), 5).toISOString();
+    const variables: MarketCandlesQueryVariables = {
+      marketId: market.id,
+      interval: Interval.INTERVAL_I1H,
+      since,
+    };
+    const mockCandles: MockedResponse<MarketCandlesQuery> = {
+      request: {
+        query: MarketCandlesDocument,
+        variables,
+      },
+      result: {
+        data: {
+          marketsConnection: {
+            edges: [
+              {
+                node: {
+                  candlesConnection: {
+                    edges: candles.map((c) => ({
+                      node: c,
+                    })),
+                  },
+                },
+              },
+            ],
+          },
+        },
+      },
+    };
+
+    renderJsx([mock, mockCandles]);

    const link = screen.getByRole('link');
    // link renders and is styled
@@ -106,18 +175,17 @@ describe('MarketSelectorItem', () => {

    expect(link).toHaveClass('ring-1');

-    expect(screen.getByTitle('24h vol')).toHaveTextContent('100');
+    expect(screen.getByTitle('24h vol')).toHaveTextContent('0.00');
    expect(screen.getByTitle(symbol)).toHaveTextContent('-');

-    // candles are loaded immediately
-    expect(screen.getByTestId('market-item-change')).toHaveTextContent(
-      '+100.00%'
-    );
-
    await waitFor(() => {
+      expect(screen.getByTitle('24h vol')).toHaveTextContent('100');
      expect(screen.getByTitle(symbol)).toHaveTextContent(
        addDecimalsFormatNumber(marketData.markPrice, market.decimalPlaces)
      );
+      expect(screen.getByTestId('market-item-change')).toHaveTextContent(
+        '+100.00%'
+      );
    });

    await userEvent.click(link);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Matthew Russell	a7d6fb6e56	chore: remove stray log	2023-06-20 08:33:42 -07:00
Matthew Russell	850f1b227c	fix: deposit loading state	2023-06-20 08:33:19 -07:00
Bartłomiej Głownia	c740c11eaa	feat(deal-ticket): improve no collateral validation (#4122 )	2023-06-20 08:31:52 -07:00
Mikołaj Młodzikowski	d1fabb31a3	feat(ci): fix deployments to testnet	2023-06-20 16:32:27 +02:00
Mikołaj Młodzikowski	94f045a60b	fix(ci): port changes for release process fixes for console on frontend	2023-06-20 16:17:13 +02:00
Mikołaj Młodzikowski	1af375bab8	feat(ci): setup fleek deployments for testnet for console (#4138 )	2023-06-20 14:49:39 +02:00
Sam Keen	5a48ba4a33	fix(governance): ensure cached finalized vote is only used when pubkey is c… (#4040 )	2023-06-19 17:07:30 +00:00
Radosław Szpiech	d1fd9184ce	test(trading): #3508 tests for Trades ACs (#4139 )	2023-06-19 17:07:27 +02:00
Joe Tsang	8f29824f9e	chore(governance): update staking acs (#4123 )	2023-06-16 16:45:19 +00:00
Joe Tsang	fc3c73ad24	chore(governance): un-skip staking test and increase test coverage for smoke tests (#4112 )	2023-06-16 14:42:38 +01:00
Bartłomiej Głownia	1027827576	feat(trading): show margin level visualisation in asset breakdown modal (#4048 )	2023-06-16 12:28:59 +02:00
Sam Keen	0089920d4c	fix(governance): earned by me reward percentage (#4093 )	2023-06-16 10:04:03 +01:00
Matthew Russell	35896a9cf5	chore(trading): clear apollo warnings (#4120 )	2023-06-16 09:50:22 +01:00
Edd	5a90ebe12e	feat(explorer): transaction list filtering	2023-06-15 17:10:17 +01:00
Mikołaj Młodzikowski	6be117086a	feat(ci): align releases for all apps (#4111 )	2023-06-15 09:03:59 -07:00
daro-maj	9c6dd9f254	test(trading): markets selector ACs update (#4107 )	2023-06-15 12:52:18 +02:00
Mikołaj Młodzikowski	a675576a52	feat(ci): turn off nx cloud (#4078 )	2023-06-15 11:32:04 +01:00
Matthew RussellandBartłomiej Głownia	98d248e02e	feat(accounts): accounts table quantum formatting (#4076 ) Co-authored-by: Bartłomiej Głownia <bglownia@gmail.com>	2023-06-15 11:31:43 +01:00
Joe Tsang	c8d55c6293	chore(governance): fix for withdrawal tests (#4047 )	2023-06-15 09:15:52 +01:00
Sam Keen	3467feb3e5	feat(governance): add 'all proposals' link on proposal details page (#4074 )	2023-06-14 15:35:12 +01:00
daro-maj	bdf1663709	test(trading): update e2e tests for acs - closed all and proposed markets (#4094 )	2023-06-14 16:00:04 +02:00
daro-majandBartłomiej Głownia	d775573543	test(trading): add e2e tests for liquidity 5002-LIQP (#4082 ) Co-authored-by: Bartłomiej Głownia <bglownia@gmail.com>	2023-06-14 14:55:32 +02:00
Mikołaj Młodzikowski	c0fdc8d570	feat(ci): add deploy & build info to ui-toolkit README	2023-06-14 13:35:50 +02:00
Mikołaj Młodzikowski	a9ebb36b9b	feat(ci): deploy ui-toolkit to s3 (#4089 )	2023-06-14 10:37:41 +00:00
Radosław Szpiech	f6c0082f2d	test(trading): #3506 orderbook AC coverage (#4088 )	2023-06-14 12:32:33 +02:00
m.ray	931ad75cc9	fix(trading): oracle markets matching (#4080 )	2023-06-14 11:06:35 +02:00
m.ray	f25a58a3c3	fix(liquidity): update liquidity table row id (#4081 )	2023-06-13 14:24:29 -07:00
Mikołaj Młodzikowski	37340b4dc3	feat(ci): modify static content to trigger push	2023-06-13 13:43:54 +02:00
Mikołaj Młodzikowski	17ba3eb351	feat(ci): setup static on s3 (#4075 )	2023-06-13 11:29:05 +00:00
Matthew Russell	8f966a4ba6	chore: remove copied dir	2023-06-12 12:38:55 -07:00
Sam Keen	cc7f403718	feat(governance): hide proposal details for freeform proposals (#4073 )	2023-06-12 12:31:03 +01:00
MaciekandMatthew Russell	9184c2374c	fix(markets): back with updating by grid api (#4059 ) Co-authored-by: Matthew Russell <mattrussell36@gmail.com>	2023-06-10 07:49:10 -07:00
MaciekandMatthew Russell	37247a504a	fix(trading): update click area in network switcher (#4057 ) Co-authored-by: Matthew Russell <mattrussell36@gmail.com>	2023-06-10 07:48:48 -07:00
Bartłomiej Głownia	2e7a6a6458	chore(trading): cleanup paginated data solution, improve performance (#4036 )	2023-06-09 19:02:23 -07:00
Ben	bf6c13f523	test(trading): 3502-POSI-e2e-tests (#4064 )	2023-06-09 17:37:50 -07:00
Matthew Russell	a6f3a08d2f	chore(trading,governance,explorer): release v0.20.18-core-0.71.8	2023-06-09 15:50:54 -07:00
Matthew Russell	f13e456a29	ci(trading,governance,explorer): remove affected project text manipulation	2023-06-09 10:56:42 -07:00
Sam Keen	5cab040189	fix(governance): temporarily skipped flaky staking tests (#4068 )	2023-06-09 16:13:44 +01:00
Maciek	e47b868c53	fix(withdraws): clear eth network errors (#4044 )	2023-06-09 08:58:16 +02:00
Matthew Russell	b6286cd0f3	fix(deal-ticket): make ticket submit button always enabled (#4055 )	2023-06-08 22:30:25 -07:00
Matthew Russell	f66e976b66	revert: "chore(trading): release v0.20.18-core-0.71.8"	2023-06-08 19:41:24 -07:00
Matthew Russell	866e7232db	chore(trading): release v0.20.18-core-0.71.8	2023-06-08 18:22:36 -07:00
Matthew Russellandmaciek	5a8ff90890	fix(ui-toolkit): display of loader in large variant (#4056 ) Co-authored-by: maciek <maciek@vegaprotocol.io>	2023-06-08 09:16:51 -07:00
Radosław Szpiech	7b8f654906	test(trading): #3505 add test coverage to 6002-MDET-market-details (#4060 )	2023-06-08 15:47:23 +02:00
Ciaran McGhie	d6f39049bd	chore(ui-toolkit,react-helpers,utils): publish new versions of ui-toolkit, react-helpers and utils (#4049 )	2023-06-07 15:58:20 -07:00
Maciek	1d06be8f4e	fix: wrong css class (#4053 )	2023-06-07 20:44:28 +00:00
Edd	5eba8fe28f	fix(explorer): fix broken protocol upgrade tx link (#4029 )	2023-06-07 14:47:55 +01:00
m.ray	2ba0e9a1b2	chore(trading): add quantum formatting to deal ticket (#4030 )	2023-06-07 11:49:50 +01:00
Maciek Bartłomiej Głownia Matthew Russell	43d3754c64	feat(trading): 3945 orderbook enhancements (#4016 ) Co-authored-by: Bartłomiej Głownia <bglownia@gmail.com> Co-authored-by: Matthew Russell <mattrussell36@gmail.com>	2023-06-07 10:58:34 +02:00
m.ray	aae5c44fa4	fix(trading): market selector volume update (#3989 )	2023-06-06 18:45:52 -07:00
Art	878bed9c7a	fix(withdraws): minimal withdrawal amount validation (#3993 )	2023-06-06 22:21:48 +01:00
Sam Keen	6f9f432c90	feat(governance): multisig warning (#3994 )	2023-06-06 22:21:31 +01:00
Sam Keen	3f01b93159	feat(governance,proposals,web3): remove use of word "we" in copy (#4034 )	2023-06-06 22:21:17 +01:00
Edd	473c244d7b	chore(governance,liquidity-provision-dashboard,trading): remove broken urls (#4042 )	2023-06-06 22:19:42 +01:00
Joe Tsang	d6a32f5090	chore(governance): fix flaky test failures (#4043 )	2023-06-06 22:19:23 +01:00
Mikołaj Młodzikowski	71540a90fb	fix(ci): resolving bucket name	2023-06-06 17:02:24 +02:00
Mikołaj Młodzikowski	cefdbe6a3c	fix(ci): missing space on resolving projects	2023-06-06 16:46:58 +02:00
Mikołaj Młodzikowski	3928dd5c0e	fix(ci): way of resolving affected	2023-06-06 15:37:06 +02:00
Ciaran McGhie	1521bab4c4	chore(react-helpers,utils,logger): create logger lib and move sentry/logger utils there (#3990 )	2023-06-06 14:10:03 +01:00
Mikołaj Młodzikowski	b3036d520f	fix(ci): way of resolving affected	2023-06-06 15:03:18 +02:00
Mikołaj Młodzikowski	429a5a23d3	fix(ci): way of resolving affected	2023-06-06 14:48:49 +02:00
Mikołaj Młodzikowski	5b02fd5d54	fix(ci): way of resolving affected	2023-06-06 14:39:28 +02:00
Mikołaj Młodzikowski	b8309a76e7	fix(ci): way of resolving affected	2023-06-06 14:29:46 +02:00
Mikołaj Młodzikowski	e8ae085c06	fix(ci): typo in app name	2023-06-06 14:18:47 +02:00
Mikołaj Młodzikowski	fdcd24847c	fix(ci): syntax for publishing dist	2023-06-06 14:07:56 +02:00
Mikołaj Młodzikowski	e054db39b5	feat(ci): add deploys for multisig-signer (#4039 )	2023-06-06 13:47:42 +02:00
Joe Tsang	a01e48d508	chore(governance): nightly e2e test fixes (#4038 )	2023-06-06 12:12:59 +01:00
Matthew Russell	0d96c487d9	fix(trading): use ag grid to handle error,loading and no data message (#4012 )	2023-06-06 00:08:19 -07:00
m.rayandMatthew Russell	011e4e4cec	fix(trading): market info refactor (#3985 ) Co-authored-by: Matthew Russell <mattrussell36@gmail.com>	2023-06-05 19:00:29 -07:00
Bartłomiej Głownia	d6e2432955	fix(accounts): avoid last row re-rendering (#3950 )	2023-06-05 12:40:34 +02:00
Ben	18c034b910	test(trading): 6501-ASSE-assets e2e tests (#4026 )	2023-06-05 09:13:24 +01:00
daro-maj	849cbb43c4	test(trading): 6001-MARK-find_markets e2e tests (#4025 )	2023-06-05 08:25:31 +01:00
Edd	cd34cb181f	feat(explorer): properly represent batch error 71 (#4019 )	2023-06-02 14:43:33 +01:00
Edd	97b3f4decf	feat(explorer): do not colourise votes in tx list (#3988 )	2023-06-01 12:35:33 +01:00
Ben	0465fb8ca9	test(trading): key to key transfer tests (#4014 )	2023-06-01 11:37:41 +01:00
daro-maj	22af89e78c	test(trading): reverted node tests (#3992 )	2023-06-01 08:32:31 +01:00
Matthew Russell	adfd2f41b6	chore(trading,governance,explorer): release v0.20.16-core-0.71.5	2023-05-31 15:00:17 -07:00
Matthew Russell	d9b1aa6da3	chore(governance): revert governance ethereum endpoint to infura (#4010 )	2023-05-31 14:58:45 -07:00
daro-majandasiaznik	205f369cdc	test(trading): add network param mocks (#4001 ) Co-authored-by: asiaznik <artur@vegaprotocol.io>	2023-05-31 17:11:02 +01:00
Joe Tsang	9f63fde123	chore(governance): 3929 proposal acs (#4008 )	2023-05-31 17:10:41 +01:00
Matthew RussellandBartłomiej Głownia	f2c70e6da4	fix(trading): performance issues with many orders (#3944 ) Co-authored-by: Bartłomiej Głownia <bglownia@gmail.com>	2023-05-31 17:38:49 +02:00
Edd	e8ff1b0b60	fix(explorer,trading): typo in release notes template (#3976 )	2023-05-30 22:47:19 -07:00
Matthew Russell	f5989b0022	chore(trading,explorer,governance): release v0.20.15-core0.71.5	2023-05-30 14:54:08 -07:00
Matthew Russell	653ca034f2	fix(governance): dont start listening for pending eth events until connected (#3996 )	2023-05-30 13:48:01 -07:00
Edd	ef25552311	fix(explorer): fix stagnet1 env (#3975 )	2023-05-29 17:31:39 +01:00
daro-maj	0a8439d125	test(trading): withdrawal details for extra security e2e tests (#3977 )	2023-05-29 17:31:15 +01:00
Maciek	702ea0c6b4	chore(markets): keep market list live updated (#3954 )	2023-05-29 07:39:42 +00:00
m.ray	0f2b86770a	fix(trading): show full node URI in trading footer (#3978 )	2023-05-26 16:38:02 +00:00
m.ray	cd6d350047	chore(trading): update vega.trading to console.vega.xyz (#3969 )	2023-05-26 12:08:26 +01:00
Matthew Russell	c5a06c57ac	chore(trading,governance,explorer): update issue templates to include check in specs repo (#3964 )	2023-05-25 22:37:40 -07:00
Matthew Russell	5bb31fa38d	chore(trading,governance,explorer): bump to v0.20.14-core-0.71.4	2023-05-25 16:31:35 -07:00
				`@@ -0,0 +1 @@`
				`export * from './multisig-incorrect-notice';`