fix: use t function for text content in zero balance message

test: update e2e tests with ac for button state
test: check that button is enabled before form is filled in
2023-06-08 09:15:10 -07:00 · 2023-06-07 22:25:16 -07:00 · 2023-06-07 22:14:36 -07:00 · 2023-06-07 22:09:03 -07:00 · 2023-06-07 22:03:23 -07:00 · 2023-06-07 17:31:13 -07:00
249 changed files with 4793 additions and 4431 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

@@ -56,12 +56,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://vega.trading).
+            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/).
@@ -5,6 +5,7 @@ on:
    branches:
      - release/*
      - develop
+      - main
    tags:
      - v*
  pull_request:
@@ -112,15 +113,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
@@ -130,13 +135,30 @@ 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 echo "$affected" | grep -q multisig-signer; then
+            echo "Tools are affected"
+            # tools are only applicable to check previews or deploy from develop to mainnet
+            if [[ "${{ github.event_name }}" = "pull_request" ]]; then
+              echo "Deploying tools on preview"
+              preview_tools=$(printf "https://%s.%s.vega.rocks" "tools" "$branch_slug")
+              projects+=' "multisig-signer" '
+            fi
+            if [[ "${{ github.ref }}" =~ .*develop$ ]]; then
+              echo "Deploying tools on s3"
+              projects+=' "multisig-signer" '
+            fi
+          fi
          projects_e2e=${projects_e2e%?}
          projects_e2e=[${projects_e2e// /,}]
+          projects=${projects%?}
+          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 }}
@@ -144,11 +166,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:
@@ -170,6 +193,7 @@ jobs:
      - publish-dist
      - lint-test-build
    if: ${{ github.event_name == 'pull_request' }}
+    timeout-minutes: 60
    name: '(CD) comment preview links'
    steps:
      - name: Find Comment
@@ -179,6 +203,35 @@ jobs:
          issue-number: ${{ github.event.pull_request.number }}
          body-includes: Previews

+      - name: Wait for deployments
+        run: |
+          # https://stackoverflow.com/questions/3183444/check-for-valid-link-url
+          regex='(https?|ftp|file)://[-[:alnum:]\+&@#/%?=~_|!:,.;]*[-[:alnum:]\+&@#/%=~_|]'
+          if [[ "${{ needs.lint-test-build.outputs.preview_governance }}" =~ $regex ]]; then
+            until curl -L --fail "${{ needs.lint-test-build.outputs.preview_governance }}"; do
+              echo "waiting for governance preview"
+              sleep 5
+            done
+          fi
+          if [[ "${{ needs.lint-test-build.outputs.preview_explorer }}" =~ $regex ]]; then
+            until curl -L --fail "${{ needs.lint-test-build.outputs.preview_explorer }}"; do
+              echo "waiting for explorer preview"
+              sleep 5
+            done
+          fi
+          if [[ "${{ needs.lint-test-build.outputs.preview_trading }}" =~ $regex ]]; then
+            until curl -L --fail "${{ needs.lint-test-build.outputs.preview_trading }}"; do
+              echo "waiting for trading preview"
+              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
        if: ${{ steps.fc.outputs.comment-id == 0 }}
@@ -189,16 +242,11 @@ 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 }}
-
-  cypress-check:
-    name: '(CI) cypress - check'
-    runs-on: ubuntu-latest
-    needs: cypress
-    steps:
-      - run: echo Done!
+            * tools: ${{ needs.lint-test-build.outputs.preview_tools }}

  # Report single result at the end, to avoid mess with required checks in PR
-  cypress-result:
+  cypress-check:
+    name: '(CI) cypress - check'
    if: ${{ always() }}
    needs: cypress
    runs-on: ubuntu-22.04
@@ -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
@@ -70,6 +70,10 @@ 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
          elif [[ "${{ github.ref }}" =~ .*main$ ]]; then
            envName="mainnet"
          elif [[ "${{ matrix.app}}" = "trading" ]] && [[ "${{ startsWith(github.ref, 'refs/tags/v') && 'true' || 'false' }}" = "true" ]]; then
@@ -78,10 +82,14 @@ jobs:

          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
@@ -204,11 +212,12 @@ jobs:
        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
        uses: actions/checkout@v3
        with:
+          repository: 'vegaprotocol/ipfs-redirect'
          path: 'ipfs-redirect'
          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
        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
        env:
          GH_TOKEN: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
@@ -220,24 +229,31 @@ jobs:
          new_hash=$(cat ${{ matrix.app }}-ipfs-hash)
          new_cid=$(ipfs cid format -v 1 -b base32 $new_hash)

-          cd ipfs-redirect
-          echo $new_hash > cidv0.txt
-          echo $new_cid > cidv1.txt
+          ls -al ipfs-redirect

-          git config --global user.email "vega-ci-bot@vega.xyz"
-          git config --global user.name "vega-ci-bot"
+          echo $new_hash > ipfs-redirect/cidv0.txt
+          echo $new_cid > ipfs-redirect/cidv1.txt

-          branch_name="update-hash-${{ github.ref }}"
-          git checkout -b "$branch_name"
-          commit_msg="Automated hash update from ${{ github.ref }}"
-          git add cidv0.txt cidv1.txt
-          git commit -m "$commit_msg"
-          git push -u origin "$branch_name"
-          pr_url="$(gh pr create --title "${commit_msg}" --body 'automated pull request to update CIDs')"
-          echo $pr_url
-          # once auto merge get's enabled on documentation repo let's do follow up
-          sleep 5
-          gh pr merge "${pr_url}" --auto --delete-branch --squash --admin
+          (
+            cd ipfs-redirect
+
+            git status
+            cat .git/config
+            git config --global user.email "vega-ci-bot@vega.xyz"
+            git config --global user.name "vega-ci-bot"
+
+            branch_name="update-hash-${{ github.ref }}"
+            git checkout -b "$branch_name"
+            commit_msg="Automated hash update from ${{ github.ref }}"
+            git add cidv0.txt cidv1.txt
+            git commit -m "$commit_msg"
+            git push -u origin "$branch_name"
+            pr_url="$(gh pr create --title "${commit_msg}" --body 'automated pull request to update CIDs')"
+            echo $pr_url
+            # once auto merge get's enabled on documentation repo let's do follow up
+            sleep 5
+            gh pr merge "${pr_url}" --delete-branch --squash --admin
+          )

          # # Generate console URL
          # new_console_url_type=ipfs
@@ -250,9 +266,9 @@ jobs:
          # # Update record in DNSimple
          # # docs: https://developer.dnsimple.com/v2/zones/records/#updateZoneRecord
          # dnsimple_account_id=84895
-          # dnsimple_zone_name=vega.trading
+          # dnsimple_zone_name=console.vega.xyz
          # dnsimple_record_id=44409591
-          # # see: https://dnsimple.com/a/84895/domains/vega.trading/records/44409591/edit
+          # # see: https://dnsimple.com/a/84895/domains/console.vega.xyz/records/44409591/edit

          # curl  -H 'Authorization: Bearer ${{ secrets.DNSIMPLE_API_TOKEN }}' \
          #       -H 'Accept: application/json' \
@@ -43,7 +43,17 @@ jobs:
            -d '{"query": "mutation{triggerDeploy(siteId:\"f8f2e051-f18e-49e6-b876-0a39369dc0d8\"){id status}}"}' \
            https://api.fleek.co/graphql

-      - name: Update vega.trading DNS to redirect to the new console
+      - name: Check out ipfs-redirect
+        uses: actions/checkout@v3
+        with:
+          repository: 'vegaprotocol/ipfs-redirect'
+          path: 'ipfs-redirect'
+          fetch-depth: '0'
+          token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
+
+      - name: Update console.vega.xyz DNS to redirect to the new console
+        env:
+          GH_TOKEN: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
        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
@@ -51,27 +61,24 @@ jobs:
          which ipfs
          new_hash=$(cat ipfs-hash)
          new_cid=$(ipfs cid format -v 1 -b base32 $new_hash)
+          git config --global user.email "vega-ci-bot@vega.xyz"
+          git config --global user.name "vega-ci-bot"
+          echo $new_hash > ipfs-redirect/cidv0.txt
+          echo $new_cid > ipfs-redirect/cidv1.txt

-          # 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}"
+          (
+            cd ipfs-redirect

-          # 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
-
-          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}
+            git status
+            branch_name="rollback-to-$new_hash"
+            git checkout -b "$branch_name"
+            commit_msg="hash rollback to $new_hash"
+            git add cidv0.txt cidv1.txt
+            git commit -m "$commit_msg"
+            git push -u origin "$branch_name" --force-with-lease
+            pr_url="$(gh pr create --title "${commit_msg}" --body 'automated pull request to update CIDs')"
+            echo $pr_url
+            # once auto merge get's enabled on documentation repo let's do follow up
+            sleep 5
+            gh pr merge "${pr_url}" --delete-branch --squash --admin
+          )
@@ -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
@@ -10,4 +10,4 @@ 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
 NX_VEGA_EXPLORER_URL=https://explorer.vega.xyz/
-NX_VEGA_CONSOLE_URL=https://vega.trading
+NX_VEGA_CONSOLE_URL=https://console.vega.xyz
@@ -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"}'
@@ -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';

@@ -160,6 +160,7 @@ export const TxOrderType = ({ orderType, command }: TxOrderTypeProps) => {
        vote={command?.voteSubmission?.value === 'VALUE_YES'}
        yesText="Proposal vote"
        noText="Proposal vote"
+        useVoteColour={false}
      />
    );
  }
@@ -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
@@ -26,6 +26,7 @@ module.exports = defineConfig({
    viewportWidth: 1440,
    viewportHeight: 900,
    numTestsKeptInMemory: 5,
+    downloadsFolder: 'cypress/downloads',
    testIsolation: false,
  },
  env: {
@@ -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,14 +187,21 @@ 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
@@ -208,8 +216,17 @@ context.skip(
          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 () {
@@ -217,7 +234,7 @@ context.skip(
        '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 +246,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 +279,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 +319,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 +367,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 +404,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 +426,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 +451,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 +460,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 +472,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 +490,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 +498,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
@@ -7,7 +7,6 @@ import {
 import {
  clickOnValidatorFromList,
  closeStakingDialog,
-  stakingPageAssociateTokens,
  stakingValidatorPageAddStake,
  waitForBeginningOfEpoch,
 } from '../../support/staking.functions';
@@ -30,19 +29,22 @@ context('rewards - flow', { tags: '@slow' }, function () {
    turnTelemetryOff();
    cy.visit('/');
    waitForSpinner();
-    depositAsset(vegaAssetAddress, '1000', 18);
    ethereumWalletConnect();
    cy.connectVegaWallet();
-    cy.VegaWalletTopUpRewardsPool(30, 200);
-    navigateTo(navigation.validators);
+    depositAsset(vegaAssetAddress, '1000', 18);
+    cy.getByTestId('currency-title', txTimeout).should(
+      'contain.text',
+      'Collateral'
+    );
    vegaWalletTeardown();
-    stakingPageAssociateTokens('6000');
+    cy.associateTokensToVegaWallet('6000');
+    navigateTo(navigation.validators);
+    cy.VegaWalletTopUpRewardsPool();
    cy.get(vegaWalletUnstakedBalance, txTimeout).should(
      'contain',
      '6,000.0',
      txTimeout
    );
-    cy.get('button').contains('Select a validator to nominate').click();
    clickOnValidatorFromList(0);
    stakingValidatorPageAddStake('3000');
    closeStakingDialog();
@@ -109,6 +109,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()
@@ -379,6 +380,7 @@ context(
      });

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

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

@@ -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',
@@ -79,27 +78,15 @@ context(
        //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(() => {
-            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);
      });

@@ -114,12 +101,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 +118,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 +145,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 +167,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 +184,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 +211,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 +231,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 +250,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 +269,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 +280,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 +301,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(
@@ -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');
@@ -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',
@@ -221,7 +221,7 @@ export function ensureSpecifiedUnstakedTokensAreAssociated(
 }

 export function closeStakingDialog() {
-  cy.getByTestId('dialog-title').should(
+  cy.getByTestId('dialog-title', txTimeout).should(
    'contain.text',
    'At the beginning of the next epoch'
  );
@@ -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,8 @@
  "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"
 }
@@ -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,
+  };
+};
@@ -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'
    );
@@ -8,6 +8,7 @@ const mockData = {
    {
      asset: 'tDAI',
      totalAmount: '5',
+      decimals: 6,
      rewardTypes: {
        ACCOUNT_TYPE_GLOBAL_REWARD: {
          amount: '0',
@@ -1,6 +1,5 @@
 import { formatNumber, toBigNum } from '@vegaprotocol/utils';
 import { Tooltip } from '@vegaprotocol/ui-toolkit';
-import { useAppState } from '../../../contexts/app-state/app-state-context';
 import {
  rowGridItemStyles,
  RewardsTable,
@@ -13,7 +12,8 @@ interface EpochIndividualRewardsGridProps {
 }

 interface RewardItemProps {
-  value: string;
+  amount: string;
+  decimals: number;
  percentageOfTotal?: string;
  dataTestId: string;
  last?: boolean;
@@ -21,15 +21,14 @@ interface RewardItemProps {

 const DisplayReward = ({
  reward,
+  decimals,
  percentageOfTotal,
 }: {
  reward: string;
+  decimals: number;
  percentageOfTotal?: string;
 }) => {
  const { t } = useTranslation();
-  const {
-    appState: { decimals },
-  } = useAppState();

  if (Number(reward) === 0) {
    return <span className="text-vega-dark-300">-</span>;
@@ -64,7 +63,8 @@ const DisplayReward = ({
 };

 const RewardItem = ({
-  value,
+  amount,
+  decimals,
  percentageOfTotal,
  dataTestId,
  last,
@@ -72,7 +72,11 @@ const RewardItem = ({
  <div data-testid={dataTestId} className={rowGridItemStyles(last)}>
    <div className="h-full w-5 absolute right-0 top-0 bg-gradient-to-r from-transparent to-black pointer-events-none" />
    <div className="overflow-auto p-5">
-      <DisplayReward reward={value} percentageOfTotal={percentageOfTotal} />
+      <DisplayReward
+        reward={amount}
+        decimals={decimals}
+        percentageOfTotal={percentageOfTotal}
+      />
    </div>
    <div className="h-full w-5 absolute left-0 top-0 bg-gradient-to-l from-transparent to-black pointer-events-none" />
  </div>
@@ -86,7 +90,7 @@ export const EpochIndividualRewardsTable = ({
      dataTestId="epoch-individual-rewards-table"
      epoch={Number(data.epoch)}
    >
-      {data.rewards.map(({ asset, rewardTypes, totalAmount }, i) => (
+      {data.rewards.map(({ asset, rewardTypes, totalAmount, decimals }, i) => (
        <div className="contents" key={i}>
          <div
            data-testid="individual-rewards-asset"
@@ -98,13 +102,19 @@ export const EpochIndividualRewardsTable = ({
            ([key, { amount, percentageOfTotal }]) => (
              <RewardItem
                key={key}
-                value={amount}
+                amount={amount}
+                decimals={decimals}
                percentageOfTotal={percentageOfTotal}
                dataTestId={key}
              />
            )
          )}
-          <RewardItem dataTestId="total" value={totalAmount} last={true} />
+          <RewardItem
+            dataTestId="total"
+            amount={totalAmount}
+            decimals={decimals}
+            last={true}
+          />
        </div>
      ))}
    </RewardsTable>
@@ -8,7 +8,7 @@ describe('generateEpochIndividualRewardsList', () => {
    amount: '100',
    percentageOfTotal: '0.1',
    receivedAt: new Date(),
-    asset: { id: 'usd', symbol: 'USD', name: 'USD' },
+    asset: { id: 'usd', symbol: 'USD', name: 'USD', decimals: 6 },
    party: { id: 'blah' },
    epoch: { id: '1' },
  };
@@ -18,7 +18,7 @@ describe('generateEpochIndividualRewardsList', () => {
    amount: '50',
    percentageOfTotal: '0.05',
    receivedAt: new Date(),
-    asset: { id: 'eur', symbol: 'EUR', name: 'EUR' },
+    asset: { id: 'eur', symbol: 'EUR', name: 'EUR', decimals: 5 },
    party: { id: 'blah' },
    epoch: { id: '2' },
  };
@@ -28,7 +28,7 @@ describe('generateEpochIndividualRewardsList', () => {
    amount: '200',
    percentageOfTotal: '0.2',
    receivedAt: new Date(),
-    asset: { id: 'gbp', symbol: 'GBP', name: 'GBP' },
+    asset: { id: 'gbp', symbol: 'GBP', name: 'GBP', decimals: 7 },
    party: { id: 'blah' },
    epoch: { id: '2' },
  };
@@ -38,7 +38,7 @@ describe('generateEpochIndividualRewardsList', () => {
    amount: '100',
    percentageOfTotal: '0.1',
    receivedAt: new Date(),
-    asset: { id: 'usd', symbol: 'USD', name: 'USD' },
+    asset: { id: 'usd', symbol: 'USD', name: 'USD', decimals: 6 },
    party: { id: 'blah' },
    epoch: { id: '1' },
  };
@@ -48,7 +48,7 @@ describe('generateEpochIndividualRewardsList', () => {
    amount: '150',
    percentageOfTotal: '0.15',
    receivedAt: new Date(),
-    asset: { id: 'usd', symbol: 'USD', name: 'USD' },
+    asset: { id: 'usd', symbol: 'USD', name: 'USD', decimals: 6 },
    party: { id: 'blah' },
    epoch: { id: '3' },
  };
@@ -58,7 +58,7 @@ describe('generateEpochIndividualRewardsList', () => {
    amount: '50',
    percentageOfTotal: '0.05',
    receivedAt: new Date(),
-    asset: { id: 'eur', symbol: 'EUR', name: 'EUR' },
+    asset: { id: 'eur', symbol: 'EUR', name: 'EUR', decimals: 5 },
    party: { id: 'blah' },
    epoch: { id: '2' },
  };
@@ -99,6 +99,7 @@ describe('generateEpochIndividualRewardsList', () => {
      rewards: [
        {
          asset: 'USD',
+          decimals: 6,
          totalAmount: '100',
          rewardTypes: {
            [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
@@ -167,6 +168,7 @@ describe('generateEpochIndividualRewardsList', () => {
          {
            asset: 'GBP',
            totalAmount: '200',
+            decimals: 7,
            rewardTypes: {
              [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
                amount: '0',
@@ -197,6 +199,7 @@ describe('generateEpochIndividualRewardsList', () => {
          {
            asset: 'EUR',
            totalAmount: '50',
+            decimals: 5,
            rewardTypes: {
              [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
                amount: '0',
@@ -232,6 +235,7 @@ describe('generateEpochIndividualRewardsList', () => {
          {
            asset: 'USD',
            totalAmount: '200',
+            decimals: 6,
            rewardTypes: {
              [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
                amount: '0',
@@ -279,6 +283,7 @@ describe('generateEpochIndividualRewardsList', () => {
        rewards: [
          {
            asset: 'USD',
+            decimals: 6,
            totalAmount: '150',
            rewardTypes: {
              [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
@@ -315,6 +320,7 @@ describe('generateEpochIndividualRewardsList', () => {
          {
            asset: 'GBP',
            totalAmount: '200',
+            decimals: 7,
            rewardTypes: {
              [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
                amount: '0',
@@ -345,6 +351,7 @@ describe('generateEpochIndividualRewardsList', () => {
          {
            asset: 'EUR',
            totalAmount: '50',
+            decimals: 5,
            rewardTypes: {
              [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
                amount: '0',
@@ -390,6 +397,7 @@ describe('generateEpochIndividualRewardsList', () => {
          {
            asset: 'USD',
            totalAmount: '200',
+            decimals: 6,
            rewardTypes: {
              [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
                amount: '0',
@@ -9,6 +9,7 @@ export interface EpochIndividualReward {
  rewards: {
    asset: string;
    totalAmount: string;
+    decimals: number;
    rewardTypes: {
      [key in AccountType]?: {
        amount: string;
@@ -53,6 +54,7 @@ export const generateEpochIndividualRewardsList = ({
  const epochIndividualRewards = rewards.reduce((acc, reward) => {
    const epochId = reward.epoch.id;
    const assetName = reward.asset.name;
+    const assetDecimals = reward.asset.decimals;
    const rewardType = reward.rewardType;
    const amount = reward.amount;
    const percentageOfTotal = reward.percentageOfTotal;
@@ -73,6 +75,7 @@ export const generateEpochIndividualRewardsList = ({
    if (!asset) {
      asset = {
        asset: assetName,
+        decimals: assetDecimals,
        totalAmount: '0',
        rewardTypes: Object.fromEntries(emptyRowAccountTypes),
      };
@@ -52,6 +52,7 @@ const assetRewards: Map<
 assetRewards.set(assetId, {
  assetId,
  name: 'tDAI TEST',
+  decimals: 6,
  rewards,
  totalAmount: '295',
 });
@@ -1,6 +1,5 @@
 import { formatNumber, toBigNum } from '@vegaprotocol/utils';
 import { Tooltip } from '@vegaprotocol/ui-toolkit';
-import { useAppState } from '../../../contexts/app-state/app-state-context';
 import {
  rowGridItemStyles,
  RewardsTable,
@@ -12,16 +11,19 @@ interface EpochTotalRewardsGridProps {
 }

 interface RewardItemProps {
-  value: string;
+  amount: string;
+  decimals: number;
  dataTestId: string;
  last?: boolean;
 }

-const DisplayReward = ({ reward }: { reward: string }) => {
-  const {
-    appState: { decimals },
-  } = useAppState();
-
+const DisplayReward = ({
+  reward,
+  decimals,
+}: {
+  reward: string;
+  decimals: number;
+}) => {
  if (Number(reward) === 0) {
    return <span className="text-vega-dark-300">-</span>;
  }
@@ -33,11 +35,16 @@ const DisplayReward = ({ reward }: { reward: string }) => {
  );
 };

-const RewardItem = ({ value, dataTestId, last }: RewardItemProps) => (
+const RewardItem = ({
+  amount,
+  decimals,
+  dataTestId,
+  last,
+}: RewardItemProps) => (
  <div data-testid={dataTestId} className={rowGridItemStyles(last)}>
    <div className="h-full w-5 absolute right-0 top-0 bg-gradient-to-r from-transparent to-black pointer-events-none" />
    <div className="overflow-auto p-5">
-      <DisplayReward reward={value} />
+      <DisplayReward reward={amount} decimals={decimals} />
    </div>
    <div className="h-full w-5 absolute left-0 top-0 bg-gradient-to-l from-transparent to-black pointer-events-none" />
  </div>
@@ -49,15 +56,25 @@ export const EpochTotalRewardsTable = ({
  return (
    <RewardsTable dataTestId="epoch-total-rewards-table" epoch={data.epoch}>
      {Array.from(data.assetRewards.values()).map(
-        ({ name, rewards, totalAmount }, i) => (
+        ({ name, rewards, totalAmount, decimals }, i) => (
          <div className="contents" key={i}>
            <div data-testid="asset" className={`${rowGridItemStyles()} p-5`}>
              {name}
            </div>
            {Array.from(rewards.values()).map(({ rewardType, amount }, i) => (
-              <RewardItem key={i} dataTestId={rewardType} value={amount} />
+              <RewardItem
+                key={i}
+                dataTestId={rewardType}
+                amount={amount}
+                decimals={decimals}
+              />
            ))}
-            <RewardItem dataTestId="total" value={totalAmount} last={true} />
+            <RewardItem
+              dataTestId="total"
+              amount={totalAmount}
+              decimals={decimals}
+              last={true}
+            />
          </div>
        )
      )}
@@ -56,12 +56,14 @@ describe('generateEpochAssetRewardsList', () => {
            node: {
              id: '1',
              name: 'Asset 1',
+              decimals: 18,
            },
          },
          {
            node: {
              id: '2',
              name: 'Asset 2',
+              decimals: 6,
            },
          },
        ],
@@ -101,6 +103,7 @@ describe('generateEpochAssetRewardsList', () => {
          {
            node: {
              epoch: 1,
+              decimals: 18,
              assetId: '1',
              rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
              amount: '123',
@@ -128,6 +131,7 @@ describe('generateEpochAssetRewardsList', () => {
                '1',
                {
                  assetId: '1',
+                  decimals: 0,
                  name: '',
                  rewards: new Map([
                    [
@@ -196,12 +200,14 @@ describe('generateEpochAssetRewardsList', () => {
            node: {
              id: '1',
              name: 'Asset 1',
+              decimals: 18,
            },
          },
          {
            node: {
              id: '2',
              name: 'Asset 2',
+              decimals: 6,
            },
          },
        ],
@@ -212,6 +218,7 @@ describe('generateEpochAssetRewardsList', () => {
            node: {
              epoch: 1,
              assetId: '1',
+              decimals: 18,
              rewardType: AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
              amount: '123',
            },
@@ -220,6 +227,7 @@ describe('generateEpochAssetRewardsList', () => {
            node: {
              epoch: 1,
              assetId: '1',
+              decimals: 18,
              rewardType: AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
              amount: '100',
            },
@@ -228,6 +236,7 @@ describe('generateEpochAssetRewardsList', () => {
            node: {
              epoch: 2,
              assetId: '1',
+              decimals: 18,
              rewardType: AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
              amount: '5',
            },
@@ -254,6 +263,7 @@ describe('generateEpochAssetRewardsList', () => {
                '1',
                {
                  assetId: '1',
+                  decimals: 18,
                  name: 'Asset 1',
                  rewards: new Map([
                    [
@@ -319,6 +329,7 @@ describe('generateEpochAssetRewardsList', () => {
                '1',
                {
                  assetId: '1',
+                  decimals: 18,
                  name: 'Asset 1',
                  rewards: new Map([
                    [
@@ -387,12 +398,14 @@ describe('generateEpochAssetRewardsList', () => {
            node: {
              id: '1',
              name: 'Asset 1',
+              decimals: 18,
            },
          },
          {
            node: {
              id: '2',
              name: 'Asset 2',
+              decimals: 6,
            },
          },
        ],
@@ -403,6 +416,7 @@ describe('generateEpochAssetRewardsList', () => {
            node: {
              epoch: 1,
              assetId: '1',
+              decimals: 18,
              rewardType: AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
              amount: '123',
            },
@@ -411,6 +425,7 @@ describe('generateEpochAssetRewardsList', () => {
            node: {
              epoch: 1,
              assetId: '1',
+              decimals: 18,
              rewardType: AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
              amount: '100',
            },
@@ -419,6 +434,7 @@ describe('generateEpochAssetRewardsList', () => {
            node: {
              epoch: 2,
              assetId: '1',
+              decimals: 18,
              rewardType: AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
              amount: '6',
            },
@@ -427,6 +443,7 @@ describe('generateEpochAssetRewardsList', () => {
            node: {
              epoch: 2,
              assetId: '1',
+              decimals: 18,
              rewardType: AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
              amount: '27',
            },
@@ -435,6 +452,7 @@ describe('generateEpochAssetRewardsList', () => {
            node: {
              epoch: 3,
              assetId: '1',
+              decimals: 18,
              rewardType: AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
              amount: '15',
            },
@@ -467,6 +485,7 @@ describe('generateEpochAssetRewardsList', () => {
                {
                  assetId: '1',
                  name: 'Asset 1',
+                  decimals: 18,
                  rewards: new Map([
                    [
                      AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
@@ -531,6 +550,7 @@ describe('generateEpochAssetRewardsList', () => {
                '1',
                {
                  assetId: '1',
+                  decimals: 18,
                  name: 'Asset 1',
                  rewards: new Map([
                    [
@@ -608,6 +628,7 @@ describe('generateEpochAssetRewardsList', () => {
                '1',
                {
                  assetId: '1',
+                  decimals: 18,
                  name: 'Asset 1',
                  rewards: new Map([
                    [
@@ -22,6 +22,7 @@ export type AggregatedEpochRewardSummary = {
  name: EpochSummaryWithNamedReward['name'];
  rewards: Map<RewardType, RewardItem>;
  totalAmount: string;
+  decimals: number;
 };

 export type EpochTotalSummary = {
@@ -91,6 +92,7 @@ export const generateEpochTotalRewardsList = ({
        assetId: reward.assetId,
        name: matchingAsset?.name || '',
        rewards: rewards || new Map(emptyRowAccountTypes),
+        decimals: matchingAsset?.decimals || 0,
        totalAmount: (
          Number(reward.amount) + Number(assetWithRewards?.totalAmount || 0)
        ).toString(),
@@ -4,6 +4,7 @@ fragment RewardFields on Reward {
    id
    symbol
    name
+    decimals
  }
  party {
    id
@@ -67,6 +68,7 @@ query EpochAssetsRewards(
      node {
        id
        name
+        decimals
      }
    }
  }
@@ -3,7 +3,7 @@ import * as Types from '@vegaprotocol/types';
 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
-export type RewardFieldsFragment = { __typename?: 'Reward', rewardType: Types.AccountType, amount: string, percentageOfTotal: string, receivedAt: any, asset: { __typename?: 'Asset', id: string, symbol: string, name: string }, party: { __typename?: 'Party', id: string }, epoch: { __typename?: 'Epoch', id: string } };
+export type RewardFieldsFragment = { __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 } };

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

@@ -16,7 +16,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 }, 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 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 };

@@ -26,7 +26,7 @@ export type EpochAssetsRewardsQueryVariables = Types.Exact<{
 }>;


-export type EpochAssetsRewardsQuery = { __typename?: 'Query', assetsConnection?: { __typename?: 'AssetsConnection', edges?: Array<{ __typename?: 'AssetEdge', node: { __typename?: 'Asset', id: string, name: string } } | 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 EpochAssetsRewardsQuery = { __typename?: 'Query', assetsConnection?: { __typename?: 'AssetsConnection', edges?: Array<{ __typename?: 'AssetEdge', node: { __typename?: 'Asset', id: string, name: string, decimals: number } } | 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 EpochFieldsFragment = { __typename?: 'Epoch', id: string, timestamps: { __typename?: 'EpochTimestamps', start?: any | null, end?: any | null, expiry?: any | null } };

@@ -42,6 +42,7 @@ export const RewardFieldsFragmentDoc = gql`
    id
    symbol
    name
+    decimals
  }
  party {
    id
@@ -143,6 +144,7 @@ export const EpochAssetsRewardsDocument = gql`
      node {
        id
        name
+        decimals
      }
    }
  }
@@ -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 && (
@@ -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=#
@@ -6,4 +6,4 @@ NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\"}
 NX_ETHEREUM_PROVIDER_URL=https://mainnet.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://etherscan.io
 NX_VEGA_EXPLORER_URL=https://explorer.vega.xyz
-NX_VEGA_CONSOLE_URL=https://vega.trading
+NX_VEGA_CONSOLE_URL=https://console.vega.xyz
@@ -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
+
+
+
@@ -0,0 +1,177 @@
+// #region consts
+const asset = 'asset';
+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.getByTestId(asset).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"]')
@@ -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,174 @@
+import * as Schema from '@vegaprotocol/types';
+
+const rowSelector =
+  '[data-testid="tab-all-markets"] .ag-center-cols-container .ag-row';
+
+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('[col-id="tradableInstrument.instrument.code"]')
+      .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', () => {
+    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('[col-id="tradableInstrument.instrument.code"]')
+        .should('have.text', ExpectedSortedMarkets[i]);
+    }
+  });
+});
@@ -57,7 +57,6 @@ describe('market info is displayed', { tags: '@smoke' }, () => {

  it('market volume displayed', () => {
    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');
@@ -40,26 +40,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)
@@ -80,7 +80,7 @@ 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;
      });
  });

@@ -0,0 +1,199 @@
+import { checkSorting } from '@vegaprotocol/cypress';
+
+const rowSelector =
+  '[data-testid="tab-proposed-markets"] .ag-center-cols-container .ag-row';
+
+describe('markets proposed table', { tags: '@smoke' }, () => {
+  beforeEach(() => {
+    cy.clearLocalStorage().then(() => {
+      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('[col-id="market"]')
+      .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', () => {
+    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);
+  });
+});
@@ -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
@@ -19,6 +19,7 @@ describe('accounts', { tags: '@smoke' }, () => {
    // 7001-COLL-005
    // 7001-COLL-006
    // 7001-COLL-007
+    // 1003-TRAN-001

    const tradingAccountRowId = '[row-id="t-0"]';
    cy.getByTestId('Collateral').click();
@@ -62,6 +63,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 });
  });
@@ -122,25 +124,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');
@@ -88,7 +88,8 @@ describe(
              .pop()
              ?.toLowerCase()} and not accepting orders`
          );
-          cy.getByTestId('place-order').should('be.disabled');
+          // 7002-SORD-060
+          cy.getByTestId('place-order').should('be.enabled');
        });
      });
    });
@@ -77,7 +77,8 @@ 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');
+      // 7002-SORD-060
+      cy.getByTestId(placeOrderBtn).should('be.enabled');
      cy.getByTestId('dealticket-error-message-size-market').should(
        'have.text',
        'Size must be whole numbers for this market'
@@ -86,12 +87,13 @@ 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(placeOrderBtn).should('be.enabled');
      cy.getByTestId('dealticket-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')
@@ -100,9 +102,8 @@ describe('deal ticker order validation', { tags: '@smoke' }, () => {
        .within(() => {
          cy.get('[data-state="closed"]').should(
            'have.text',
-            'Total margin available'
+            'Total margin available100,000.01 tDAI'
          );
-          cy.get('.text-neutral-500').should('have.text', '100,000.01 tDAI');
        });
    });
  });
@@ -23,13 +23,14 @@ describe(
      });

      it('should show an error if your balance is zero', () => {
-        cy.getByTestId('place-order').should('be.disabled');
+        // 7002-SORD-060
+        cy.getByTestId('place-order').should('be.enabled');
        // 7002-SORD-003
        cy.getByTestId('dealticket-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');
      });
@@ -34,9 +34,9 @@ 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(
      'have.text',
      'This market is in auction until it reaches sufficient liquidity. Only limit orders are permitted when market is in auction'
@@ -59,7 +59,7 @@ 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(placeOrderBtn).should('be.enabled');
    cy.getByTestId('dealticket-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'
@@ -1,6 +1,7 @@
 import { checkSorting } from '@vegaprotocol/cypress';
 import { aliasGQLQuery } from '@vegaprotocol/cypress';
 import { marketsDataQuery } from '@vegaprotocol/mock';
+import { positionsQuery } from '@vegaprotocol/mock';

 beforeEach(() => {
  cy.mockTradingPage();
@@ -16,9 +17,27 @@ describe('positions', { tags: '@smoke', testIsolation: true }, () => {
  });

  it('renders positions on portfolio page', () => {
+    cy.mockGQL((req) => {
+      const positions = positionsQuery();
+      if (positions.positions?.edges) {
+        positions.positions.edges.push(
+          ...positions.positions.edges.map((edge) => ({
+            ...edge,
+            node: {
+              ...edge.node,
+              party: {
+                ...edge.node.party,
+                id: 'vega-1',
+              },
+            },
+          }))
+        );
+      }
+      aliasGQLQuery(req, 'Positions', positions);
+    });
    cy.visit('/#/portfolio');
    cy.getByTestId('Positions').click();
-    validatePositionsDisplayed();
+    validatePositionsDisplayed(true);
  });
  describe('renders position among some graphql errors', () => {
    it('rows should be displayed despite errors', () => {
@@ -56,7 +75,9 @@ describe('positions', { tags: '@smoke', testIsolation: true }, () => {
      cy.getByTestId('tab-positions')
        .first()
        .within(() => {
-          cy.get('[row-id="market-2"]')
+          cy.get(
+            '[row-id="02eceaba4df2bef76ea10caf728d8a099a2aa846cced25737cccaa9812342f65-market-2"]'
+          )
            .eq(1)
            .within(() => {
              emptyCells.forEach((cell) => {
@@ -77,23 +98,14 @@ describe('positions', { tags: '@smoke', testIsolation: true }, () => {
          },
        },
      ];
-      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 },
+        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:'
-      );
+      cy.get('[data-testid="tab-positions"]').contains('no market data');
    });
  });

@@ -103,9 +115,11 @@ describe('positions', { tags: '@smoke', testIsolation: true }, () => {
      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',
      ];
@@ -119,9 +133,13 @@ describe('positions', { tags: '@smoke', testIsolation: true }, () => {
    });
    it('sorting by notional', () => {
      cy.visit('/#/markets/market-0');
-      const marketsSortedDefault = ['276,761.40348', '46,126.90058'];
-      const marketsSortedAsc = ['46,126.90058', '276,761.40348'];
-      const marketsSortedDesc = ['276,761.40348', '46,126.90058'];
+      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',
@@ -132,9 +150,9 @@ describe('positions', { tags: '@smoke', testIsolation: true }, () => {
    });
    it('sorting by unrealisedPNL', () => {
      cy.visit('/#/markets/market-0');
-      const marketsSortedDefault = ['8.95', '-0.22519'];
-      const marketsSortedAsc = ['-0.22519', '8.95'];
-      const marketsSortedDesc = ['8.95', '-0.22519'];
+      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',
@@ -145,7 +163,7 @@ describe('positions', { tags: '@smoke', testIsolation: true }, () => {
    });
  });

-  function validatePositionsDisplayed() {
+  function validatePositionsDisplayed(multiKey = false) {
    cy.getByTestId('tab-positions').should('be.visible');
    cy.getByTestId('tab-positions').within(() => {
      cy.get('[col-id="marketName"]')
@@ -165,10 +183,11 @@ describe('positions', { tags: '@smoke', testIsolation: true }, () => {
        cy.wrap($prices).invoke('text').should('not.be.empty');
      });

-      cy.get('[col-id="currentLeverage"]').should('contain.text', '2.846.1');
-
-      cy.get('[col-id="marginAccountBalance"]') // margin allocated
-        .should('contain.text', '0.01');
+      if (!multiKey) {
+        cy.get('[col-id="currentLeverage"]').should('contain.text', '2.846.1');
+        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');
@@ -184,6 +203,6 @@ describe('positions', { tags: '@smoke', testIsolation: true }, () => {
      cy.get('.ag-popup').should('contain.text', 'Mark price x open volume');
    });

-    cy.getByTestId('close-position').should('be.visible').and('have.length', 2);
+    cy.getByTestId('close-position').should('be.visible').and('have.length', 3);
  }
 });
@@ -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,7 @@ import {
  withdrawalsQuery,
  protocolUpgradeProposalsQuery,
  blockStatisticsQuery,
+  networkParamQuery,
 } from '@vegaprotocol/mock';
 import type { PartialDeep } from 'type-fest';
 import type { MarketDataQuery, MarketsQuery } from '@vegaprotocol/markets';
@@ -160,6 +161,7 @@ const mockTradingPage = (
  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());
@@ -6,7 +6,7 @@ NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/m
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
 NX_VEGA_ENV=STAGNET1
 NX_VEGA_EXPLORER_URL=https://explorer.stagnet1.vega.rocks
-NX_VEGA_NETWORKS={\"MAINNET\":\"https://vega.trading\",\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://trading.stagnet1.vega.rocks\"}
+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
@@ -5,7 +5,7 @@ NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_VEGA_CONFIG_URL=''
 NX_VEGA_ENV=CUSTOM
 NX_VEGA_EXPLORER_URL=https://explorer.stagnet1.vega.rocks
-NX_VEGA_NETWORKS={\"MAINNET\":\"https://vega.trading\",\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://trading.stagnet1.vega.rocks\"}
+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_URL=http://localhost:3008/graphql
 NX_VEGA_WALLET_URL=http://localhost:1789
@@ -6,10 +6,10 @@ NX_TRADING_SENTRY_DSN=https://2ffce43721964aafa78277c50654ece4@o286262.ingest.se
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml
 NX_VEGA_ENV=DEVNET
 NX_VEGA_EXPLORER_URL=https://dev.explorer.vega.xyz
-NX_VEGA_NETWORKS={\"MAINNET\":\"https://vega.trading\",\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://trading.stagnet1.vega.rocks\"}
+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
@@ -5,13 +5,13 @@ NX_TRADING_SENTRY_DSN=https://2ffce43721964aafa78277c50654ece4@o286262.ingest.se
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/mainnet1/mainnet1.toml
 NX_VEGA_ENV=MAINNET
 NX_VEGA_EXPLORER_URL=https://explorer.vega.xyz
-NX_VEGA_NETWORKS={\"MAINNET\":\"https://vega.trading\",\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://trading.stagnet1.vega.rocks\"}
+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.vega.xyz
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
 NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
-NX_VEGA_CONSOLE_URL=https://vega.trading
+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.12-core-0.71.4
+NX_APP_VERSION=v0.20.16-core-0.71.5
@@ -6,7 +6,7 @@ NX_TRADING_SENTRY_DSN=https://2ffce43721964aafa78277c50654ece4@o286262.ingest.se
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
 NX_VEGA_ENV=STAGNET1
 NX_VEGA_EXPLORER_URL=https://explorer.stagnet1.vega.rocks
-NX_VEGA_NETWORKS={\"MAINNET\":\"https://vega.trading\",\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://trading.stagnet1.vega.rocks\"}
+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.stagnet1.vega.rocks
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
@@ -6,7 +6,7 @@ NX_TRADING_SENTRY_DSN=https://2ffce43721964aafa78277c50654ece4@o286262.ingest.se
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
 NX_VEGA_ENV=TESTNET
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
-NX_VEGA_NETWORKS={\"MAINNET\":\"https://vega.trading\",\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://trading.stagnet1.vega.rocks\"}
+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
@@ -6,7 +6,7 @@ NX_TRADING_SENTRY_DSN=https://2ffce43721964aafa78277c50654ece4@o286262.ingest.se
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/testnet2/testnet2.toml
 NX_VEGA_ENV=VALIDATOR_TESTNET
 NX_VEGA_EXPLORER_URL=https://explorer.validators-testnet.vega.rocks
-NX_VEGA_NETWORKS={\"MAINNET\":\"https://vega.trading\",\"STAGNET1\":\"https://trading.stagnet1.vega.rocks\",\"TESTNET\":\"https://console.fairground.wtf\"}
+NX_VEGA_NETWORKS={\"MAINNET\":\"https://console.vega.xyz\",\"STAGNET1\":\"https://trading.stagnet1.vega.rocks\",\"TESTNET\":\"https://console.fairground.wtf\"}
 NX_VEGA_TOKEN_URL=https://governance.validators-testnet.vega.rocks
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
@@ -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>
  );
 };
@@ -56,13 +56,7 @@ export const HeaderStats = ({ market }: HeaderStatsProps) => {
              decimalPlaces={market?.decimalPlaces}
            />
          </HeaderStat>
-          <HeaderStat
-            heading={t('Volume (24h)')}
-            testId="market-volume"
-            description={t(
-              'The total number of contracts traded in the last 24 hours.'
-            )}
-          >
+          <HeaderStat heading={t('Volume (24h)')} testId="market-volume">
            <Last24hVolume
              marketId={market?.id}
              positionDecimalPlaces={market?.positionDecimalPlaces}
@@ -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);
@@ -1,4 +1,4 @@
-import type { CSSProperties } from 'react';
+import type { CSSProperties, ReactNode } from 'react';
 import { Link } from 'react-router-dom';
 import classNames from 'classnames';
 import {
@@ -8,6 +8,7 @@ import {
 } from '@vegaprotocol/utils';
 import type { MarketMaybeWithDataAndCandles } from '@vegaprotocol/markets';
 import { calcCandleVolume } from '@vegaprotocol/markets';
+import { useCandles } from '@vegaprotocol/markets';
 import { useMarketDataUpdateSubscription } from '@vegaprotocol/markets';
 import { Sparkline } from '@vegaprotocol/ui-toolkit';
 import {
@@ -80,8 +81,9 @@ const MarketData = ({ market }: { market: MarketMaybeWithDataAndCandles }) => {
    : '';

  const instrument = market.tradableInstrument.instrument;
+  const { oneDayCandles } = useCandles({ marketId: market.id });

-  const vol = market.candles ? calcCandleVolume(market.candles) : '0';
+  const vol = oneDayCandles ? calcCandleVolume(oneDayCandles) : '0';
  const volume =
    vol && vol !== '0'
      ? addDecimalsFormatNumber(vol, market.positionDecimalPlaces)
@@ -111,20 +113,20 @@ const MarketData = ({ market }: { market: MarketMaybeWithDataAndCandles }) => {
        value={price}
        label={instrument.product.settlementAsset.symbol}
      />
-      <div className="relative">
-        {market.candles && (
-          <PriceChange candles={market.candles.map((c) => c.close)} />
+      <div className="relative text-xs p-1">
+        {oneDayCandles && (
+          <PriceChange candles={oneDayCandles.map((c) => c.close)} />
        )}

        <div
          // absolute so height is not larger than price change value
          className="absolute right-0 bottom-0 w-[120px]"
        >
-          {market.candles && (
+          {oneDayCandles && (
            <Sparkline
              width={120}
              height={20}
-              data={market.candles.filter(Boolean).map((c) => Number(c.close))}
+              data={oneDayCandles.map((c) => Number(c.close))}
            />
          )}
        </div>
@@ -133,7 +135,13 @@ const MarketData = ({ market }: { market: MarketMaybeWithDataAndCandles }) => {
  );
 };

-const DataRow = ({ value, label }: { value: string; label: string }) => {
+const DataRow = ({
+  value,
+  label,
+}: {
+  value: string | ReactNode;
+  label: string;
+}) => {
  return (
    <div
      className="text-ellipsis whitespace-nowrap overflow-hidden leading-tight"
@@ -296,7 +296,7 @@ const MainGrid = memo(
              </TradeGridChild>
            </ResizableGridPanel>
            <ResizableGridPanel
-              preferredSize={sizesMiddle[2] || 430}
+              preferredSize={sizesMiddle[2] || 300}
              minSize={200}
            >
              <TradeGridChild>
@@ -53,7 +53,7 @@ export const useMarketSelectorList = ({
      });

    if (sort === Sort.None) {
-      // Sort by market state primarilly and AtoZ secondarilly
+      // Sort by market state primarily and AtoZ secondarily
      return orderBy(
        markets,
        [
@@ -175,6 +175,10 @@ describe('Closed', () => {
        __typename: 'Market',
        id: marketId,
      },
+      party: {
+        __typename: 'Party',
+        id: pubKey,
+      },
    };
  };
  const position = createPosition();
@@ -182,18 +186,14 @@ describe('Closed', () => {
    request: {
      query: PositionsDocument,
      variables: {
-        partyId: pubKey,
+        partyIds: [pubKey],
      },
    },
    result: {
      data: {
-        party: {
-          __typename: 'Party',
-          id: pubKey,
-          positionsConnection: {
-            __typename: 'PositionConnection',
-            edges: [{ __typename: 'PositionEdge', node: position }],
-          },
+        positions: {
+          __typename: 'PositionConnection',
+          edges: [{ __typename: 'PositionEdge', node: position }],
        },
      },
    },
@@ -27,7 +27,6 @@ import type { ColDef } from 'ag-grid-community';
 import { SettlementDateCell } from './settlement-date-cell';
 import { SettlementPriceCell } from './settlement-price-cell';
 import { useDataProvider } from '@vegaprotocol/data-provider';
-import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';

 type SettlementAsset =
  MarketMaybeWithData['tradableInstrument']['instrument']['product']['settlementAsset'];
@@ -55,7 +54,6 @@ export const Closed = () => {
  const { pubKey } = useVegaWallet();
  const {
    data: marketData,
-    loading,
    error,
    reload,
  } = useDataProvider({
@@ -64,7 +62,7 @@ export const Closed = () => {
  });
  const { data: positionData } = usePositionsQuery({
    variables: {
-      partyId: pubKey || '',
+      partyIds: pubKey ? [pubKey] : [],
    },
    skip: !pubKey,
  });
@@ -72,11 +70,9 @@ export const Closed = () => {
  // find a position for each market and add the realised pnl to
  // a normalized object
  const rowData = compact(marketData).map((market) => {
-    const position = positionData?.party?.positionsConnection?.edges?.find(
-      (edge) => {
-        return edge.node.market.id === market.id;
-      }
-    );
+    const position = positionData?.positions?.edges?.find((edge) => {
+      return edge.node.market.id === market.id;
+    });

    const instrument = market.tradableInstrument.instrument;

@@ -119,21 +115,20 @@ export const Closed = () => {
  });
  return (
    <div className="h-full relative">
-      <ClosedMarketsDataGrid rowData={rowData} />
-      <div className="pointer-events-none absolute inset-0">
-        <AsyncRenderer
-          loading={loading}
-          error={error}
-          data={marketData}
-          noDataMessage={t('No markets')}
-          reload={reload}
-        />
-      </div>
+      <ClosedMarketsDataGrid rowData={rowData} error={error} reload={reload} />
    </div>
  );
 };

-const ClosedMarketsDataGrid = ({ rowData }: { rowData: Row[] }) => {
+const ClosedMarketsDataGrid = ({
+  rowData,
+  error,
+  reload,
+}: {
+  rowData: Row[];
+  error: Error | undefined;
+  reload: () => void;
+}) => {
  const openAssetDialog = useAssetDetailsDialogStore((store) => store.open);
  const colDefs = useMemo(() => {
    const cols: ColDef[] = [
@@ -317,7 +312,7 @@ const ClosedMarketsDataGrid = ({ rowData }: { rowData: Row[] }) => {
        resizable: true,
        minWidth: 100,
      }}
-      overlayNoRowsTemplate="No data"
+      overlayNoRowsTemplate={error ? error.message : t('No markets')}
      storeKey="closedMarkets"
    />
  );
@@ -1,4 +1,4 @@
-import { AsyncRenderer, Button } from '@vegaprotocol/ui-toolkit';
+import { Button } from '@vegaprotocol/ui-toolkit';
 import { useDepositDialog, DepositsTable } from '@vegaprotocol/deposits';
 import { depositsProvider } from '@vegaprotocol/deposits';
 import { t } from '@vegaprotocol/i18n';
@@ -11,7 +11,7 @@ import type { AgGridReact } from 'ag-grid-react';
 export const DepositsContainer = () => {
  const gridRef = useRef<AgGridReact | null>(null);
  const { pubKey, isReadOnly } = useVegaWallet();
-  const { data, loading, error, reload } = useDataProvider({
+  const { data, error } = useDataProvider({
    dataProvider: depositsProvider,
    variables: { partyId: pubKey || '' },
    skip: !pubKey,
@@ -23,21 +23,10 @@ export const DepositsContainer = () => {
      <div className="h-full relative">
        <DepositsTable
          rowData={data || []}
-          suppressLoadingOverlay
-          suppressNoRowsOverlay
          ref={gridRef}
          {...bottomPlaceholderProps}
+          overlayNoRowsTemplate={error ? error.message : t('No deposits')}
        />
-        <div className="pointer-events-none absolute inset-0">
-          <AsyncRenderer
-            data={data}
-            loading={loading}
-            error={error}
-            noDataCondition={(data) => !(data && data.length)}
-            noDataMessage={t('No deposits')}
-            reload={reload}
-          />
-        </div>
      </div>
      {!isReadOnly && (
        <div className="h-auto flex justify-end px-[11px] py-2 bottom-0 right-3 absolute dark:bg-black/75 bg-white/75 rounded">
@@ -54,6 +54,7 @@ export const Portfolio = () => {
                    onMarketClick={onMarketClick}
                    noBottomPlaceholder
                    storeKey="portfolioPositions"
+                    allKeys
                  />
                </VegaWalletContainer>
              </Tab>
@@ -1,4 +1,4 @@
-import { AsyncRenderer, Button } from '@vegaprotocol/ui-toolkit';
+import { Button } from '@vegaprotocol/ui-toolkit';
 import {
  withdrawalProvider,
  useWithdrawalDialog,
@@ -11,7 +11,7 @@ import { VegaWalletContainer } from '../../components/vega-wallet-container';

 export const WithdrawalsContainer = () => {
  const { pubKey, isReadOnly } = useVegaWallet();
-  const { data, loading, error, reload } = useDataProvider({
+  const { data, error } = useDataProvider({
    dataProvider: withdrawalProvider,
    variables: { partyId: pubKey || '' },
    skip: !pubKey,
@@ -24,19 +24,8 @@ export const WithdrawalsContainer = () => {
        <WithdrawalsTable
          data-testid="withdrawals-history"
          rowData={data}
-          suppressLoadingOverlay
-          suppressNoRowsOverlay
+          overlayNoRowsTemplate={error ? error.message : t('No withdrawals')}
        />
-        <div className="pointer-events-none absolute inset-0">
-          <AsyncRenderer
-            data={data}
-            loading={loading}
-            error={error}
-            noDataCondition={(data) => !(data && data.length)}
-            noDataMessage={t('No withdrawals')}
-            reload={reload}
-          />
-        </div>
      </div>
      {!isReadOnly && (
        <div className="h-auto flex justify-end px-[11px] py-2 bottom-0 right-3 absolute dark:bg-black/75 bg-white/75 rounded">
@@ -59,7 +59,7 @@ const cacheConfig: InMemoryCacheConfig = {
      keyFields: false,
    },
    TradableInstrument: {
-      keyFields: ['instrument'],
+      keyFields: false,
    },
    Product: {
      keyFields: ['settlementAsset', ['id']],
@@ -89,8 +89,16 @@ const cacheConfig: InMemoryCacheConfig = {
    Party: {
      keyFields: false,
    },
+    Position: {
+      keyFields: ['market', ['id'], 'party', ['id']],
+    },
    Fees: {
      keyFields: false,
    },
+    // Don't cache order update as this subscription result gets merged into the main order cache
+    // We don't need to write these to the cache at all
+    OrderUpdate: {
+      keyFields: false,
+    },
  },
 };
@@ -1,4 +1,5 @@
 import { useMemo, useState } from 'react';
+import { gt, prerelease } from 'semver';
 import {
  ReleasesFeed,
  useEnvironment,
@@ -15,7 +16,10 @@ import {
  VegaIconNames,
 } from '@vegaprotocol/ui-toolkit';

-const CANONICAL_URL = 'https://vega.trading';
+// v0.20.12-core-0.71.4 -> v0.20.12
+// we need to strip the "core" suffix in order to determine whether a release
+// is a pre-release (candidate); example: v.0.21.0-beta.1-core-0.71.4
+const parseTagName = (tagName: string) => tagName.replace(/-core-[\d.]+$/i, '');

 type UpgradeBannerProps = {
  showVersionChange: boolean;
@@ -23,34 +27,24 @@ type UpgradeBannerProps = {
 export const UpgradeBanner = ({ showVersionChange }: UpgradeBannerProps) => {
  const [visible, setVisible] = useState(true);
  const { data } = useReleases(ReleasesFeed.FrontEnd);
-  const { APP_VERSION, VEGA_ENV } = useEnvironment();
-  /**
-   * Filtering out the release candidates.
-   */
-  const latest = useMemo(() => {
+  const { APP_VERSION, VEGA_ENV, VEGA_NETWORKS } = useEnvironment();
+
+  const CANONICAL_URL = VEGA_NETWORKS[VEGA_ENV] || 'https://console.vega.xyz';
+
+  const newest = useMemo(() => {
+    if (!APP_VERSION || !data) return undefined;
+    const newer = data.filter((r) => gt(r.tagName, APP_VERSION));
    const valid =
+      // filter pre-releases on mainnet
      VEGA_ENV === Networks.MAINNET
-        ? data?.filter((r) => !/-rc$/i.test(r.tagName))
-        : data;
+        ? newer?.filter((r) => !prerelease(parseTagName(r.tagName)))
+        : newer;
+    return valid.sort((a, b) => (gt(a.tagName, b.tagName) ? -1 : 1))[0];
+  }, [APP_VERSION, VEGA_ENV, data]);

-    return valid && valid.length > 0 ? valid[0] : undefined;
-  }, [VEGA_ENV, data]);
-
-  if (!APP_VERSION) return null;
-
-  if (!visible || !latest || latest.tagName === APP_VERSION) return null;
-
-  const versionChange = (
-    <span>
-      <span className="line-through text-vega-light-300 dark:text-vega-dark-300">
-        {APP_VERSION}
-      </span>{' '}
-      <VegaIcon size={14} name={VegaIconNames.ARROW_RIGHT} />{' '}
-      <span className="text-vega-orange-500 dark:text-vega-yellow-500">
-        <ExternalLink href={latest.htmlUrl}>{latest.tagName}</ExternalLink>
-      </span>
-    </span>
-  );
+  if (!visible || !newest) {
+    return null;
+  }

  return (
    <NotificationBanner
@@ -59,13 +53,24 @@ export const UpgradeBanner = ({ showVersionChange }: UpgradeBannerProps) => {
        setVisible(false);
      }}
    >
