chore: fix tests

.github/workflows/add-ipfs-notes-to-release.yml

@@ -1,74 +0,0 @@
-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 }}/

.github/workflows/cypress-live-test.yml

@@ -33,4 +33,5 @@ jobs:
           config: baseUrl=${{ github.event.inputs.url }}
           env: grepTags=@live
         env:
+          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/cypress-run.yml

@@ -20,7 +20,7 @@ jobs:
         project: ${{ fromJSON(inputs.projects) }}
     name: ${{ matrix.project }}
     runs-on: self-hosted-runner
-    timeout-minutes: 60
+    timeout-minutes: 40
     steps:
       # Checks if skip cache was requested
       - name: Set skip-nx-cache flag
@@ -66,7 +66,7 @@ jobs:
       ######
 
       - name: Run Cypress tests
-        run: yarn nx run ${{ matrix.project }}:e2e ${{ env.SKIP_CACHE }}  --browser chrome --env.grepTags="${{ inputs.tags }}"
+        run: yarn nx run ${{ matrix.project }}:e2e ${{ env.SKIP_CACHE }} --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --browser chrome --env.grepTags="${{ inputs.tags }}"
         working-directory: frontend-monorepo
         env:
           CYPRESS_SLACK_WEBHOOK: ${{ secrets.CYPRESS_SLACK_WEBHOOK }}
@@ -98,4 +98,4 @@ jobs:
         if: ${{ failure() }}
         with:
           name: test-report-${{ matrix.project }}
-          path: frontend-monorepo/apps/${{ matrix.project }}/cypress/reports
+          path: frontend-monorepo/apps/trading-e2e/cypress/reports

.github/workflows/publish-dist.yml

@@ -62,19 +62,17 @@ 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
@@ -121,7 +119,7 @@ jobs:
         run: |
           echo "Check ipfs-hash"
           docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local cat /ipfs-hash
-          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local cat /ipfs-hash > ${{ matrix.app }}-ipfs-hash
+          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local cat /ipfs-hash > ${{ matirx.app }}-ipfs-hash
           echo "List html directory"
           docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local sh -c 'apk add --update tree; tree /usr/share/nginx/html'
 
@@ -150,7 +148,6 @@ jobs:
             ENV_NAME=${{ env.ENV_NAME }}
           tags: |
             vegaprotocol/${{ matrix.app }}:${{ github.ref_name }}
-            vegaprotocol/${{ matrix.app }}:mainnet
 
       # bucket creation in github.com/vegaprotocol/terraform//frontend
       - name: Publish dist to s3
@@ -172,51 +169,8 @@ jobs:
           labels: ${{ matrix.app }}-preview
           number: ${{ github.event.number }}
 
-      - name: Trigger fleek deployment
+      - 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') }}
-        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
-        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
-        run: |
-          curl -L https://dist.ipfs.tech/kubo/v0.20.0/kubo_v0.20.0_linux-amd64.tar.gz -o kubo.tgz
-          tar -xzf kubo.tgz
-          export PATH="$PATH:$PWD/kubo"
-          which ipfs
-          new_hash=$(cat ${{ matrix.app }}-ipfs-hash)
-          new_cid=$(ipfs cid format -v 1 -b base32 $new_hash)
-
-          # 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}
+        with:
+          files: ${{ matrix.app }}-ipfs-hash

.github/workflows/rollback-console.yml

@@ -1,77 +0,0 @@
-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}

.gitignore

@@ -49,4 +49,4 @@ cypress.env.json
 .next
 
 #cypress
-/apps/**/cypress/reports/
+/apps/trading-e2e/cypress/reports/

Makefile

@@ -1,20 +1,20 @@
 .PHONY: latest-release
 latest-release:
-	gh release list | head -n 1 | awk '{print $1}'
+  gh release list | head -n 1 | awk '{print $1}'
 
 .PHONY: show-latest-release
 show-latest-release:
-	gh release view `gh release list | head -n 1 | awk '{print $1}'`
+  gh release view `gh release list | head -n 1 | awk '{print $1}'`
 
 .PHONY: recalculate-ipfs
 recalculate-ipfs:
-	echo "ipfs hash inside the image"
-	docker run --rm ${TAG} cat /ipfs-hash
-	echo "recalculating ipfs hash"
-	docker run --rm ${TAG} ipfs add -r /usr/share/nginx/html
+  echo "ipfs hash inside the image"
+  docker run --rm ${TAG} cat /ipfs-hash
+  echo "recalculating ipfs hash"
+  docker run --rm ${TAG} ipfs add -rw /usr/share/nginx/html
 
 .PHONY: eject-ipfs-hash
 unpack:
-	docker create --name=dist ${TAG}
-	docker cp dist:/usr/share/nginx/html dist
-	docker rm dist
+  docker create --name=dist ${TAG}
+  docker cp dist:/usr/share/nginx/html dist
+  docker rm dist

apps/explorer-e2e/cypress.config.js

