fix(ui-toolkit): test toast configuration

feat(trading): move trade grid panel - fix id of store (#3872 )
feat(trading): move deal ticket panel to the left (#3842 )
2023-05-22 16:55:03 +02:00 · 2023-05-22 14:09:37 +00:00 · 2023-05-22 15:40:42 +02:00 · 2023-05-22 13:38:51 +00:00 · 2023-05-22 12:08:25 +00:00 · 2023-05-22 11:42:09 +02:00
384 changed files with 11550 additions and 3902 deletions
@@ -0,0 +1,74 @@
+name: After Release
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  after-release:
+    runs-on: ubuntu-22.04
+    timeout-minutes: 30
+    steps:
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Log in to the Container registry (ghcr)
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Log in to the Container registry (docker hub)
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: resolve ipfs hashes for release
+        run: |
+          echo "Tag name: ${{ github.event.release.tag_name }}"
+          echo "Name: ${{ github.event.release.name }}"
+          echo "Description: ${{ github.event.release.body }}"
+          until docker pull vegaprotocol/trading:${{ github.event.release.tag_name }}; do
+            echo "Image not pushed yet, waiting 60 seconds"
+            sleep 60
+          done
+          docker run --rm vegaprotocol/trading:${{ github.event.release.tag_name }} cat /ipfs-hash > ipfs-hash
+          curl -L https://dist.ipfs.tech/kubo/v0.20.0/kubo_v0.20.0_linux-amd64.tar.gz -o kubo.tgz
+          tar -xzf kubo.tgz
+          export PATH="$PATH:$PWD/kubo"
+          which ipfs
+          echo IPFS_V0=$(cat ipfs-hash) >> $GITHUB_ENV
+          echo IPFS_V1=$(ipfs cid format -v 1 -b base32 $(cat ipfs-hash)) >> $GITHUB_ENV
+
+      - name: Edit Release
+        uses: irongut/EditRelease@v1.2.0
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          id: ${{ github.event.release.id }}
+          body: |
+            ---
+
+            # Deployments
+            * https://explorer.vega.xyz
+            * https://governance.vega.xyz
+
+            # IPFS releases
+            Tye 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 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/).
+
+            Your settings are not remembered across different URLs.
+
+            IPFS gateways:
+
+            https://${{ env.IPFS_V1 }}.ipfs.dweb.link/
+            https://${{ env.IPFS_V1 }}.ipfs.cf-ipfs.com/
+            ipfs://${{ env.IPFS_V0 }}/
@@ -98,36 +98,37 @@ jobs:
      # See affected apps
      - name: See affected apps
        run: |
+          affected="$(yarn nx print-affected --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }} --select=projects)"
+          branch_slug="$(echo '${{ github.head_ref || github.ref_name }}' | sed -r s/[^a-zA-Z0-9]+/-/g | sed -r s/^-+\|-+$//g | cut -c 1-50 )"
+
          echo ">>>> debug"
          echo "NX_BASE: ${{ env.NX_BASE }}"
          echo "NX_HEAD: ${{ env.NX_HEAD }}"
+          echo "Affected: ${affected}"
+          echo "Branch slug: ${branch_slug}"
          echo ">>>> eof debug"

-          affected="$(yarn nx print-affected --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }} --select=projects)"
-
-          branch_slug="$(echo '${{ github.head_ref || github.ref_name }}' | sed -r s/[^a-zA-Z0-9]+/-/g | sed -r s/^-+\|-+$//g | cut -c 1-50 )"
          projects_e2e=""
          preview_governance="not deployed"
          preview_trading="not deployed"
          preview_explorer="not deployed"
+          if [[ $affected == *"governance"* ]]; then
+            projects_e2e+='"governance-e2e" '
+            preview_governance=$(printf "https://%s.%s.vega.rocks" "governance" "$branch_slug")
+          fi
+          if [[ $affected == *"trading"* ]]; then
+            projects_e2e+='"trading-e2e" '
+            preview_trading=$(printf "https://%s.%s.vega.rocks" "trading" "$branch_slug")
+          fi
+          if [[ $affected == *"explorer"* ]]; then
+            projects_e2e+='"explorer-e2e" '
+            preview_explorer=$(printf "https://%s.%s.vega.rocks" "explorer" "$branch_slug")
+          fi
          if [[ -z "$projects_e2e" ]]; then
            projects_e2e+='"governance-e2e" "trading-e2e" "explorer-e2e" '
            preview_governance=$(printf "https://%s.%s.vega.rocks" "governance" "$branch_slug")
            preview_trading=$(printf "https://%s.%s.vega.rocks" "trading" "$branch_slug")
            preview_explorer=$(printf "https://%s.%s.vega.rocks" "explorer" "$branch_slug")
-          else
-            if [[ $affected == *"governance"* ]]; then
-              projects_e2e+='"governance-e2e" '
-              preview_governance=$(printf "https://%s.%s.vega.rocks" "governance" "$branch_slug")
-            fi
-            if [[ $affected == *"trading"* ]]; then
-              projects_e2e+='"trading-e2e" '
-              preview_trading=$(printf "https://%s.%s.vega.rocks" "trading" "$branch_slug")
-            fi
-            if [[ $affected == *"explorer"* ]]; then
-              projects_e2e+='"explorer-e2e" '
-              preview_explorer=$(printf "https://%s.%s.vega.rocks" "explorer" "$branch_slug")
-            fi
          fi
          projects_e2e=${projects_e2e%?}
          projects_e2e=[${projects_e2e// /,}]
@@ -20,7 +20,7 @@ jobs:
        project: ${{ fromJSON(inputs.projects) }}
    name: ${{ matrix.project }}
    runs-on: self-hosted-runner
-    timeout-minutes: 40
+    timeout-minutes: 60
    steps:
      # Checks if skip cache was requested
      - name: Set skip-nx-cache flag
@@ -98,4 +98,4 @@ jobs:
        if: ${{ failure() }}
        with:
          name: test-report-${{ matrix.project }}
-          path: frontend-monorepo/apps/trading-e2e/cypress/reports
+          path: frontend-monorepo/apps/${{ matrix.project }}/cypress/reports
@@ -62,17 +62,19 @@ jobs:
      - name: Define variables
        run: |
          envName=''
+          domain="vega.rocks"
          if [[ "${{ github.event_name }}" = "push" ]]; then
-            domain="vega.rocks"
            if [[ "${{ github.ref }}" =~ .*release/.* ]]; then
              envName="$(echo ${{ github.ref }} | rev | cut -d '/' -f 1 | rev)"
-              if [[ "${{ github.ref }}" =~ .*mainnet.* ]]; then
-                domain="vega.community"
-              fi
            elif [[ "${{ github.ref }}" =~ .*develop$ ]]; then
              envName="stagnet1"
            elif [[ "${{ matrix.app}}" = "trading" ]] && [[ ${{ startsWith(github.ref, 'refs/tags/v') && 'true' || 'false' }} = "true" ]]; then
              envName="mainnet"
+            elif [[ "${{ github.ref }}" =~ .*main$ ]]; then
+              envName="mainnet"
+            fi
+            if [[ "${envName}" = "mainnet" ]]; then
+              domain="vega.xyz"
            fi
            bucketName="${{ matrix.app }}.${envName}.${domain}"
            echo BUCKET_NAME=${bucketName} >> $GITHUB_ENV
@@ -170,12 +172,6 @@ jobs:
          labels: ${{ matrix.app }}-preview
          number: ${{ github.event.number }}

-      - name: Add ipfs hash to release
-        uses: softprops/action-gh-release@v1
-        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
-        with:
-          files: ${{ matrix.app }}-ipfs-hash
-
      - name: Trigger fleek deployment
        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
        run: |
@@ -0,0 +1,77 @@
+name: 'Rollback console'
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Version that should be set on rollback'
+        required: true
+        type: string
+
+jobs:
+  rollback:
+    runs-on: ubuntu-22.04
+    timeout-minutes: 10
+    steps:
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Log in to the Container registry (docker hub)
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Retag mainnet
+        run: |
+          docker pull vegaprotocol/trading:${{ inputs.version }}
+          docker tag vegaprotocol/trading:${{ inputs.version }} vegaprotocol/trading:mainnet
+          docker push vegaprotocol/trading:mainnet
+          docker run --rm vegaprotocol/trading:mainnet cat /ipfs-hash > ipfs-hash
+
+      - name: Trigger fleek deployment
+        run: |
+          # display info about app
+          curl -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
+            -H "Content-Type: application/json" \
+            -d '{"query": "query{getSiteById(siteId:\"f8f2e051-f18e-49e6-b876-0a39369dc0d8\"){id latestDeploy{id status}}}"}' \
+            https://api.fleek.co/graphql
+
+          # trigger new deployment as base image is always set to vegaprotocol/trading:mainnet
+          curl -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
+            -H "Content-Type: application/json" \
+            -d '{"query": "mutation{triggerDeploy(siteId:\"f8f2e051-f18e-49e6-b876-0a39369dc0d8\"){id status}}"}' \
+            https://api.fleek.co/graphql
+
+      - name: Update vega.trading DNS to redirect to the new console
+        run: |
+          curl -L https://dist.ipfs.tech/kubo/v0.20.0/kubo_v0.20.0_linux-amd64.tar.gz -o kubo.tgz
+          tar -xzf kubo.tgz
+          export PATH="$PATH:$PWD/kubo"
+          which ipfs
+          new_hash=$(cat ipfs-hash)
+          new_cid=$(ipfs cid format -v 1 -b base32 $new_hash)
+
+          # 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}"
+
+          # 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}
@@ -49,4 +49,4 @@ cypress.env.json
 .next

 #cypress
-/apps/trading-e2e/cypress/reports/
+/apps/**/cypress/reports/
@@ -1,10 +1,11 @@
 const { defineConfig } = require('cypress');

 module.exports = defineConfig({
-  projectId: 'et4snf',
+  reporter: '../../node_modules/cypress-mochawesome-reporter',

  e2e: {
    setupNodeEvents(on, config) {
+      require('cypress-mochawesome-reporter/plugin')(on);
      require('@cypress/grep/src/plugin')(config);
      return config;
    },
@@ -15,5 +15,6 @@

 import '@vegaprotocol/cypress';
 import './common.functions.js';
+import 'cypress-mochawesome-reporter/register';
 import registerCypressGrep from '@cypress/grep';
 registerCypressGrep();
@@ -14,6 +14,7 @@ NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/m
 NX_VEGA_GOVERNANCE_URL=https://stagnet1.governance.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.jsoo
 NX_VEGA_NETWORKS='{"TESTNET":"https://explorer.fairground.wtf","MAINNET":"https://explorer.vega.xyz"}'
+NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions

 # App flags
 NX_EXPLORER_ASSETS=1
@@ -1,6 +1,7 @@
 # App configuration variables
 NX_TENDERMINT_URL=https://be.vega.community
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket
+NX_SENTRY_DSN=https://b3a56b03eda842faad731f3ea9dfd1bc@o286262.ingest.sentry.io/6242427
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/mainnet1/mainnet1.toml
 NX_VEGA_URL=https://api.vega.community/graphql
 NX_VEGA_ENV=MAINNET
@@ -8,7 +8,7 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json

 NX_VEGA_GOVERNANCE_URL=https://validator-testnet.governance.vega.xyz
-NX_TENDERMINT_URL=https://tm-be.validators-testnet.vega.rocks
+NX_TENDERMINT_URL=https://tm.be.validators-testnet.vega.rocks
 NX_BLOCK_EXPLORER=https://be.validators-testnet.vega.rocks/rest
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.xyz/websocket
-NX_VEGA_EXPLORER_URL=https://validator-testnet.explorer.vega.xyz/
+NX_VEGA_EXPLORER_URL=https://explorer.validators-testnet.vega.rocks/
@@ -48,11 +48,13 @@ export const Footer = () => {
          </Link>
        </div>

-        <div className="flex pl-2 content-center">
-          <ExternalLink href={ENV.addresses.feedback}>
-            {showFullFeedbackLabel ? t('Share your feedback') : t('Feedback')}
-          </ExternalLink>
-        </div>
+        {ENV.addresses.feedback ? (
+          <div className="flex pl-2 content-center">
+            <ExternalLink href={ENV.addresses.feedback}>
+              {showFullFeedbackLabel ? t('Share your feedback') : t('Feedback')}
+            </ExternalLink>
+          </div>
+        ) : null}
      </div>
    </footer>
  );
@@ -62,9 +64,5 @@ const NodeUrl = ({ url }: { url: string }) => {
  // get base url from api url, api sub domain
  const urlObj = new URL(url);
  const nodeUrl = urlObj.origin.replace(/^[^.]+\./g, '');
-  return (
-    <Link href={'https://' + nodeUrl} target="_blank">
-      {nodeUrl}
-    </Link>
-  );
+  return <span className="cursor-default">{nodeUrl}</span>;
 };
@@ -1,8 +1,8 @@
 import { t } from '@vegaprotocol/i18n';
-import type { MarketInfoWithData } from '@vegaprotocol/market-info';
-import { LiquidityInfoPanel } from '@vegaprotocol/market-info';
-import { LiquidityMonitoringParametersInfoPanel } from '@vegaprotocol/market-info';
+import type { MarketInfoWithData } from '@vegaprotocol/markets';
 import {
+  LiquidityInfoPanel,
+  LiquidityMonitoringParametersInfoPanel,
  InstrumentInfoPanel,
  KeyDetailsInfoPanel,
  LiquidityPriceRangeInfoPanel,
@@ -12,20 +12,18 @@ import {
  RiskModelInfoPanel,
  RiskParametersInfoPanel,
  SettlementAssetInfoPanel,
-} from '@vegaprotocol/market-info';
-import { MarketInfoTable } from '@vegaprotocol/market-info';
+} from '@vegaprotocol/markets';
+import { MarketInfoTable } from '@vegaprotocol/markets';
 import type { DataSourceDefinition } from '@vegaprotocol/types';
 import isEqual from 'lodash/isEqual';

 export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
  if (!market) return null;

-  const settlementData =
-    market.tradableInstrument.instrument.product.dataSourceSpecForSettlementData
-      .data;
-  const terminationData =
-    market.tradableInstrument.instrument.product
-      .dataSourceSpecForTradingTermination.data;
+  const settlementData = market.tradableInstrument.instrument.product
+    .dataSourceSpecForSettlementData.data as DataSourceDefinition;
+  const terminationData = market.tradableInstrument.instrument.product
+    .dataSourceSpecForTradingTermination.data as DataSourceDefinition;

  const getSigners = (data: DataSourceDefinition) => {
    if (data.sourceType.__typename === 'DataSourceDefinitionExternal') {
@@ -1,4 +1,4 @@
-import type { MarketFieldsFragment } from '@vegaprotocol/market-list';
+import type { MarketFieldsFragment } from '@vegaprotocol/markets';
 import { t } from '@vegaprotocol/i18n';
 import { ButtonLink } from '@vegaprotocol/ui-toolkit';
 import type { AgGridReact } from 'ag-grid-react';
@@ -0,0 +1,56 @@
+import type { Proposal } from './tx-proposal';
+import { proposalRequiresSignatureBundle } from './tx-proposal';
+
+describe('proposalRequiresSignatureBundle', () => {
+  it('should return false for freeform proposals, which do not require a signature bundle to enact', () => {
+    const mock = {
+      terms: {
+        newFreeform: {},
+      },
+    };
+
+    expect(proposalRequiresSignatureBundle(mock)).toEqual(false);
+  });
+
+  it('should return false for newMarket proposals, which do not require a signature bundle to enact', () => {
+    const mock = {
+      terms: {
+        newMarket: {},
+      },
+    };
+
+    expect(proposalRequiresSignatureBundle(mock)).toEqual(false);
+  });
+
+  it('should return true for newAsset proposals, which do require a signature bundle to enact', () => {
+    const mock = {
+      terms: {
+        newAsset: {},
+      },
+    };
+
+    expect(proposalRequiresSignatureBundle(mock)).toEqual(true);
+  });
+
+  it('should return true for updateAsset proposals, which do require a signature bundle to enact', () => {
+    const mock = {
+      terms: {
+        updateAsset: {},
+      },
+    };
+
+    expect(proposalRequiresSignatureBundle(mock)).toEqual(true);
+  });
+
+  it('should return false when bad data is supplied', () => {
+    expect(
+      proposalRequiresSignatureBundle(false as unknown as Proposal)
+    ).toEqual(false);
+    expect(
+      proposalRequiresSignatureBundle(undefined as unknown as Proposal)
+    ).toEqual(false);
+    expect(
+      proposalRequiresSignatureBundle({ test: false } as unknown as Proposal)
+    ).toEqual(false);
+  });
+});
@@ -28,11 +28,16 @@ interface TxProposalProps {
 * @returns boolean True if a signature bundle is required. Used to fetch a signature bundle
 */
 export function proposalRequiresSignatureBundle(proposal?: Proposal): boolean {
+  const proposalsThatRequireBundles = ['newAsset', 'updateAsset'];
+
  if (!proposal?.terms) {
    return false;
  }
-  return !!['newAsset', 'updateAsset'].filter((requiredIfExists) =>
-    has(proposal.terms, requiredIfExists)
+
+  return (
+    proposalsThatRequireBundles.filter((requiredIfExists) =>
+      has(proposal.terms, requiredIfExists)
+    ).length > 0
  );
 }

@@ -81,6 +86,7 @@ export const TxProposal = ({ txData, pubKey, blockData }: TxProposalProps) => {

  const tx = proposal.terms?.newAsset || proposal.terms?.updateAsset;

+  // This component is not rendered if no bundle is required
  const SignatureBundleComponent = proposal.terms?.newAsset
    ? ProposalSignatureBundleNewAsset
    : ProposalSignatureBundleUpdateAsset;
@@ -8,7 +8,7 @@ import { useScrollToLocation } from '../../hooks/scroll-to-location';
 import { useDocumentTitle } from '../../hooks/use-document-title';
 import compact from 'lodash/compact';
 import { JsonViewerDialog } from '../../components/dialogs/json-viewer-dialog';
-import { marketInfoWithDataProvider } from '@vegaprotocol/market-info';
+import { marketInfoWithDataProvider } from '@vegaprotocol/markets';
 import { PageTitle } from '../../components/page-helpers/page-title';

 export const MarketPage = () => {
@@ -1,6 +1,6 @@
 import { useScrollToLocation } from '../../hooks/scroll-to-location';
 import { useDocumentTitle } from '../../hooks/use-document-title';
-import { marketsProvider } from '@vegaprotocol/market-list';
+import { marketsProvider } from '@vegaprotocol/markets';
 import { RouteTitle } from '../../components/route-title';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { t } from '@vegaprotocol/i18n';
@@ -32,9 +32,9 @@
  line-height: calc(min(var(--ag-line-height, 26px), 26px) - 4px);
 }

-.vega-ag-grid .ag-row {
-  border-width: 1px 0;
-  border-bottom: 1px solid transparent;
+.vega-ag-grid .ag-row,
+.vega-ag-grid .ag-cell {
+  border-width: 0;
 }

 /* Light variables */
@@ -46,7 +46,6 @@
  --ag-header-column-separator-color: theme(colors.neutral[300]);
  --ag-row-border-color: theme(colors.white);
  --ag-row-hover-color: theme(colors.neutral[100]);
-  --ag-font-size: 12px;
 }

 /* Dark variables */
@@ -58,7 +57,6 @@
  --ag-header-column-separator-color: theme(colors.neutral[600]);
  --ag-row-border-color: theme(colors.black);
  --ag-row-hover-color: theme(colors.neutral[800]);
-  --ag-font-size: 12px;
 }

 .voteicon svg {
@@ -17,6 +17,7 @@ NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
+NX_VEGA_REST_URL=http://localhost:3008/api/v2/

 #Test configuration variables
 CYPRESS_FAIRGROUND=false
@@ -1,10 +1,11 @@
 const { defineConfig } = require('cypress');

 module.exports = defineConfig({
-  projectId: 'et4snf',
+  reporter: '../../node_modules/cypress-mochawesome-reporter',

  e2e: {
    setupNodeEvents(on, config) {
+      require('cypress-mochawesome-reporter/plugin')(on);
      require('@cypress/grep/src/plugin')(config);
      return config;
    },
@@ -0,0 +1,113 @@
+{
+  "rationale": {
+    "title": "New Market Proposal E2E submission",
+    "description": "E2E new market proposal"
+  },
+  "terms": {
+    "newMarket": {
+      "changes": {
+        "decimalPlaces": "5",
+        "positionDecimalPlaces": "5",
+        "linearSlippageFactor": "0.001",
+        "quadraticSlippageFactor": "0",
+        "lpPriceRange": "10",
+        "instrument": {
+          "name": "Token test market",
+          "code": "TEST.24h",
+          "future": {
+            "settlementAsset": "73174a6fb1d5802ba0ac7bd7ab79e0a3a4837b262de0a4e80815a55442692bd0",
+            "quoteName": "fBTC",
+            "dataSourceSpecForSettlementData": {
+              "external": {
+                "oracle": {
+                  "signers": [
+                    {
+                      "pubKey": {
+                        "key": "70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680"
+                      }
+                    }
+                  ],
+                  "filters": [
+                    {
+                      "key": {
+                        "name": "prices.ETH.value",
+                        "type": "TYPE_INTEGER",
+                        "numberDecimalPlaces": "0"
+                      },
+                      "conditions": [
+                        {
+                          "operator": "OPERATOR_GREATER_THAN",
+                          "value": "0"
+                        }
+                      ]
+                    }
+                  ]
+                }
+              }
+            },
+            "dataSourceSpecForTradingTermination": {
+              "external": {
+                "oracle": {
+                  "signers": [
+                    {
+                      "pubKey": {
+                        "key": "70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680"
+                      }
+                    }
+                  ],
+                  "filters": [
+                    {
+                      "key": {
+                        "name": "trading.terminated.ETH5",
+                        "type": "TYPE_BOOLEAN"
+                      },
+                      "conditions": [
+                        {
+                          "operator": "OPERATOR_EQUALS",
+                          "value": "true"
+                        }
+                      ]
+                    }
+                  ]
+                }
+              }
+            },
+            "dataSourceSpecBinding": {
+              "settlementDataProperty": "prices.ETH.value",
+              "tradingTerminationProperty": "trading.terminated.ETH5"
+            }
+          }
+        },
+        "metadata": ["sector:energy", "sector:tech", "source:docs.vega.xyz"],
+        "priceMonitoringParameters": {
+          "triggers": [
+            {
+              "horizon": "43200",
+              "probability": "0.9999999",
+              "auctionExtension": "600"
+            }
+          ]
+        },
+        "liquidityMonitoringParameters": {
+          "targetStakeParameters": {
+            "timeWindow": "3600",
+            "scalingFactor": 10
+          },
+          "triggeringRatio": "0.7",
+          "auctionExtension": "1"
+        },
+        "logNormal": {
+          "tau": 0.0001140771161,
+          "riskAversionParameter": 0.01,
+          "params": {
+            "mu": 0,
+            "r": 0.016,
+            "sigma": 0.5
+          }
+        }
+      }
+    },
+    "closingTimestamp": 0,
+    "enactmentTimestamp": 0
+  }
+}
@@ -7,17 +7,12 @@ import {
 import {
  createRawProposal,
  createTenDigitUnixTimeStampForSpecifiedDays,
-  enterUniqueFreeFormProposalBody,
  generateFreeFormProposalTitle,
  getDateFormatForSpecifiedDays,
-  getProposalIdFromList,
+  getProposalFromTitle,
  getProposalInformationFromTable,
-  getSubmittedProposalFromProposalList,
-  goToMakeNewProposal,
-  governanceProposalType,
+  submitUniqueRawProposal,
  voteForProposal,
-  waitForProposalSubmitted,
-  waitForProposalSync,
 } from '../../../../governance-e2e/src/support/governance.functions';
 import { ensureSpecifiedUnstakedTokensAreAssociated } from '../../../../governance-e2e/src/support/staking.functions';
 import { ethereumWalletConnect } from '../../../../governance-e2e/src/support/wallet-eth.functions';
@@ -38,6 +33,8 @@ const proposalDetailsTitle = '[data-testid="proposal-title"]';
 const proposalDetailsDescription = '[data-testid="proposal-description"]';
 const openProposals = '[data-testid="open-proposals"]';
 const viewProposalButton = '[data-testid="view-proposal-btn"]';
+const voteBreakdownToggle = 'vote-breakdown-toggle';
+const proposalTermsToggle = 'proposal-terms-toggle';

 describe(
  'Governance flow for proposal details',
@@ -62,23 +59,25 @@ describe(

    // 3001-VOTE-050 3001-VOTE-054 3001-VOTE-055 3002-PROP-019
    it('Newly created raw proposal details - shows proposal title and full description', function () {
+      const proposalDescription =
+        'I propose that everyone evaluate the following IPFS document and vote Yes if they agree. bafybeigwwctpv37xdcwacqxvekr6e4kaemqsrv34em6glkbiceo3fcy4si';
+
      createRawProposal();
      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-        getProposalIdFromList(rawProposal.rationale.title);
-        cy.get('@proposalIdText').then((proposalId) => {
-          cy.get(openProposals).within(() => {
-            cy.get(`#${proposalId}`).within(() => {
-              cy.get(viewProposalButton).should('be.visible').click();
-            });
+        cy.get(openProposals).within(() => {
+          getProposalFromTitle(rawProposal.rationale.title).within(() => {
+            cy.get(viewProposalButton).should('be.visible').click();
          });
        });
-        cy.get(proposalDetailsTitle)
-          .should('contain', rawProposal.rationale.title)
-          .and('be.visible');
+        cy.get(proposalDetailsTitle).should(
+          'contain.text',
+          rawProposal.rationale.title
+        );
        cy.get(proposalDetailsDescription)
-          .should('contain', rawProposal.rationale.description)
-          .and('be.visible');
+          .find('p')
+          .should('have.text', proposalDescription);
      });
+      cy.getByTestId(proposalTermsToggle).click();
      // 3001-VOTE-052
      cy.get('code.language-json')
        .should('exist')
@@ -89,33 +88,36 @@ describe(

    // 3001-VOTE-043
    it('Newly created freeform proposal details - shows proposed and closing dates', function () {
-      const closingVoteHrs = '72';
      const proposalTitle = generateFreeFormProposalTitle();
      const proposalTimeStamp = createTenDigitUnixTimeStampForSpecifiedDays(3);
+      // const currentDate = new Date(createTenDigitUnixTimeStampForSpecifiedDays(0) * 1000)
+      // const proposedDate = new Date(currentDate.getTime() + 60000)

-      goToMakeNewProposal(governanceProposalType.FREEFORM);
-      enterUniqueFreeFormProposalBody(closingVoteHrs, proposalTitle);
-      waitForProposalSubmitted();
-      waitForProposalSync();
+      submitUniqueRawProposal({
+        proposalTitle: proposalTitle,
+        closingTimestamp: proposalTimeStamp,
+      });
      navigateTo(navigation.proposals);
-      getSubmittedProposalFromProposalList(proposalTitle).within(() =>
+      getProposalFromTitle(proposalTitle).within(() =>
        cy.get(viewProposalButton).click()
      );
      cy.wrap(
        formatDateWithLocalTimezone(new Date(proposalTimeStamp * 1000))
      ).then((closingDate) => {
-        getProposalInformationFromTable('Closes on')
-          .contains(closingDate)
-          .should('be.visible');
+        getProposalInformationFromTable('Closes on').should(
+          'have.text',
+          closingDate
+        );
      });
      cy.wrap(
        formatDateWithLocalTimezone(
          new Date(createTenDigitUnixTimeStampForSpecifiedDays(0) * 1000)
        )
      ).then((proposalDate) => {
-        getProposalInformationFromTable('Proposed on')
-          .contains(proposalDate)
-          .should('be.visible');
+        getProposalInformationFromTable('Proposed on').should(
+          'have.text',
+          proposalDate
+        );
      });
    });

@@ -125,13 +127,14 @@ describe(
      // 3001-VOTE-067
      createRawProposal();
      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-        getSubmittedProposalFromProposalList(
-          rawProposal.rationale.title
-        ).within(() => cy.get(viewProposalButton).click());
+        getProposalFromTitle(rawProposal.rationale.title).within(() =>
+          cy.get(viewProposalButton).click()
+        );
      });
      cy.contains('Participation: Not Met 0.00 0.00%(0.00% Required)').should(
        'be.visible'
      );
+      cy.getByTestId(voteBreakdownToggle).click();
      getProposalInformationFromTable('Expected to pass')
        .contains('👎')
        .should('be.visible');
@@ -151,9 +154,9 @@ describe(
    it('Newly created proposal details - ability to vote for and against proposal - with minimum required tokens associated', function () {
      createRawProposal();
      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-        getSubmittedProposalFromProposalList(
-          rawProposal.rationale.title
-        ).within(() => cy.get(viewProposalButton).click());
+        getProposalFromTitle(rawProposal.rationale.title).within(() =>
+          cy.get(viewProposalButton).click()
+        );
      });
      // 3001-VOTE-080
      cy.getByTestId('vote-buttons').contains('against').should('be.visible');
@@ -179,6 +182,7 @@ describe(
      cy.get(proposalVoteProgressAgainstTokens)
        .contains('0.00')
        .and('be.visible');
+      cy.getByTestId(voteBreakdownToggle).click();
      getProposalInformationFromTable('Tokens for proposal')
        .should('have.text', (1).toFixed(2))
        .and('be.visible');
@@ -220,14 +224,15 @@ describe(
      vegaWalletSetSpecifiedApprovalAmount('1000');
      createRawProposal();
      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-        getSubmittedProposalFromProposalList(
-          rawProposal.rationale.title
-        ).within(() => cy.get(viewProposalButton).click());
+        getProposalFromTitle(rawProposal.rationale.title).within(() =>
+          cy.get(viewProposalButton).click()
+        );
      });
      voteForProposal('for');
      // 3001-VOTE-079
      cy.contains('You voted: For').should('be.visible');
      cy.get(proposalVoteProgressForTokens).contains('1').and('be.visible');
+      cy.getByTestId(voteBreakdownToggle).click();
      getProposalInformationFromTable('Total Supply')
        .invoke('text')
        .then((totalSupply) => {
@@ -235,14 +240,15 @@ describe(
            (Number(totalSupply.replace(/,/g, '')) * 0.001) /
            100
          ).toFixed(2);
+          ethereumWalletConnect();
          ensureSpecifiedUnstakedTokensAreAssociated(
            tokensRequiredToAchieveResult
          );
          navigateTo(navigation.proposals);
          cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-            getSubmittedProposalFromProposalList(
-              rawProposal.rationale.title
-            ).within(() => cy.get(viewProposalButton).click());
+            getProposalFromTitle(rawProposal.rationale.title).within(() =>
+              cy.get(viewProposalButton).click()
+            );
          });
          cy.get(proposalVoteProgressForPercentage)
            .contains('100.00%')
@@ -259,6 +265,7 @@ describe(
          cy.get(proposalVoteProgressAgainstTokens)
            .contains('0.00')
            .and('be.visible');
+          cy.getByTestId(voteBreakdownToggle).click();
          getProposalInformationFromTable('Total tokens voted percentage')
            .should('have.text', '0.00%')
            .and('be.visible');
@@ -58,14 +58,12 @@ context(
          .parentsUntil(proposalListItem)
          .last()
          .within(() => {
-            cy.get(proposalStatus).should('have.text', 'Enacted ');
+            cy.get(proposalStatus).should('have.text', 'Enacted');
            cy.get(viewProposalButton).click();
          });
      });
      cy.getByTestId('proposal-type').should('have.text', 'New market');
-      getProposalInformationFromTable('State')
-        .contains('Enacted')
-        .and('be.visible');
+      cy.get(proposalStatus).should('have.text', 'Enacted');
      cy.get(votesTable).within(() => {
        cy.contains('Vote passed.').should('be.visible');
        cy.contains('Voting has ended.').should('be.visible');
@@ -87,16 +85,10 @@ context(
          .last()
          .within(() => cy.get(viewProposalButton).click());
      });
-      getProposalInformationFromTable('State')
-        .contains('Open')
-        .and('be.visible');
+      cy.get(proposalStatus).should('have.text', 'Open');
      voteForProposal('for');
-      getProposalInformationFromTable('State') // 3001-VOTE-047
-        .contains('Passed', proposalTimeout)
-        .and('be.visible');
-      getProposalInformationFromTable('State')
-        .contains('Enacted', proposalTimeout)
-        .and('be.visible');
+      cy.get(proposalStatus, proposalTimeout).should('have.text', 'Passed');
+      cy.get(proposalStatus, proposalTimeout).should('have.text', 'Enacted');
      cy.get(votesTable).within(() => {
        cy.contains('Vote passed.').should('be.visible');
        cy.contains('Voting has ended.').should('be.visible');
@@ -121,13 +113,9 @@ context(
          .last()
          .within(() => cy.get(viewProposalButton).click());
      });
-      getProposalInformationFromTable('State')
-        .contains('Open')
-        .and('be.visible');
+      cy.get(proposalStatus).should('have.text', 'Open');
      voteForProposal('for');
-      getProposalInformationFromTable('State')
-        .contains('Enacted', proposalTimeout)
-        .and('be.visible');
+      cy.get(proposalStatus, proposalTimeout).should('have.text', 'Enacted');
    });

    // 3001-VOTE-048 3001-VOTE-049 3001-VOTE-050
@@ -144,12 +132,8 @@ context(
          .last()
          .within(() => cy.get(viewProposalButton).click());
      });
-      getProposalInformationFromTable('State')
-        .contains('Open')
-        .and('be.visible');
-      getProposalInformationFromTable('State') // 3001-VOTE-047
-        .contains('Declined', proposalTimeout)
-        .and('be.visible');
+      cy.get(proposalStatus).should('have.text', 'Open');
+      cy.get(proposalStatus, proposalTimeout).should('have.text', 'Declined');
      getProposalInformationFromTable('Rejection reason')
        .contains('PROPOSAL_ERROR_PARTICIPATION_THRESHOLD_NOT_REACHED')
        .and('be.visible');
@@ -5,10 +5,11 @@ import {
  enterRawProposalBody,
  enterUniqueFreeFormProposalBody,
  generateFreeFormProposalTitle,
+  getProposalFromTitle,
  getProposalInformationFromTable,
-  getSubmittedProposalFromProposalList,
  goToMakeNewProposal,
  governanceProposalType,
+  submitUniqueRawProposal,
  voteForProposal,
  waitForProposalSubmitted,
  waitForProposalSync,
@@ -81,7 +82,6 @@ context(
      });

      vegaWalletSetSpecifiedApprovalAmount('1000');
-      cy.associateTokensToVegaWallet('1');
    });

    beforeEach('visit governance tab', function () {
@@ -95,7 +95,8 @@ context(
      navigateTo(navigation.proposals);
    });

-    it('Should be able to see that no proposals exist', function () {
+    // Test can only pass if run before other proposal tests.
+    it.skip('Should be able to see that no proposals exist', function () {
      // 3001-VOTE-003
      cy.get(noOpenProposals)
        .should('be.visible')
@@ -107,7 +108,7 @@ context(

    // 3002-PROP-002
    // 3002-PROP-003
-    it('Submit a proposal form - shows how many vega tokens are required to make a proposal', function () {
+    it('Proposal form - shows how many vega tokens are required to make a proposal', function () {
      // 3002-PROP-005
      goToMakeNewProposal(governanceProposalType.NEW_MARKET);
      cy.contains(
@@ -115,8 +116,9 @@ context(
      ).should('be.visible');
    });

+    // Skipping as currently unable to propose using forms other than raw
    // 3002-PROP-011
-    it('Able to submit a valid freeform proposal - with minimum required tokens associated', function () {
+    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');
@@ -140,16 +142,13 @@ context(
      closeStakingDialog();

      cy.get(vegaWalletStakedBalances, txTimeout).should('contain', '2');
-
-      navigateTo(navigation.proposals);
-      goToMakeNewProposal(governanceProposalType.FREEFORM);
-      enterUniqueFreeFormProposalBody('50', generateFreeFormProposalTitle());
-      waitForProposalSubmitted();
+      createRawProposal();
    });

-    it('Creating a proposal - proposal rejected - when closing time sooner than system default', function () {
+    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'
      );
@@ -158,7 +157,7 @@ context(
        .should('equal', 'Value must be greater than or equal to 1.');
    });

-    it('Creating a proposal - proposal rejected - when closing time later than system default', function () {
+    it.skip('Creating a proposal - proposal rejected - when closing time later than system default', function () {
      goToMakeNewProposal(governanceProposalType.FREEFORM);
      enterUniqueFreeFormProposalBody(
        '100000',
@@ -185,17 +184,13 @@ context(
      navigateTo(navigation.proposals);
      cy.get(rejectProposalsLink).click();
      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-        getSubmittedProposalFromProposalList(
-          rawProposal.rationale.title
-        ).within(() => {
+        getProposalFromTitle(rawProposal.rationale.title).within(() => {
          cy.contains('Rejected').should('be.visible');
          cy.contains('Close time too late').should('be.visible');
          cy.get(viewProposalButton).click();
        });
      });
-      getProposalInformationFromTable('State')
-        .contains('Rejected')
-        .and('be.visible');
+      cy.getByTestId('proposal-status').should('have.text', 'Rejected');
      getProposalInformationFromTable('Rejection reason')
        .contains('PROPOSAL_ERROR_CLOSE_TIME_TOO_LATE')
        .and('be.visible');
@@ -290,18 +285,19 @@ context(
      const proposalTitle = generateFreeFormProposalTitle();

      ensureSpecifiedUnstakedTokensAreAssociated('1');
-      goToMakeNewProposal(governanceProposalType.FREEFORM);
-      enterUniqueFreeFormProposalBody('50', proposalTitle);
-      waitForProposalSubmitted();
+      submitUniqueRawProposal({ proposalTitle: proposalTitle });
+      ethereumWalletConnect();
      stakingPageDisassociateTokens('0.0001');
-      cy.get(vegaWallet).within(() => {
-        cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-          'contain',
-          '0.9999'
-        );
-      });
+      cy.get(vegaWallet)
+        .first()
+        .within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should(
+            'contain',
+            '0.9999'
+          );
+        });
      navigateTo(navigation.proposals);
-      getSubmittedProposalFromProposalList(proposalTitle).within(() =>
+      getProposalFromTitle(proposalTitle).within(() =>
        cy.get(viewProposalButton).click()
      );
      cy.contains('Vote breakdown').should('be.visible', {
@@ -319,9 +315,9 @@ context(
      cy.get('[data-testid="manage-vega-wallet"]:visible').click();
      cy.get('[data-testid="disconnect"]').click();
      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-        getSubmittedProposalFromProposalList(
-          rawProposal.rationale.title
-        ).within(() => cy.get(viewProposalButton).click());
+        getProposalFromTitle(rawProposal.rationale.title).within(() =>
+          cy.get(viewProposalButton).click()
+        );
      });
      // 3001-VOTE-075
      // 3001-VOTE-076
@@ -8,6 +8,7 @@ import {
 import {
  getProposalInformationFromTable,
  goToMakeNewProposal,
+  governanceProposalType,
  voteForProposal,
  waitForProposalSubmitted,
 } from '../../support/governance.functions';
@@ -56,18 +57,8 @@ const fUSDCId =
 const epochTimeout = Cypress.env('epochTimeout');
 const proposalTimeout = { timeout: 14000 };

-const governanceProposalType = {
-  NETWORK_PARAMETER: 'Network parameter',
-  NEW_MARKET: 'New market',
-  UPDATE_MARKET: 'Update market',
-  NEW_ASSET: 'New asset',
-  UPDATE_ASSET: 'Update asset',
-  FREEFORM: 'Freeform',
-  RAW: 'raw proposal',
-};
-
 // 3001-VOTE-007
-context(
+context.skip(
  'Governance flow - form validations for different governance proposals',
  { tags: '@slow' },
  function () {
@@ -6,16 +6,15 @@ import {
  waitForSpinner,
 } from '../../support/common.functions';
 import {
-  createFreeformProposal,
  createRawProposal,
  createTenDigitUnixTimeStampForSpecifiedDays,
  enterRawProposalBody,
  generateFreeFormProposalTitle,
-  getProposalIdFromList,
+  getProposalFromTitle,
  getProposalInformationFromTable,
-  getSubmittedProposalFromProposalList,
  goToMakeNewProposal,
  governanceProposalType,
+  submitUniqueRawProposal,
  voteForProposal,
  waitForProposalSubmitted,
  waitForProposalSync,
@@ -24,10 +23,14 @@ import { ensureSpecifiedUnstakedTokensAreAssociated } from '../../support/stakin
 import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
 import { vegaWalletSetSpecifiedApprovalAmount } from '../../support/wallet-teardown.functions';

+const proposalListItem = 'proposals-list-item';
 const openProposals = '[data-testid="open-proposals"]';
-const voteStatus = '[data-testid="vote-status"]';
+const voteStatus = 'vote-status';
+const proposalType = 'proposal-type';
+const proposalStatus = 'proposal-status';
 const proposalClosingDate = '[data-testid="vote-details"]';
 const viewProposalButton = '[data-testid="view-proposal-btn"]';
+const voteBreakDownToggle = 'vote-breakdown-toggle';

 describe('Governance flow for proposal list', { tags: '@slow' }, function () {
  before('connect wallets and set approval limit', function () {
@@ -60,12 +63,12 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {

    navigateTo(navigation.proposals);
    cy.get(openProposals).within(() => {
-      cy.get(proposalClosingDate).first().should('contain.text', 'year');
-      cy.get(proposalClosingDate).should('contain.text', 'months');
      cy.get(proposalClosingDate)
-        .last()
+        .first()
        .invoke('text')
        .should('match', /days|minutes/);
+      cy.get(proposalClosingDate).should('contain.text', 'months');
+      cy.get(proposalClosingDate).last().should('contain.text', 'year');
    });
  });

@@ -73,36 +76,27 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
    const proposerId = Cypress.env('vegaWalletPublicKey');
    const proposalTitle = generateFreeFormProposalTitle();

-    createFreeformProposal(proposalTitle);
-    getProposalIdFromList(proposalTitle);
-    cy.get('@proposalIdText').then((proposalId) => {
-      cy.get('[data-testid="set-proposals-filter-visible"]').click();
-      cy.get('[data-testid="filter-input"]').type(proposerId);
-      cy.get(`#${proposalId}`).should('contain', proposalId);
-    });
+    submitUniqueRawProposal({ proposalTitle: proposalTitle });
+    cy.get('[data-testid="set-proposals-filter-visible"]').click();
+    cy.get('[data-testid="filter-input"]').type(proposerId);
+    // cy.get(`#${proposalId}`).should('contain', proposalId);
+    cy.contains(proposalTitle).should('be.visible');
+    cy.get('[data-testid="filter-input"]').type('123');
+    cy.getByTestId(proposalListItem).should('not.exist');
  });

  it('Newly created proposals list - shows title and portion of summary', function () {
-    createRawProposal(this.minProposerBalance); // 3001-VOTE-052
-    cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-      getProposalIdFromList(rawProposal.rationale.title);
-      cy.get('@proposalIdText').then((proposalId) => {
-        cy.get(openProposals).within(() => {
-          // 3001-VOTE-008
-          // 3001-VOTE-034
-          cy.get(`#${proposalId}`)
-            // 3001-VOTE-097
-            .should('contain', rawProposal.rationale.title)
-            .and('be.visible');
-          cy.get(`#${proposalId}`)
-            .should(
-              'contain',
-              rawProposal.rationale.description.substring(0, 59)
-            )
-            .and('be.visible');
-        });
-      });
-    });
+    const proposalPath = '/proposals/new-market-raw.json';
+    const enactmentTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(3);
+    submitUniqueRawProposal({
+      proposalBody: proposalPath,
+      enactmentTimestamp: enactmentTimestamp,
+    }); // 3001-VOTE-052
+    // 3001-VOTE-008
+    // 3001-VOTE-034
+    // 3001-VOTE-097
+    cy.contains('New Market Proposal E2E submission');
+    cy.contains('Code: TEST.24h. fBTC settled future.').should('be.visible');
  });

  it('Newly created proposals list - shows open proposals in an open state', function () {
@@ -110,23 +104,11 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
    // 3001-VOTE-035
    createRawProposal(this.minProposerBalance);
    cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-      getSubmittedProposalFromProposalList(rawProposal.rationale.title).within(
-        () => {
-          cy.get(viewProposalButton).should('be.visible').click();
-        }
-      );
-
-      cy.get('@proposalIdText').then((proposalId) => {
-        getProposalInformationFromTable('ID')
-          .contains(String(proposalId))
-          .and('be.visible');
+      getProposalFromTitle(rawProposal.rationale.title).within(() => {
+        cy.get(viewProposalButton).should('be.visible');
+        cy.getByTestId(proposalType).should('have.text', 'Freeform');
+        cy.getByTestId(proposalStatus).should('have.text', 'Open');
      });
-      getProposalInformationFromTable('State')
-        .contains('Open')
-        .and('be.visible');
-      getProposalInformationFromTable('Type')
-        .contains('Freeform')
-        .and('be.visible');
    });
  });

@@ -134,18 +116,22 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
  it('Newly created freeform proposals list - shows proposal participation - both met and not', function () {
    const proposalTitle = generateFreeFormProposalTitle();

-    createFreeformProposal(proposalTitle);
-    getSubmittedProposalFromProposalList(proposalTitle).within(() => {
+    submitUniqueRawProposal({ proposalTitle: proposalTitle });
+    getProposalFromTitle(proposalTitle).within(() => {
      // 3001-VOTE-039
-      cy.get(voteStatus).should('have.text', 'Participation not reached');
+      cy.getByTestId(voteStatus).should(
+        'have.text',
+        'Participation not reached'
+      );
      cy.get(viewProposalButton).click();
    });
    voteForProposal('for');
    navigateTo(navigation.proposals);
-    getSubmittedProposalFromProposalList(proposalTitle).within(() => {
-      cy.get(voteStatus).should('have.text', 'Set to pass');
+    getProposalFromTitle(proposalTitle).within(() => {
+      cy.getByTestId(voteStatus).should('have.text', 'Set to pass');
      cy.get(viewProposalButton).click();
    });
+    cy.getByTestId(voteBreakDownToggle).click();
    getProposalInformationFromTable('Token participation met')
      .contains('👍')
      .should('be.visible');
@@ -96,7 +96,7 @@ context(
        navigateTo(navigation.validators);

        // 2002-SINC-007
-        validateValidatorListTotalStakeAndShare('0', '2.00', '100.00%');
+        validateValidatorListTotalStakeAndShare('0', '3,002.00', '50.02%');
      });

      it('Able to view validators staked by me', function () {
@@ -146,7 +146,7 @@ context(
        verifyThisEpochValue(2.0);
        closeStakingDialog();
        navigateTo(navigation.validators);
-        validateValidatorListTotalStakeAndShare('0', '2.00', '100.00%');
+        validateValidatorListTotalStakeAndShare('0', '3,002.00', '50.02%');
      });

      it('Able to stake against a validator - using vega from both wallet and vesting contract', function () {
@@ -166,10 +166,11 @@ context(
        verifyThisEpochValue(6.0);
        closeStakingDialog();
        navigateTo(navigation.validators);
-        validateValidatorListTotalStakeAndShare('0', '6.00', '100.00%');
+        validateValidatorListTotalStakeAndShare('0', '3,006.00', '50.05%');
      });

      it('Able to stake against multiple validators', function () {
+        vegaWalletTeardown();
        stakingPageAssociateTokens('5');
        verifyUnstakedBalance(5.0);
        cy.get('button').contains('Select a validator to nominate').click();
@@ -197,14 +198,10 @@ context(
          .eq(1)
          .within(() => {
            cy.getByTestId(stakeValidatorListTotalStake)
-              .should('have.text', '2.00')
+              .should('have.text', '3,002.00')
              .and('be.visible');
            cy.getByTestId(stakeValidatorListTotalShare)
-              .should('have.text', '66.67%')
-              .and('be.visible');
-            cy.getByTestId(stakeValidatorListTotalStake)
-              .scrollIntoView()
-              .should('have.text', '2.00')
+              .should('have.text', '50.01%')
              .and('be.visible');
          });
        cy.get(`[row-id="${1}"]`)
@@ -212,14 +209,10 @@ context(
          .within(() => {
            cy.getByTestId(stakeValidatorListTotalStake)
              .scrollIntoView()
-              .should('have.text', '1.00')
+              .should('have.text', '3,001.00')
              .and('be.visible');
            cy.getByTestId(stakeValidatorListTotalShare)
-              .should('have.text', '33.33%')
-              .and('be.visible');
-            cy.getByTestId(stakeValidatorListTotalStake)
-              .scrollIntoView()
-              .should('have.text', '1.00')
+              .should('have.text', '49.99%')
              .and('be.visible');
          });
      });
@@ -282,7 +275,7 @@ context(
          txTimeout
        );
        navigateTo(navigation.validators);
-        validateValidatorListTotalStakeAndShare('0', '0.00', '0.00%');
+        validateValidatorListTotalStakeAndShare('0', '3,000.00', '50.00%');

        cy.getByTestId(userStakeBtn).should('not.exist');
        cy.getByTestId(userStake).should('not.exist');
@@ -354,7 +347,7 @@ context(
          txTimeout
        );
        navigateTo(navigation.validators);
-        validateValidatorListTotalStakeAndShare('0', '0.00', '0.00%');
+        validateValidatorListTotalStakeAndShare('0', '3,000.00', '50.00%');
      });

      it('Disassociating all vesting contract tokens max - removes all staked tokens', function () {
@@ -382,7 +375,7 @@ context(
          txTimeout
        );
        navigateTo(navigation.validators);
-        validateValidatorListTotalStakeAndShare('0', '0.00', '0.00%');
+        validateValidatorListTotalStakeAndShare('0', '3,000.00', '50.00%');
      });

      it('Disassociating some tokens - prioritizes unstaked tokens', function () {
@@ -404,7 +397,7 @@ context(
        });
        verifyStakedBalance(2.0);
        navigateTo(navigation.validators);
-        validateValidatorListTotalStakeAndShare('0', '2.00', '100.00%');
+        validateValidatorListTotalStakeAndShare('0', '3,002.00', '50.02%');
      });

      it('Associating wallet tokens - when some already staked - auto stakes tokens to staked validator', function () {
@@ -111,10 +111,10 @@ context(
        // 1004-ASSO-028
        // 1004-ASSO-029
        // 1004-ASSO-031
-
+        vegaWalletTeardown();
        stakingPageAssociateTokens('2');
        verifyEthWalletAssociatedBalance('2.0');
-        verifyEthWalletTotalAssociatedBalance('2.0');
+        verifyEthWalletTotalAssociatedBalance('6,002.00');
        cy.get('button').contains('Select a validator to nominate').click();
        stakingPageDisassociateTokens('2');
        cy.getByTestId('currency-title', txTimeout).should(
@@ -125,17 +125,18 @@ context(
        validateWalletCurrency('Pending association', '2.00');
        validateWalletCurrency('Total associated after pending', '0.00');
        cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
-        cy.getByTestId('eth-wallet-associated-balances', txTimeout).should(
-          'not.exist'
-        );
-        verifyEthWalletTotalAssociatedBalance('0.00');
+        cy.get(
+          '[data-testid="eth-wallet-associated-balances"]:visible',
+          txTimeout
+        ).should('have.length', 2);
+        verifyEthWalletTotalAssociatedBalance('6,000.00');
      });

      it('Able to associate more tokens than the approved amount of 1000 - requires re-approval', function () {
        //1004-ASSO-011
        stakingPageAssociateTokens('1001', { approve: true });
        verifyEthWalletAssociatedBalance('1,001.00');
-        verifyEthWalletTotalAssociatedBalance('1,001.00');
+        verifyEthWalletTotalAssociatedBalance('7,001.00');
        cy.get(vegaWallet)
          .last()
          .within(() => {
@@ -47,11 +47,8 @@ context(
  function () {
    before('visit withdrawals and connect vega wallet', function () {
      cy.visit('/');
-      // When running tests locally, will fail if run without restarting capsule
-      cy.updateCapsuleMultiSig().then(() => {
-        ethereumWalletConnect();
-        depositAsset(usdcEthAddress, '1000', 5);
-      });
+      ethereumWalletConnect();
+      depositAsset(usdcEthAddress, '1000', 5);
    });

    beforeEach('Navigate to withdrawal page', function () {
@@ -9,6 +9,7 @@ import {
 import {
  enterUniqueFreeFormProposalBody,
  goToMakeNewProposal,
+  governanceProposalType,
 } from '../../support/governance.functions';
 import { vegaWalletFaucetAssetsWithoutCheck } from '../../support/wallet-vega.functions';

@@ -50,7 +51,7 @@ context('View functionality with public key', { tags: '@smoke' }, function () {
    const expectedErrorTxt = `You are connected in a view only state for public key: ${vegaWalletPubKey}. In order to send transactions you must connect to a real wallet.`;

    navigateTo(navigation.proposals);
-    goToMakeNewProposal('Freeform');
+    goToMakeNewProposal(governanceProposalType.FREEFORM);
    enterUniqueFreeFormProposalBody('50', 'pub key proposal test');
    cy.getByTestId('dialog-content')
      .first()
@@ -1,8 +1,12 @@
 import { format } from 'date-fns';
-import { closeDialog, navigateTo, navigation } from './common.functions';
+import {
+  closeDialog,
+  navigateTo,
+  navigation,
+  waitForSpinner,
+} from './common.functions';
 import { ensureSpecifiedUnstakedTokensAreAssociated } from './staking.functions';

-const newProposalButton = '[data-testid="new-proposal-link"]';
 const proposalInformationTableRows = '[data-testid="key-value-table-row"]';
 const proposalListItem = '[data-testid="proposals-list-item"]';
 const newProposalTitle = '[data-testid="proposal-title"]';
@@ -46,6 +50,53 @@ export function enterRawProposalBody(timestamp: number) {
  });
 }

+export function submitUniqueRawProposal(proposalFields: {
+  proposalBody?: string;
+  proposalTitle?: string;
+  proposalDescription?: string;
+  closingTimestamp?: number;
+  enactmentTimestamp?: number;
+  submit?: boolean;
+}) {
+  goToMakeNewProposal(governanceProposalType.RAW);
+  let proposalBodyPath = '/proposals/raw.json';
+  if (proposalFields.proposalBody) {
+    proposalBodyPath = proposalFields.proposalBody;
+  }
+  cy.fixture(proposalBodyPath).then((rawProposal) => {
+    if (proposalFields.proposalTitle) {
+      rawProposal.rationale.title = proposalFields.proposalTitle;
+      cy.wrap(proposalFields.proposalTitle).as('proposalTitle');
+    }
+    if (proposalFields.proposalDescription) {
+      rawProposal.rationale.description = proposalFields.proposalDescription;
+    }
+    if (proposalFields.closingTimestamp) {
+      rawProposal.terms.closingTimestamp = proposalFields.closingTimestamp;
+    } else {
+      const minTimeStamp = createTenDigitUnixTimeStampForSpecifiedDays(2);
+      rawProposal.terms.closingTimestamp = minTimeStamp;
+    }
+    if (proposalFields.enactmentTimestamp) {
+      rawProposal.terms.enactmentTimestamp = proposalFields.enactmentTimestamp;
+    }
+
+    const proposalPayload = JSON.stringify(rawProposal);
+    cy.get(rawProposalData).type(proposalPayload, {
+      parseSpecialCharSequences: false,
+      delay: 2,
+    });
+
+    if (proposalFields.submit !== false) {
+      cy.get(newProposalSubmitButton).should('be.visible').click();
+      cy.wrap(rawProposal).as('rawProposal');
+      waitForProposalSubmitted();
+      waitForProposalSync();
+      navigateTo(navigation.proposals);
+    }
+  });
+}
+
 export function enterUniqueFreeFormProposalBody(
  timestamp: string,
  proposalTitle: string
@@ -58,6 +109,10 @@ export function enterUniqueFreeFormProposalBody(
  cy.getByTestId('proposal-submit').should('be.visible').click();
 }

+export function getProposalFromTitle(proposalTitle: string) {
+  return cy.contains(proposalTitle).parentsUntil(proposalListItem).last();
+}
+
 export function getSubmittedProposalFromProposalList(proposalTitle: string) {
  getProposalIdFromList(proposalTitle);
  cy.get('@proposalIdText').then((proposalId) => {
@@ -120,13 +175,17 @@ export function waitForProposalSync() {
  });
 }

-export function goToMakeNewProposal(proposalType: string) {
-  navigateTo(navigation.proposals);
-  cy.get(newProposalButton).should('be.visible').click();
+export function goToMakeNewProposal(proposalType: governanceProposalType) {
+  cy.visit('/proposals/propose');
+  waitForSpinner();
  cy.url().should('include', '/proposals/propose');
  cy.get(navigation.pageSpinner, { timeout: 20000 }).should('not.exist');
-  cy.get('li').should('contain.text', proposalType).and('be.visible');
-  cy.get('li').contains(proposalType).click();
+  if (proposalType == governanceProposalType.RAW) {
+    cy.get('[href="/proposals/propose/raw"]').click();
+  } else {
+    cy.get('li').should('contain.text', proposalType).and('be.visible');
+    cy.get('li').contains(proposalType).click();
+  }
 }

 export function waitForProposalSubmitted() {
@@ -163,11 +222,12 @@ export function createFreeformProposal(proposalTitle: string) {
  navigateTo(navigation.proposals);
 }

-export const governanceProposalType = {
-  NETWORK_PARAMETER: 'Network parameter',
-  NEW_MARKET: 'New market',
-  UPDATE_MARKET: 'Update market',
-  NEW_ASSET: 'New asset',
-  FREEFORM: 'Freeform',
-  RAW: 'raw proposal',
-};
+export enum governanceProposalType {
+  NETWORK_PARAMETER = 'Network parameter',
+  NEW_MARKET = 'New market',
+  UPDATE_MARKET = 'Update market',
+  NEW_ASSET = 'New asset',
+  UPDATE_ASSET = 'Update asset',
+  FREEFORM = 'Freeform',
+  RAW = 'raw proposal',
+}
@@ -8,6 +8,7 @@ import './wallet-eth.functions.ts';
 import './wallet-teardown.functions.ts';
 import './wallet-vega.functions.ts';
 import './proposal.functions.ts';
+import 'cypress-mochawesome-reporter/register';
 import registerCypressGrep from '@cypress/grep';
 import { aliasGQLQuery } from '@vegaprotocol/cypress';
 import { chainIdQuery, statisticsQuery } from '@vegaprotocol/mock';
@@ -85,6 +85,132 @@ export function createFreeFormProposalTxBody(): ProposalSubmissionBody {
  };
 }

+export function createNewMarketProposalTxBody(): ProposalSubmissionBody {
+  const MIN_CLOSE_SEC = 5;
+  const MIN_ENACT_SEC = 7;
+
+  const closingDate = addSeconds(new Date(), MIN_CLOSE_SEC);
+  const enactmentDate = addSeconds(closingDate, MIN_ENACT_SEC);
+  const closingTimestamp = millisecondsToSeconds(closingDate.getTime());
+  const enactmentTimestamp = millisecondsToSeconds(enactmentDate.getTime());
+  return {
+    proposalSubmission: {
+      rationale: {
+        title: 'New Market Proposal E2E submission',
+        description: 'E2E new market proposal',
+      },
+      terms: {
+        newMarket: {
+          changes: {
+            decimalPlaces: '5',
+            positionDecimalPlaces: '5',
+            linearSlippageFactor: '0.001',
+            quadraticSlippageFactor: '0',
+            lpPriceRange: '10',
+            instrument: {
+              name: 'Token test market',
+              code: 'TEST.24h',
+              future: {
+                settlementAsset:
+                  '73174a6fb1d5802ba0ac7bd7ab79e0a3a4837b262de0a4e80815a55442692bd0',
+                quoteName: 'fBTC',
+                dataSourceSpecForSettlementData: {
+                  external: {
+                    oracle: {
+                      signers: [
+                        {
+                          pubKey: {
+                            key: '70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680',
+                          },
+                        },
+                      ],
+                      filters: [
+                        {
+                          key: {
+                            name: 'prices.ETH.value',
+                            type: 'TYPE_INTEGER' as const,
+                            numberDecimalPlaces: '0',
+                          },
+                          conditions: [
+                            {
+                              operator: 'OPERATOR_GREATER_THAN' as const,
+                              value: '0',
+                            },
+                          ],
+                        },
+                      ],
+                    },
+                  },
+                },
+                dataSourceSpecForTradingTermination: {
+                  external: {
+                    oracle: {
+                      signers: [
+                        {
+                          pubKey: {
+                            key: '70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680',
+                          },
+                        },
+                      ],
+                      filters: [
+                        {
+                          key: {
+                            name: 'trading.terminated.ETH5',
+                            type: 'TYPE_BOOLEAN' as const,
+                          },
+                          conditions: [
+                            {
+                              operator: 'OPERATOR_EQUALS' as const,
+                              value: 'true',
+                            },
+                          ],
+                        },
+                      ],
+                    },
+                  },
+                },
+                dataSourceSpecBinding: {
+                  settlementDataProperty: 'prices.ETH.value',
+                  tradingTerminationProperty: 'trading.terminated.ETH5',
+                },
+              },
+            },
+            metadata: ['sector:energy', 'sector:tech', 'source:docs.vega.xyz'],
+            priceMonitoringParameters: {
+              triggers: [
+                {
+                  horizon: '43200',
+                  probability: '0.9999999',
+                  auctionExtension: '600',
+                },
+              ],
+            },
+            liquidityMonitoringParameters: {
+              targetStakeParameters: {
+                timeWindow: '3600',
+                scalingFactor: 10,
+              },
+              triggeringRatio: '0.7',
+              auctionExtension: '1',
+            },
+            logNormal: {
+              tau: 0.0001140771161,
+              riskAversionParameter: 0.01,
+              params: {
+                mu: 0,
+                r: 0.016,
+                sigma: 0.5,
+              },
+            },
+          },
+        },
+        closingTimestamp,
+        enactmentTimestamp,
+      },
+    },
+  };
+}
+
 export function mockNetworkUpgradeProposal() {
  cy.mockGQL((req) => {
    aliasGQLQuery(req, 'Nodes', nodeData);
@@ -67,7 +67,6 @@ export async function faucetAsset(assetEthAddress: string) {

 export async function vegaWalletTeardown() {
  cy.get(associatedAmountInWallet)
-    .should('be.visible')
    .invoke('text')
    .then((associatedAmount) => {
      cy.get('body').then(($body) => {
@@ -82,9 +81,11 @@ export async function vegaWalletTeardown() {
      cy.get(vegaWalletContainer).within(() => {
        cy.get(associatedAmountInWallet, {
          timeout: transactionTimeout,
-        }).contains('0.00', {
-          timeout: transactionTimeout,
-        });
+        })
+          .should('have.length', 1, { timeout: transactionTimeout })
+          .contains('0.00', {
+            timeout: transactionTimeout,
+          });
      });
    });
 }
@@ -15,6 +15,7 @@ NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/main/announcements.json
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
+NX_VEGA_REST_URL=https://api.n00.stagnet1.vega.xyz/api/v2/

 #Test configuration variables
 CYPRESS_FAIRGROUND=false
@@ -17,6 +17,7 @@ NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
+NX_VEGA_REST_URL=http://localhost:3008/api/v2/

 #Test configuration variables
 CYPRESS_FAIRGROUND=false
@@ -11,3 +11,5 @@ NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-devnet1-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
+NX_VEGA_REST_URL=https://api.n00.devnet1.vega.xyz/api/v2/
+NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996
@@ -3,12 +3,14 @@ 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://mainnet.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
+NX_ETHEREUM_PROVIDER_URL=https://eth-mainnet.gateway.pokt.network/v1/lb/6684b914570bbfa533ba9324
 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
 NX_VEGA_EXPLORER_URL=https://explorer.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40:87edc2605e544f888305d7fc4a9141bd@o286262.ingest.sentry.io/5882996
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-mainnet-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
+NX_VEGA_REST_URL=https://api.vega.community/api/v2/
@@ -8,3 +8,4 @@ NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
+NX_VEGA_REST_URL=https://api.n00.stagnet1.vega.xyz/api/v2/
@@ -12,3 +12,5 @@ NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-testnet-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
+NX_VEGA_REST_URL=https://api.n07.testnet.vega.xyz/api/v2/
+NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996
@@ -9,3 +9,5 @@ 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_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
@@ -16,6 +16,7 @@ import { AppStateProvider } from './contexts/app-state/app-state-provider';
 import { ContractsProvider } from './contexts/contracts/contracts-provider';
 import { AppRouter } from './routes';
 import type { EthereumConfig } from '@vegaprotocol/web3';
+import { WithdrawalApprovalDialogContainer } from '@vegaprotocol/web3';
 import {
  createConnectors,
  useEthTransactionManager,
@@ -43,7 +44,7 @@ import {
 } from '@vegaprotocol/environment';
 import { ENV } from './config';
 import type { InMemoryCacheConfig } from '@apollo/client';
-import { WithdrawalDialog } from '@vegaprotocol/withdraws';
+import { CreateWithdrawalDialog } from '@vegaprotocol/withdraws';
 import { SplashLoader } from './components/splash-loader';
 import { ToastsManager } from './toasts-manager';
 import {
@@ -52,6 +53,7 @@ import {
 } from './components/telemetry-dialog/telemetry-dialog';
 import { useLocalStorage } from '@vegaprotocol/react-helpers';
 import { useTranslation } from 'react-i18next';
+import { isPartyNotFoundError } from './lib/party';

 const cache: InMemoryCacheConfig = {
  typePolicies: {
@@ -157,7 +159,8 @@ const Web3Container = ({
                  <InitializeHandlers />
                  <VegaWalletDialogs />
                  <TransactionModal />
-                  <WithdrawalDialog />
+                  <CreateWithdrawalDialog />
+                  <WithdrawalApprovalDialogContainer />
                  <TelemetryDialog />
                </>
              </BalanceManager>
@@ -219,9 +222,8 @@ const AppContainer = () => {
          const transaction = event.transaction;

          if (
-            (errorIsString && error.includes('failed to get party ID')) ||
-            (errorIsObject &&
-              error?.message?.includes('failed to get party ID'))
+            (errorIsString && isPartyNotFoundError({ message: error })) ||
+            (errorIsObject && isPartyNotFoundError(error))
          ) {
            // This error is caused by a pubkey making an API request before
            // it has interacted with the chain. This isn't needed in Sentry.
@@ -0,0 +1,40 @@
+import { t } from '@vegaprotocol/i18n';
+import {
+  ExternalLink,
+  VegaIcon,
+  VegaIconNames,
+} from '@vegaprotocol/ui-toolkit';
+import Routes from '../../routes/routes';
+
+export const RiskMessage = () => {
+  return (
+    <>
+      <div className="bg-vega-light-100 dark:bg-vega-dark-100 p-6 mb-6">
+        <ul className="list-[square] ml-4">
+          <li>
+            {t(
+              'You may encounter bugs, loss of functionality or loss of assets using the App.'
+            )}
+          </li>
+          <li>
+            {t(
+              'No party accepts any liability for any losses whatsoever related to its use.'
+            )}
+          </li>
+        </ul>
+      </div>
+      <p className="mb-8">
+        {t(
+          'By using the Vega Governance App, you acknowledge that you have read and understood the'
+        )}{' '}
+        <ExternalLink href={Routes.DISCLAIMER} className="underline">
+          <span className="flex items-center gap-1">
+            <span>{t('Vega Governance Disclaimer')}</span>
+            <VegaIcon name={VegaIconNames.OPEN_EXTERNAL} />
+          </span>
+        </ExternalLink>
+        .
+      </p>
+    </>
+  );
+};
@@ -4,9 +4,11 @@ import {
  useAppState,
 } from '../../contexts/app-state/app-state-context';
 import { Connectors } from '../../lib/vega-connectors';
+import { RiskMessage } from './risk-message';

 export const VegaWalletDialogs = () => {
  const { appState, appDispatch } = useAppState();
+
  return (
    <>
      <VegaConnectDialog
@@ -17,6 +19,7 @@ export const VegaWalletDialogs = () => {
            isOpen: open,
          })
        }
+        riskMessage={<RiskMessage />}
      />

      <VegaManageDialog
@@ -26,6 +26,7 @@ import type {
  WalletDelegationFieldsFragment,
 } from './__generated__/Delegations';
 import { DelegationsDocument } from './__generated__/Delegations';
+import { isPartyNotFoundError } from '../../lib/party';

 export const usePollForDelegations = () => {
  const { token: vegaToken } = useContracts();
@@ -75,6 +76,7 @@ export const usePollForDelegations = () => {
          })
          .then((res) => {
            if (!mounted) return;
+
            const canonisedDelegations = removePaginationWrapper(
              res.data.party?.delegationsConnection?.edges
            );
@@ -203,6 +205,15 @@ export const usePollForDelegations = () => {
            setDelegatedNodes(delegatedAmounts);
          })
          .catch((err: Error) => {
+            // if party isn't found, dont log to Sentry, just clear state as, user
+            // will not have any delagations or accounts
+            if (isPartyNotFoundError(err)) {
+              setDelegations([]);
+              setAccounts([]);
+              setDelegatedNodes([]);
+              setCurrentStakeAvailable(new BigNumber(0));
+              return;
+            }
            Sentry.captureException(err);
            // If query fails stop interval. Its almost certain that the query
            // will just continue to fail
@@ -62,6 +62,7 @@ export const ENV = {
  ethWalletMnemonic: windowOrDefault('NX_ETH_WALLET_MNEMONIC'),
  localProviderUrl: windowOrDefault('NX_LOCAL_PROVIDER_URL'),
  delegationsPagination: windowOrDefault('NX_DELEGATIONS_PAGINATION'),
+  rest: windowOrDefault('NX_VEGA_REST_URL'),
  flags: {
    NETWORK_DOWN: TRUTHY.includes(windowOrDefault('NX_NETWORK_DOWN')),
    MOCK: TRUTHY.includes(windowOrDefault('NX_MOCKED')),
@@ -815,5 +815,11 @@
  "NoThanks": "No thanks",
  "ShareData": "Share data",
  "ContinueSharingData": "Continue sharing data",
-  "NodeUnsuitable": "Node: {{url}} is unsuitable"
+  "NodeUnsuitable": "Node: {{url}} is unsuitable",
+  "Disclaimer": "Disclaimer",
+  "disclaimer1": "The Vega Governance App allows the Vega network to arrive at on-chain decisions, where tokenholders can create proposals that other tokenholders can vote to approve or reject.  Vega supports on-chain proposals for creating markets and assets, and changing network parameters, markets and assets. Vega also supports freeform proposals for community suggestions that will not be enacted on-chain.",
+  "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."
 }
@@ -0,0 +1,8 @@
+export const PARTY_NOT_FOUND = 'failed to get party for ID';
+
+export const isPartyNotFoundError = (error: { message: string }) => {
+  if (error.message.includes(PARTY_NOT_FOUND)) {
+    return true;
+  }
+  return false;
+};
@@ -0,0 +1,21 @@
+import type { RouteChildProps } from '..';
+import { useDocumentTitle } from '../../hooks/use-document-title';
+import { Heading } from '../../components/heading';
+import { useTranslation } from 'react-i18next';
+
+const Disclaimer = ({ name }: RouteChildProps) => {
+  useDocumentTitle(name);
+  const { t } = useTranslation();
+  return (
+    <>
+      <Heading title={t('Disclaimer')} />
+      <p className="mb-6 mt-10">{t('disclaimer1')}</p>
+      <p className="mb-6">{t('disclaimer2')}</p>
+      <p className="mb-6">{t('disclaimer3')}</p>
+      <p className="mb-8">{t('disclaimer4')}</p>
+      <p className="mb-8">{t('disclaimer5')}</p>
+    </>
+  );
+};
+
+export default Disclaimer;
@@ -27,6 +27,10 @@ import type { ProposalFieldsFragment } from '../proposals/proposals/__generated_
 import type { NodesFragmentFragment } from '../staking/home/__generated__/Nodes';
 import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
 import { useProtocolUpgradeProposalsQuery } from '@vegaprotocol/proposals';
+import {
+  orderByDate,
+  orderByUpgradeBlockHeight,
+} from '../proposals/components/proposals-list/proposals-list';

 const nodesToShow = 6;

@@ -200,17 +204,20 @@ const GovernanceHome = ({ name }: RouteChildProps) => {
  const proposals = useMemo(
    () =>
      proposalsData
-        ? getNotRejectedProposals<ProposalFieldsFragment>(
-            proposalsData.proposalsConnection
-          )
+        ? getNotRejectedProposals(proposalsData.proposalsConnection)
        : [],
    [proposalsData]
  );

+  const sortedProposals = useMemo(
+    () => orderByDate(proposals).reverse(),
+    [proposals]
+  );
+
  const protocolUpgradeProposals = useMemo(
    () =>
      protocolUpgradesData
-        ? getNotRejectedProtocolUpgradeProposals<ProtocolUpgradeProposalFieldsFragment>(
+        ? getNotRejectedProtocolUpgradeProposals(
            protocolUpgradesData.protocolUpgradeProposals
          ).filter(
            (p) =>
@@ -221,15 +228,20 @@ const GovernanceHome = ({ name }: RouteChildProps) => {
    [protocolUpgradesData]
  );

+  const sortedProtocolUpgradeProposals = useMemo(
+    () => orderByUpgradeBlockHeight(protocolUpgradeProposals),
+    [protocolUpgradeProposals]
+  );
+
  const totalProposalsDesired = 4;
-  const protocolUpgradeProposalsToShow = protocolUpgradeProposals.slice(
+  const protocolUpgradeProposalsToShow = sortedProtocolUpgradeProposals.slice(
    0,
    totalProposalsDesired
  );
  const proposalsToShow =
    protocolUpgradeProposalsToShow.length === totalProposalsDesired
      ? []
-      : proposals.slice(
+      : sortedProposals.slice(
          0,
          totalProposalsDesired - protocolUpgradeProposalsToShow.length
        );
@@ -124,7 +124,7 @@ describe('Proposal header', () => {
      })
    );
    expect(screen.getByTestId('proposal-title')).toHaveTextContent(
-      'Unknown proposal'
+      'New asset proposal'
    );
    expect(screen.getByTestId('proposal-type')).toHaveTextContent('New asset');
    expect(screen.getByTestId('proposal-details')).toHaveTextContent(
@@ -21,6 +21,7 @@ export const ProposalHeader = ({

  let details: ReactNode;
  let proposalType = '';
+  let fallbackTitle = '';

  const title = proposal?.rationale.title.trim();

@@ -29,6 +30,7 @@ export const ProposalHeader = ({
  switch (change?.__typename) {
    case 'NewMarket': {
      proposalType = 'NewMarket';
+      fallbackTitle = t('NewMarketProposal');
      details = (
        <>
          <span>
@@ -50,6 +52,7 @@ export const ProposalHeader = ({
    }
    case 'UpdateMarket': {
      proposalType = 'UpdateMarket';
+      fallbackTitle = t('UpdateMarketProposal');
      details = (
        <>
          <span>{t('Market change')}:</span>{' '}
@@ -60,6 +63,7 @@ export const ProposalHeader = ({
    }
    case 'NewAsset': {
      proposalType = 'NewAsset';
+      fallbackTitle = t('NewAssetProposal');
      details = (
        <>
          <span>{t('Symbol')}:</span> <Lozenge>{change.symbol}.</Lozenge>{' '}
@@ -81,6 +85,7 @@ export const ProposalHeader = ({
    }
    case 'UpdateNetworkParameter': {
      proposalType = 'NetworkParameter';
+      fallbackTitle = t('NetworkParameterProposal');
      details = (
        <>
          <span>{t('Change')}:</span>{' '}
@@ -95,11 +100,13 @@ export const ProposalHeader = ({
    }
    case 'NewFreeform': {
      proposalType = 'Freeform';
+      fallbackTitle = t('FreeformProposal');
      details = <span />;
      break;
    }
    case 'UpdateAsset': {
      proposalType = 'UpdateAsset';
+      fallbackTitle = t('UpdateAssetProposal');
      details = (
        <>
          <span>{t('AssetID')}:</span>{' '}
@@ -115,10 +122,14 @@ export const ProposalHeader = ({
      <div data-testid="proposal-title">
        {isListItem ? (
          <header>
-            <SubHeading title={titleContent || t('Unknown proposal')} />
+            <SubHeading
+              title={titleContent || fallbackTitle || t('Unknown proposal')}
+            />
          </header>
        ) : (
-          <Heading title={titleContent || t('Unknown proposal')} />
+          <Heading
+            title={titleContent || fallbackTitle || t('Unknown proposal')}
+          />
        )}
      </div>

@@ -43,13 +43,17 @@ jest.mock('../list-asset', () => ({

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

 it('renders each section', async () => {
  const proposal = generateProposal();
-  render(<Proposal proposal={proposal as ProposalQuery['proposal']} />);
+  render(
+    <Proposal restData={{}} proposal={proposal as ProposalQuery['proposal']} />
+  );
  expect(await screen.findByTestId('proposal-header')).toBeInTheDocument();
  expect(screen.getByTestId('proposal-change-table')).toBeInTheDocument();
  expect(screen.getByTestId('proposal-json')).toBeInTheDocument();
@@ -76,6 +80,8 @@ it('renders whitelist section if proposal is new asset and source is erc20', asy
      },
    },
  });
-  render(<Proposal proposal={proposal as ProposalQuery['proposal']} />);
+  render(
+    <Proposal restData={{}} proposal={proposal as ProposalQuery['proposal']} />
+  );
  expect(screen.getByTestId('proposal-list-asset')).toBeInTheDocument();
 });
@@ -24,9 +24,11 @@ export enum ProposalType {
 }
 export interface ProposalProps {
  proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  restData: any;
 }

-export const Proposal = ({ proposal }: ProposalProps) => {
+export const Proposal = ({ proposal, restData }: ProposalProps) => {
  const { params, loading, error } = useNetworkParams([
    NetworkParams.governance_proposal_market_minVoterBalance,
    NetworkParams.governance_proposal_updateMarket_minVoterBalance,
@@ -99,12 +101,15 @@ export const Proposal = ({ proposal }: ProposalProps) => {
          <ProposalDescription description={proposal.rationale.description} />
        </div>

-        <div className="mb-4">
-          <ProposalTerms data={proposal.terms} />
-        </div>
+        {proposal.terms.change.__typename !== 'NewMarket' &&
+          proposal.terms.change.__typename !== 'UpdateMarket' && (
+            <div className="mb-4">
+              <ProposalTerms data={proposal.terms} />
+            </div>
+          )}

        <div className="mb-6">
-          <ProposalJson proposal={proposal} />
+          <ProposalJson proposal={restData?.data?.proposal} />
        </div>

        <div className="mb-10">
@@ -132,10 +132,10 @@ describe('Proposals list', () => {
    const closedProposalsItems = closedProposals.getAllByTestId(
      'proposals-list-item'
    );
-    expect(openProposalsItems[0]).toHaveAttribute('id', 'proposal1');
-    expect(openProposalsItems[1]).toHaveAttribute('id', 'proposal2');
-    expect(closedProposalsItems[0]).toHaveAttribute('id', 'proposal4');
-    expect(closedProposalsItems[1]).toHaveAttribute('id', 'proposal3');
+    expect(openProposalsItems[0]).toHaveAttribute('id', 'proposal2');
+    expect(openProposalsItems[1]).toHaveAttribute('id', 'proposal1');
+    expect(closedProposalsItems[0]).toHaveAttribute('id', 'proposal3');
+    expect(closedProposalsItems[1]).toHaveAttribute('id', 'proposal4');
  });

  it('Displays info on no proposals', () => {
@@ -1,5 +1,6 @@
+import orderBy from 'lodash/orderBy';
 import { isFuture } from 'date-fns';
-import { useState } from 'react';
+import { useState, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Heading, SubHeading } from '../../../../components/heading';
 import { ProposalsListItem } from '../proposals-list-item';
@@ -30,6 +31,25 @@ interface SortedProtocolUpgradeProposalsProps {
  closed: ProtocolUpgradeProposalFieldsFragment[];
 }

+export const orderByDate = (arr: ProposalFieldsFragment[]) =>
+  orderBy(
+    arr,
+    [
+      (p) => new Date(p?.terms?.closingDatetime).getTime(),
+      (p) => new Date(p?.datetime).getTime(),
+    ],
+    ['asc', 'asc']
+  );
+
+export const orderByUpgradeBlockHeight = (
+  arr: ProtocolUpgradeProposalFieldsFragment[]
+) =>
+  orderBy(
+    arr,
+    [(p) => p?.upgradeBlockHeight, (p) => p.vegaReleaseTag],
+    ['desc', 'desc']
+  );
+
 export const ProposalsList = ({
  proposals,
  protocolUpgradeProposals,
@@ -37,35 +57,57 @@ export const ProposalsList = ({
 }: ProposalsListProps) => {
  const { t } = useTranslation();
  const [filterString, setFilterString] = useState('');
-  const sortedProposals = proposals.reduce(
-    (acc: SortedProposalsProps, proposal) => {
-      if (isFuture(new Date(proposal?.terms.closingDatetime))) {
-        acc.open.push(proposal);
-      } else {
-        acc.closed.push(proposal);
-      }
-      return acc;
-    },
-    {
-      open: [],
-      closed: [],
-    }
-  );

-  const sortedProtocolUpgradeProposals = protocolUpgradeProposals.reduce(
-    (acc: SortedProtocolUpgradeProposalsProps, proposal) => {
-      if (Number(proposal?.upgradeBlockHeight) > Number(lastBlockHeight)) {
-        acc.open.push(proposal);
-      } else {
-        acc.closed.push(proposal);
+  const sortedProposals: SortedProposalsProps = useMemo(() => {
+    const initialSorting = proposals.reduce(
+      (acc: SortedProposalsProps, proposal) => {
+        if (isFuture(new Date(proposal?.terms.closingDatetime))) {
+          acc.open.push(proposal);
+        } else {
+          acc.closed.push(proposal);
+        }
+        return acc;
+      },
+      {
+        open: [],
+        closed: [],
      }
-      return acc;
-    },
-    {
-      open: [],
-      closed: [],
-    }
-  );
+    );
+    return {
+      open:
+        initialSorting.open.length > 0
+          ? orderByDate(initialSorting.open as ProposalFieldsFragment[])
+          : [],
+      closed:
+        initialSorting.closed.length > 0
+          ? orderByDate(
+              initialSorting.closed as ProposalFieldsFragment[]
+            ).reverse()
+          : [],
+    };
+  }, [proposals]);
+
+  const sortedProtocolUpgradeProposals: SortedProtocolUpgradeProposalsProps =
+    useMemo(() => {
+      const initialSorting = protocolUpgradeProposals.reduce(
+        (acc: SortedProtocolUpgradeProposalsProps, proposal) => {
+          if (Number(proposal?.upgradeBlockHeight) > Number(lastBlockHeight)) {
+            acc.open.push(proposal);
+          } else {
+            acc.closed.push(proposal);
+          }
+          return acc;
+        },
+        {
+          open: [],
+          closed: [],
+        }
+      );
+      return {
+        open: orderByUpgradeBlockHeight(initialSorting.open),
+        closed: orderByUpgradeBlockHeight(initialSorting.closed).reverse(),
+      };
+    }, [protocolUpgradeProposals, lastBlockHeight]);

  const filterPredicate = (
    p: ProposalFieldsFragment | ProposalQuery['proposal']
@@ -107,7 +107,7 @@ export const ProtocolUpgradeProposalsListItem = ({
          <div className="grid grid-cols-1 mt-3">
            <div className="justify-self-end">
              <Link
-                to={`${Routes.PROPOSALS}/protocol-upgrade/${stripFullStops(
+                to={`${Routes.PROTOCOL_UPGRADES}/${stripFullStops(
                  proposal.vegaReleaseTag
                )}`}
              >
@@ -5,9 +5,14 @@ import { useParams } from 'react-router-dom';
 import { Proposal } from '../components/proposal';
 import { ProposalNotFound } from '../components/proposal-not-found';
 import { useProposalQuery } from './__generated__/Proposal';
+import { useFetch } from '@vegaprotocol/react-helpers';
+import { ENV } from '../../../config';

 export const ProposalContainer = () => {
  const params = useParams<{ proposalId: string }>();
+  const {
+    state: { data: restData },
+  } = useFetch(`${ENV.rest}governance?proposalId=${params.proposalId}`);
  const { data, loading, error, refetch } = useProposalQuery({
    fetchPolicy: 'network-only',
    errorPolicy: 'ignore',
@@ -23,7 +28,7 @@ export const ProposalContainer = () => {
  return (
    <AsyncRenderer loading={loading} error={error} data={data}>
      {data?.proposal ? (
-        <Proposal proposal={data.proposal} />
+        <Proposal proposal={data.proposal} restData={restData} />
      ) : (
        <ProposalNotFound />
      )}
@@ -1,3 +1,4 @@
+import flow from 'lodash/flow';
 import { Callout, Intent, Splash } from '@vegaprotocol/ui-toolkit';
 import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -6,36 +7,15 @@ import { SplashLoader } from '../../../components/splash-loader';
 import { ProposalsList } from '../components/proposals-list';
 import { useProposalsQuery } from './__generated__/Proposals';
 import { getNodes } from '@vegaprotocol/utils';
-import flow from 'lodash/flow';
 import {
  ProposalState,
  ProtocolUpgradeProposalStatus,
 } from '@vegaprotocol/types';
 import type { NodeConnection, NodeEdge } from '@vegaprotocol/utils';
 import type { ProposalFieldsFragment } from './__generated__/Proposals';
-import orderBy from 'lodash/orderBy';
 import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
 import { useProtocolUpgradeProposalsQuery } from '@vegaprotocol/proposals';

-const orderByDate = (arr: ProposalFieldsFragment[]) =>
-  orderBy(
-    arr,
-    [
-      (p) => new Date(p?.terms?.closingDatetime).getTime(),
-      (p) => new Date(p?.datetime).getTime(),
-    ],
-    ['asc', 'asc']
-  );
-
-const orderByUpgradeBlockHeight = (
-  arr: ProtocolUpgradeProposalFieldsFragment[]
-) =>
-  orderBy(
-    arr,
-    [(p) => p?.upgradeBlockHeight, (p) => p.vegaReleaseTag],
-    ['desc', 'desc']
-  );
-
 export function getNotRejectedProposals<T extends ProposalFieldsFragment>(
  data?: NodeConnection<NodeEdge<T>> | null
 ): T[] {
@@ -44,7 +24,6 @@ export function getNotRejectedProposals<T extends ProposalFieldsFragment>(
      getNodes<ProposalFieldsFragment>(data, (p) =>
        p ? p.state !== ProposalState.STATE_REJECTED : false
      ),
-    orderByDate,
  ])(data);
 }

@@ -59,7 +38,6 @@ export function getNotRejectedProtocolUpgradeProposals<
            ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_REJECTED
          : false
      ),
-    orderByUpgradeBlockHeight,
  ])(data);
 }

@@ -82,17 +60,14 @@ export const ProposalsContainer = () => {
  });

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

  const protocolUpgradeProposals = useMemo(
    () =>
      protocolUpgradesData
-        ? getNotRejectedProtocolUpgradeProposals<ProtocolUpgradeProposalFieldsFragment>(
+        ? getNotRejectedProtocolUpgradeProposals(
            protocolUpgradesData.protocolUpgradeProposals
          )
        : [],
@@ -49,6 +49,7 @@ export const ProposeFreeform = () => {
    formState: { errors },
    setValue,
    watch,
+    trigger,
  } = useForm<FreeformProposalFormFields>();
  const { finalizedProposal, submit, Dialog } = useProposalSubmit();

@@ -85,7 +86,13 @@ export const ProposeFreeform = () => {
    await submit(assembleProposal(fields));
  };

-  const viewJson = () => {
+  const viewJson = async () => {
+    const isValid = await trigger();
+
+    if (!isValid) {
+      return;
+    }
+
    const formData = watch();
    downloadJson(
      JSON.stringify(assembleProposal(formData)),
@@ -89,6 +89,7 @@ export const ProposeNetworkParameter = () => {
    formState: { errors },
    setValue,
    watch,
+    trigger,
  } = useForm<NetworkParameterProposalFormFields>();
  const { finalizedProposal, submit, Dialog } = useProposalSubmit();

@@ -148,7 +149,13 @@ export const ProposeNetworkParameter = () => {
    await submit(assembleProposal(fields));
  };

-  const viewJson = () => {
+  const viewJson = async () => {
+    const isValid = await trigger();
+
+    if (!isValid) {
+      return;
+    }
+
    const formData = watch();
    downloadJson(
      JSON.stringify(assembleProposal(formData)),
@@ -61,6 +61,7 @@ export const ProposeNewAsset = () => {
    formState: { errors },
    setValue,
    watch,
+    trigger,
  } = useForm<NewAssetProposalFormFields>();
  const { finalizedProposal, submit, Dialog } = useProposalSubmit();

@@ -117,7 +118,13 @@ export const ProposeNewAsset = () => {
    await submit(assembleProposal(fields));
  };

-  const viewJson = () => {
+  const viewJson = async () => {
+    const isValid = await trigger();
+
+    if (!isValid) {
+      return;
+    }
+
    const formData = watch();
    downloadJson(
      JSON.stringify(assembleProposal(formData)),
@@ -59,6 +59,7 @@ export const ProposeNewMarket = () => {
    formState: { errors },
    setValue,
    watch,
+    trigger,
  } = useForm<NewMarketProposalFormFields>();
  const { finalizedProposal, submit, Dialog } = useProposalSubmit();

@@ -107,7 +108,13 @@ export const ProposeNewMarket = () => {
    await submit(assembleProposal(fields));
  };

-  const viewJson = () => {
+  const viewJson = async () => {
+    const isValid = await trigger();
+
+    if (!isValid) {
+      return;
+    }
+
    const formData = watch();
    downloadJson(
      JSON.stringify(assembleProposal(formData)),
@@ -59,6 +59,7 @@ export const ProposeUpdateAsset = () => {
    formState: { errors },
    setValue,
    watch,
+    trigger,
  } = useForm<UpdateAssetProposalFormFields>();
  const { finalizedProposal, submit, Dialog } = useProposalSubmit();

@@ -107,7 +108,13 @@ export const ProposeUpdateAsset = () => {
    await submit(assembleProposal(fields));
  };

-  const viewJson = () => {
+  const viewJson = async () => {
+    const isValid = await trigger();
+
+    if (!isValid) {
+      return;
+    }
+
    const formData = watch();
    downloadJson(
      JSON.stringify(assembleProposal(formData)),
@@ -106,6 +106,7 @@ export const ProposeUpdateMarket = () => {
    formState: { errors },
    setValue,
    watch,
+    trigger,
  } = useForm<UpdateMarketProposalFormFields>();
  const { finalizedProposal, submit, Dialog } = useProposalSubmit();

@@ -157,7 +158,13 @@ export const ProposeUpdateMarket = () => {
    await submit(assembleProposal(fields));
  };

-  const viewJson = () => {
+  const viewJson = async () => {
+    const isValid = await trigger();
+
+    if (!isValid) {
+      return;
+    }
+
    const formData = watch();
    downloadJson(
      JSON.stringify(assembleProposal(formData)),
@@ -16,11 +16,10 @@ const orderByDate = (arr: ProposalFieldsFragment[]) =>
  orderBy(
    arr,
    [
-      (p) => new Date(p?.terms?.enactmentDatetime || 0).getTime(), // has to be defaulted to 0 because new Date(null).getTime() -> NaN which is first when ordered.
-      (p) => new Date(p?.terms?.closingDatetime).getTime(),
+      (p) => new Date(p?.terms?.closingDatetime || 0).getTime(), // has to be defaulted to 0 because new Date(null).getTime() -> NaN which is first when ordered
      (p) => p.id,
    ],
-    ['desc', 'desc', 'desc']
+    ['desc', 'desc']
  );

 export function getRejectedProposals<T extends ProposalFieldsFragment>(
@@ -207,6 +207,13 @@ const LazyWithdrawals = React.lazy(
    )
 );

+const LazyDisclaimer = React.lazy(
+  () =>
+    import(
+      /* webpackChunkName: "route-disclaimer", webpackPrefetch: true */ './disclaimer'
+    )
+);
+
 const redirects = [
  {
    path: Routes.VALIDATORS,
@@ -224,12 +231,16 @@ const redirects = [
    path: '/vesting',
    element: <Navigate to={Routes.REDEEM} replace />,
  },
+  {
+    path: Routes.PROTOCOL_UPGRADES,
+    element: <Navigate to={Routes.PROPOSALS} replace />,
+  },
 ];

 const routerConfig = [
  {
    path: Routes.HOME,
-    element: <LazyHome name="Token" />,
+    element: <LazyHome name="Home" />,
  },
  {
    path: Routes.PROPOSALS,
@@ -264,13 +275,13 @@ const routerConfig = [
      },
      { path: 'proposals', element: <LazyProposalsList /> },
      { path: ':proposalId', element: <LazyProposal /> },
-      {
-        path: 'protocol-upgrade/:proposalReleaseTag',
-        element: <LazyProtocolUpgradeProposal />,
-      },
      { path: 'rejected', element: <LazyRejectedProposalsList /> },
    ],
  },
+  {
+    path: `${Routes.PROTOCOL_UPGRADES}/:proposalReleaseTag`,
+    element: <LazyProtocolUpgradeProposal />,
+  },
  {
    path: Routes.VALIDATORS,
    element: <LazyStaking name="Staking" />,
@@ -291,7 +302,7 @@ const routerConfig = [
    // Not lazy as loaded when a user first hits the site
    children: [
      {
-        element: <Home name="Home" />,
+        element: <Home name="Token" />,
        index: true,
      },
      {
@@ -325,8 +336,11 @@ const routerConfig = [
          },
        ],
      },
-      { path: 'associate', element: <LazyStakingAssociate /> },
-      { path: 'disassociate', element: <LazyStakingDisassociate /> },
+      { path: 'associate', element: <LazyStakingAssociate name="Associate" /> },
+      {
+        path: 'disassociate',
+        element: <LazyStakingDisassociate name="Disassociate" />,
+      },
    ],
  },
  {
@@ -342,6 +356,10 @@ const routerConfig = [
    path: Routes.CONTRACTS,
    element: <LazyContracts name="Contracts" />,
  },
+  {
+    path: Routes.DISCLAIMER,
+    element: <LazyDisclaimer name="Disclaimer" />,
+  },
  {
    path: '*',
    // Not lazy as loaded when a user first hits the site
@@ -5,6 +5,7 @@ const Routes = {
  REWARDS: '/rewards',
  PROPOSALS: '/proposals',
  PROPOSALS_REJECTED: '/proposals/rejected',
+  PROTOCOL_UPGRADES: '/protocol-upgrades',
  NOT_PERMITTED: '/not-permitted',
  NOT_FOUND: '/not-found',
  CONTRACTS: '/contracts',
@@ -14,6 +15,7 @@ const Routes = {
  SUPPLY: '/token/tranches',
  ASSOCIATE: '/token/associate',
  DISASSOCIATE: '/token/disassociate',
+  DISCLAIMER: '/disclaimer',
 };

 export default Routes;
@@ -5,12 +5,22 @@ query PreviousEpoch($epochId: ID) {
      edges {
        node {
          id
+          stakedTotal
          rewardScore {
            rawValidatorScore
            performanceScore
+            multisigScore
+            validatorScore
+            normalisedScore
+            validatorStatus
          }
          rankingScore {
+            status
+            previousStatus
+            rankingScore
            stakeScore
+            performanceScore
+            votingPower
          }
        }
      }
@@ -8,7 +8,7 @@ export type PreviousEpochQueryVariables = Types.Exact<{
 }>;


-export type PreviousEpochQuery = { __typename?: 'Query', epoch: { __typename?: 'Epoch', id: string, validatorsConnection?: { __typename?: 'NodesConnection', edges?: Array<{ __typename?: 'NodeEdge', node: { __typename?: 'Node', id: string, rewardScore?: { __typename?: 'RewardScore', rawValidatorScore: string, performanceScore: string } | null, rankingScore: { __typename?: 'RankingScore', stakeScore: string } } } | null> | null } | null } };
+export type PreviousEpochQuery = { __typename?: 'Query', epoch: { __typename?: 'Epoch', id: string, validatorsConnection?: { __typename?: 'NodesConnection', edges?: Array<{ __typename?: 'NodeEdge', node: { __typename?: 'Node', id: string, stakedTotal: string, rewardScore?: { __typename?: 'RewardScore', rawValidatorScore: string, performanceScore: string, multisigScore: string, validatorScore: string, normalisedScore: string, validatorStatus: Types.ValidatorStatus } | null, rankingScore: { __typename?: 'RankingScore', status: Types.ValidatorStatus, previousStatus: Types.ValidatorStatus, rankingScore: string, stakeScore: string, performanceScore: string, votingPower: string } } } | null> | null } | null } };


 export const PreviousEpochDocument = gql`
@@ -19,12 +19,22 @@ export const PreviousEpochDocument = gql`
      edges {
        node {
          id
+          stakedTotal
          rewardScore {
            rawValidatorScore
            performanceScore
+            multisigScore
+            validatorScore
+            normalisedScore
+            validatorStatus
          }
          rankingScore {
+            status
+            previousStatus
+            rankingScore
            stakeScore
+            performanceScore
+            votingPower
          }
        }
      }
@@ -1,12 +1,14 @@
 import { useEthereumConfig } from '@vegaprotocol/web3';
-import { StakingWalletsContainer } from './components/staking-wallets-container/staking-wallets-container';
+import { StakingWalletsContainer } from './components/staking-wallets-container';
 import { AssociatePage } from './associate-page';
 import { AssociatePageNoVega } from './associate-page-no-vega';
 import { Heading } from '../../../components/heading';
-import React from 'react';
 import { useTranslation } from 'react-i18next';
+import { useDocumentTitle } from '../../../hooks/use-document-title';
+import type { RouteChildProps } from '../../index';

-export const AssociateContainer = () => {
+export const AssociateContainer = ({ name }: RouteChildProps) => {
+  useDocumentTitle(name);
  const { t } = useTranslation();
  const { config } = useEthereumConfig();

@@ -39,7 +39,7 @@ jest.mock('@vegaprotocol/wallet', () => ({
 }));

 const renderComponent = () => {
-  return render(<Disassociate />);
+  return render(<Disassociate name="Disassociate" />);
 };

 describe('Disassociate', () => {
@@ -3,10 +3,12 @@ import { useWeb3React } from '@web3-react/core';
 import { EthConnectPrompt } from '../../../components/eth-connect-prompt';
 import { DisassociatePage } from './components/disassociate-page';
 import { Heading } from '../../../components/heading';
-import React from 'react';
 import { useTranslation } from 'react-i18next';
+import { useDocumentTitle } from '../../../hooks/use-document-title';
+import type { RouteChildProps } from '../../index';

-export const DisassociateContainer = () => {
+export const DisassociateContainer = ({ name }: RouteChildProps) => {
+  useDocumentTitle(name);
  const { t } = useTranslation();
  const { account } = useWeb3React();
  const { pubKey } = useVegaWallet();
@@ -79,36 +79,72 @@ const MOCK_PREVIOUS_EPOCH: PreviousEpochQuery = {
        {
          node: {
            id: 'ccc022b7e63a4d0a6d3a193c3940c88574060e58a184964c994998d86835a1b4',
+            stakedTotal: '14182454495731682635157',
            rewardScore: {
              rawValidatorScore: '0.25',
              performanceScore: '0.9998677767864936',
+              multisigScore: '',
+              validatorScore: '',
+              normalisedScore: '',
+              validatorStatus:
+                Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_TENDERMINT,
            },
            rankingScore: {
              stakeScore: '0.2499583402766206',
+              performanceScore: '0.9998677767864936',
+              status: Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_TENDERMINT,
+              previousStatus:
+                Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_TENDERMINT,
+              rankingScore: '',
+              votingPower: '',
            },
          },
        },
        {
          node: {
            id: '966438c6bffac737cfb08173ffcb3f393c4692b099ad80cb45a82e2dc0a8cf99',
+            stakedTotal: '9618711883996159534058',
            rewardScore: {
              rawValidatorScore: '0.3',
              performanceScore: '1',
+              multisigScore: '',
+              validatorScore: '0.31067',
+              normalisedScore: '',
+              validatorStatus:
+                Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_TENDERMINT,
            },
            rankingScore: {
              stakeScore: '0.25',
+              performanceScore: '0.9998677767864936',
+              status: Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_TENDERMINT,
+              previousStatus:
+                Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_TENDERMINT,
+              rankingScore: '',
+              votingPower: '',
            },
          },
        },
        {
          node: {
            id: '12c81b738e8051152e1afe44376ec37bca9216466e6d44cdd772194bad0ada81',
+            stakedTotal: '4041343338923442976709',
            rewardScore: {
              rawValidatorScore: '0.35',
              performanceScore: '0.999629748500531',
+              multisigScore: '',
+              validatorScore: '',
+              normalisedScore: '',
+              validatorStatus:
+                Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_TENDERMINT,
            },
            rankingScore: {
              stakeScore: '0.2312',
+              performanceScore: '0.9998677767864936',
+              status: Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_TENDERMINT,
+              previousStatus:
+                Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_TENDERMINT,
+              rankingScore: '',
+              votingPower: '',
            },
          },
        },
@@ -7,12 +7,12 @@ import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
 import { useAppState } from '../../../../contexts/app-state/app-state-context';
 import { BigNumber } from '../../../../lib/bignumber';
 import {
+  calculateOverallPenalty,
+  calculateOverstakedPenalty,
+  calculatesPerformancePenalty,
  getFormattedPerformanceScore,
  getLastEpochScoreAndPerformance,
  getNormalisedVotingPower,
-  getOverstakingPenalty,
-  getPerformancePenalty,
-  getTotalPenalties,
  getUnnormalisedVotingPower,
 } from '../../shared';
 import {
@@ -32,6 +32,7 @@ import type { ValidatorsTableProps } from './shared';
 import {
  formatNumber,
  formatNumberPercentage,
+  removePaginationWrapper,
  toBigNum,
 } from '@vegaprotocol/utils';
 import { VALIDATOR_LOGO_MAP } from './logo-map';
@@ -136,6 +137,10 @@ export const ConsensusValidatorsTable = ({
    [totalStake]
  );

+  const allNodesInPreviousEpoch = removePaginationWrapper(
+    previousEpochData?.epoch.validatorsConnection?.edges
+  );
+
  const nodes = useMemo(() => {
    if (!data) return [];
    let canonisedNodes = data
@@ -160,7 +165,7 @@ export const ConsensusValidatorsTable = ({
          stakedByDelegates,
          stakedByOperator,
          stakedTotal,
-          rankingScore: { stakeScore, votingPower },
+          rankingScore: { stakeScore, votingPower, performanceScore },
          pendingStake,
          stakedTotalRanking,
          stakedByUser,
@@ -172,11 +177,8 @@ export const ConsensusValidatorsTable = ({
            : avatarUrl
            ? avatarUrl
            : null;
-          const {
-            rawValidatorScore: previousEpochValidatorScore,
-            performanceScore: previousEpochPerformanceScore,
-            stakeScore: previousEpochStakeScore,
-          } = getLastEpochScoreAndPerformance(previousEpochData, id);
+          const { rawValidatorScore: previousEpochValidatorScore } =
+            getLastEpochScoreAndPerformance(previousEpochData, id);

          return {
            id,
@@ -199,21 +201,19 @@ export const ConsensusValidatorsTable = ({
              toBigNum(stakedByOperator, decimals),
              2
            ),
-            [ValidatorFields.PERFORMANCE_SCORE]: getFormattedPerformanceScore(
-              previousEpochPerformanceScore
-            ).toString(),
-            [ValidatorFields.PERFORMANCE_PENALTY]: getPerformancePenalty(
-              previousEpochPerformanceScore
+            [ValidatorFields.PERFORMANCE_SCORE]:
+              getFormattedPerformanceScore(performanceScore).toString(),
+            [ValidatorFields.PERFORMANCE_PENALTY]: formatNumberPercentage(
+              calculatesPerformancePenalty(performanceScore),
+              2
            ),
-            [ValidatorFields.OVERSTAKING_PENALTY]: getOverstakingPenalty(
-              previousEpochValidatorScore,
-              previousEpochStakeScore
+            [ValidatorFields.OVERSTAKING_PENALTY]: formatNumberPercentage(
+              calculateOverstakedPenalty(id, allNodesInPreviousEpoch),
+              2
            ),
-            [ValidatorFields.TOTAL_PENALTIES]: getTotalPenalties(
-              previousEpochValidatorScore,
-              previousEpochPerformanceScore,
-              stakedTotal,
-              totalStake
+            [ValidatorFields.TOTAL_PENALTIES]: formatNumberPercentage(
+              calculateOverallPenalty(id, allNodesInPreviousEpoch),
+              2
            ),
            [ValidatorFields.PENDING_STAKE]: pendingStake,
            [ValidatorFields.STAKED_BY_USER]: stakedByUser
@@ -328,12 +328,12 @@ export const ConsensusValidatorsTable = ({
      ...remaining,
    ];
  }, [
+    allNodesInPreviousEpoch,
    data,
    decimals,
    hideTopThird,
    previousEpochData,
    thirdOfTotalStake,
-    totalStake,
    validatorsView,
  ]);

@@ -5,15 +5,14 @@ import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
 import { useAppState } from '../../../../contexts/app-state/app-state-context';
 import { BigNumber } from '../../../../lib/bignumber';
 import {
+  calculatesPerformancePenalty,
+  calculateOverallPenalty,
+  calculateOverstakedPenalty,
  getFormattedPerformanceScore,
  getLastEpochScoreAndPerformance,
-  getOverstakingPenalty,
-  getPerformancePenalty,
-  getTotalPenalties,
 } from '../../shared';
 import {
  defaultColDef,
-  StakeNeededForPromotionRenderer,
  stakedTotalPercentage,
  ValidatorFields,
  ValidatorRenderer,
@@ -28,6 +27,7 @@ import type { ValidatorsTableProps } from './shared';
 import {
  formatNumber,
  formatNumberPercentage,
+  removePaginationWrapper,
  toBigNum,
 } from '@vegaprotocol/utils';

@@ -52,6 +52,10 @@ export const StandbyPendingValidatorsTable = ({

  const gridRef = useRef<AgGridReact | null>(null);

+  const allNodesInPreviousEpoch = removePaginationWrapper(
+    previousEpochData?.epoch.validatorsConnection?.edges
+  );
+
  let nodes = useMemo(() => {
    if (!data) return [];

@@ -77,18 +81,15 @@ export const StandbyPendingValidatorsTable = ({
          stakedByDelegates,
          stakedByOperator,
          stakedTotal,
-          rankingScore: { stakeScore },
+          rankingScore: { stakeScore, performanceScore },
          pendingStake,
          stakedTotalRanking,
          stakedByUser,
          pendingUserStake,
          userStakeShare,
        }) => {
-          const {
-            rawValidatorScore: previousEpochValidatorScore,
-            performanceScore: previousEpochPerformanceScore,
-            stakeScore: previousEpochStakeScore,
-          } = getLastEpochScoreAndPerformance(previousEpochData, id);
+          const { performanceScore: previousEpochPerformanceScore } =
+            getLastEpochScoreAndPerformance(previousEpochData, id);

          let individualStakeNeededForPromotion,
            individualStakeNeededForPromotionDescription;
@@ -144,21 +145,19 @@ export const StandbyPendingValidatorsTable = ({
              toBigNum(stakedByOperator, decimals),
              2
            ),
-            [ValidatorFields.PERFORMANCE_SCORE]: getFormattedPerformanceScore(
-              previousEpochPerformanceScore
-            ).toString(),
-            [ValidatorFields.PERFORMANCE_PENALTY]: getPerformancePenalty(
-              previousEpochPerformanceScore
+            [ValidatorFields.PERFORMANCE_SCORE]:
+              getFormattedPerformanceScore(performanceScore).toString(),
+            [ValidatorFields.PERFORMANCE_PENALTY]: formatNumberPercentage(
+              calculatesPerformancePenalty(performanceScore),
+              2
            ),
-            [ValidatorFields.OVERSTAKING_PENALTY]: getOverstakingPenalty(
-              previousEpochValidatorScore,
-              previousEpochStakeScore
+            [ValidatorFields.OVERSTAKING_PENALTY]: formatNumberPercentage(
+              calculateOverstakedPenalty(id, allNodesInPreviousEpoch),
+              2
            ),
-            [ValidatorFields.TOTAL_PENALTIES]: getTotalPenalties(
-              previousEpochValidatorScore,
-              previousEpochPerformanceScore,
-              stakedTotal,
-              totalStake
+            [ValidatorFields.TOTAL_PENALTIES]: formatNumberPercentage(
+              calculateOverallPenalty(id, allNodesInPreviousEpoch),
+              2
            ),
            [ValidatorFields.PENDING_STAKE]: pendingStake,
            [ValidatorFields.STAKED_BY_USER]: stakedByUser
@@ -172,13 +171,13 @@ export const StandbyPendingValidatorsTable = ({
        }
      );
  }, [
+    allNodesInPreviousEpoch,
    data,
    decimals,
    previousEpochData,
    stakeNeededForPromotion,
    stakeNeededForPromotionDescription,
    t,
-    totalStake,
  ]);

  if (validatorsView === 'myStake') {
@@ -226,21 +225,21 @@ export const StandbyPendingValidatorsTable = ({
          cellRenderer: StakeShareRenderer,
          width: 100,
        },
-        {
-          field: ValidatorFields.STAKE_NEEDED_FOR_PROMOTION,
-          headerName: t(ValidatorFields.STAKE_NEEDED_FOR_PROMOTION).toString(),
-          headerTooltip: t(stakeNeededForPromotionDescription, {
-            prefix: t('The'),
-          }),
-          cellRenderer: StakeNeededForPromotionRenderer,
-          width: 210,
-        },
+        // {
+        //   field: ValidatorFields.STAKE_NEEDED_FOR_PROMOTION,
+        //   headerName: t(ValidatorFields.STAKE_NEEDED_FOR_PROMOTION).toString(),
+        //   headerTooltip: t(stakeNeededForPromotionDescription, {
+        //     prefix: t('The'),
+        //   }),
+        //   cellRenderer: StakeNeededForPromotionRenderer,
+        //   width: 210,
+        // },
        {
          field: ValidatorFields.TOTAL_PENALTIES,
          headerName: t(ValidatorFields.TOTAL_PENALTIES).toString(),
          headerTooltip: t('TotalPenaltiesDescription').toString(),
          cellRenderer: TotalPenaltiesRenderer,
-          width: 120,
+          width: 120 + 210,
        },
      ],
      []
@@ -9,6 +9,7 @@ import { usePreviousEpochQuery } from '../__generated__/PreviousEpoch';
 import type { ReactElement } from 'react';
 import type { StakingQuery } from '../__generated__/Staking';
 import type { PreviousEpochQuery } from '../__generated__/PreviousEpoch';
+import { isPartyNotFoundError } from '../../../lib/party';

 // TODO should only request a single node. When migrating from deprecated APIs we should address this.

@@ -50,7 +51,7 @@ export const NodeContainer = ({

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

-  if (error && !error.message.includes('failed to get party for ID')) {
+  if (error && !isPartyNotFoundError(error)) {
    return (
      <Callout intent={Intent.Danger} title={t('Something went wrong')}>
        <pre>
@@ -1,11 +1,15 @@
-import React, { useMemo } from 'react';
+import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import {
  useEnvironment,
  DocsLinks,
  ExternalLinks,
 } from '@vegaprotocol/environment';
-import { toBigNum } from '@vegaprotocol/utils';
+import {
+  formatNumberPercentage,
+  removePaginationWrapper,
+  toBigNum,
+} from '@vegaprotocol/utils';
 import * as Schema from '@vegaprotocol/types';
 import {
  Link as UTLink,
@@ -24,11 +28,11 @@ import { SubHeading } from '../../../components/heading';
 import {
  getLastEpochScoreAndPerformance,
  getNormalisedVotingPower,
-  getOverstakingPenalty,
-  getPerformancePenalty,
-  getTotalPenalties,
  getUnnormalisedVotingPower,
  getStakePercentage,
+  calculatesPerformancePenalty,
+  calculateOverstakedPenalty,
+  calculateOverallPenalty,
 } from '../shared';
 import type { ReactNode } from 'react';
 import type { StakingNodeFieldsFragment } from '../__generated__/Staking';
@@ -78,17 +82,27 @@ export const ValidatorTable = ({

  const stakedOnNode = toBigNum(node.stakedTotal, decimals);

-  const { rawValidatorScore, performanceScore, stakeScore } =
-    getLastEpochScoreAndPerformance(previousEpochData, node.id);
+  const { rawValidatorScore } = getLastEpochScoreAndPerformance(
+    previousEpochData,
+    node.id
+  );

  const stakePercentage = getStakePercentage(total, stakedOnNode);

-  const totalPenaltiesAmount = getTotalPenalties(
-    rawValidatorScore,
-    performanceScore,
-    stakedOnNode.toString(),
-    total.toString()
-  );
+  const penalties = useMemo(() => {
+    const allNodesInPreviousEpoch = removePaginationWrapper(
+      previousEpochData?.epoch.validatorsConnection?.edges
+    );
+    return {
+      // current epoch
+      performance: calculatesPerformancePenalty(
+        node.rankingScore.performanceScore
+      ),
+      // previous epoch
+      overstaked: calculateOverstakedPenalty(node.id, allNodesInPreviousEpoch),
+      overall: calculateOverallPenalty(node.id, allNodesInPreviousEpoch),
+    };
+  }, [node, previousEpochData?.epoch.validatorsConnection?.edges]);

  return (
    <>
@@ -242,7 +256,7 @@ export const ValidatorTable = ({

              <Tooltip description={t('OverstakedPenaltyDescription')}>
                <span data-testid="overstaking-penalty">
-                  {getOverstakingPenalty(rawValidatorScore, stakeScore)}
+                  {formatNumberPercentage(penalties.overstaked, 2)}
                </span>
              </Tooltip>
            </KeyValueTableRow>
@@ -251,7 +265,7 @@ export const ValidatorTable = ({

              <Tooltip description={t('PerformancePenaltyDescription')}>
                <span data-testid="performance-penalty">
-                  {getPerformancePenalty(performanceScore)}
+                  {formatNumberPercentage(penalties.performance, 2)}
                </span>
              </Tooltip>
            </KeyValueTableRow>
@@ -260,7 +274,7 @@ export const ValidatorTable = ({
                <strong>{t('TOTAL PENALTIES')}</strong>
              </span>
              <span data-testid="total-penalties">
-                <strong>{totalPenaltiesAmount}</strong>
+                <strong>{formatNumberPercentage(penalties.overall, 2)}</strong>
              </span>
            </KeyValueTableRow>
          </KeyValueTable>
@@ -9,6 +9,7 @@ import {
  getTotalPenalties,
  getStakePercentage,
 } from './shared';
+import * as Schema from '@vegaprotocol/types';

 describe('getLastEpochScoreAndPerformance', () => {
  const mockPreviousEpochData = {
@@ -19,24 +20,48 @@ describe('getLastEpochScoreAndPerformance', () => {
          {
            node: {
              id: '0x123',
+              stakedTotal: '',
              rewardScore: {
                rawValidatorScore: '0.25',
                performanceScore: '0.75',
+                multisigScore: '',
+                validatorScore: '',
+                normalisedScore: '',
+                validatorStatus:
+                  Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_TENDERMINT,
              },
              rankingScore: {
                stakeScore: '0.25',
+                performanceScore: '0.75',
+                status: Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_TENDERMINT,
+                previousStatus:
+                  Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_TENDERMINT,
+                rankingScore: '',
+                votingPower: '',
              },
            },
          },
          {
            node: {
              id: '0x234',
+              stakedTotal: '',
              rewardScore: {
                rawValidatorScore: '0.35',
                performanceScore: '0.85',
+                multisigScore: '',
+                validatorScore: '',
+                normalisedScore: '',
+                validatorStatus:
+                  Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_TENDERMINT,
              },
              rankingScore: {
                stakeScore: '0.25',
+                performanceScore: '0.85',
+                status: Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_TENDERMINT,
+                previousStatus:
+                  Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_TENDERMINT,
+                rankingScore: '',
+                votingPower: '',
              },
            },
          },
@@ -4,6 +4,94 @@ import {
 } from '@vegaprotocol/utils';
 import type { PreviousEpochQuery } from './__generated__/PreviousEpoch';
 import { BigNumber } from '../../lib/bignumber';
+import type { LastArrayElement } from 'type-fest';
+
+type Node = NonNullable<
+  LastArrayElement<
+    NonNullable<
+      NonNullable<PreviousEpochQuery['epoch']['validatorsConnection']>['edges']
+    >
+  >
+>['node'];
+
+/**
+ * Calculates theoretical stake score for a given node
+ * @param nodeId Id of a node for which a score is calculated
+ * @param nodes A collection of all nodes
+ * @returns Theoretical stake score for given node based on the staked total
+ * of all node of the same type (status)
+ */
+const calculateTheoreticalStakeScore = (nodeId: string, nodes: Node[]) => {
+  const node = nodes.find((n) => n.id === nodeId);
+  if (!node) {
+    return new BigNumber(0);
+  }
+  const all = nodes
+    .filter((n) => n.rankingScore.status === node.rankingScore.status)
+    .map((n) => new BigNumber(n.stakedTotal));
+  const sumOfSameType = all.reduce((acc, a) => acc.plus(a), new BigNumber(0));
+  if (sumOfSameType.isZero()) {
+    return new BigNumber(0);
+  }
+  return new BigNumber(node.stakedTotal).dividedBy(sumOfSameType);
+};
+
+/**
+ * Calculates overall penalty for a given node
+ * @param nodeId Id of a node for which a penalty is calculated
+ * @param nodes A collection of all nodes - needed to calculate theoretical stake score
+ * @returns %
+ */
+export const calculateOverallPenalty = (nodeId: string, nodes: Node[]) => {
+  const node = nodes.find((n) => n.id === nodeId);
+  const tts = calculateTheoreticalStakeScore(nodeId, nodes);
+  if (!node || tts.isZero()) {
+    return new BigNumber(0);
+  }
+  const penalty = new BigNumber(1)
+    .minus(new BigNumber(node.rewardScore?.validatorScore || 0).dividedBy(tts))
+    .times(100);
+  return penalty.isLessThan(0) ? new BigNumber(0) : penalty;
+};
+
+/**
+ *  Calculates over-staked penalty for a given node
+ * @param nodeId Id of a node for which a penalty is calculated
+ * @param nodes A collection of all nodes - needed to calculate theoretical stake score
+ * @returns %
+ */
+export const calculateOverstakedPenalty = (nodeId: string, nodes: Node[]) => {
+  const node = nodes.find((n) => n.id === nodeId);
+  const tts = calculateTheoreticalStakeScore(nodeId, nodes);
+  if (!node || tts.isZero()) {
+    return new BigNumber(0);
+  }
+  const penalty = new BigNumber(1)
+    .minus(
+      new BigNumber(node.rewardScore?.rawValidatorScore || 0).dividedBy(tts)
+    )
+    .times(100);
+  console.log(
+    nodeId,
+    new BigNumber(node.rewardScore?.rawValidatorScore || 0).toString(),
+    tts.toString(),
+    new BigNumber(node.rewardScore?.rawValidatorScore || 0)
+      .dividedBy(tts)
+      .toString()
+  );
+  return penalty.isLessThan(0) ? new BigNumber(0) : penalty;
+};
+
+/**
+ * Calculates performance penalty based on the given performance score.
+ * @returns %
+ */
+export const calculatesPerformancePenalty = (performanceScore: string) => {
+  const penalty = new BigNumber(1)
+    .minus(new BigNumber(performanceScore))
+    .times(100);
+  return penalty.isLessThan(0) ? new BigNumber(0) : penalty;
+};

 export const getLastEpochScoreAndPerformance = (
  previousEpochData: PreviousEpochQuery | undefined,
@@ -15,7 +103,7 @@ export const getLastEpochScoreAndPerformance = (

  return {
    rawValidatorScore: validator?.rewardScore?.rawValidatorScore,
-    performanceScore: validator?.rewardScore?.performanceScore,
+    performanceScore: validator?.rankingScore?.performanceScore,
    stakeScore: validator?.rankingScore?.stakeScore,
  };
 };
@@ -40,9 +40,9 @@
  line-height: calc(min(var(--ag-line-height, 26px), 26px) - 4px);
 }

-.vega-ag-grid .ag-row {
-  border-width: 1px 0;
-  border-bottom: 1px solid transparent;
+.vega-ag-grid .ag-row,
+.vega-ag-grid .ag-cell {
+  border-width: 0;
 }

 /* Dark variables */
@@ -54,7 +54,6 @@
  --ag-header-column-separator-color: theme(colors.neutral[600]);
  --ag-row-border-color: theme(colors.black);
  --ag-row-hover-color: theme(colors.neutral[800]);
-  --ag-font-size: 12px;
 }

 .validators-table .ag-theme-balham-dark .ag-body-horizontal-scroll {
@@ -10,8 +10,8 @@ import {
  displayChange,
 } from '@vegaprotocol/liquidity';

-import type { Candle } from '@vegaprotocol/market-list';
-import { marketCandlesProvider } from '@vegaprotocol/market-list';
+import type { Candle } from '@vegaprotocol/markets';
+import { marketCandlesProvider } from '@vegaprotocol/markets';

 const THROTTLE_UPDATE_TIME = 500;

@@ -194,6 +194,7 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {
  });

  it('shows node health', function () {
+    // 0006-NETW-010
    const market = this.market;
    cy.visit(`/#/markets/${market.id}`);
    cy.getByTestId('node-health')
@@ -1,5 +1,10 @@
 import { aliasGQLQuery } from '@vegaprotocol/cypress';
-import { MarketState, MarketStateMapping } from '@vegaprotocol/types';
+import type { DataSourceDefinition } from '@vegaprotocol/types';
+import {
+  MarketState,
+  MarketStateMapping,
+  PropertyKeyType,
+} from '@vegaprotocol/types';
 import { addDays, subDays } from 'date-fns';
 import {
  chainIdQuery,
@@ -20,6 +25,25 @@ import {
 } from '@vegaprotocol/utils';

 describe('Closed markets', { tags: '@smoke' }, () => {
+  const settlementDataProperty = 'settlement-data-property';
+  const settlementDataPropertyKey = {
+    __typename: 'PropertyKey' as const,
+    name: settlementDataProperty,
+    type: PropertyKeyType.TYPE_INTEGER,
+    numberDecimalPlaces: 2,
+  };
+  const settlementDataSourceData: DataSourceDefinition = {
+    sourceType: {
+      sourceType: {
+        filters: [
+          {
+            __typename: 'Filter',
+            key: settlementDataPropertyKey,
+          },
+        ],
+      },
+    },
+  };
  const rowSelector =
    '[data-testid="tab-closed-markets"] .ag-center-cols-container .ag-row';

@@ -37,11 +61,15 @@ describe('Closed markets', { tags: '@smoke' }, () => {
    tradableInstrument: {
      instrument: {
        product: {
+          dataSourceSpecBinding: {
+            settlementDataProperty,
+          },
          dataSourceSpecForTradingTermination: {
            id: 'market-1-trading-termination-oracle-id',
          },
          dataSourceSpecForSettlementData: {
            id: 'market-1-settlement-data-oracle-id',
+            data: settlementDataSourceData,
          },
          settlementAsset,
        },
@@ -63,6 +91,15 @@ describe('Closed markets', { tags: '@smoke' }, () => {
            `settlement-expiry-date:${addDays(new Date(), 4).toISOString()}`,
          ],
        },
+        product: {
+          dataSourceSpecBinding: {
+            settlementDataProperty,
+          },
+          dataSourceSpecForSettlementData: {
+            id: 'market-1-settlement-data-oracle-id',
+            data: settlementDataSourceData,
+          },
+        },
      },
    },
  });
@@ -81,6 +118,15 @@ describe('Closed markets', { tags: '@smoke' }, () => {
            `settlement-expiry-date:${subDays(new Date(), 2).toISOString()}`,
          ],
        },
+        product: {
+          dataSourceSpecBinding: {
+            settlementDataProperty,
+          },
+          dataSourceSpecForSettlementData: {
+            id: 'market-1-settlement-data-oracle-id',
+            data: settlementDataSourceData,
+          },
+        },
      },
    },
  });
@@ -301,7 +347,7 @@ describe('Closed markets', { tags: '@smoke' }, () => {
        addDecimalsFormatNumber(
          // @ts-ignore cannot deep un-partial
          specDataConnection.externalData.data.data[0].value,
-          settledMarket.decimalPlaces
+          settlementDataPropertyKey.numberDecimalPlaces
        )
      );

@@ -318,10 +364,11 @@ describe('Closed markets', { tags: '@smoke' }, () => {
      .should('have.text', product.settlementAsset.symbol);

    // 6001-MARK-020
-    cy.get(rowSelector)
+    cy.get('.ag-pinned-right-cols-container')
+      .find('[col-id="market-actions"]')
      .first()
-      .find('[col-id="id"]')
-      .should('have.text', settledMarket.id);
+      .find('button svg')
+      .should('exist');
  });

  // test market list for market in terminated state
@@ -373,5 +420,33 @@ describe('Closed markets', { tags: '@smoke' }, () => {
      'have.text',
      `Asset details - ${settlementAsset.symbol}`
    );
+
+    cy.get('[data-testid="dialog-close"]').click();
+  });
+
+  it('can open row actions', () => {
+    cy.get('.ag-pinned-right-cols-container')
+      .find('[col-id="market-actions"]')
+      .first()
+      .find('button')
+      .click();
+
+    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');
+
+    cy.get(dropdownContent)
+      .find(dropdownContentItem)
+      .eq(1)
+      .find('a')
+      .then(($el) => {
+        const href = $el.attr('href');
+        expect(/\/markets\/0/.test(href || '')).to.equal(true);
+      })
+      .should('have.text', 'View on Explorer');
  });
 });
@@ -108,10 +108,9 @@ describe('deposit actions', { tags: '@smoke' }, () => {

  it('Deposit to trade is visble', () => {
    cy.getByTestId('Collateral').click();
-    cy.contains('[data-testid="deposit"]', 'Deposit to trade').should(
-      'be.visible'
-    );
-    cy.contains('[data-testid="deposit"]', 'Deposit to trade').click();
+    cy.contains('[data-testid="deposit"]', 'Deposit')
+      .should('be.visible')
+      .click();
    cy.getByTestId('deposit-submit').should('be.visible');
  });
 });
@@ -0,0 +1,110 @@
+import { closeWelcomeDialog } from '../support/helpers';
+
+const dialogContent = 'dialog-content';
+const nodeHealth = 'node-health';
+
+describe('home', { tags: '@regression' }, () => {
+  before(() => {
+    cy.clearAllLocalStorage();
+    cy.mockTradingPage();
+    cy.mockSubscription();
+    cy.visit('/');
+    closeWelcomeDialog();
+  });
+
+  describe('footer', () => {
+    it.skip('shows current block height', () => {
+      closeWelcomeDialog();
+      // 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 })
+        .next()
+        .should('contain.text', new URL(Cypress.env('VEGA_URL')).origin)
+        .next()
+        .should('contain.text', '100'); // all mocked queries have x-block-height header set to 100
+    });
+
+    it('shows node switcher details', () => {
+      // 0006-NETW-012
+      // 0006-NETW-013
+      // 0006-NETW-014
+      // 0006-NETW-015
+      // 0006-NETW-016
+      cy.getByTestId(nodeHealth).click();
+      cy.getByTestId(dialogContent).should('contain.text', 'Connected node');
+      cy.getByTestId(dialogContent).should(
+        'contain.text',
+        'This app will only work on CUSTOM. Select a node to connect to.'
+      );
+      cy.getByTestId('node')
+        .first()
+        .should('contain.text', new URL(Cypress.env('VEGA_URL')).origin)
+        .next()
+        .should('contain.text', 'Response time')
+        .next()
+        .should('contain.text', 'Block')
+        .next()
+        .should('contain.text', 'Subscription');
+      cy.getByTestId('custom-row').should('contain.text', 'Other');
+      cy.getByTestId('dialog-close').click();
+    });
+
+    it('switch to other node', () => {
+      // 0006-NETW-017
+      // 0006-NETW-018
+      // 0006-NETW-019
+      // 0006-NETW-020
+      cy.getByTestId(nodeHealth).click();
+      cy.getByTestId('connect').should('be.disabled');
+      cy.getByTestId('node-url-custom').click();
+      cy.getByTestId('connect').should('be.disabled');
+      cy.get("input[placeholder='https://']")
+        .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();
+      cy.mockSubscription();
+      cy.visit('/');
+    });
+
+    // 0006-NETW-002
+    // 0006-NETW-003
+    it('switch to fairground network', () => {
+      cy.getByTestId('network-switcher').click();
+      cy.getByTestId('network-item').contains('Fairground testnet').click();
+      cy.get('[aria-haspopup="menu"]').should('contain.text', 'Fairground');
+    });
+  });
+});
@@ -4,6 +4,7 @@ import { marketsDataQuery } from '@vegaprotocol/mock';
 import * as Schema from '@vegaprotocol/types';

 const selectMarketOverlay = 'select-market-list';
+const dialogContent = 'dialog-content';

 const generateProposal = (code: string): ProposalListFieldsFragment => ({
  __typename: 'Proposal',
@@ -81,20 +82,12 @@ const generateProposal = (code: string): ProposalListFieldsFragment => ({
            __typename: 'DataSourceDefinition',
            sourceType: {
              __typename: 'DataSourceDefinitionInternal',
-              sourceType: {
-                __typename: 'DataSourceSpecConfigurationTime',
-                conditions: [],
-              },
            },
          },
          dataSourceSpecForTradingTermination: {
            __typename: 'DataSourceDefinition',
            sourceType: {
              __typename: 'DataSourceDefinitionInternal',
-              sourceType: {
-                __typename: 'DataSourceSpecConfigurationTime',
-                conditions: [],
-              },
            },
          },
        },
@@ -288,7 +281,7 @@ describe('home', { tags: '@regression' }, () => {
        cy.visit('/');
        cy.wait('@Markets');
        cy.location('hash').should('equal', '#/markets/market-1');
-        cy.getByTestId('dialog-content').should('not.exist');
+        cy.getByTestId(dialogContent).should('not.exist');
      });
    });

@@ -301,22 +294,8 @@ describe('home', { tags: '@regression' }, () => {
        cy.visit('/');
        cy.wait('@Markets');
        cy.location('hash').should('equal', '#/markets/market-not-existing');
-        cy.getByTestId('dialog-content').should('not.exist');
+        cy.getByTestId(dialogContent).should('not.exist');
      });
    });
  });
-
-  describe('footer', () => {
-    it('shows current block height', () => {
-      cy.visit('/');
-      cy.getByTestId('node-health')
-        .children()
-        .first()
-        .should('contain.text', 'Operational')
-        .next()
-        .should('contain.text', new URL(Cypress.env('VEGA_URL')).origin)
-        .next()
-        .should('contain.text', '100'); // all mocked queries have x-block-height header set to 100
-    });
-  });
 });
@@ -1,7 +1,7 @@
 import { mockConnectWallet } from '@vegaprotocol/cypress';

 describe('Navbar', { tags: '@smoke' }, () => {
-  before(() => {
+  beforeEach(() => {
    cy.clearAllLocalStorage();
    cy.mockTradingPage();
    cy.mockSubscription();
@@ -47,6 +47,18 @@ describe('Navbar', { tags: '@smoke' }, () => {
          });
      });
    });
+
+    it('Disclaimer should be presented after choosing from menu', () => {
+      cy.get('nav')
+        .find('ul li:contains(Resources)')
+        .contains('Resources')
+        .click();
+      cy.getByTestId('Disclaimer').eq(0).click();
+      cy.location('hash').should('equal', '#/disclaimer');
+      cy.get('p').contains(
+        'Vega is a decentralised peer-to-peer protocol that can be used to trade derivatives with cryptoassets.'
+      );
+    });
  });

  describe('mobile view', () => {
@@ -48,7 +48,7 @@ describe('accounts', { tags: '@smoke' }, () => {
    cy.getByTestId('tab-accounts')
      .get(tradingAccountRowId)
      .find('[col-id="accounts-actions"]')
-      .should('have.text', ' ');
+      .should('have.text', '');

    cy.getByTestId('tab-accounts')
      .get(tradingAccountRowId)
@@ -482,7 +482,7 @@ describe('amend and cancel order', { tags: '@smoke' }, () => {
        testOrderCancellation(order);
      });
  });
-  it('must be able to cancel all orders on a market', () => {
+  it('must be able to cancel all orders on all markets', () => {
    // 7003-MORD-009
    // 7003-MORD-010
    // 7003-MORD-011
@@ -496,9 +496,7 @@ describe('amend and cancel order', { tags: '@smoke' }, () => {
      .should('have.text', 'Cancel all')
      .then(($btn) => {
        cy.wrap($btn).click({ force: true });
-        const order: OrderCancellation = {
-          marketId: 'market-0',
-        };
+        const order: OrderCancellation = {};
        testOrderCancellation(order);
      });
  });
@@ -1,7 +1,7 @@
 import { aliasGQLQuery } from '@vegaprotocol/cypress';
 import * as Schema from '@vegaprotocol/types';
 import type { CyHttpMessages } from 'cypress/types/net-stubbing';
-import type { Provider, Status } from '@vegaprotocol/market-info';
+import type { Provider, Status } from '@vegaprotocol/markets';
 import {
  accountsQuery,
  assetQuery,
@@ -32,7 +32,7 @@ import {
  blockStatisticsQuery,
 } from '@vegaprotocol/mock';
 import type { PartialDeep } from 'type-fest';
-import type { MarketDataQuery, MarketsQuery } from '@vegaprotocol/market-list';
+import type { MarketDataQuery, MarketsQuery } from '@vegaprotocol/markets';

 type MarketPageMockData = {
  state: Schema.MarketState;
@@ -2,6 +2,7 @@ NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
+NX_TRADING_SENTRY_DSN=https://2ffce43721964aafa78277c50654ece4@o286262.ingest.sentry.io/6300613
 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
@@ -1,6 +1,7 @@
-NX_ETHEREUM_PROVIDER_URL=https://mainnet.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
+NX_ETHEREUM_PROVIDER_URL=https://eth-mainnet.gateway.pokt.network/v1/lb/af6a2d529a11f8158bc8ca2a
 NX_ETHERSCAN_URL=https://etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
+NX_TRADING_SENTRY_DSN=https://2ffce43721964aafa78277c50654ece4@o286262.ingest.sentry.io/6300613
 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
@@ -2,6 +2,7 @@ NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
+NX_TRADING_SENTRY_DSN=https://2ffce43721964aafa78277c50654ece4@o286262.ingest.sentry.io/6300613
 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://stagnet1.explorer.vega.xyz
@@ -2,6 +2,7 @@ NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
+NX_TRADING_SENTRY_DSN=https://2ffce43721964aafa78277c50654ece4@o286262.ingest.sentry.io/6300613
 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
@@ -2,6 +2,7 @@ NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
+NX_TRADING_SENTRY_DSN=https://2ffce43721964aafa78277c50654ece4@o286262.ingest.sentry.io/6300613
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/testnet2/testnet2.toml
 NX_VEGA_ENV=VALIDATOR_TESTNET
 NX_VEGA_EXPLORER_URL=https://validator-testnet.explorer.vega.xyz
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
asiaznik	8a30cc6237	fix(ui-toolkit): test toast configuration	2023-05-22 16:55:03 +02:00
Maciek	fff8fdd78b	feat(trading): move trade grid panel - fix id of store (#3872 )	2023-05-22 14:09:37 +00:00
m.rayandmaciek	079d8bc48d	feat(trading): move deal ticket panel to the left (#3842 ) Co-authored-by: maciek <maciek@vegaprotocol.io>	2023-05-22 15:40:42 +02:00
Eddandm.ray	9658363b56	chore(explorer): update be env for validator testnet (#3867 ) Co-authored-by: m.ray <16125548+MadalinaRaicu@users.noreply.github.com>	2023-05-22 13:38:51 +00:00
dexturr	e24289330e	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-22 12:08:25 +00:00
Mikołaj Młodzikowski	0fbd2bfa72	feat(ci): adjust environment name	2023-05-22 11:42:09 +02:00
Mikołaj MłodzikowskiandMikołaj Młodzikowski	43ef4fad6f	feat(ci): fix affected resolution (#3849 ) Co-authored-by: Mikołaj Młodzikowski <mikolaj.mlodzikowski@github.com>	2023-05-22 11:16:33 +02:00
Matthew Russell	828dcf6e93	chore(governance,explorer,trading): move sentry dsn to env files (#3860 )	2023-05-22 08:54:15 +02:00
dexturr	4a583ccf09	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-22 06:07:44 +00:00
dexturr	8bcad28f50	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-22 00:16:28 +00:00
dexturr	b375681076	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-21 18:07:08 +00:00
dexturr	8a2db407cf	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-21 12:10:41 +00:00
dexturr	491844d3fd	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-21 06:09:53 +00:00
dexturr	f1f51c5ecd	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-21 00:15:03 +00:00
dexturr	9bc78f8ccd	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-20 18:06:53 +00:00
dexturr	a03031a283	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-20 12:10:14 +00:00
Matthew Russell	b499c293e3	fix(trading): fix proposals not showing (#3859 )	2023-05-20 10:55:52 +01:00
dexturr	65747e8d26	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-20 06:09:41 +00:00
dexturr	9a84eda21b	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-20 00:14:21 +00:00
Maciek	fba98f2fd0	feat(trading,governance): improve flow of risk disclaimer presentation (#3772 )	2023-05-19 21:27:45 +00:00
Matthew Russell	3e32d0f396	chore(governance,trading): update mainnet envs with new ethereum provider url (#3857 )	2023-05-19 13:31:49 -07:00
Matthew Russell	b75d189054	fix(trading): settlement price of closed markets (#3831 )	2023-05-19 13:29:24 -07:00
Sam Keen	afa627864c	fix(governance): homepage proposals ordering fixed (#3856 )	2023-05-19 18:12:14 +00:00
dexturr	b13a866b2a	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-19 18:07:12 +00:00
daro-maj	c65f07eee6	test(trading): skip failing node tests (#3854 )	2023-05-19 19:54:56 +02:00
Sam Keen	5bd18cc127	feat(governance): avoid showing untitled proposals (#3851 )	2023-05-19 16:19:28 +01:00
Art	ff3519279d	fix(governance): penalties calculation (#3850 )	2023-05-19 16:19:07 +01:00
m.ray	fd338c7400	fix(orders): cancel all and pegged orders amendable (#3843 )	2023-05-19 14:55:08 +00:00
Sam Keen	0db5d0ce87	feat(governance): hide proposal details on market proposals (#3845 )	2023-05-19 13:47:48 +00:00
Matthew Russell	42c316c8e1	feat(environment): avoid logging node check queries (#3830 )	2023-05-19 14:32:27 +01:00
Sam Keen	9e2474d39a	feat(governance): proposals-sort-order (#3848 )	2023-05-19 14:30:08 +01:00
Joe Tsang	2533e5ec44	test(governance): 3790 proposal tests refactor (#3838 )	2023-05-19 14:29:20 +01:00
dexturr	22a43249ea	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-19 12:08:42 +00:00
m.ray	b40ee0caf5	fix(markets): remove queries for internal data sources (#3829 )	2023-05-19 12:53:00 +01:00
Edd	95aca70434	fix(explorer): prevent render of signature component on some proposals (#3840 )	2023-05-19 12:09:48 +01:00
Sam Keen	5e13266250	feat(governance): change url of upgrade proposals (#3841 )	2023-05-19 12:09:40 +01:00
Edd	5c0588887c	fix(explorer): fix footer links (#3825 )	2023-05-19 10:37:59 +01:00
daro-maj	089a7daac7	test(trading): e2e test for select network and nodes - 0006-NETW (#3828 )	2023-05-19 10:37:44 +01:00
Mikołaj Młodzikowski	02b6251b1a	feat(ci): support mainnet branching strategy (#3832 )	2023-05-19 10:38:36 +02:00
Bartłomiej Głownia	9ce8907861	feat(trading): do not show oracle banner when data is loading (#3821 )	2023-05-19 10:01:22 +02:00
dexturr	3be9126906	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-19 06:10:00 +00:00
dexturr	77316092d1	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-19 00:15:57 +00:00
Dexter Edwards	fca229e62a	feat(governance): use rest to expose proposal data (#3827 )	2023-05-18 22:43:32 +01:00
dexturr	162b167860	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-18 18:07:36 +00:00
Art	a4149cc55e	feat(web3): withdrawal details (#3701 )	2023-05-18 16:50:15 +02:00
Mikołaj Młodzikowski	4161a74eaf	feat(ci): fix release body (#3822 )	2023-05-18 14:59:46 +01:00
Mikołaj Młodzikowski	5008e57a56	feat(ci): adjust variables during release pipeline to cover actual tag_name	2023-05-18 15:12:12 +02:00
Mikołaj Młodzikowski	89031bf826	feat(ci): append ipfs related information to release body (#3818 )	2023-05-18 14:51:53 +02:00
dexturr	61501d4d14	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-18 12:10:20 +00:00
Madalina Raicu	f8f3ce7df9	fix: no oracle for this market banner	2023-05-18 13:00:17 +01:00
Maciek	f7aab5a78a	feat(ui-toolkit,trading): allow toast box configuration (#3811 )	2023-05-18 12:53:36 +01:00
Bartłomiej Głownia	2904975fd3	feat(trading): highlight negative oracle statuses in market lists (#3816 )	2023-05-18 13:22:54 +02:00
Mikołaj Młodzikowski	4f55c946f0	feat(ci): add pipeline for rollback console deployments (#3817 )	2023-05-18 10:11:41 +00:00
Matthew Russell	de637fee13	chore(trading): show markets in opening auction in market selector (#3814 )	2023-05-18 09:49:44 +01:00
dexturr	69c6db8ec2	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-18 06:09:07 +00:00
Matthew Russell	8dc465c1d1	feat(trading): additional row actions for tables (#3600 )	2023-05-17 21:05:53 -07:00
dexturr	0be934edca	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-18 00:16:39 +00:00
Matthew Russell	653688c1dd	fix(governance): clear wallet state if user changes to a non existent party (#3813 )	2023-05-17 19:25:14 +00:00
dexturr	34400be18a	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-17 18:09:58 +00:00
Sam Keen	d4a0a4a42c	fix(governance): updated page titles (#3810 )	2023-05-17 16:16:19 +00:00
Joe Tsang	fabf643ce7	chore(ci): fix nightly test runner (#3804 )	2023-05-17 16:21:10 +01:00