-      <div className="uppercase ">
-        {t('Upgrade to the latest version of Console')}{' '}
-        {showVersionChange && versionChange}
+      <div className="uppercase mb-1">
+        <ExternalLink href={CANONICAL_URL}>
+          {t('Upgrade to the latest version of Console')}
+        </ExternalLink>
      </div>
      <div data-testid="bookmark-message">
-        {t('Bookmark')}{' '}
-        <ExternalLink href={CANONICAL_URL}>{t('vega.trading')}</ExternalLink>
+        <a
+          className="underline"
+          href={newest.htmlUrl}
+          rel="noreferrer nofollow noopener"
+          target="_blank"
+        >
+          {t("View what's changed")}
+        </a>{' '}
+        {t(' or bookmark')}{' '}
+        <a className="underline" href={CANONICAL_URL}>
+          {t('console.vega.xyz')}
+        </a>{' '}
        <CopyWithTooltip text={CANONICAL_URL}>
          <button title={t('Copy %s', CANONICAL_URL)}>
            <span className="sr-only">{t('Copy %s', CANONICAL_URL)}</span>
@@ -36,11 +36,12 @@ describe('NodeHealth', () => {
 describe('NodeUrl', () => {
  it('renders correct part of node url', () => {
    const node = 'https://api.n99.somenetwork.vega.xyz';
-    const expectedText = node.split('.').slice(1).join('.');

    render(<NodeUrl url={node} />);

-    expect(screen.getByText(expectedText)).toBeInTheDocument();
+    expect(
+      screen.getByText('api.n99.somenetwork.vega.xyz')
+    ).toBeInTheDocument();
  });
 });

@@ -65,9 +65,8 @@ interface NodeUrlProps {
 }

 export const NodeUrl = ({ url }: NodeUrlProps) => {
-  // get base url from api url, api sub domain
  const urlObj = new URL(url);
-  const nodeUrl = urlObj.origin.replace(/^[^.]+\./g, '');
+  const nodeUrl = urlObj.hostname;
  return <span title={t('Connected node')}>{nodeUrl}</span>;
 };

@@ -26,7 +26,7 @@ export const MarketMarkPrice = ({
    {
      dataProvider: marketDataProvider,
      variables: { marketId: marketId || '' },
-      skip: !inView,
+      skip: !inView || !marketId,
    },
    THROTTLE_UPDATE_TIME
  );
@@ -53,7 +53,6 @@ const MobileWalletButton = ({
      setDrawerOpen(!drawerOpen);
    }
  }, [drawerOpen, fetchPubKeys, isConnected, openVegaWalletDialog]);
-  console.log(drawerOpen, isYellow);

  const iconClass = drawerOpen
    ? 'hidden'
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Matthew Russell	cd0b29c251	fix: use t function for text content in zero balance message	2023-06-08 09:15:10 -07:00
Matthew Russell	6471be323d	test: update e2e tests with ac for button state	2023-06-07 22:25:16 -07:00
Matthew Russell	3e9aeb2f2f	test: check that button is enabled before form is filled in	2023-06-07 22:14:36 -07:00
Matthew Russell	e83a7915ad	chore: make assertion check for enabled	2023-06-07 22:09:03 -07:00
Matthew Russell	d2b2d16c9c	test: update to check that button is always enabled	2023-06-07 22:03:23 -07:00
Matthew Russell	16b2360da7	chore: make deal ticket notification buttons smaller	2023-06-07 17:31:13 -07:00
Matthew Russell	1adbc2dbd7	chore: remove disabled submit button	2023-06-07 17:20:59 -07: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
m.ray	fd8f38803c	chore(trading): bump version v0.20.13-core-0.71.4 (#3968 )	2023-05-25 22:01:43 +00:00
Edd	a22f8f0ef1	fix(explorer,trading): remove vega.trading links (#3962 )	2023-05-25 21:27:51 +00:00
Matthew Russell	c2d5c71f35	chore(trading): remove stray log (#3967 )	2023-05-25 11:32:31 -07:00
Joe Tsang	f88c35648e	chore(governance): reward tests passing (#3963 )	2023-05-25 18:08:06 +00:00
Mikołaj Młodzikowski	348c61530e	feat(ci): implement active checks for previews readiness (#3949 )	2023-05-25 14:36:38 +02:00
Bartłomiej Głownia	f364dabe2f	feat(trading): show positions for all connected keys (#3858 )	2023-05-25 11:59:08 +01:00
m.rayandasiaznik	1ae1fdff5e	fix(trading): price and volume in the last 24h can be incorrectly reported (#3870 ) Co-authored-by: asiaznik <artur@vegaprotocol.io>	2023-05-25 10:39:07 +00:00
m.ray	3ed615c36e	fix(oracles): word breakdown oracles (#3946 )	2023-05-25 10:07:17 +00:00
Bartłomiej Głownia	6b50816234	fix(orders): re-render last column of orders table on data change (#3927 )	2023-05-25 10:37:53 +01:00
Sam Keen	f5e67a0c2d	fix(governance): rewards decimals set per asset (#3941 )	2023-05-25 10:37:40 +01:00
Bartłomiej Głownia	e4d4646878	fix(trading): skip market data query if market not present (#3928 )	2023-05-25 10:37:33 +01:00
Art	bbd1536c18	chore(trading): upgrade banner semver comparison (#3919 )	2023-05-25 10:37:13 +01:00
Mikołaj Młodzikowski	f8444c0c88	feat(ci): deploy from main branch as well	2023-05-25 10:20:58 +02:00
Mikołaj Młodzikowski	b1adf776c0	feat(ci): update rollback flow	2023-05-24 16:05:15 +02:00
Mikołaj Młodzikowski	ad898ab0e8	feat(ci): update rollback flow	2023-05-24 15:58:53 +02:00
Maciek	5b0fffc5cb	chore(market-depth): replace bid and ask columns with a single volume column when i… (#3930 )	2023-05-24 15:55:21 +02:00
Mikołaj Młodzikowski	a9dbc0f6eb	feat(ci): update rollback flow	2023-05-24 15:53:07 +02:00
Mikołaj Młodzikowski	a71786817f	fix(ci): pr creation adjust	2023-05-24 13:47:36 +02:00
Vega CI Botandvega-ci-bot	9ee0cb7b65	Automated hash update from refs/tags/v0.20.12-core-0.71.4-4 (#3933 ) Co-authored-by: vega-ci-bot <vega-ci-bot@vega.xyz>	2023-05-24 13:46:01 +02:00
Mikołaj Młodzikowski	8c4aa41240	fix(ci): pr creation adjust	2023-05-24 13:37:04 +02:00
Vega CI Botandvega-ci-bot	91ac977704	Automated hash update from refs/tags/v0.20.12-core-0.71.4-3 (#3932 ) Co-authored-by: vega-ci-bot <vega-ci-bot@vega.xyz>	2023-05-24 13:34:10 +02:00
Mikołaj Młodzikowski	1190033776	fix(ci): pr creation adjust	2023-05-24 13:24:28 +02:00
				`@@ -0,0 +1 @@`
				`export * from './multisig-incorrect-notice';`