@@ -1,11 +1,10 @@
 const { defineConfig } = require('cypress');
 
 module.exports = defineConfig({
-  reporter: '../../node_modules/cypress-mochawesome-reporter',
+  projectId: 'et4snf',
 
   e2e: {
     setupNodeEvents(on, config) {
-      require('cypress-mochawesome-reporter/plugin')(on);
       require('@cypress/grep/src/plugin')(config);
       return config;
     },

apps/explorer-e2e/src/support/index.js

@@ -15,6 +15,5 @@
 
 import '@vegaprotocol/cypress';
 import './common.functions.js';
-import 'cypress-mochawesome-reporter/register';
 import registerCypressGrep from '@cypress/grep';
 registerCypressGrep();

apps/explorer/.env

@@ -14,7 +14,6 @@ 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

apps/explorer/.env.mainnet

@@ -2,7 +2,6 @@
 NX_TENDERMINT_URL=https://be.vega.community
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/mainnet1/mainnet1.toml
-NX_VEGA_URL=https://api.vega.community/graphql
 NX_VEGA_ENV=MAINNET
 NX_BLOCK_EXPLORER=https://be.vega.community/rest/
 NX_ETHERSCAN_URL=https://etherscan.io

apps/explorer/src/app/components/footer/footer.tsx

@@ -48,13 +48,11 @@ export const Footer = () => {
           </Link>
         </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 className="flex pl-2 content-center">
+          <ExternalLink href={ENV.addresses.feedback}>
+            {showFullFeedbackLabel ? t('Share your feedback') : t('Feedback')}
+          </ExternalLink>
+        </div>
       </div>
     </footer>
   );
@@ -64,5 +62,9 @@ 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 <span className="cursor-default">{nodeUrl}</span>;
+  return (
+    <Link href={'https://' + nodeUrl} target="_blank">
+      {nodeUrl}
+    </Link>
+  );
 };

apps/explorer/src/app/components/header/header.spec.tsx

@@ -3,7 +3,6 @@ import { Header } from './header';
 import { MemoryRouter } from 'react-router-dom';
 
 jest.mock('@vegaprotocol/environment', () => ({
-  ...jest.requireActual('@vegaprotocol/environment'),
   NetworkSwitcher: () => (
     <div data-testid="network-switcher">NetworkSwitcher</div>
   ),

apps/explorer/src/app/components/markets/market-details.tsx

@@ -1,8 +1,8 @@
 import { t } from '@vegaprotocol/i18n';
-import type { MarketInfoWithData } from '@vegaprotocol/markets';
+import type { MarketInfoWithData } from '@vegaprotocol/market-info';
+import { LiquidityInfoPanel } from '@vegaprotocol/market-info';
+import { LiquidityMonitoringParametersInfoPanel } from '@vegaprotocol/market-info';
 import {
-  LiquidityInfoPanel,
-  LiquidityMonitoringParametersInfoPanel,
   InstrumentInfoPanel,
   KeyDetailsInfoPanel,
   LiquidityPriceRangeInfoPanel,
@@ -12,18 +12,20 @@ import {
   RiskModelInfoPanel,
   RiskParametersInfoPanel,
   SettlementAssetInfoPanel,
-} from '@vegaprotocol/markets';
-import { MarketInfoTable } from '@vegaprotocol/markets';
+} from '@vegaprotocol/market-info';
+import { MarketInfoTable } from '@vegaprotocol/market-info';
 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 as DataSourceDefinition;
-  const terminationData = market.tradableInstrument.instrument.product
-    .dataSourceSpecForTradingTermination.data as DataSourceDefinition;
+  const settlementData =
+    market.tradableInstrument.instrument.product.dataSourceSpecForSettlementData
+      .data;
+  const terminationData =
+    market.tradableInstrument.instrument.product
+      .dataSourceSpecForTradingTermination.data;
 
   const getSigners = (data: DataSourceDefinition) => {
     if (data.sourceType.__typename === 'DataSourceDefinitionExternal') {

apps/explorer/src/app/components/markets/markets-table.tsx

@@ -1,4 +1,4 @@
-import type { MarketFieldsFragment } from '@vegaprotocol/markets';
+import type { MarketFieldsFragment } from '@vegaprotocol/market-list';
 import { t } from '@vegaprotocol/i18n';
 import { ButtonLink } from '@vegaprotocol/ui-toolkit';
 import type { AgGridReact } from 'ag-grid-react';

apps/explorer/src/app/components/txs/details/chain-response-code/chain-reponse.code.tsx

@@ -1,5 +1,3 @@
-import { Icon } from '@vegaprotocol/ui-toolkit';
-
 // https://github.com/vegaprotocol/vega/blob/develop/core/blockchain/response.go
 export const ErrorCodes = new Map([
   [51, 'Transaction failed validation'],
@@ -30,11 +28,7 @@ export const ChainResponseCode = ({
 }: ChainResponseCodeProps) => {
   const isSuccess = successCodes.has(code);
 
-  const icon = isSuccess ? (
-    <Icon name="tick-circle" className="fill-vega-green-550" />
-  ) : (
-    <Icon name="cross" className="fill-vega-pink-550" />
-  );
+  const icon = isSuccess ? '✅' : '❌';
   const label = ErrorCodes.get(code) || 'Unknown response code';
 
   // Hack for batches with many errors - see https://github.com/vegaprotocol/vega/issues/7245
@@ -42,7 +36,7 @@ export const ChainResponseCode = ({
     error && error.length > 100 ? error.replace(/,/g, ',\r\n') : error;
 
   return (
-    <div title={`Response code: ${code} - ${label}`} className=" inline-block">
+    <div title={`Response code: ${code} - ${label}`} className="inline-block">
       <span
         className="mr-2"
         aria-label={isSuccess ? 'Success' : 'Warning'}

apps/explorer/src/app/components/txs/details/tx-proposal-vote.tsx

@@ -4,7 +4,6 @@ import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint
 import { TxDetailsShared } from './shared/tx-details-shared';
 import { TableCell, TableRow, TableWithTbody } from '../../table';
 import ProposalLink from '../../links/proposal-link/proposal-link';
-import { VoteIcon } from '../../vote-icon/vote-icon';
 
 interface TxProposalVoteProps {
   txData: BlockExplorerTransactionResult | undefined;
@@ -31,22 +30,27 @@ export const TxProposalVote = ({
     return <>{t('Awaiting Block Explorer transaction details')}</>;
   }
 
-  const vote = txData.command.voteSubmission.value === 'VALUE_YES';
-
+  const vote = txData.command.voteSubmission.value ? '👍' : '👎';
   return (
     <TableWithTbody className="mb-8" allowWrap={true}>
       <TxDetailsShared txData={txData} pubKey={pubKey} blockData={blockData} />
+      <TableRow modifier="bordered">
+        <TableCell>{t('Proposal ID')}</TableCell>
+        <TableCell>{txData.command.voteSubmission.proposalId}</TableCell>
+      </TableRow>
       <TableRow modifier="bordered">
         <TableCell>{t('Proposal details')}</TableCell>
         <TableCell>
           <ProposalLink id={txData.command.voteSubmission.proposalId} />
         </TableCell>
       </TableRow>
+      <TableRow modifier="bordered">
+        <TableCell>{t('Proposal')}</TableCell>
+        <TableCell>{txData.command.voteSubmission.proposalId}</TableCell>
+      </TableRow>
       <TableRow modifier="bordered">
         <TableCell>{t('Vote')}</TableCell>
-        <TableCell>
-          <VoteIcon vote={vote} />
-        </TableCell>
+        <TableCell>{vote}</TableCell>
       </TableRow>
     </TableWithTbody>
   );

apps/explorer/src/app/components/txs/details/tx-proposal.spec.tsx

@@ -1,56 +0,0 @@
-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);
-  });
-});

apps/explorer/src/app/components/txs/details/tx-proposal.tsx

@@ -28,16 +28,11 @@ 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 (
-    proposalsThatRequireBundles.filter((requiredIfExists) =>
-      has(proposal.terms, requiredIfExists)
-    ).length > 0
+  return !!['newAsset', 'updateAsset'].filter((requiredIfExists) =>
+    has(proposal.terms, requiredIfExists)
   );
 }
 
@@ -86,7 +81,6 @@ 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;

apps/explorer/src/app/components/txs/tx-order-type.tsx

@@ -1,6 +1,5 @@
 import { t } from '@vegaprotocol/i18n';
 import type { components } from '../../../types/explorer';
-import { VoteIcon } from '../vote-icon/vote-icon';
 
 interface TxOrderTypeProps {
   orderType: string;
@@ -138,15 +137,12 @@ export const TxOrderType = ({ orderType, command }: TxOrderTypeProps) => {
   let type = displayString[orderType] || orderType;
 
   let colours =
-    'text-white dark:text-white bg-vega-dark-150 dark:bg-vega-dark-250';
+    'text-white dark:text-white bg-vega-dark-150 dark:bg-vega-dark-150';
 
   // This will get unwieldy and should probably produce a different colour of tag
   if (type === 'Chain Event' && !!command?.chainEvent) {
     type = getLabelForChainEvent(command.chainEvent);
     colours = 'text-white dark-text-white bg-vega-pink dark:bg-vega-pink';
-  } else if (type === 'Validator Heartbeat') {
-    colours =
-      'text-white dark-text-white bg-vega-light-200 dark:bg-vega-dark-100';
   } else if (type === 'Proposal' || type === 'Governance Proposal') {
     if (command && !!command.proposalSubmission) {
       type = getLabelForProposal(command.proposalSubmission);
@@ -154,16 +150,6 @@ export const TxOrderType = ({ orderType, command }: TxOrderTypeProps) => {
     colours = 'text-black bg-vega-yellow';
   }
 
-  if (type === 'Vote on Proposal') {
-    return (
-      <VoteIcon
-        vote={command?.voteSubmission?.value === 'VALUE_YES'}
-        yesText="Proposal vote"
-        noText="Proposal vote"
-      />
-    );
-  }
-
   if (type === 'Vote on Proposal' || type === 'Vote Submission') {
     colours = 'text-black bg-vega-yellow';
   }

apps/explorer/src/app/components/txs/txs-infinite-list-item.spec.tsx

@@ -98,6 +98,6 @@ describe('Txs infinite list item', () => {
     expect(screen.getByTestId('pub-key')).toHaveTextContent('testPubKey');
     expect(screen.getByTestId('tx-type')).toHaveTextContent('testType');
     expect(screen.getByTestId('tx-block')).toHaveTextContent('1');
-    expect(screen.getByTestId('tx-success')).toHaveTextContent('Success');
+    expect(screen.getByTestId('tx-success')).toHaveTextContent('Success: ✅');
   });
 });

apps/explorer/src/app/components/txs/txs-infinite-list-item.tsx

@@ -31,7 +31,7 @@ export const TxsInfiniteListItem = ({
   return (
     <div
       data-testid="transaction-row"
-      className="flex items-center h-full border-t border-neutral-600 dark:border-neutral-800 txs-infinite-list-item grid grid-cols-10"
+      className="flex items-center h-full border-t border-neutral-600 dark:border-neutral-800 txs-infinite-list-item grid grid-cols-10 py-2"
     >
       <div
         className="text-sm col-span-10 md:col-span-3 leading-none"
@@ -83,7 +83,7 @@ export const TxsInfiniteListItem = ({
         data-testid="tx-success"
       >
         <span className="md:hidden uppercase text-vega-dark-300">
-          Success&nbsp;
+          Success:&nbsp;
         </span>
         {isNumber(code) ? (
           <ChainResponseCode code={code} hideLabel={true} />

apps/explorer/src/app/components/vote-icon/vote-icon.spec.tsx

@@ -1,37 +0,0 @@
-import { render } from '@testing-library/react';
-import { VoteIcon } from './vote-icon';
-
-describe('Vote TX icon', () => {
-  it('should use the text For by default for yes votes', () => {
-    const yes = render(<VoteIcon vote={true} />);
-    expect(yes.getByTestId('label')).toHaveTextContent('For');
-  });
-
-  it('should use the yesText for yes votes if specified', () => {
-    const yes = render(<VoteIcon vote={true} yesText="Test" />);
-    expect(yes.getByTestId('label')).toHaveTextContent('Test');
-  });
-
-  it('should display the tick icon for yes votes', () => {
-    const no = render(<VoteIcon vote={true} />);
-    expect(no.getByRole('img')).toHaveAttribute(
-      'aria-label',
-      'tick-circle icon'
-    );
-  });
-
-  it('should use the text Against by default for no votes', () => {
-    const no = render(<VoteIcon vote={false} />);
-    expect(no.getByTestId('label')).toHaveTextContent('Against');
-  });
-
-  it('should use the noText for no votes if specified', () => {
-    const no = render(<VoteIcon vote={false} noText="Test" />);
-    expect(no.getByTestId('label')).toHaveTextContent('Test');
-  });
-
-  it('should display the delete icon for no votes', () => {
-    const no = render(<VoteIcon vote={false} />);
-    expect(no.getByRole('img')).toHaveAttribute('aria-label', 'delete icon');
-  });
-});

apps/explorer/src/app/components/vote-icon/vote-icon.tsx

@@ -1,40 +0,0 @@
-import { Icon } from '@vegaprotocol/ui-toolkit';
-import type { IconName } from '@vegaprotocol/ui-toolkit';
-
-export interface VoteIconProps {
-  // True is a yes vote, false is undefined or no vorte
-  vote: boolean;
-  // Defaults to 'For', but can be any text
-  yesText?: string;
-  // Defaults to 'Against', but can be any text
-  noText?: string;
-}
-
-/**
- * Displays a lozenge with an icon representing the way a user voted for a proposal.
- * The yes and no text can be overridden
- *
- * @returns
- */
-export function VoteIcon({
-  vote,
-  yesText = 'For',
-  noText = 'Against',
-}: VoteIconProps) {
-  const label = vote ? yesText : noText;
-  const bg = vote ? 'bg-vega-green-550' : 'bg-vega-pink-550';
-  const icon: IconName = vote ? 'tick-circle' : 'delete';
-  const fill = vote ? 'vega-green-300' : 'vega-pink-300';
-  const text = vote ? 'vega-green-200' : 'vega-pink-200';
-
-  return (
-    <div
-      className={`voteicon inline-block my-1 py-1 px-2 py rounded-md text-white leading-one sm align-top ${bg}`}
-    >
-      <Icon name={icon} size={3} className={`mr-2 p-0 fill-${fill}`} />
-      <span className={`text-base text-${text}`} data-testid="label">
-        {label}
-      </span>
-    </div>
-  );
-}

apps/explorer/src/app/routes/markets/market-page.tsx

@@ -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/markets';
+import { marketInfoWithDataProvider } from '@vegaprotocol/market-info';
 import { PageTitle } from '../../components/page-helpers/page-title';
 
 export const MarketPage = () => {

apps/explorer/src/app/routes/markets/markets-page.tsx

@@ -1,6 +1,6 @@
 import { useScrollToLocation } from '../../hooks/scroll-to-location';
 import { useDocumentTitle } from '../../hooks/use-document-title';
-import { marketsProvider } from '@vegaprotocol/markets';
+import { marketsProvider } from '@vegaprotocol/market-list';
 import { RouteTitle } from '../../components/route-title';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { t } from '@vegaprotocol/i18n';

apps/explorer/src/styles.css

@@ -32,9 +32,9 @@
   line-height: calc(min(var(--ag-line-height, 26px), 26px) - 4px);
 }
 
-.vega-ag-grid .ag-row,
-.vega-ag-grid .ag-cell {
-  border-width: 0;
+.vega-ag-grid .ag-row {
+  border-width: 1px 0;
+  border-bottom: 1px solid transparent;
 }
 
 /* Light variables */
@@ -46,6 +46,7 @@
   --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 */
@@ -57,8 +58,5 @@
   --ag-header-column-separator-color: theme(colors.neutral[600]);
   --ag-row-border-color: theme(colors.black);
   --ag-row-hover-color: theme(colors.neutral[800]);
-}
-
-.voteicon svg {
-  vertical-align: baseline;
+  --ag-font-size: 12px;
 }

apps/governance-e2e/.env

@@ -17,7 +17,6 @@ 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

apps/governance-e2e/cypress.config.js

@@ -1,11 +1,10 @@
 const { defineConfig } = require('cypress');
 
 module.exports = defineConfig({
-  reporter: '../../node_modules/cypress-mochawesome-reporter',
+  projectId: 'et4snf',
 
   e2e: {
     setupNodeEvents(on, config) {
-      require('cypress-mochawesome-reporter/plugin')(on);
       require('@cypress/grep/src/plugin')(config);
       return config;
     },

apps/governance-e2e/src/fixtures/proposals/new-market-raw.json

@@ -1,113 +0,0 @@
-{
-  "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
-  }
-}

apps/governance-e2e/src/integration/flow/proposal-details.cy.ts

@@ -7,12 +7,17 @@ import {
 import {
   createRawProposal,
   createTenDigitUnixTimeStampForSpecifiedDays,
+  enterUniqueFreeFormProposalBody,
   generateFreeFormProposalTitle,
   getDateFormatForSpecifiedDays,
-  getProposalFromTitle,
+  getProposalIdFromList,
   getProposalInformationFromTable,
-  submitUniqueRawProposal,
+  getSubmittedProposalFromProposalList,
+  goToMakeNewProposal,
+  governanceProposalType,
   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';
@@ -33,8 +38,6 @@ 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',
@@ -59,25 +62,23 @@ 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) => {
-        cy.get(openProposals).within(() => {
-          getProposalFromTitle(rawProposal.rationale.title).within(() => {
-            cy.get(viewProposalButton).should('be.visible').click();
+        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(proposalDetailsTitle).should(
-          'contain.text',
-          rawProposal.rationale.title
-        );
+        cy.get(proposalDetailsTitle)
+          .should('contain', rawProposal.rationale.title)
+          .and('be.visible');
         cy.get(proposalDetailsDescription)
-          .find('p')
-          .should('have.text', proposalDescription);
+          .should('contain', rawProposal.rationale.description)
+          .and('be.visible');
       });
-      cy.getByTestId(proposalTermsToggle).click();
       // 3001-VOTE-052
       cy.get('code.language-json')
         .should('exist')
@@ -88,36 +89,33 @@ 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)
 
-      submitUniqueRawProposal({
-        proposalTitle: proposalTitle,
-        closingTimestamp: proposalTimeStamp,
-      });
+      goToMakeNewProposal(governanceProposalType.FREEFORM);
+      enterUniqueFreeFormProposalBody(closingVoteHrs, proposalTitle);
+      waitForProposalSubmitted();
+      waitForProposalSync();
       navigateTo(navigation.proposals);
-      getProposalFromTitle(proposalTitle).within(() =>
+      getSubmittedProposalFromProposalList(proposalTitle).within(() =>
         cy.get(viewProposalButton).click()
       );
       cy.wrap(
         formatDateWithLocalTimezone(new Date(proposalTimeStamp * 1000))
       ).then((closingDate) => {
-        getProposalInformationFromTable('Closes on').should(
-          'have.text',
-          closingDate
-        );
+        getProposalInformationFromTable('Closes on')
+          .contains(closingDate)
+          .should('be.visible');
       });
       cy.wrap(
         formatDateWithLocalTimezone(
           new Date(createTenDigitUnixTimeStampForSpecifiedDays(0) * 1000)
         )
       ).then((proposalDate) => {
-        getProposalInformationFromTable('Proposed on').should(
-          'have.text',
-          proposalDate
-        );
+        getProposalInformationFromTable('Proposed on')
+          .contains(proposalDate)
+          .should('be.visible');
       });
     });
 
@@ -127,14 +125,13 @@ describe(
       // 3001-VOTE-067
       createRawProposal();
       cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-        getProposalFromTitle(rawProposal.rationale.title).within(() =>
-          cy.get(viewProposalButton).click()
-        );
+        getSubmittedProposalFromProposalList(
+          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');
@@ -154,9 +151,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) => {
-        getProposalFromTitle(rawProposal.rationale.title).within(() =>
-          cy.get(viewProposalButton).click()
-        );
+        getSubmittedProposalFromProposalList(
+          rawProposal.rationale.title
+        ).within(() => cy.get(viewProposalButton).click());
       });
       // 3001-VOTE-080
       cy.getByTestId('vote-buttons').contains('against').should('be.visible');
@@ -182,7 +179,6 @@ 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');
@@ -224,15 +220,14 @@ describe(
       vegaWalletSetSpecifiedApprovalAmount('1000');
       createRawProposal();
       cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-        getProposalFromTitle(rawProposal.rationale.title).within(() =>
-          cy.get(viewProposalButton).click()
-        );
+        getSubmittedProposalFromProposalList(
+          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) => {
@@ -240,15 +235,14 @@ describe(
             (Number(totalSupply.replace(/,/g, '')) * 0.001) /
             100
           ).toFixed(2);
-          ethereumWalletConnect();
           ensureSpecifiedUnstakedTokensAreAssociated(
             tokensRequiredToAchieveResult
           );
           navigateTo(navigation.proposals);
           cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-            getProposalFromTitle(rawProposal.rationale.title).within(() =>
-              cy.get(viewProposalButton).click()
-            );
+            getSubmittedProposalFromProposalList(
+              rawProposal.rationale.title
+            ).within(() => cy.get(viewProposalButton).click());
           });
           cy.get(proposalVoteProgressForPercentage)
             .contains('100.00%')
@@ -265,7 +259,6 @@ 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');

apps/governance-e2e/src/integration/flow/proposal-enacted.cy.ts

@@ -58,12 +58,14 @@ 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');
-      cy.get(proposalStatus).should('have.text', 'Enacted');
+      getProposalInformationFromTable('State')
+        .contains('Enacted')
+        .and('be.visible');
       cy.get(votesTable).within(() => {
         cy.contains('Vote passed.').should('be.visible');
         cy.contains('Voting has ended.').should('be.visible');
@@ -85,10 +87,16 @@ context(
           .last()
           .within(() => cy.get(viewProposalButton).click());
       });
-      cy.get(proposalStatus).should('have.text', 'Open');
+      getProposalInformationFromTable('State')
+        .contains('Open')
+        .and('be.visible');
       voteForProposal('for');
-      cy.get(proposalStatus, proposalTimeout).should('have.text', 'Passed');
-      cy.get(proposalStatus, proposalTimeout).should('have.text', 'Enacted');
+      getProposalInformationFromTable('State') // 3001-VOTE-047
+        .contains('Passed', proposalTimeout)
+        .and('be.visible');
+      getProposalInformationFromTable('State')
+        .contains('Enacted', proposalTimeout)
+        .and('be.visible');
       cy.get(votesTable).within(() => {
         cy.contains('Vote passed.').should('be.visible');
         cy.contains('Voting has ended.').should('be.visible');
@@ -113,9 +121,13 @@ context(
           .last()
           .within(() => cy.get(viewProposalButton).click());
       });
-      cy.get(proposalStatus).should('have.text', 'Open');
+      getProposalInformationFromTable('State')
+        .contains('Open')
+        .and('be.visible');
       voteForProposal('for');
-      cy.get(proposalStatus, proposalTimeout).should('have.text', 'Enacted');
+      getProposalInformationFromTable('State')
+        .contains('Enacted', proposalTimeout)
+        .and('be.visible');
     });
 
     // 3001-VOTE-048 3001-VOTE-049 3001-VOTE-050
@@ -132,8 +144,12 @@ context(
           .last()
           .within(() => cy.get(viewProposalButton).click());
       });
-      cy.get(proposalStatus).should('have.text', 'Open');
-      cy.get(proposalStatus, proposalTimeout).should('have.text', 'Declined');
+      getProposalInformationFromTable('State')
+        .contains('Open')
+        .and('be.visible');
+      getProposalInformationFromTable('State') // 3001-VOTE-047
+        .contains('Declined', proposalTimeout)
+        .and('be.visible');
       getProposalInformationFromTable('Rejection reason')
         .contains('PROPOSAL_ERROR_PARTICIPATION_THRESHOLD_NOT_REACHED')
         .and('be.visible');

apps/governance-e2e/src/integration/flow/proposal-flow.cy.ts

@@ -5,11 +5,10 @@ import {
   enterRawProposalBody,
   enterUniqueFreeFormProposalBody,
   generateFreeFormProposalTitle,
-  getProposalFromTitle,
   getProposalInformationFromTable,
+  getSubmittedProposalFromProposalList,
   goToMakeNewProposal,
   governanceProposalType,
-  submitUniqueRawProposal,
   voteForProposal,
   waitForProposalSubmitted,
   waitForProposalSync,
@@ -82,6 +81,7 @@ context(
       });
 
       vegaWalletSetSpecifiedApprovalAmount('1000');
+      cy.associateTokensToVegaWallet('1');
     });
 
     beforeEach('visit governance tab', function () {
@@ -95,8 +95,7 @@ context(
       navigateTo(navigation.proposals);
     });
 
-    // Test can only pass if run before other proposal tests.
-    it.skip('Should be able to see that no proposals exist', function () {
+    it('Should be able to see that no proposals exist', function () {
       // 3001-VOTE-003
       cy.get(noOpenProposals)
         .should('be.visible')
@@ -108,7 +107,7 @@ context(
 
     // 3002-PROP-002
     // 3002-PROP-003
-    it('Proposal form - shows how many vega tokens are required to make a proposal', function () {
+    it('Submit a proposal form - shows how many vega tokens are required to make a proposal', function () {
       // 3002-PROP-005
       goToMakeNewProposal(governanceProposalType.NEW_MARKET);
       cy.contains(
@@ -116,9 +115,8 @@ context(
       ).should('be.visible');
     });
 
-    // Skipping as currently unable to propose using forms other than raw
     // 3002-PROP-011
-    it.skip('Able to submit a valid freeform proposal - with minimum required tokens associated', function () {
+    it('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');
@@ -142,13 +140,16 @@ context(
       closeStakingDialog();
 
       cy.get(vegaWalletStakedBalances, txTimeout).should('contain', '2');
-      createRawProposal();
+
+      navigateTo(navigation.proposals);
+      goToMakeNewProposal(governanceProposalType.FREEFORM);
+      enterUniqueFreeFormProposalBody('50', generateFreeFormProposalTitle());
+      waitForProposalSubmitted();
     });
 
-    it.skip('Creating a proposal - proposal rejected - when closing time sooner than system default', function () {
+    it('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'
       );
@@ -157,7 +158,7 @@ context(
         .should('equal', 'Value must be greater than or equal to 1.');
     });
 
-    it.skip('Creating a proposal - proposal rejected - when closing time later than system default', function () {
+    it('Creating a proposal - proposal rejected - when closing time later than system default', function () {
       goToMakeNewProposal(governanceProposalType.FREEFORM);
       enterUniqueFreeFormProposalBody(
         '100000',
@@ -184,13 +185,17 @@ context(
       navigateTo(navigation.proposals);
       cy.get(rejectProposalsLink).click();
       cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-        getProposalFromTitle(rawProposal.rationale.title).within(() => {
+        getSubmittedProposalFromProposalList(
+          rawProposal.rationale.title
+        ).within(() => {
           cy.contains('Rejected').should('be.visible');
           cy.contains('Close time too late').should('be.visible');
           cy.get(viewProposalButton).click();
         });
       });
-      cy.getByTestId('proposal-status').should('have.text', 'Rejected');
+      getProposalInformationFromTable('State')
+        .contains('Rejected')
+        .and('be.visible');
       getProposalInformationFromTable('Rejection reason')
         .contains('PROPOSAL_ERROR_CLOSE_TIME_TOO_LATE')
         .and('be.visible');
@@ -285,19 +290,18 @@ context(
       const proposalTitle = generateFreeFormProposalTitle();
 
       ensureSpecifiedUnstakedTokensAreAssociated('1');
-      submitUniqueRawProposal({ proposalTitle: proposalTitle });
-      ethereumWalletConnect();
+      goToMakeNewProposal(governanceProposalType.FREEFORM);
+      enterUniqueFreeFormProposalBody('50', proposalTitle);
+      waitForProposalSubmitted();
       stakingPageDisassociateTokens('0.0001');
-      cy.get(vegaWallet)
-        .first()
-        .within(() => {
-          cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-            'contain',
-            '0.9999'
-          );
-        });
+      cy.get(vegaWallet).within(() => {
+        cy.get(vegaWalletAssociatedBalance, txTimeout).should(
+          'contain',
+          '0.9999'
+        );
+      });
       navigateTo(navigation.proposals);
-      getProposalFromTitle(proposalTitle).within(() =>
+      getSubmittedProposalFromProposalList(proposalTitle).within(() =>
         cy.get(viewProposalButton).click()
       );
       cy.contains('Vote breakdown').should('be.visible', {
@@ -315,9 +319,9 @@ context(
       cy.get('[data-testid="manage-vega-wallet"]:visible').click();
       cy.get('[data-testid="disconnect"]').click();
       cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-        getProposalFromTitle(rawProposal.rationale.title).within(() =>
-          cy.get(viewProposalButton).click()
-        );
+        getSubmittedProposalFromProposalList(
+          rawProposal.rationale.title
+        ).within(() => cy.get(viewProposalButton).click());
       });
       // 3001-VOTE-075
       // 3001-VOTE-076

apps/governance-e2e/src/integration/flow/proposal-forms.cy.ts

@@ -8,7 +8,6 @@ import {
 import {
   getProposalInformationFromTable,
   goToMakeNewProposal,
-  governanceProposalType,
   voteForProposal,
   waitForProposalSubmitted,
 } from '../../support/governance.functions';
@@ -57,8 +56,18 @@ 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.skip(
+context(
   'Governance flow - form validations for different governance proposals',
   { tags: '@slow' },
   function () {

apps/governance-e2e/src/integration/flow/proposal-list.cy.ts

@@ -6,15 +6,16 @@ import {
   waitForSpinner,
 } from '../../support/common.functions';
 import {
+  createFreeformProposal,
   createRawProposal,
   createTenDigitUnixTimeStampForSpecifiedDays,
   enterRawProposalBody,
   generateFreeFormProposalTitle,
-  getProposalFromTitle,
+  getProposalIdFromList,
   getProposalInformationFromTable,
+  getSubmittedProposalFromProposalList,
   goToMakeNewProposal,
   governanceProposalType,
-  submitUniqueRawProposal,
   voteForProposal,
   waitForProposalSubmitted,
   waitForProposalSync,
@@ -23,14 +24,10 @@ 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 = 'vote-status';
-const proposalType = 'proposal-type';
-const proposalStatus = 'proposal-status';
+const voteStatus = '[data-testid="vote-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 () {
@@ -63,12 +60,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)
-        .first()
+        .last()
         .invoke('text')
         .should('match', /days|minutes/);
-      cy.get(proposalClosingDate).should('contain.text', 'months');
-      cy.get(proposalClosingDate).last().should('contain.text', 'year');
     });
   });
 
@@ -76,27 +73,36 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
     const proposerId = Cypress.env('vegaWalletPublicKey');
     const proposalTitle = generateFreeFormProposalTitle();
 
-    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');
+    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);
+    });
   });
 
   it('Newly created proposals list - shows title and portion of summary', function () {
-    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');
+    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');
+        });
+      });
+    });
   });
 
   it('Newly created proposals list - shows open proposals in an open state', function () {
@@ -104,11 +110,23 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
     // 3001-VOTE-035
     createRawProposal(this.minProposerBalance);
     cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-      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');
+      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');
       });
+      getProposalInformationFromTable('State')
+        .contains('Open')
+        .and('be.visible');
+      getProposalInformationFromTable('Type')
+        .contains('Freeform')
+        .and('be.visible');
     });
   });
 
@@ -116,22 +134,18 @@ 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();
 
-    submitUniqueRawProposal({ proposalTitle: proposalTitle });
-    getProposalFromTitle(proposalTitle).within(() => {
+    createFreeformProposal(proposalTitle);
+    getSubmittedProposalFromProposalList(proposalTitle).within(() => {
       // 3001-VOTE-039
-      cy.getByTestId(voteStatus).should(
-        'have.text',
-        'Participation not reached'
-      );
+      cy.get(voteStatus).should('have.text', 'Participation not reached');
       cy.get(viewProposalButton).click();
     });
     voteForProposal('for');
     navigateTo(navigation.proposals);
-    getProposalFromTitle(proposalTitle).within(() => {
-      cy.getByTestId(voteStatus).should('have.text', 'Set to pass');
+    getSubmittedProposalFromProposalList(proposalTitle).within(() => {
+      cy.get(voteStatus).should('have.text', 'Set to pass');
       cy.get(viewProposalButton).click();
     });
-    cy.getByTestId(voteBreakDownToggle).click();
     getProposalInformationFromTable('Token participation met')
       .contains('👍')
       .should('be.visible');

apps/governance-e2e/src/integration/flow/staking-flow.cy.ts

@@ -7,7 +7,6 @@ import {
   waitForSpinner,
   navigateTo,
   navigation,
-  turnTelemetryOff,
 } from '../../support/common.functions';
 import {
   clickOnValidatorFromList,
@@ -68,7 +67,6 @@ context(
         'teardown wallet & drill into a specific validator',
         function () {
           cy.clearLocalStorage();
-          turnTelemetryOff();
           cy.reload();
           waitForSpinner();
           cy.connectVegaWallet();
@@ -96,7 +94,7 @@ context(
         navigateTo(navigation.validators);
 
         // 2002-SINC-007
-        validateValidatorListTotalStakeAndShare('0', '3,002.00', '50.02%');
+        validateValidatorListTotalStakeAndShare('0', '2.00', '100.00%');
       });
 
       it('Able to view validators staked by me', function () {
@@ -146,7 +144,7 @@ context(
         verifyThisEpochValue(2.0);
         closeStakingDialog();
         navigateTo(navigation.validators);
-        validateValidatorListTotalStakeAndShare('0', '3,002.00', '50.02%');
+        validateValidatorListTotalStakeAndShare('0', '2.00', '100.00%');
       });
 
       it('Able to stake against a validator - using vega from both wallet and vesting contract', function () {
@@ -166,11 +164,10 @@ context(
         verifyThisEpochValue(6.0);
         closeStakingDialog();
         navigateTo(navigation.validators);
-        validateValidatorListTotalStakeAndShare('0', '3,006.00', '50.05%');
+        validateValidatorListTotalStakeAndShare('0', '6.00', '100.00%');
       });
 
       it('Able to stake against multiple validators', function () {
-        vegaWalletTeardown();
         stakingPageAssociateTokens('5');
         verifyUnstakedBalance(5.0);
         cy.get('button').contains('Select a validator to nominate').click();
@@ -198,10 +195,14 @@ context(
           .eq(1)
           .within(() => {
             cy.getByTestId(stakeValidatorListTotalStake)
-              .should('have.text', '3,002.00')
+              .should('have.text', '2.00')
               .and('be.visible');
             cy.getByTestId(stakeValidatorListTotalShare)
-              .should('have.text', '50.01%')
+              .should('have.text', '66.67%')
+              .and('be.visible');
+            cy.getByTestId(stakeValidatorListTotalStake)
+              .scrollIntoView()
+              .should('have.text', '2.00')
               .and('be.visible');
           });
         cy.get(`[row-id="${1}"]`)
@@ -209,10 +210,14 @@ context(
           .within(() => {
             cy.getByTestId(stakeValidatorListTotalStake)
               .scrollIntoView()
-              .should('have.text', '3,001.00')
+              .should('have.text', '1.00')
               .and('be.visible');
             cy.getByTestId(stakeValidatorListTotalShare)
-              .should('have.text', '49.99%')
+              .should('have.text', '33.33%')
+              .and('be.visible');
+            cy.getByTestId(stakeValidatorListTotalStake)
+              .scrollIntoView()
+              .should('have.text', '1.00')
               .and('be.visible');
           });
       });
@@ -247,10 +252,10 @@ context(
           waitForBeginningOfEpoch();
           cy.getByTestId(stakeValidatorListStakePercentage).should(
             'have.text',
-            '50.02%'
+            '100%'
           );
           navigateTo(navigation.validators);
-          validateValidatorListTotalStakeAndShare('0', '3,002.00', '50.02%');
+          validateValidatorListTotalStakeAndShare('0', '2.00', '100.00%');
         }
       );
 
@@ -275,7 +280,7 @@ context(
           txTimeout
         );
         navigateTo(navigation.validators);
-        validateValidatorListTotalStakeAndShare('0', '3,000.00', '50.00%');
+        validateValidatorListTotalStakeAndShare('0', '0.00', '0.00%');
 
         cy.getByTestId(userStakeBtn).should('not.exist');
         cy.getByTestId(userStake).should('not.exist');
@@ -347,7 +352,7 @@ context(
           txTimeout
         );
         navigateTo(navigation.validators);
-        validateValidatorListTotalStakeAndShare('0', '3,000.00', '50.00%');
+        validateValidatorListTotalStakeAndShare('0', '0.00', '0.00%');
       });
 
       it('Disassociating all vesting contract tokens max - removes all staked tokens', function () {
@@ -375,7 +380,7 @@ context(
           txTimeout
         );
         navigateTo(navigation.validators);
-        validateValidatorListTotalStakeAndShare('0', '3,000.00', '50.00%');
+        validateValidatorListTotalStakeAndShare('0', '0.00', '0.00%');
       });
 
       it('Disassociating some tokens - prioritizes unstaked tokens', function () {
@@ -397,7 +402,7 @@ context(
         });
         verifyStakedBalance(2.0);
         navigateTo(navigation.validators);
-        validateValidatorListTotalStakeAndShare('0', '3,002.00', '50.02%');
+        validateValidatorListTotalStakeAndShare('0', '2.00', '100.00%');
       });
 
       it('Associating wallet tokens - when some already staked - auto stakes tokens to staked validator', function () {

apps/governance-e2e/src/integration/flow/token-association-flow.cy.ts

@@ -111,10 +111,10 @@ context(
         // 1004-ASSO-028
         // 1004-ASSO-029
         // 1004-ASSO-031
-        vegaWalletTeardown();
+
         stakingPageAssociateTokens('2');
         verifyEthWalletAssociatedBalance('2.0');
-        verifyEthWalletTotalAssociatedBalance('6,002.00');
+        verifyEthWalletTotalAssociatedBalance('2.0');
         cy.get('button').contains('Select a validator to nominate').click();
         stakingPageDisassociateTokens('2');
         cy.getByTestId('currency-title', txTimeout).should(
@@ -125,18 +125,17 @@ context(
         validateWalletCurrency('Pending association', '2.00');
         validateWalletCurrency('Total associated after pending', '0.00');
         cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
-        cy.get(
-          '[data-testid="eth-wallet-associated-balances"]:visible',
-          txTimeout
-        ).should('have.length', 2);
-        verifyEthWalletTotalAssociatedBalance('6,000.00');
+        cy.getByTestId('eth-wallet-associated-balances', txTimeout).should(
+          'not.exist'
+        );
+        verifyEthWalletTotalAssociatedBalance('0.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('7,001.00');
+        verifyEthWalletTotalAssociatedBalance('1,001.00');
         cy.get(vegaWallet)
           .last()
           .within(() => {

apps/governance-e2e/src/integration/flow/withdrawal-flow.cy.ts

@@ -47,8 +47,11 @@ context(
   function () {
     before('visit withdrawals and connect vega wallet', function () {
       cy.visit('/');
-      ethereumWalletConnect();
-      depositAsset(usdcEthAddress, '1000', 5);
+      // When running tests locally, will fail if run without restarting capsule
+      cy.updateCapsuleMultiSig().then(() => {
+        ethereumWalletConnect();
+        depositAsset(usdcEthAddress, '1000', 5);
+      });
     });
 
     beforeEach('Navigate to withdrawal page', function () {

apps/governance-e2e/src/integration/view/proposal.cy.ts

@@ -109,7 +109,7 @@ context(
             );
             cy.getByTestId('protocol-upgrade-proposal-status').should(
               'have.text',
-              'Approved by validators '
+              'Approved '
             );
           });
       });
@@ -136,7 +136,7 @@ context(
         );
         cy.getByTestId('protocol-upgrade-state').should(
           'have.text',
-          'Approved by validators'
+          'Approved'
         );
         cy.getByTestId('protocol-upgrade-release-tag').should(
           'have.text',

apps/governance-e2e/src/integration/view/pubkey-view.cy.ts

@@ -9,7 +9,6 @@ import {
 import {
   enterUniqueFreeFormProposalBody,
   goToMakeNewProposal,
-  governanceProposalType,
 } from '../../support/governance.functions';
 import { vegaWalletFaucetAssetsWithoutCheck } from '../../support/wallet-vega.functions';
 
@@ -51,7 +50,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(governanceProposalType.FREEFORM);
+    goToMakeNewProposal('Freeform');
     enterUniqueFreeFormProposalBody('50', 'pub key proposal test');
     cy.getByTestId('dialog-content')
       .first()

apps/governance-e2e/src/integration/view/rewards.cy.ts

@@ -63,6 +63,7 @@ context(
       });
 
       it('should have option to go to last and newest page', function () {
+        waitForBeginningOfEpoch();
         cy.getByTestId('goto-last-page').click();
         cy.getByTestId('epoch-total-rewards-table')
           .last()

apps/governance-e2e/src/integration/view/validators.cy.ts

@@ -29,7 +29,7 @@ const performancePenaltyToolTip = '[data-testid="performance-penalty-tooltip"]';
 const overstakedPenaltyToolTip = '[data-testid="overstaked-penalty-tooltip"]';
 const totalPenaltyToolTip = '[data-testid="total-penalty-tooltip"]';
 const epochCountDown = '[data-testid="epoch-countdown"]';
-const stakeNumberRegex = /^\d{1,3}(,\d{3})*(\.\d+)?$/;
+const stakeNumberRegex = /^\d*\.?\d*$/;
 
 context('Validators Page - verify elements on page', function () {
   before('navigate to validators page', function () {
@@ -84,13 +84,13 @@ context('Validators Page - verify elements on page', function () {
 
           cy.get(stakedByOperatorToolTip)
             .invoke('text')
-            .should('contain', 'Staked by operator: 3,000.00');
+            .should('contain', 'Staked by operator: 0.00');
           cy.get(stakedByDelegatesToolTip)
             .invoke('text')
             .should('contain', 'Staked by delegates: 0.00');
           cy.get(totalStakedToolTip)
             .invoke('text')
-            .should('contain', 'Total stake: 3,000.00');
+            .should('contain', 'Total stake: 0.00');
         });
 
         it('Should be able to see validator normalised voting power', function () {
@@ -106,10 +106,10 @@ context('Validators Page - verify elements on page', function () {
 
           cy.get(unnormalisedVotingPowerToolTip)
             .invoke('text')
-            .should('contain', 'Unnormalised voting power: 20.00%');
+            .should('contain', 'Unnormalised voting power: 0.00%');
           cy.get(normalisedVotingPowerToolTip)
             .invoke('text')
-            .should('contain', 'Normalised voting power: 50.00%');
+            .should('contain', 'Normalised voting power: 0.10%');
         });
 
         // 2002-SINC-018
@@ -126,13 +126,13 @@ context('Validators Page - verify elements on page', function () {
 
           cy.get(performancePenaltyToolTip)
             .invoke('text')
-            .should('contain', 'Performance penalty: 0.00%');
+            .should('contain', 'Performance penalty: 100.00%');
           cy.get(overstakedPenaltyToolTip)
             .invoke('text')
-            .should('contain', 'Overstaked penalty: 60.00%'); // value not asserted due to #2886
+            .should('contain', 'Overstaked penalty:'); // value not asserted due to #2886
           cy.get(totalPenaltyToolTip)
             .invoke('text')
-            .should('contain', 'Total penalties: 60.00%');
+            .should('contain', 'Total penalties: 0.00%');
         });
 
         it('Should be able to see validator pending stake', function () {

apps/governance-e2e/src/support/governance.functions.ts

@@ -1,12 +1,8 @@
 import { format } from 'date-fns';
-import {
-  closeDialog,
-  navigateTo,
-  navigation,
-  waitForSpinner,
-} from './common.functions';
+import { closeDialog, navigateTo, navigation } 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"]';
@@ -50,53 +46,6 @@ 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
@@ -109,10 +58,6 @@ 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) => {
@@ -175,17 +120,13 @@ export function waitForProposalSync() {
   });
 }
 
-export function goToMakeNewProposal(proposalType: governanceProposalType) {
-  cy.visit('/proposals/propose');
-  waitForSpinner();
+export function goToMakeNewProposal(proposalType: string) {
+  navigateTo(navigation.proposals);
+  cy.get(newProposalButton).should('be.visible').click();
   cy.url().should('include', '/proposals/propose');
   cy.get(navigation.pageSpinner, { timeout: 20000 }).should('not.exist');
-  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();
-  }
+  cy.get('li').should('contain.text', proposalType).and('be.visible');
+  cy.get('li').contains(proposalType).click();
 }
 
 export function waitForProposalSubmitted() {
@@ -222,12 +163,11 @@ export function createFreeformProposal(proposalTitle: string) {
   navigateTo(navigation.proposals);
 }
 
-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',
-}
+export const governanceProposalType = {
+  NETWORK_PARAMETER: 'Network parameter',
+  NEW_MARKET: 'New market',
+  UPDATE_MARKET: 'Update market',
+  NEW_ASSET: 'New asset',
+  FREEFORM: 'Freeform',
+  RAW: 'raw proposal',
+};

apps/governance-e2e/src/support/index.js

@@ -8,7 +8,6 @@ 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';
@@ -34,6 +33,4 @@ before(() => {
     aliasGQLQuery(req, 'ChainId', chainIdQuery());
     aliasGQLQuery(req, 'Statistics', statisticsQuery());
   });
-  // Self stake validators so they are displayed
-  cy.validatorsSelfDelegate();
 });

apps/governance-e2e/src/support/proposal.functions.ts

@@ -85,132 +85,6 @@ 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);

apps/governance-e2e/src/support/wallet-teardown.functions.ts

@@ -3,6 +3,7 @@ import {
   StakingBridge,
   Token,
   TokenVesting,
+  TokenFaucetable,
   CollateralBridge,
 } from '@vegaprotocol/smart-contracts';
 import { ethers, Wallet } from 'ethers';
@@ -40,7 +41,7 @@ export async function depositAsset(
   decimalPlaces: number
 ) {
   // Approve asset
-  const faucet = new Token(assetEthAddress, signer);
+  const faucet = new TokenFaucetable(assetEthAddress, signer);
   cy.wrap(
     faucet.approve(Erc20BridgeAddress, amount + '0'.repeat(decimalPlaces + 1)),
     {
@@ -61,12 +62,13 @@ export async function depositAsset(
 }
 
 export async function faucetAsset(assetEthAddress: string) {
-  const faucet = new Token(assetEthAddress, signer);
+  const faucet = new TokenFaucetable(assetEthAddress, signer);
   await promiseWithTimeout(faucet.faucet(), 10 * 60 * 1000, 'faucet asset');
 }
 
 export async function vegaWalletTeardown() {
   cy.get(associatedAmountInWallet)
+    .should('be.visible')
     .invoke('text')
     .then((associatedAmount) => {
       cy.get('body').then(($body) => {
@@ -81,11 +83,9 @@ export async function vegaWalletTeardown() {
       cy.get(vegaWalletContainer).within(() => {
         cy.get(associatedAmountInWallet, {
           timeout: transactionTimeout,
-        })
-          .should('have.length', 1, { timeout: transactionTimeout })
-          .contains('0.00', {
-            timeout: transactionTimeout,
-          });
+        }).contains('0.00', {
+          timeout: transactionTimeout,
+        });
       });
     });
 }

apps/governance/.env

@@ -15,7 +15,6 @@ 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

apps/governance/.env.capsule

@@ -17,7 +17,6 @@ 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

apps/governance/.env.devnet

@@ -11,4 +11,3 @@ 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/

apps/governance/.env.mainnet

@@ -12,4 +12,3 @@ NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40:87edc2605e544f888305d7fc4
 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/

apps/governance/.env.stagnet1

@@ -8,4 +8,3 @@ 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/

apps/governance/.env.testnet

@@ -12,4 +12,3 @@ 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/

apps/governance/.env.validator-testnet

@@ -9,4 +9,3 @@ 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/

apps/governance/__mocks__/react-markdown.js

@@ -1,6 +0,0 @@
-function ReactMarkdown({ children }) {
-  // eslint-disable-next-line react/jsx-no-useless-fragment
-  return <>{children}</>;
-}
-
-export default ReactMarkdown;

apps/governance/src/app.tsx

@@ -2,6 +2,7 @@ import './i18n';
 
 import React, { useEffect } from 'react';
 import * as Sentry from '@sentry/react';
+import { Integrations } from '@sentry/tracing';
 import { BrowserRouter as Router, useLocation } from 'react-router-dom';
 import { AppLoader } from './app-loader';
 import { NetworkInfo } from '@vegaprotocol/network-info';
@@ -16,7 +17,6 @@ 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,
@@ -44,7 +44,7 @@ import {
 } from '@vegaprotocol/environment';
 import { ENV } from './config';
 import type { InMemoryCacheConfig } from '@apollo/client';
-import { CreateWithdrawalDialog } from '@vegaprotocol/withdraws';
+import { WithdrawalDialog } from '@vegaprotocol/withdraws';
 import { SplashLoader } from './components/splash-loader';
 import { ToastsManager } from './toasts-manager';
 import {
@@ -53,7 +53,6 @@ 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: {
@@ -159,8 +158,7 @@ const Web3Container = ({
                   <InitializeHandlers />
                   <VegaWalletDialogs />
                   <TransactionModal />
-                  <CreateWithdrawalDialog />
-                  <WithdrawalApprovalDialogContainer />
+                  <WithdrawalDialog />
                   <TelemetryDialog />
                 </>
               </BalanceManager>
@@ -186,10 +184,6 @@ const ScrollToTop = () => {
   return null;
 };
 
-const removeQueryParams = (url: string) => {
-  return url.split('?')[0];
-};
-
 const AppContainer = () => {
   const { config, loading, error } = useEthereumConfig();
   const {
@@ -207,61 +201,25 @@ const AppContainer = () => {
   ]);
 
   useEffect(() => {
-    if (ENV.dsn && telemetryOn === 'true') {
+    if (ENV.dsn && telemetryOn) {
       Sentry.init({
         dsn: ENV.dsn,
+        integrations: [new Integrations.BrowserTracing()],
         tracesSampleRate: 0.1,
         enabled: true,
         environment: VEGA_ENV,
         release: GIT_COMMIT_HASH,
-        beforeSend(event, hint) {
-          const error = hint?.originalException;
-          const errorIsString = typeof error === 'string';
-          const errorIsObject = error instanceof Error;
-          const requestUrl = event.request?.url;
-          const transaction = event.transaction;
-
-          if (
-            (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.
-            return null;
+        beforeSend(event) {
+          if (event.request?.url?.includes('/claim?')) {
+            return {
+              ...event,
+              request: {
+                ...event.request,
+                url: event.request?.url.split('?')[0],
+              },
+            };
           }
-
-          const updatedRequest =
-            requestUrl && requestUrl.includes('/claim?')
-              ? { ...event.request, url: removeQueryParams(requestUrl) }
-              : event.request;
-
-          const updatedTransaction =
-            transaction && transaction.includes('/claim?')
-              ? removeQueryParams(transaction)
-              : transaction;
-
-          const updatedBreadcrumbs = event.breadcrumbs?.map((breadcrumb) => {
-            if (
-              breadcrumb.type === 'navigation' &&
-              breadcrumb.data?.to?.includes('/claim?')
-            ) {
-              return {
-                ...breadcrumb,
-                data: {
-                  ...breadcrumb.data,
-                  to: removeQueryParams(breadcrumb.data.to),
-                },
-              };
-            }
-            return breadcrumb;
-          });
-
-          return {
-            ...event,
-            request: updatedRequest,
-            transaction: updatedTransaction,
-            breadcrumbs: updatedBreadcrumbs ?? event.breadcrumbs,
-          };
+          return event;
         },
       });
       Sentry.setTag('branch', GIT_BRANCH);

apps/governance/src/components/eth-connect-prompt/eth-connect-promp.tsx

@@ -1,14 +1,23 @@
 import { Button } from '@vegaprotocol/ui-toolkit';
 import { useTranslation } from 'react-i18next';
-import { useWeb3ConnectStore } from '@vegaprotocol/web3';
+
+import {
+  AppStateActionType,
+  useAppState,
+} from '../../contexts/app-state/app-state-context';
 
 export const EthConnectPrompt = () => {
   const { t } = useTranslation();
-  const { open } = useWeb3ConnectStore();
+  const { appDispatch } = useAppState();
   return (
     <Button
       variant="default"
-      onClick={open}
+      onClick={() =>
+        appDispatch({
+          type: AppStateActionType.SET_ETH_WALLET_OVERLAY,
+          isOpen: true,
+        })
+      }
       fill={true}
       data-testid="connect-to-eth-btn"
     >

apps/governance/src/components/eth-wallet-container/eth-wallet-container.tsx

@@ -2,7 +2,10 @@ import { Button } from '@vegaprotocol/ui-toolkit';
 import { useWeb3React } from '@web3-react/core';
 import type { ReactElement } from 'react';
 import { useTranslation } from 'react-i18next';
-import { useWeb3ConnectStore } from '@vegaprotocol/web3';
+import {
+  AppStateActionType,
+  useAppState,
+} from '../../contexts/app-state/app-state-context';
 
 export const EthWalletContainer = ({
   children,
@@ -11,12 +14,21 @@ export const EthWalletContainer = ({
 }) => {
   const { account } = useWeb3React();
   const { t } = useTranslation();
-  const { open } = useWeb3ConnectStore();
+  const { appDispatch } = useAppState();
 
   if (!account) {
     return (
       <div className="w-full text-center">
-        <Button onClick={open}>{t('connectEthWallet')}</Button>
+        <Button
+          onClick={() =>
+            appDispatch({
+              type: AppStateActionType.SET_ETH_WALLET_OVERLAY,
+              isOpen: true,
+            })
+          }
+        >
+          {t('connectEthWallet')}
+        </Button>
       </div>
     );
   }

apps/governance/src/components/eth-wallet/eth-wallet.tsx

@@ -27,11 +27,7 @@ import {
 import { Loader } from '@vegaprotocol/ui-toolkit';
 import colors from 'tailwindcss/colors';
 import { useBalances } from '../../lib/balances/balances-store';
-import {
-  useEthereumConfig,
-  useWeb3ConnectStore,
-  useWeb3Disconnect,
-} from '@vegaprotocol/web3';
+import { useEthereumConfig, useWeb3Disconnect } from '@vegaprotocol/web3';
 import { getChainName } from '@vegaprotocol/web3';
 
 const removeLeadingAddressSymbol = (key: string) => {
@@ -193,7 +189,6 @@ export const EthWallet = () => {
   const pendingTxs = usePendingTransactions();
   const disconnect = useWeb3Disconnect(connector);
   const { config } = useEthereumConfig();
-  const { open } = useWeb3ConnectStore();
 
   return (
     <WalletCard>
@@ -238,7 +233,12 @@ export const EthWallet = () => {
           ) : (
             <Button
               fill={true}
-              onClick={open}
+              onClick={() =>
+                appDispatch({
+                  type: AppStateActionType.SET_ETH_WALLET_OVERLAY,
+                  isOpen: true,
+                })
+              }
               data-testid="connect-to-eth-wallet-button"
             >
               {t('connectEthWalletToAssociate')}

apps/governance/src/components/vega-wallet/download-wallet-prompt.tsx

@@ -1,6 +1,6 @@
 import { Link } from '@vegaprotocol/ui-toolkit';
 import { useTranslation } from 'react-i18next';
-import { ExternalLinks } from '@vegaprotocol/environment';
+import { ExternalLinks } from '@vegaprotocol/utils';
 
 export const DownloadWalletPrompt = () => {
   const { t } = useTranslation();

apps/governance/src/components/vega-wallet/hooks.ts

@@ -26,7 +26,6 @@ import type {
   WalletDelegationFieldsFragment,
 } from './__generated__/Delegations';
 import { DelegationsDocument } from './__generated__/Delegations';
-import { isPartyNotFoundError } from '../../lib/party';
 
 export const usePollForDelegations = () => {
   const { token: vegaToken } = useContracts();
@@ -76,7 +75,6 @@ export const usePollForDelegations = () => {
           })
           .then((res) => {
             if (!mounted) return;
-
             const canonisedDelegations = removePaginationWrapper(
               res.data.party?.delegationsConnection?.edges
             );
@@ -205,15 +203,6 @@ 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

apps/governance/src/components/web3-connector/web3-connector.tsx

@@ -25,26 +25,20 @@ export function Web3Connector({
   connectors,
   chainId,
 }: Web3ConnectorProps) {
-  const { open, close, isOpen } = useWeb3ConnectStore();
-
+  const { appState, appDispatch } = useAppState();
   const setDialogOpen = useCallback(
     (isOpen: boolean) => {
-      if (isOpen) {
-        open();
-      } else {
-        close();
-      }
+      appDispatch({ type: AppStateActionType.SET_ETH_WALLET_OVERLAY, isOpen });
     },
-    [open, close]
+    [appDispatch]
   );
-
   const appChainId = Number(chainId);
   return (
     <>
       <Web3Content appChainId={appChainId}>{children}</Web3Content>
       <Web3ConnectDialog
         connectors={connectors}
-        dialogOpen={isOpen}
+        dialogOpen={appState.ethConnectOverlay}
         setDialogOpen={setDialogOpen}
         desiredChainId={appChainId}
       />

apps/governance/src/config/env.ts

@@ -62,7 +62,6 @@ 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')),

apps/governance/src/contexts/app-state/app-state-context.ts

@@ -34,6 +34,9 @@ export interface AppState {
   /** Whether or not the manage VEGA wallet overlay is open */
   vegaWalletManageOverlay: boolean;
 
+  /** Whether or not the connect to Ethereum wallet overlay is open */
+  ethConnectOverlay: boolean;
+
   /**  Whether or not the transaction modal is open */
   transactionOverlay: boolean;
   /**
@@ -54,6 +57,7 @@ export enum AppStateActionType {
   REFRESH_BALANCES,
   SET_VEGA_WALLET_OVERLAY,
   SET_VEGA_WALLET_MANAGE_OVERLAY,
+  SET_ETH_WALLET_OVERLAY,
   SET_DRAWER,
   REFRESH_ASSOCIATED_BALANCES,
   SET_ASSOCIATION_BREAKDOWN,
@@ -77,6 +81,10 @@ export type AppStateAction =
       type: AppStateActionType.SET_VEGA_WALLET_MANAGE_OVERLAY;
       isOpen: boolean;
     }
+  | {
+      type: AppStateActionType.SET_ETH_WALLET_OVERLAY;
+      isOpen: boolean;
+    }
   | {
       type: AppStateActionType.SET_DRAWER;
       isOpen: boolean;

apps/governance/src/contexts/app-state/app-state-provider.tsx

@@ -16,6 +16,7 @@ const initialAppState: AppState = {
   totalSupply: new BigNumber(0),
   vegaWalletOverlay: false,
   vegaWalletManageOverlay: false,
+  ethConnectOverlay: false,
   transactionOverlay: false,
   bannerMessage: '',
   disconnectNotice: false,
@@ -44,6 +45,12 @@ function appStateReducer(state: AppState, action: AppStateAction): AppState {
         vegaWalletOverlay: action.isOpen ? false : state.vegaWalletOverlay,
       };
     }
+    case AppStateActionType.SET_ETH_WALLET_OVERLAY: {
+      return {
+        ...state,
+        ethConnectOverlay: action.isOpen,
+      };
+    }
     case AppStateActionType.SET_DRAWER: {
       return {
         ...state,

apps/governance/src/i18n/translations/dev.json

@@ -202,7 +202,6 @@
   "tokenVotes": "Token votes",
   "liquidityVotes": "Liquidity votes",
   "castYourVote": "Cast your vote",
-  "yourVote": "Your vote",
   "for": "For",
   "against": "Against",
   "majorityRequired": "Majority Required",
@@ -594,9 +593,7 @@
   "numberOfAgainstVotes": "Number of votes against",
   "yesPercentage": "Yes percentage",
   "noPercentage": "No percentage",
-  "proposalJson": "Full proposal JSON",
-  "proposalDetails": "Proposal details",
-  "proposalDescription": "Description",
+  "proposalTerms": "Proposal terms",
   "currentlySetTo": "Currently expected to ",
   "currently": "currently",
   "finalOutcomeMayDiffer": "Final outcome may differ",
@@ -790,9 +787,9 @@
   "homeVegaTokenButtonText": "Manage tokens",
   "downloadProposalJson": "Download proposal as JSON",
   "networkUpgrade": "Network Upgrade",
-  "PROTOCOL_UPGRADE_PROPOSAL_STATUS_APPROVED": "Approved by validators",
-  "PROTOCOL_UPGRADE_PROPOSAL_STATUS_PENDING": "Waiting for validator votes",
-  "PROTOCOL_UPGRADE_PROPOSAL_STATUS_REJECTED": "Declined by validators",
+  "PROTOCOL_UPGRADE_PROPOSAL_STATUS_APPROVED": "Approved",
+  "PROTOCOL_UPGRADE_PROPOSAL_STATUS_PENDING": "Pending",
+  "PROTOCOL_UPGRADE_PROPOSAL_STATUS_REJECTED": "Rejected",
   "PROTOCOL_UPGRADE_PROPOSAL_STATUS_UNSPECIFIED": "Unspecified",
   "vegaRelease{release}": "Vega Release {{release}}",
   "upgradeBlockHeight": "Upgrade block height",

apps/governance/src/lib/party.ts

@@ -1,8 +0,0 @@
-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;
-};

apps/governance/src/lib/tranches/tranches-store.tsx

@@ -50,22 +50,7 @@ export const useTranches = create<TranchesStore>()((set) => ({
         ?.map((t) => {
           const tranche_progress =
             t.duration !== 0 ? (now - t.cliff_start) / t.duration : 0;
-          let lockedDecimal;
-          if (t.duration !== 0) {
-            if (tranche_progress < 0) {
-              lockedDecimal = 1;
-            } else {
-              lockedDecimal = 1 - tranche_progress;
-            }
-          } else {
-            if (now < t.cliff_start) {
-              lockedDecimal = 1;
-            } else {
-              lockedDecimal = 0;
-            }
-          }
-          const clampedLockedDecimal = Math.max(0, Math.min(1, lockedDecimal));
-
+          const lockedDecimal = tranche_progress < 0 ? 1 : 1 - tranche_progress;
           return {
             tranche_id: t.tranche_id,
             tranche_start: secondsToDate(t.cliff_start),
@@ -75,7 +60,7 @@ export const useTranches = create<TranchesStore>()((set) => ({
               toBigNum(t.current_balance, decimals)
             ),
             locked_amount: toBigNum(t.initial_balance, decimals).times(
-              clampedLockedDecimal
+              lockedDecimal
             ),
             users: t.users,
           };

apps/governance/src/routes/home/index.tsx

@@ -12,8 +12,7 @@ import { useRefreshAfterEpoch } from '../../hooks/use-refresh-after-epoch';
 import { ProposalsListItem } from '../proposals/components/proposals-list-item';
 import { ProtocolUpgradeProposalsListItem } from '../proposals/components/protocol-upgrade-proposals-list-item/protocol-upgrade-proposals-list-item';
 import Routes from '../routes';
-import { ExternalLinks } from '@vegaprotocol/environment';
-import { removePaginationWrapper } from '@vegaprotocol/utils';
+import { ExternalLinks, removePaginationWrapper } from '@vegaprotocol/utils';
 import { useNodesQuery } from '../staking/home/__generated__/Nodes';
 import { useProposalsQuery } from '../proposals/proposals/__generated__/Proposals';
 import {
@@ -27,10 +26,6 @@ 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;
 
@@ -204,17 +199,17 @@ const GovernanceHome = ({ name }: RouteChildProps) => {
   const proposals = useMemo(
     () =>
       proposalsData
-        ? getNotRejectedProposals(proposalsData.proposalsConnection)
+        ? getNotRejectedProposals<ProposalFieldsFragment>(
+            proposalsData.proposalsConnection
+          )
         : [],
     [proposalsData]
   );
 
-  const sortedProposals = useMemo(() => orderByDate(proposals), [proposals]);
-
   const protocolUpgradeProposals = useMemo(
     () =>
       protocolUpgradesData
-        ? getNotRejectedProtocolUpgradeProposals(
+        ? getNotRejectedProtocolUpgradeProposals<ProtocolUpgradeProposalFieldsFragment>(
             protocolUpgradesData.protocolUpgradeProposals
           ).filter(
             (p) =>
@@ -225,20 +220,15 @@ const GovernanceHome = ({ name }: RouteChildProps) => {
     [protocolUpgradesData]
   );
 
-  const sortedProtocolUpgradeProposals = useMemo(
-    () => orderByUpgradeBlockHeight(protocolUpgradeProposals),
-    [protocolUpgradeProposals]
-  );
-
   const totalProposalsDesired = 4;
-  const protocolUpgradeProposalsToShow = sortedProtocolUpgradeProposals.slice(
+  const protocolUpgradeProposalsToShow = protocolUpgradeProposals.slice(
     0,
     totalProposalsDesired
   );
   const proposalsToShow =
     protocolUpgradeProposalsToShow.length === totalProposalsDesired
       ? []
-      : sortedProposals.slice(
+      : proposals.slice(
           0,
           totalProposalsDesired - protocolUpgradeProposalsToShow.length
         );

apps/governance/src/routes/proposals/components/list-asset/list-asset.spec.tsx

@@ -53,6 +53,7 @@ const mockAppState: AppState = {
   totalSupply: new BigNumber(65000000),
   vegaWalletOverlay: false,
   vegaWalletManageOverlay: false,
+  ethConnectOverlay: false,
   transactionOverlay: false,
   bannerMessage: '',
   disconnectNotice: false,

apps/governance/src/routes/proposals/components/proposal-description/index.tsx

@@ -1 +0,0 @@
-export { ProposalDescription } from './proposal-description';

apps/governance/src/routes/proposals/components/proposal-description/proposal-description.tsx

@@ -1,51 +0,0 @@
-import ReactMarkdown from 'react-markdown';
-import classnames from 'classnames';
-import { useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { Icon, RoundedWrapper } from '@vegaprotocol/ui-toolkit';
-import { SubHeading } from '../../../../components/heading';
-
-export const ProposalDescription = ({
-  description,
-}: {
-  description: string;
-}) => {
-  const { t } = useTranslation();
-  const [showDescription, setShowDescription] = useState(false);
-  const showDescriptionIconClasses = classnames('mb-4', {
-    'rotate-180': showDescription,
-  });
-
-  return (
-    <section data-testid="proposal-description">
-      <button
-        onClick={() => setShowDescription(!showDescription)}
-        data-testid="proposal-description-toggle"
-      >
-        <div className="flex items-center gap-3">
-          <SubHeading title={t('proposalDescription')} />
-          <div className={showDescriptionIconClasses}>
-            <Icon name="chevron-down" size={8} />
-          </div>
-        </div>
-      </button>
-
-      {showDescription && (
-        <RoundedWrapper paddingBottom={true} marginBottomLarge={true}>
-          <div className="p-2">
-            <ReactMarkdown
-              className="react-markdown-container"
-              /* Prevents HTML embedded in the description from rendering */
-              skipHtml={true}
-              /* Stops users embedding images which could be used for tracking  */
-              disallowedElements={['img']}
-              linkTarget="_blank"
-            >
-              {description}
-            </ReactMarkdown>
-          </div>
-        </RoundedWrapper>
-      )}
-    </section>
-  );
-};

apps/governance/src/routes/proposals/components/proposal-detail-header/proposal-header.spec.tsx

@@ -206,6 +206,28 @@ describe('Proposal header', () => {
     ).not.toBeInTheDocument();
   });
 
+  it('Renders Freeform proposal - long rationale (105 chars) - details', () => {
+    renderComponent(
+      generateProposal({
+        id: 'long',
+        rationale: {
+          title: '0x0',
+          description:
+            'Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Aenean dolor.',
+        },
+        terms: {
+          change: {
+            __typename: 'NewFreeform',
+          },
+        },
+      }),
+      false
+    );
+    expect(screen.getByTestId('proposal-description')).toHaveTextContent(
+      /Class aptent/
+    );
+  });
+
   // Remove once proposals have rationale and re-enable above tests
   it('Renders Freeform proposal - id for title', () => {
     renderComponent(

apps/governance/src/routes/proposals/components/proposal-detail-header/proposal-header.tsx

@@ -5,6 +5,7 @@ import { Heading, SubHeading } from '../../../../components/heading';
 import type { ReactNode } from 'react';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
+import ReactMarkdown from 'react-markdown';
 import { truncateMiddle } from '../../../../lib/truncate-middle';
 import { CurrentProposalState } from '../current-proposal-state';
 import { ProposalInfoLabel } from '../proposal-info-label';
@@ -22,7 +23,12 @@ export const ProposalHeader = ({
   let details: ReactNode;
   let proposalType = '';
 
-  const title = proposal?.rationale.title.trim();
+  let title = proposal?.rationale.title.trim();
+  let description = proposal?.rationale.description.trim();
+  if (title?.length === 0 && description && description.length > 0) {
+    title = description;
+    description = '';
+  }
 
   const titleContent = shorten(title ?? '', 100);
 
@@ -139,6 +145,23 @@ export const ProposalHeader = ({
           {details}
         </div>
       )}
+
+      {description && !isListItem && (
+        <div data-testid="proposal-description">
+          {/*<div className="uppercase mr-2">{t('ProposalDescription')}:</div>*/}
+          <SubHeading title={t('ProposalDescription')} />
+          <ReactMarkdown
+            className="react-markdown-container"
+            /* Prevents HTML embedded in the description from rendering */
+            skipHtml={true}
+            /* Stops users embedding images which could be used for tracking  */
+            disallowedElements={['img']}
+            linkTarget="_blank"
+          >
+            {description}
+          </ReactMarkdown>
+        </div>
+      )}
     </>
   );
 };

apps/governance/src/routes/proposals/components/proposal-json/index.tsx

@@ -1 +0,0 @@
-export { ProposalJson } from './proposal-json';

apps/governance/src/routes/proposals/components/proposal-terms-json/index.tsx

@@ -0,0 +1 @@
+export { ProposalTermsJson } from './proposal-terms-json';

apps/governance/src/routes/proposals/components/proposal-terms-json/proposal-terms-json.tsx

@@ -1,15 +1,15 @@
-import classnames from 'classnames';
-import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Icon, SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
 import { SubHeading } from '../../../../components/heading';
-import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
-import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
+import type { PartialDeep } from 'type-fest';
+import type * as Schema from '@vegaprotocol/types';
+import { useState } from 'react';
+import classnames from 'classnames';
 
-export const ProposalJson = ({
-  proposal,
+export const ProposalTermsJson = ({
+  terms,
 }: {
-  proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
+  terms: PartialDeep<Schema.ProposalTerms>;
 }) => {
   const { t } = useTranslation();
   const [showDetails, setShowDetails] = useState(false);
@@ -18,20 +18,20 @@ export const ProposalJson = ({
   });
 
   return (
-    <section data-testid="proposal-json">
+    <section>
       <button
         onClick={() => setShowDetails(!showDetails)}
-        data-testid="proposal-json-toggle"
+        data-testid="proposal-terms-toggle"
       >
         <div className="flex items-center gap-3">
-          <SubHeading title={t('proposalJson')} />
+          <SubHeading title={t('proposalTerms')} />
           <div className={showDetailsIconClasses}>
             <Icon name="chevron-down" size={8} />
           </div>
         </div>
       </button>
 
-      {showDetails && <SyntaxHighlighter data={proposal} />}
+      {showDetails && <SyntaxHighlighter data={terms} />}
     </section>
   );
 };

apps/governance/src/routes/proposals/components/proposal-terms/index.tsx

@@ -1 +0,0 @@
-export { ProposalTerms } from './proposal-terms';

apps/governance/src/routes/proposals/components/proposal-terms/proposal-terms.tsx

@@ -1,142 +0,0 @@
-import {
-  RoundedWrapper,
-  KeyValueTable,
-  KeyValueTableRow,
-  Icon,
-} from '@vegaprotocol/ui-toolkit';
-import { BigNumber } from '../../../../lib/bignumber';
-import { SubHeading } from '../../../../components/heading';
-import { useTranslation } from 'react-i18next';
-import { useState } from 'react';
-import classnames from 'classnames';
-
-interface ProposalTermsProps {
-  data: Record<string, unknown>;
-}
-
-const getParsedValue = (value: unknown) => {
-  if (typeof value === 'string') {
-    try {
-      // Check if value is a number string - if so use bignumber to maintain precision
-      if (/^\d+(\.\d+)?$/.test(value)) {
-        return new BigNumber(value).toString();
-      } else {
-        // This would convert, for example, a JSON object ('{"key":"value"}')
-        // into an actual JS object ({key: "value"})
-        return JSON.parse(value);
-      }
-    } catch (error) {
-      return value;
-    }
-  } else {
-    return value;
-  }
-};
-
-const RenderKeyValue = ({
-  title,
-  value,
-}: {
-  title: string;
-  value: string | number;
-}) => (
-  <KeyValueTable>
-    <KeyValueTableRow>
-      {title}
-      {value}
-    </KeyValueTableRow>
-  </KeyValueTable>
-);
-
-const RenderArray = ({ title, array }: { title: string; array: unknown[] }) => {
-  if (array.every((item) => typeof item === 'string')) {
-    return <RenderKeyValue title={title} value={array.join(', ')} />;
-  } else {
-    return (
-      <div>
-        <div className="mb-2">{title}</div>
-        {array.map((item, index) => (
-          <div key={index}>
-            <ProposalTermsRenderer data={item as Record<string, unknown>} />
-          </div>
-        ))}
-      </div>
-    );
-  }
-};
-
-// Working with 'unknown' type as a proposal's terms can be in many shapes
-const RenderTerm = ({ title, value }: { title: string; value: unknown }) => {
-  const parsedValue = getParsedValue(value);
-
-  if (parsedValue === null || typeof parsedValue === 'boolean') {
-    return <RenderKeyValue title={title} value={String(parsedValue)} />;
-  } else if (
-    typeof parsedValue === 'string' ||
-    typeof parsedValue === 'number'
-  ) {
-    return <RenderKeyValue title={title} value={parsedValue} />;
-  } else if (typeof parsedValue === 'object') {
-    if (Array.isArray(parsedValue)) {
-      return <RenderArray title={title} array={parsedValue} />;
-    } else {
-      return (
-        <div>
-          <div className="my-2">{title}</div>
-          <ProposalTermsRenderer
-            data={parsedValue as Record<string, unknown>}
-          />
-        </div>
-      );
-    }
-  } else if (parsedValue === undefined) {
-    return <span>{'undefined'}</span>;
-  } else {
-    return <span>{String(parsedValue)}</span>;
-  }
-};
-
-const ProposalTermsRenderer = ({ data }: ProposalTermsProps) => {
-  return (
-    <RoundedWrapper paddingBottom={true}>
-      {Object.keys(data)
-        .filter(
-          (key) =>
-            !['__typename', 'closingDatetime', 'enactmentDatetime'].includes(
-              key
-            )
-        )
-        .map((key, index) => (
-          <div key={index}>
-            <RenderTerm title={key} value={data[key]} />
-          </div>
-        ))}
-    </RoundedWrapper>
-  );
-};
-
-export const ProposalTerms = ({ data }: ProposalTermsProps) => {
-  const { t } = useTranslation();
-  const [showTerms, setShowTerms] = useState(false);
-  const showTermsIconClasses = classnames('mb-4', {
-    'rotate-180': showTerms,
-  });
-
-  return (
-    <section data-testid="proposal-terms">
-      <button
-        onClick={() => setShowTerms(!showTerms)}
-        data-testid="proposal-terms-toggle"
-      >
-        <div className="flex items-center gap-3">
-          <SubHeading title={t('proposalDetails')} />
-          <div className={showTermsIconClasses}>
-            <Icon name="chevron-down" size={8} />
-          </div>
-        </div>
-      </button>
-
-      {showTerms && <ProposalTermsRenderer data={data} />}
-    </section>
-  );
-};

apps/governance/src/routes/proposals/components/proposal/proposal.spec.tsx

@@ -25,11 +25,8 @@ jest.mock('../proposal-detail-header/proposal-header', () => ({
 jest.mock('../proposal-change-table', () => ({
   ProposalChangeTable: () => <div data-testid="proposal-change-table"></div>,
 }));
-jest.mock('../proposal-json', () => ({
-  ProposalJson: () => <div data-testid="proposal-json"></div>,
-}));
-jest.mock('../proposal-terms/proposal-terms', () => ({
-  ProposalTerms: () => <div data-testid="proposal-terms"></div>,
+jest.mock('../proposal-terms-json', () => ({
+  ProposalTermsJson: () => <div data-testid="proposal-terms-json"></div>,
 }));
 jest.mock('../proposal-votes-table', () => ({
   ProposalVotesTable: () => <div data-testid="proposal-votes-table"></div>,
@@ -43,21 +40,16 @@ jest.mock('../list-asset', () => ({
 
 it('Renders with data-testid', async () => {
   const proposal = generateProposal();
-  render(
-    <Proposal restData={{}} proposal={proposal as ProposalQuery['proposal']} />
-  );
+  render(<Proposal proposal={proposal as ProposalQuery['proposal']} />);
   expect(await screen.findByTestId('proposal')).toBeInTheDocument();
 });
 
 it('renders each section', async () => {
   const proposal = generateProposal();
-  render(
-    <Proposal restData={{}} proposal={proposal as ProposalQuery['proposal']} />
-  );
+  render(<Proposal 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();
-  expect(screen.getByTestId('proposal-terms')).toBeInTheDocument();
+  expect(screen.getByTestId('proposal-terms-json')).toBeInTheDocument();
   expect(screen.getByTestId('proposal-votes-table')).toBeInTheDocument();
   expect(screen.getByTestId('proposal-vote-details')).toBeInTheDocument();
   expect(screen.queryByTestId('proposal-list-asset')).not.toBeInTheDocument();
@@ -80,8 +72,6 @@ it('renders whitelist section if proposal is new asset and source is erc20', asy
       },
     },
   });
-  render(
-    <Proposal restData={{}} proposal={proposal as ProposalQuery['proposal']} />
-  );
+  render(<Proposal proposal={proposal as ProposalQuery['proposal']} />);
   expect(screen.getByTestId('proposal-list-asset')).toBeInTheDocument();
 });

apps/governance/src/routes/proposals/components/proposal/proposal.tsx

@@ -6,10 +6,8 @@ import { AsyncRenderer, RoundedWrapper } from '@vegaprotocol/ui-toolkit';
 import { ProposalHeader } from '../proposal-detail-header/proposal-header';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
-import { ProposalDescription } from '../proposal-description';
 import { ProposalChangeTable } from '../proposal-change-table';
-import { ProposalJson } from '../proposal-json';
-import { ProposalTerms } from '../proposal-terms';
+import { ProposalTermsJson } from '../proposal-terms-json';
 import { ProposalVotesTable } from '../proposal-votes-table';
 import { VoteDetails } from '../vote-details';
 import { ListAsset } from '../list-asset';
@@ -22,13 +20,11 @@ export enum ProposalType {
   PROPOSAL_NETWORK_PARAMETER = 'PROPOSAL_NETWORK_PARAMETER',
   PROPOSAL_FREEFORM = 'PROPOSAL_FREEFORM',
 }
-export interface ProposalProps {
+interface ProposalProps {
   proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  restData: any;
 }
 
-export const Proposal = ({ proposal, restData }: ProposalProps) => {
+export const Proposal = ({ proposal }: ProposalProps) => {
   const { params, loading, error } = useNetworkParams([
     NetworkParams.governance_proposal_market_minVoterBalance,
     NetworkParams.governance_proposal_updateMarket_minVoterBalance,
@@ -82,11 +78,9 @@ export const Proposal = ({ proposal, restData }: ProposalProps) => {
     <AsyncRenderer data={params} loading={loading} error={error}>
       <section data-testid="proposal">
         <ProposalHeader proposal={proposal} isListItem={false} />
-
         <div className="my-10">
           <ProposalChangeTable proposal={proposal} />
         </div>
-
         {proposal.terms.change.__typename === 'NewAsset' &&
         proposal.terms.change.source.__typename === 'ERC20' &&
         proposal.id ? (
@@ -96,23 +90,7 @@ export const Proposal = ({ proposal, restData }: ProposalProps) => {
             lifetimeLimit={proposal.terms.change.source.lifetimeLimit}
           />
         ) : null}
-
-        <div className="mb-4">
-          <ProposalDescription description={proposal.rationale.description} />
-        </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={restData?.data?.proposal} />
-        </div>
-
-        <div className="mb-10">
+        <div className="mb-12">
           <RoundedWrapper paddingBottom={true}>
             <VoteDetails
               proposal={proposal}
@@ -124,10 +102,10 @@ export const Proposal = ({ proposal, restData }: ProposalProps) => {
             />
           </RoundedWrapper>
         </div>
-
         <div className="mb-4">
           <ProposalVotesTable proposal={proposal} proposalType={proposalType} />
         </div>
+        <ProposalTermsJson terms={proposal.terms} />
       </section>
     </AsyncRenderer>
   );

apps/governance/src/routes/proposals/components/proposals-list/proposals-list.spec.tsx

@@ -24,6 +24,7 @@ const openProposalClosesNextMonth = generateProposal({
   },
   terms: {
     closingDatetime: nextMonth.toString(),
+    enactmentDatetime: nextMonth.toString(),
   },
 });
 
@@ -35,6 +36,7 @@ const openProposalClosesNextWeek = generateProposal({
   },
   terms: {
     closingDatetime: nextWeek.toString(),
+    enactmentDatetime: nextWeek.toString(),
   },
 });
 
@@ -43,6 +45,7 @@ const enactedProposalClosedLastWeek = generateProposal({
   state: ProposalState.STATE_ENACTED,
   terms: {
     closingDatetime: lastWeek.toString(),
+    enactmentDatetime: lastWeek.toString(),
   },
 });
 
@@ -51,6 +54,7 @@ const failedProposalClosedLastMonth = generateProposal({
   state: ProposalState.STATE_FAILED,
   terms: {
     closingDatetime: lastMonth.toString(),
+    enactmentDatetime: lastMonth.toString(),
   },
 });
 
@@ -132,10 +136,10 @@ describe('Proposals list', () => {
     const closedProposalsItems = closedProposals.getAllByTestId(
       'proposals-list-item'
     );
-    expect(openProposalsItems[0]).toHaveAttribute('id', 'proposal2');
-    expect(openProposalsItems[1]).toHaveAttribute('id', 'proposal1');
-    expect(closedProposalsItems[0]).toHaveAttribute('id', 'proposal3');
-    expect(closedProposalsItems[1]).toHaveAttribute('id', 'proposal4');
+    expect(openProposalsItems[0]).toHaveAttribute('id', 'proposal1');
+    expect(openProposalsItems[1]).toHaveAttribute('id', 'proposal2');
+    expect(closedProposalsItems[0]).toHaveAttribute('id', 'proposal4');
+    expect(closedProposalsItems[1]).toHaveAttribute('id', 'proposal3');
   });
 
   it('Displays info on no proposals', () => {

apps/governance/src/routes/proposals/components/proposals-list/proposals-list.tsx

@@ -1,6 +1,5 @@
-import orderBy from 'lodash/orderBy';
 import { isFuture } from 'date-fns';
-import { useState, useMemo } from 'react';
+import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Heading, SubHeading } from '../../../../components/heading';
 import { ProposalsListItem } from '../proposals-list-item';
@@ -9,11 +8,12 @@ import { ProposalsListFilter } from '../proposals-list-filter';
 import Routes from '../../../routes';
 import { Button, VegaIcon, VegaIconNames } from '@vegaprotocol/ui-toolkit';
 import { Link } from 'react-router-dom';
+import { createDocsLinks, ExternalLinks } from '@vegaprotocol/utils';
 import { ExternalLink } from '@vegaprotocol/ui-toolkit';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
-import { DocsLinks, ExternalLinks } from '@vegaprotocol/environment';
+import { useEnvironment } from '@vegaprotocol/environment';
 
 interface ProposalsListProps {
   proposals: Array<ProposalFieldsFragment | ProposalQuery['proposal']>;
@@ -31,83 +31,43 @@ 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,
   lastBlockHeight,
 }: ProposalsListProps) => {
+  const { VEGA_DOCS_URL } = useEnvironment();
   const { t } = useTranslation();
   const [filterString, setFilterString] = useState('');
-
-  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: [],
+  const sortedProposals = proposals.reduce(
+    (acc: SortedProposalsProps, proposal) => {
+      if (isFuture(new Date(proposal?.terms.closingDatetime))) {
+        acc.open.push(proposal);
+      } else {
+        acc.closed.push(proposal);
       }
-    );
-    return {
-      open:
-        initialSorting.open.length > 0
-          ? orderByDate(initialSorting.open as ProposalFieldsFragment[])
-          : [],
-      closed:
-        initialSorting.closed.length > 0
-          ? orderByDate(
-              initialSorting.closed as ProposalFieldsFragment[]
-            ).reverse()
-          : [],
-    };
-  }, [proposals]);
+      return acc;
+    },
+    {
+      open: [],
+      closed: [],
+    }
+  );
 
-  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 sortedProtocolUpgradeProposals = protocolUpgradeProposals.reduce(
+    (acc: SortedProtocolUpgradeProposalsProps, proposal) => {
+      if (Number(proposal?.upgradeBlockHeight) > Number(lastBlockHeight)) {
+        acc.open.push(proposal);
+      } else {
+        acc.closed.push(proposal);
+      }
+      return acc;
+    },
+    {
+      open: [],
+      closed: [],
+    }
+  );
 
   const filterPredicate = (
     p: ProposalFieldsFragment | ProposalQuery['proposal']
@@ -123,9 +83,9 @@ export const ProposalsList = ({
           marginBottom={false}
           title={t('pageTitleProposals')}
         />
-        {DocsLinks && (
+        {VEGA_DOCS_URL && (
           <div className="xs:justify-self-end" data-testid="new-proposal-link">
-            <ExternalLink href={DocsLinks.PROPOSALS_GUIDE}>
+            <ExternalLink href={createDocsLinks(VEGA_DOCS_URL).PROPOSALS_GUIDE}>
               <Button variant="primary" size="sm">
                 <div className="flex items-center gap-1">
                   {t('NewProposal')}

apps/governance/src/routes/proposals/components/propose/proposal-form-terms.spec.tsx

@@ -2,10 +2,9 @@ import { render, screen } from '@testing-library/react';
 import { ProposalFormTerms } from './proposal-form-terms';
 
 jest.mock('@vegaprotocol/environment', () => ({
-  ...jest.requireActual('@vegaprotocol/environment'),
-  DocsLinks: {
-    PROPOSALS_GUIDE: 'https://docs.vega.xyz/tutorials/proposals',
-  },
+  useEnvironment: () => ({
+    VEGA_DOCS_URL: 'https://docs.vega.xyz',
+  }),
 }));
 
 const renderComponent = () => {

apps/governance/src/routes/proposals/components/propose/proposal-form-terms.tsx

@@ -5,7 +5,8 @@ import {
   ExternalLink,
   TextArea,
 } from '@vegaprotocol/ui-toolkit';
-import { DocsLinks } from '@vegaprotocol/environment';
+import { createDocsLinks } from '@vegaprotocol/utils';
+import { useEnvironment } from '@vegaprotocol/environment';
 import type { UseFormRegisterReturn } from 'react-hook-form';
 
 interface ProposalFormTermsProps {
@@ -21,20 +22,23 @@ export const ProposalFormTerms = ({
   labelOverride,
   docsLink,
 }: ProposalFormTermsProps) => {
+  const { VEGA_DOCS_URL } = useEnvironment();
   const { t } = useTranslation();
   return (
     <FormGroup
       label={labelOverride || t('ProposalTerms')}
       labelFor="proposal-terms"
     >
-      {docsLink && DocsLinks && (
+      {docsLink && VEGA_DOCS_URL && (
         <div className="mt-[-4px] mb-2 text-sm font-light">
           <span className="mr-1">{t('ProposalTermsText')}</span>
           <ExternalLink
-            href={`${DocsLinks.PROPOSALS_GUIDE}${docsLink}`}
+            href={`${
+              createDocsLinks(VEGA_DOCS_URL).PROPOSALS_GUIDE
+            }${docsLink}`}
             target="_blank"
           >
-            {`${DocsLinks.PROPOSALS_GUIDE}${docsLink}`}
+            {`${createDocsLinks(VEGA_DOCS_URL).PROPOSALS_GUIDE}${docsLink}`}
           </ExternalLink>
         </div>
       )}

apps/governance/src/routes/proposals/components/protocol-upgrade-proposal-detail-info/protocol-upgrade-proposal-detail-info.spec.tsx

@@ -32,9 +32,7 @@ describe('ProtocolUpgradeProposalDetailInfo', () => {
 
   it('should render the state', () => {
     const { getByTestId } = renderComponent();
-    expect(getByTestId('protocol-upgrade-state')).toHaveTextContent(
-      'Waiting for validator votes'
-    );
+    expect(getByTestId('protocol-upgrade-state')).toHaveTextContent('Pending');
   });
 
   it('should render the vega release tag', () => {

apps/governance/src/routes/proposals/components/protocol-upgrade-proposals-list-item/protocol-upgrade-proposals-list-item.spec.tsx

@@ -26,34 +26,28 @@ describe('ProtocolUpgradeProposalsListItem', () => {
         status:
           ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_REJECTED,
         icon: 'protocol-upgrade-proposal-status-icon-rejected',
-        text: 'Declined by validators',
       },
       {
         status:
           ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_PENDING,
         icon: 'protocol-upgrade-proposal-status-icon-pending',
-        text: 'Waiting for validator votes',
       },
       {
         status:
           ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_APPROVED,
         icon: 'protocol-upgrade-proposal-status-icon-approved',
-        text: 'Approved by validators',
       },
       {
         status:
           ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_UNSPECIFIED,
         icon: 'protocol-upgrade-proposal-status-icon-unspecified',
-        text: 'Unspecified',
       },
     ];
 
-    statuses.forEach(({ status, icon, text }) => {
+    statuses.forEach(({ status, icon }) => {
       renderComponent({ ...proposal, status });
       const statusIcon = screen.getByTestId(icon);
-      const textContent = screen.getByText(text);
       expect(statusIcon).toBeInTheDocument();
-      expect(textContent).toBeInTheDocument();
     });
   });
 

apps/governance/src/routes/proposals/components/protocol-upgrade-proposals-list-item/protocol-upgrade-proposals-list-item.tsx

@@ -107,7 +107,7 @@ export const ProtocolUpgradeProposalsListItem = ({
           <div className="grid grid-cols-1 mt-3">
             <div className="justify-self-end">
               <Link
-                to={`${Routes.PROTOCOL_UPGRADES}/${stripFullStops(
+                to={`${Routes.PROPOSALS}/protocol-upgrade/${stripFullStops(
                   proposal.vegaReleaseTag
                 )}`}
               >

apps/governance/src/routes/proposals/components/vote-details/vote-buttons.spec.tsx

@@ -111,9 +111,7 @@ describe('Vote buttons', () => {
       </AppStateProvider>
     );
     expect(
-      screen.getByText(
-        'You need some VEGA tokens to participate in governance.'
-      )
+      screen.getByText('You need some VEGA tokens to participate in governance')
     ).toBeTruthy();
   });
 

apps/governance/src/routes/proposals/components/vote-details/vote-buttons.tsx

@@ -2,12 +2,7 @@ import { format } from 'date-fns';
 import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useVegaWallet, useVegaWalletDialogStore } from '@vegaprotocol/wallet';
-import {
-  AsyncRenderer,
-  Button,
-  ButtonLink,
-  ExternalLink,
-} from '@vegaprotocol/ui-toolkit';
+import { AsyncRenderer, Button, ButtonLink } from '@vegaprotocol/ui-toolkit';
 import { addDecimal, toBigNum } from '@vegaprotocol/utils';
 import { ProposalState, VoteValue } from '@vegaprotocol/types';
 import {
@@ -166,12 +161,7 @@ export const VoteButtons = ({
       {changeVote || (voteState === VoteState.NotCast && proposalVotable) ? (
         <>
           {currentStakeAvailable.isLessThanOrEqualTo(0) && (
-            <>
-              <p data-testid="no-stake-available">{t('noGovernanceTokens')}.</p>
-              <ExternalLink href="https://blog.vega.xyz/how-to-vote-on-vega-2195d1e52ec5">
-                {t('findOutMoreAboutHowToVote')}
-              </ExternalLink>
-            </>
+            <p data-testid="no-stake-available">{t('noGovernanceTokens')}</p>
           )}
 
           <div className="flex gap-4" data-testid="vote-buttons">

apps/governance/src/routes/proposals/components/vote-details/vote-details.tsx

@@ -1,6 +1,6 @@
 import { useTranslation } from 'react-i18next';
 import { formatDistanceToNow } from 'date-fns';
-import { RoundedWrapper, Icon, ExternalLink } from '@vegaprotocol/ui-toolkit';
+import { RoundedWrapper, Icon } from '@vegaprotocol/ui-toolkit';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { ProposalState } from '@vegaprotocol/types';
 import { useVoteSubmit, VoteProgress } from '@vegaprotocol/proposals';
@@ -202,12 +202,7 @@ export const VoteDetails = ({
         )}
 
         <section className="mt-10">
-          {proposal?.state === ProposalState.STATE_OPEN ? (
-            <SubHeading title={t('castYourVote')} />
-          ) : (
-            <SubHeading title={t('yourVote')} />
-          )}
-
+          <SubHeading title={t('castYourVote')} />
           {pubKey ? (
             proposal && (
               <VoteButtonsContainer
@@ -229,9 +224,6 @@ export const VoteDetails = ({
                   <Icon name={'info-sign'} />
                   <div>{t('connectAVegaWalletToVote')}</div>
                 </div>
-                <ExternalLink href="https://blog.vega.xyz/how-to-vote-on-vega-2195d1e52ec5">
-                  {t('findOutMoreAboutHowToVote')}
-                </ExternalLink>
               </div>
               <ConnectToVega />
             </RoundedWrapper>

apps/governance/src/routes/proposals/hooks/use-vote-information.spec.ts

@@ -16,6 +16,7 @@ const mockAppState: AppState = {
   totalSupply: mockTotalSupply,
   vegaWalletOverlay: false,
   vegaWalletManageOverlay: false,
+  ethConnectOverlay: false,
   transactionOverlay: false,
   bannerMessage: '',
   disconnectNotice: false,

apps/governance/src/routes/proposals/proposal/proposal-container.tsx

@@ -5,14 +5,9 @@ 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',
@@ -28,7 +23,7 @@ export const ProposalContainer = () => {
   return (
     <AsyncRenderer loading={loading} error={error} data={data}>
       {data?.proposal ? (
-        <Proposal proposal={data.proposal} restData={restData} />
+        <Proposal proposal={data.proposal} />
       ) : (
         <ProposalNotFound />
       )}

apps/governance/src/routes/proposals/proposals/proposals-container.tsx

@@ -1,4 +1,3 @@
-import flow from 'lodash/flow';
 import { Callout, Intent, Splash } from '@vegaprotocol/ui-toolkit';
 import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -7,15 +6,33 @@ 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) => p.id],
+    ['desc', 'desc']
+  );
+
+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[] {
@@ -24,6 +41,7 @@ export function getNotRejectedProposals<T extends ProposalFieldsFragment>(
       getNodes<ProposalFieldsFragment>(data, (p) =>
         p ? p.state !== ProposalState.STATE_REJECTED : false
       ),
+    orderByDate,
   ])(data);
 }
 
@@ -38,6 +56,7 @@ export function getNotRejectedProtocolUpgradeProposals<
             ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_REJECTED
           : false
       ),
+    orderByUpgradeBlockHeight,
   ])(data);
 }
 
@@ -60,14 +79,17 @@ export const ProposalsContainer = () => {
   });
 
   const proposals = useMemo(
-    () => getNotRejectedProposals(data?.proposalsConnection),
+    () =>
+      getNotRejectedProposals<ProposalFieldsFragment>(
+        data?.proposalsConnection
+      ),
     [data]
   );
 
   const protocolUpgradeProposals = useMemo(
     () =>
       protocolUpgradesData
-        ? getNotRejectedProtocolUpgradeProposals(
+        ? getNotRejectedProtocolUpgradeProposals<ProtocolUpgradeProposalFieldsFragment>(
             protocolUpgradesData.protocolUpgradeProposals
           )
         : [],

apps/governance/src/routes/proposals/propose/freeform/propose-freeform.spec.tsx

@@ -10,10 +10,9 @@ import type { MockedResponse } from '@apollo/client/testing';
 import { NetworkParamsDocument } from '@vegaprotocol/network-parameters';
 
 jest.mock('@vegaprotocol/environment', () => ({
-  ...jest.requireActual('@vegaprotocol/environment'),
-  DocsLinks: {
-    PROPOSALS_GUIDE: 'https://docs.vega.xyz/tutorials/proposals',
-  },
+  useEnvironment: () => ({
+    VEGA_DOCS_URL: 'https://docs.vega.xyz',
+  }),
 }));
 
 const updateMarketNetworkParamsQueryMock: MockedResponse<NetworkParamsQuery> = {

apps/governance/src/routes/proposals/propose/freeform/propose-freeform.tsx

@@ -5,7 +5,7 @@ import {
   useProposalSubmit,
   deadlineToRoundedHours,
 } from '@vegaprotocol/proposals';
-import { useEnvironment, DocsLinks } from '@vegaprotocol/environment';
+import { useEnvironment } from '@vegaprotocol/environment';
 import {
   ProposalFormDescription,
   ProposalFormSubheader,
@@ -17,6 +17,7 @@ import {
 import { ProposalMinRequirements } from '../../components/shared';
 import { AsyncRenderer, ExternalLink } from '@vegaprotocol/ui-toolkit';
 import { Heading } from '../../../../components/heading';
+import { createDocsLinks } from '@vegaprotocol/utils';
 import {
   NetworkParams,
   useNetworkParams,
@@ -41,7 +42,7 @@ export const ProposeFreeform = () => {
     NetworkParams.governance_proposal_freeform_minProposerBalance,
     NetworkParams.spam_protection_proposal_min_tokens,
   ]);
-  const { VEGA_EXPLORER_URL } = useEnvironment();
+  const { VEGA_DOCS_URL, VEGA_EXPLORER_URL } = useEnvironment();
   const { t } = useTranslation();
   const {
     register,
@@ -110,13 +111,17 @@ export const ProposeFreeform = () => {
             userAction={ProposalUserAction.CREATE}
           />
 
-          {DocsLinks && (
+          {VEGA_DOCS_URL && (
             <p className="text-sm" data-testid="proposal-docs-link">
               <span className="mr-1">{t('ProposalTermsText')}</span>
               <ExternalLink
-                href={`${DocsLinks.PROPOSALS_GUIDE}${DOCS_LINK}`}
+                href={`${
+                  createDocsLinks(VEGA_DOCS_URL).PROPOSALS_GUIDE
+                }${DOCS_LINK}`}
                 target="_blank"
-              >{`${DocsLinks.PROPOSALS_GUIDE}${DOCS_LINK}`}</ExternalLink>
+              >{`${
+                createDocsLinks(VEGA_DOCS_URL).PROPOSALS_GUIDE
+              }${DOCS_LINK}`}</ExternalLink>
             </p>
           )}
 

apps/governance/src/routes/proposals/propose/network-parameter/propose-network-parameter.spec.tsx

@@ -10,10 +10,9 @@ import { NetworkParamsDocument } from '@vegaprotocol/network-parameters';
 import type { MockedResponse } from '@apollo/client/testing';
 
 jest.mock('@vegaprotocol/environment', () => ({
-  ...jest.requireActual('@vegaprotocol/environment'),
-  DocsLinks: {
-    PROPOSALS_GUIDE: 'https://docs.vega.xyz/tutorials/proposals',
-  },
+  useEnvironment: () => ({
+    VEGA_DOCS_URL: 'https://docs.vega.xyz',
+  }),
 }));
 
 const updateMarketNetworkParamsQueryMock: MockedResponse<NetworkParamsQuery> = {

apps/governance/src/routes/proposals/propose/network-parameter/propose-network-parameter.tsx

@@ -1,7 +1,10 @@
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useForm } from 'react-hook-form';
-import { suitableForSyntaxHighlighter } from '@vegaprotocol/utils';
+import {
+  createDocsLinks,
+  suitableForSyntaxHighlighter,
+} from '@vegaprotocol/utils';
 import { useNetworkParams } from '@vegaprotocol/network-parameters';
 import {
   getClosingTimestamp,
@@ -9,7 +12,7 @@ import {
   useProposalSubmit,
   doesValueEquateToParam,
 } from '@vegaprotocol/proposals';
-import { useEnvironment, DocsLinks } from '@vegaprotocol/environment';
+import { useEnvironment } from '@vegaprotocol/environment';
 import {
   ProposalFormDescription,
   ProposalFormSubheader,
@@ -81,7 +84,7 @@ export const ProposeNetworkParameter = () => {
     loading: networkParamsLoading,
     error: networkParamsError,
   } = useNetworkParams();
-  const { VEGA_EXPLORER_URL } = useEnvironment();
+  const { VEGA_EXPLORER_URL, VEGA_DOCS_URL } = useEnvironment();
   const { t } = useTranslation();
   const {
     register,
@@ -172,13 +175,17 @@ export const ProposeNetworkParameter = () => {
             userAction={ProposalUserAction.CREATE}
           />
 
-          {DocsLinks && (
+          {VEGA_DOCS_URL && (
             <p className="text-sm" data-testid="proposal-docs-link">
               <span className="mr-1">{t('ProposalTermsText')}</span>
               <ExternalLink
-                href={`${DocsLinks.PROPOSALS_GUIDE}${DOCS_LINK}`}
+                href={`${
+                  createDocsLinks(VEGA_DOCS_URL).PROPOSALS_GUIDE
+                }${DOCS_LINK}`}
                 target="_blank"
-              >{`${DocsLinks.PROPOSALS_GUIDE}${DOCS_LINK}`}</ExternalLink>
+              >{`${
+                createDocsLinks(VEGA_DOCS_URL).PROPOSALS_GUIDE
+              }${DOCS_LINK}`}</ExternalLink>
             </p>
           )}
 

apps/governance/src/routes/proposals/propose/new-asset/propose-new-asset.spec.tsx

@@ -10,10 +10,9 @@ import type { MockedResponse } from '@apollo/client/testing';
 import { NetworkParamsDocument } from '@vegaprotocol/network-parameters';
 
 jest.mock('@vegaprotocol/environment', () => ({
-  ...jest.requireActual('@vegaprotocol/environment'),
-  DocsLinks: {
-    PROPOSALS_GUIDE: 'https://docs.vega.xyz/tutorials/proposals',
-  },
+  useEnvironment: () => ({
+    VEGA_DOCS_URL: 'https://docs.vega.xyz',
+  }),
 }));
 
 const newAssetNetworkParamsQueryMock: MockedResponse<NetworkParamsQuery> = {

apps/governance/src/routes/proposals/propose/new-asset/propose-new-asset.tsx

@@ -7,8 +7,8 @@ import {
   useProposalSubmit,
   doesValueEquateToParam,
 } from '@vegaprotocol/proposals';
-import { useEnvironment, DocsLinks } from '@vegaprotocol/environment';
-import { validateJson } from '@vegaprotocol/utils';
+import { useEnvironment } from '@vegaprotocol/environment';
+import { createDocsLinks, validateJson } from '@vegaprotocol/utils';
 import {
   NetworkParams,
   useNetworkParams,
@@ -53,7 +53,7 @@ export const ProposeNewAsset = () => {
     NetworkParams.governance_proposal_asset_minProposerBalance,
     NetworkParams.spam_protection_proposal_min_tokens,
   ]);
-  const { VEGA_EXPLORER_URL } = useEnvironment();
+  const { VEGA_EXPLORER_URL, VEGA_DOCS_URL } = useEnvironment();
   const { t } = useTranslation();
   const {
     register,
@@ -142,13 +142,17 @@ export const ProposeNewAsset = () => {
             userAction={ProposalUserAction.CREATE}
           />
 
-          {DocsLinks && (
+          {VEGA_DOCS_URL && (
             <p className="text-sm" data-testid="proposal-docs-link">
               <span className="mr-1">{t('ProposalTermsText')}</span>
               <ExternalLink
-                href={`${DocsLinks.PROPOSALS_GUIDE}${DOCS_LINK}`}
+                href={`${
+                  createDocsLinks(VEGA_DOCS_URL).PROPOSALS_GUIDE
+                }${DOCS_LINK}`}
                 target="_blank"
-              >{`${DocsLinks.PROPOSALS_GUIDE}${DOCS_LINK}`}</ExternalLink>
+              >{`${
+                createDocsLinks(VEGA_DOCS_URL).PROPOSALS_GUIDE
+              }${DOCS_LINK}`}</ExternalLink>
             </p>
           )}
 

apps/governance/src/routes/proposals/propose/new-market/propose-new-market.spec.tsx

@@ -10,10 +10,9 @@ import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
 import { NetworkParamsDocument } from '@vegaprotocol/network-parameters';
 
 jest.mock('@vegaprotocol/environment', () => ({
-  ...jest.requireActual('@vegaprotocol/environment'),
-  DocsLinks: {
-    PROPOSALS_GUIDE: 'https://docs.vega.xyz/tutorials/proposals',
-  },
+  useEnvironment: () => ({
+    VEGA_DOCS_URL: 'https://docs.vega.xyz',
+  }),
 }));
 
 const newMarketNetworkParamsQueryMock: MockedResponse<NetworkParamsQuery> = {