test: reverted assertion

.github/workflows/branch-length.yml

@@ -1,16 +0,0 @@
-name: 'Check if branch is shorter than 52 chars'
-on: pull_request
-
-jobs:
-  branch-naming-rules:
-    runs-on: ubuntu-latest
-    steps:
-      # echo "branches that are longer than 51 chars can't be parsed by kubernetes to create previews. Each app has prefix of it's name like: 'governance-' (12 chars), what leaves 51 max branch length"
-      # current parsable length: $( git rev-parse --abbrev-ref HEAD | sed -r s/[^a-zA-Z0-9]+/-/g | sed -r s/^-+\|-+$//g | wc -c)
-      - uses: deepakputhraya/action-branch-name@master
-        with:
-          # regex: '([a-z])+\/([a-z])+' # Regex the branch should match. This example enforces grouping
-          # allowed_prefixes: 'feature,stable,fix' # All branches should start with the given prefix
-          # ignore: master,develop # Ignore exactly matching branch names from convention
-          min_length: 1 # Min length of the branch name
-          max_length: 51 # Max length of the branch name

.github/workflows/ci-cd-trigger.yml

@@ -50,7 +50,7 @@ jobs:
     secrets: inherit
 
   lint-test-build:
-    timeout-minutes: 60
+    timeout-minutes: 35
     needs: node-modules
     runs-on: ubuntu-22.04
     name: '(CI) lint + unit test + build'
@@ -105,44 +105,19 @@ jobs:
           affected="$(yarn nx print-affected --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }} --select=projects)"
           echo -n "Affected projects: $affected"
 
-          branch_slug="$(echo ${{ github.head_ref || github.ref_name }} | sed -r s/[^a-zA-Z0-9]+/-/g | sed -r s/^-+\|-+$//g | cut -c 1-50 )"
           projects_e2e=""
-          preview_governance="not deployed"
-          preview_trading="not deployed"
-          preview_explorer="not deployed"
-          if [[ -z "$projects_e2e" ]]; then
-            projects_e2e+='"governance-e2e" "trading-e2e" "explorer-e2e" '
-            preview_governance=$(printf "https://%s.%s.vega.rocks" "governance" "$branch_slug")
-            preview_trading=$(printf "https://%s.%s.vega.rocks" "trading" "$branch_slug")
-            preview_explorer=$(printf "https://%s.%s.vega.rocks" "explorer" "$branch_slug")
-          else
-            if [[ $affected == *"governance"* ]]; then
-              projects_e2e+='"governance-e2e" '
-              preview_governance=$(printf "https://%s.%s.vega.rocks" "governance" "$branch_slug")
-            fi
-            if [[ $affected == *"trading"* ]]; then
-              projects_e2e+='"trading-e2e" '
-              preview_trading=$(printf "https://%s.%s.vega.rocks" "trading" "$branch_slug")
-            fi
-            if [[ $affected == *"explorer"* ]]; then
-              projects_e2e+='"explorer-e2e" '
-              preview_explorer=$(printf "https://%s.%s.vega.rocks" "explorer" "$branch_slug")
-            fi
-          fi
+          if [[ $affected == *"governance"* ]]; then projects_e2e+='"governance-e2e" '; fi
+          if [[ $affected == *"trading"* ]]; then projects_e2e+='"trading-e2e" '; fi
+          if [[ $affected == *"explorer"* ]]; then projects_e2e+='"explorer-e2e" '; fi
+          if [[ -z "$projects_e2e" ]]; then projects_e2e+='"governance-e2e" "trading-e2e" "explorer-e2e" '; fi
           projects_e2e=${projects_e2e%?}
           projects_e2e=[${projects_e2e// /,}]
           echo PROJECTS_E2E=$projects_e2e >> $GITHUB_ENV
           echo PROJECTS=$(echo $projects_e2e | sed 's|-e2e||g') >> $GITHUB_ENV
-          echo PREVIEW_GOVERNANCE=$preview_governance >> $GITHUB_ENV
-          echo PREVIEW_TRADING=$preview_trading >> $GITHUB_ENV
-          echo PREVIEW_EXPLORER=$preview_explorer >> $GITHUB_ENV
 
     outputs:
       projects: ${{ env.PROJECTS }}
       projects-e2e: ${{ env.PROJECTS_E2E }}
-      preview_governance: ${{ env.PREVIEW_GOVERNANCE }}
-      preview_trading: ${{ env.PREVIEW_TRADING }}
-      preview_explorer: ${{ env.PREVIEW_EXPLORER }}
 
   cypress:
     needs: lint-test-build
@@ -165,9 +140,7 @@ jobs:
 
   dist-check:
     runs-on: ubuntu-latest
-    needs:
-      - publish-dist
-      - lint-test-build
+    needs: publish-dist
     if: ${{ github.event_name == 'pull_request' }}
     name: '(CD) comment preview links'
     steps:
@@ -178,16 +151,22 @@ jobs:
           issue-number: ${{ github.event.pull_request.number }}
           body-includes: Previews
 
-      - name: Create comment
-        uses: peter-evans/create-or-update-comment@v3
+      - name: Inject slug/short variables
         if: ${{ steps.fc.outputs.comment-id == 0 }}
+        uses: rlespinasse/github-slug-action@v4
+        with:
+          prefix: CI_
+
+      - name: Create comment
+        if: ${{ steps.fc.outputs.comment-id == 0 }}
+        uses: peter-evans/create-or-update-comment@v3
         with:
           issue-number: ${{ github.event.pull_request.number }}
           body: |
-            Previews:
-            * governance: ${{ needs.lint-test-build.outputs.preview_governance }}
-            * explorer: ${{ needs.lint-test-build.outputs.preview_explorer  }}
-            * trading: ${{ needs.lint-test-build.outputs.preview_trading }}
+            Previews
+            - explorer https://explorer.${{ env.CI_GITHUB_REF_NAME }}.vega.rocks
+            - trading https://trading.${{ env.CI_GITHUB_REF_NAME }}.vega.rocks
+            - governance https://governance.${{ env.CI_GITHUB_REF_NAME }}.vega.rocks
 
   cypress-check:
     name: '(CI) cypress - check'

.github/workflows/publish-dist.yml

@@ -66,7 +66,7 @@ jobs:
                 fi
               fi
             elif [[ "${{ github.ref }}" =~ .*develop$ ]]; then
-              envName="stagnet1"
+              envName="stagnet3"
             fi
             bucketName="${{ matrix.app }}.${envName}.${domain}"
             echo BUCKET_NAME=${bucketName} >> $GITHUB_ENV

.prettierignore

@@ -7,4 +7,5 @@ __generated___
 
 apps/static/src/assets/devnet-tranches.json
 apps/static/src/assets/mainnet-tranches.json
+apps/static/src/assets/stagnet3-tranches.json
 apps/static/src/assets/testnet-tranches.json

Jenkinsfile

@@ -1,2 +1,20 @@
 @Library('vega-shared-library') _
-runApprobation ignoreFailure: false, frontendBranch: env.BRANCH_NAME, type: 'frontend'
+
+def commitHash = 'UNKNOWN'
+
+pipeline {
+  agent any
+  options {
+    skipDefaultCheckout true
+    parallelsAlwaysFailFast()
+  }
+  stages {
+    stage('approbation') {
+      steps {
+        sh 'printenv'
+        checkout scm
+        runApprobation ignoreFailure: false, frontendBranch: env.BRANCH_NAME, type: 'frontend'
+      }
+    }
+  }
+}

README.md

@@ -72,7 +72,7 @@ Run `nx serve my-app` for a dev server. Navigate to the port specified in `app/<
 In order to generate the schemas for your GraphQL queries, you can run `GRAPHQL_SCHEMA_PATH=[YOUR SCHEMA FILE / API URL HERE] nx run types:generate`.
 
 ```bash
-export  GRAPHQL_SCHEMA_PATH=https://api.n07.testnet.vega.xyz/graphql
+export  GRAPHQL_SCHEMA_PATH=https://api.n11.testnet.vega.xyz/graphql
 yarn nx run types:generate
 ```
 

apps/explorer-e2e/.env

@@ -1,7 +1,7 @@
 NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
 NX_TENDERMINT_URL=http://localhost:26617
 NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket
-NX_VEGA_URL=http://localhost:3008/graphql
+NX_VEGA_URL=http://localhost:3028/query
 NX_VEGA_ENV=CUSTOM
 NX_VEGA_CONFIG_URL=
 
@@ -18,4 +18,4 @@ NX_EXPLORER_PARTIES=1
 NX_EXPLORER_VALIDATORS=1
 
 CYPRESS_VEGA_WALLET_API_TOKEN=
-CYPRESS_VEGA_URL=http://localhost:3008/graphql
+CYPRESS_VEGA_URL=http://localhost:3028/query

apps/explorer-e2e/.env.stagnet3

@@ -0,0 +1,18 @@
+# App configuration variables
+NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
+NX_TENDERMINT_URL=https://tm.n00.stagnet3.vega.xyz
+NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n00.stagnet3.vega.xyz/websocket
+NX_VEGA_URL=https://api.stagnet3.vega.xyz/graphql
+NX_VEGA_ENV=STAGNET3
+NX_BLOCK_EXPLORER=https://be.stagnet3.vega.xyz/rest
+
+# App flags
+NX_EXPLORER_ASSETS=1
+NX_EXPLORER_GENESIS=1
+NX_EXPLORER_GOVERNANCE=1
+NX_EXPLORER_MARKETS=1
+NX_EXPLORER_ORACLES=1
+NX_EXPLORER_TXS_LIST=0
+NX_EXPLORER_NETWORK_PARAMETERS=1
+NX_EXPLORER_PARTIES=1
+NX_EXPLORER_VALIDATORS=1

apps/explorer-e2e/.env.testnet

@@ -2,7 +2,7 @@
 NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
 NX_TENDERMINT_URL=https://tm.n07.testnet.vega.xyz/tm
 NX_TENDERMINT_WEBSOCKET_URL=wss://lb.testnet.vega.xyz/tm/websocket
-NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
+NX_VEGA_URL=https://api.n11.testnet.vega.xyz/graphql
 NX_VEGA_ENV=TESTNET
 NX_BLOCK_EXPLORER=https://be.testnet.vega.xyz/rest
 

apps/explorer-e2e/cypress.config.js

@@ -25,7 +25,7 @@ module.exports = defineConfig({
   },
   env: {
     environment: 'CUSTOM',
-    networkQueryUrl: 'http://localhost:3008/graphql',
+    networkQueryUrl: 'http://localhost:3028/query',
     ethUrl: 'https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8',
     commitHash: 'dev',
     tsConfig: 'tsconfig.json',

apps/explorer-e2e/src/fixtures/net_parameter_format_lookup.json

@@ -10,8 +10,6 @@
     "governance.proposal.updateMarket.minVoterBalance",
     "governance.proposal.updateNetParam.minProposerBalance",
     "governance.proposal.updateNetParam.minVoterBalance",
-    "governance.proposal.updateAsset.minProposerBalance",
-    "governance.proposal.updateAsset.minVoterBalance",
     "reward.staking.delegation.maxPayoutPerEpoch",
     "reward.staking.delegation.maxPayoutPerParticipant",
     "reward.staking.delegation.minimumValidatorStake",
@@ -21,6 +19,9 @@
     "validators.delegation.minAmount"
   ],
   "fiveDecimal": [
+    "governance.proposal.updateAsset.minProposerBalance",
+    "governance.proposal.updateAsset.minVoterBalance",
+    "governance.proposal.updateAsset.requiredParticipation",
     "market.fee.factors.infrastructureFee",
     "market.fee.factors.makerFee",
     "market.liquidity.bondPenaltyParameter",
@@ -76,7 +77,6 @@
     "governance.proposal.updateNetParam.requiredMajority",
     "governance.proposal.updateNetParam.requiredParticipation",
     "governance.proposal.updateMarket.minProposerEquityLikeShare",
-    "governance.proposal.updateAsset.requiredParticipation",
     "validators.vote.required"
   ],
   "duration": [

apps/explorer-e2e/src/integration/home.cy.js

@@ -9,22 +9,21 @@ context('Home Page', function () {
     it('should show connected environment stats', function () {
       const statTitles = {
         0: 'Status',
-        1: 'Epoch',
-        2: 'Block height',
-        3: 'Uptime',
-        4: 'Total nodes',
-        5: 'Total staked',
-        6: 'Backlog',
-        7: 'Trades / second',
-        8: 'Orders / block',
-        9: 'Orders / second',
-        10: 'Transactions / block',
-        11: 'Block time',
-        12: 'Time',
-        13: 'App',
-        14: 'Tendermint',
-        15: 'Up since',
-        16: 'Chain ID',
+        1: 'Block height',
+        2: 'Uptime',
+        3: 'Total nodes',
+        4: 'Total staked',
+        5: 'Backlog',
+        6: 'Trades / second',
+        7: 'Orders / block',
+        8: 'Orders / second',
+        9: 'Transactions / block',
+        10: 'Block time',
+        11: 'Time',
+        12: 'App',
+        13: 'Tendermint',
+        14: 'Up since',
+        15: 'Chain ID',
       };
 
       cy.get('[data-testid="stats-title"]')
@@ -32,13 +31,42 @@ context('Home Page', function () {
           cy.wrap($list).should('contain.text', statTitles[index]);
         })
         .then(($list) => {
-          cy.wrap($list).should('have.length', 17);
+          cy.wrap($list).should('have.length', 16);
         });
+
+      cy.get(statsValue).eq(0).should('contain.text', 'CONNECTED');
+      cy.get(statsValue).eq(1).should('not.be.empty');
+      cy.get(statsValue)
+        .eq(2)
+        .invoke('text')
+        .should('match', /\d+d \d+h \d+m \d+s/i);
+      cy.get(statsValue).eq(3).should('contain.text', '2');
+      cy.get(statsValue)
+        .eq(4)
+        .invoke('text')
+        .should('match', /\d+\.\d\d(?!\d)/i);
+      cy.get(statsValue).eq(5).should('contain.text', '0');
+      cy.get(statsValue).eq(6).should('contain.text', '0');
+      cy.get(statsValue).eq(7).should('contain.text', '0');
+      cy.get(statsValue).eq(8).should('contain.text', '0');
+      cy.get(statsValue).eq(9).should('not.be.empty');
+      cy.get(statsValue).eq(10).should('not.be.empty');
+      cy.get(statsValue).eq(11).should('not.be.empty');
+      cy.get(statsValue)
+        .eq(12)
+        .invoke('text')
+        .should('match', /v\d+\.\d+\.\d+/i);
+      cy.get(statsValue)
+        .eq(13)
+        .invoke('text')
+        .should('match', /\d+\.\d+\.\d+/i);
+      cy.get(statsValue).eq(14).should('not.be.empty');
+      cy.get(statsValue).eq(15).should('not.be.empty');
     });
 
     it('Block height should be updating', function () {
       cy.get(statsValue)
-        .eq(2)
+        .eq(1)
         .invoke('text')
         .then((blockHeightTxt) => {
           cy.get(statsValue)

apps/explorer-e2e/src/integration/network.cy.js

@@ -138,7 +138,7 @@ context('Network parameters page', { tags: '@smoke' }, function () {
       });
     });
 
-    it.skip('should list each network parameter displayed as a currency value with four decimals - in the correct format', function () {
+    it('should list each network parameter displayed as a currency value with four decimals - in the correct format', function () {
       cy.get_network_parameters().then((network_parameters) => {
         network_parameters = Object.entries(network_parameters);
         network_parameters.forEach((network_parameter) => {

apps/explorer-e2e/src/integration/node-switcher.cy.js

@@ -6,7 +6,7 @@ const customNodeBtn = 'custom-node';
 context.skip('Node switcher', { tags: '@regression' }, function () {
   beforeEach('visit home page', function () {
     cy.intercept('GET', 'https://static.vega.xyz/assets/capsule-network.json', {
-      hosts: ['http://localhost:3008/graphql'],
+      hosts: ['http://localhost:3028/query'],
     }).as('nodeData');
     cy.visit('/');
     cy.wait('@nodeData');

apps/explorer-e2e/src/integration/parties.cy.js

@@ -219,7 +219,7 @@ context.skip('Parties page', { tags: '@regression' }, function () {
           balance type asset {id symbol decimals}}}}}}}}';
       cy.request({
         method: 'POST',
-        url: `http://localhost:3008/graphql`,
+        url: `http://localhost:3028/query`,
         body: {
           query: mutation,
         },

apps/explorer/.env

@@ -1,18 +1,13 @@
-NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
+NX_TENDERMINT_URL=https://tm.n00.stagnet3.vega.xyz
+NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n00.stagnet3.vega.xyz/websocket
+NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml
+NX_VEGA_NETWORKS='{"STAGNET1":"https://stagnet1.token.vega.xyz", "STAGNET3":"https://stagnet3.explorer.vega.xyz","VALIDATOR_TESTNET":"https://validator-testnet.fairground.wtf","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_ENV=STAGNET3
+NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
-NX_VEGA_ENV=STAGNET1
-NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
-NX_VEGA_TOKEN_URL=https://stagnet1.token.vega.xyz
-NX_VEGA_WALLET_URL=http://localhost:1789
-NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.xyz
-NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket
-NX_BLOCK_EXPLORER=https://be.stagnet1.vega.xyz/rest
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-NX_VEGA_GOVERNANCE_URL=https://stagnet1.token.vega.xyz
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.jsoo
+NX_BLOCK_EXPLORER=https://be.stagnet3.vega.xyz/rest
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 
 # App flags
 NX_EXPLORER_ASSETS=1

apps/explorer/.env.capsule

@@ -6,4 +6,12 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
 
 # App flags
+NX_EXPLORER_ASSETS=1
+NX_EXPLORER_GENESIS=1
+NX_EXPLORER_GOVERNANCE=1
+NX_EXPLORER_MARKETS=1
+NX_EXPLORER_ORACLES=1
 NX_EXPLORER_TXS_LIST=0
+NX_EXPLORER_NETWORK_PARAMETERS=1
+NX_EXPLORER_PARTIES=1
+NX_EXPLORER_VALIDATORS=1

apps/explorer/.env.stagnet1

@@ -1 +1,14 @@
-# .env is stagnet1, so there are no overrides required
+NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io
+NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
+NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
+NX_VEGA_ENV=STAGNET1
+NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
+NX_VEGA_TOKEN_URL=https://stagnet1.token.vega.xyz
+NX_VEGA_WALLET_URL=http://localhost:1789
+NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.xyz
+NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket
+NX_BLOCK_EXPLORER=https://be.stagnet1.vega.xyz/rest
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io
+NX_VEGA_GOVERNANCE_URL=https://stagnet1.token.vega.xyz
+NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json

apps/explorer/.env.stagnet3

@@ -0,0 +1,8 @@
+NX_TENDERMINT_URL=https://tm.n00.stagnet3.vega.xyz
+NX_TENDERMINT_WEBSOCKET_URL=wss://be.stagnet3.vega.xyz/websocket
+NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml
+NX_VEGA_ENV=STAGNET3
+NX_BLOCK_EXPLORER=https://be.stagnet3.vega.xyz/rest
+NX_VEGA_GOVERNANCE_URL=https://stagnet3.token.vega.xyz
+NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega-dev-releases/releases/
+NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json

apps/explorer/README.md

@@ -35,11 +35,12 @@ Example configurations are provided here:
 - [Devnet](./.env.devnet)
 - [Capsule](./.env.capsule)
 - [Testnet](./.env.testnet)
+- [Stagnet3](./.env.stagnet3)
 
 For convenience, you can boot the app injecting one of the configurations above by running:
 
 ```bash
-yarn nx run explorer:serve --env={env} # e.g. stagnet1
+yarn nx run explorer:serve --env={env} # e.g. stagnet3
 ```
 
 There are a few different configuration options offered for this app:

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

@@ -4,7 +4,7 @@ import { t } from '@vegaprotocol/i18n';
 import { ButtonLink } from '@vegaprotocol/ui-toolkit';
 import type { AgGridReact } from 'ag-grid-react';
 import { AgGridColumn } from 'ag-grid-react';
-import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
+import { AgGridDynamic as AgGrid } from '@vegaprotocol/datagrid';
 import type { VegaICellRendererParams } from '@vegaprotocol/datagrid';
 import { useRef, useLayoutEffect } from 'react';
 import { BREAKPOINT_MD } from '../../config/breakpoints';

apps/explorer/src/app/components/links/asset-link/asset-link.tsx

@@ -43,7 +43,7 @@ export const AssetLink = ({
         if (asDialog) {
           open(assetId, e.target as HTMLElement);
         } else {
-          navigate(`/${Routes.ASSETS}/${asset?.id}`);
+          navigate(`${Routes.ASSETS}/${asset?.id}`);
         }
       }}
       {...props}

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

@@ -14,72 +14,11 @@ import {
   SettlementAssetInfoPanel,
 } from '@vegaprotocol/market-info';
 import { MarketInfoTable } from '@vegaprotocol/market-info';
-import type { DataSourceDefinition } from '@vegaprotocol/types';
-import isEqual from 'lodash/isEqual';
+import { Link } from 'react-router-dom';
 
 export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
   if (!market) return null;
 
-  const settlementData =
-    market.tradableInstrument.instrument.product.dataSourceSpecForSettlementData
-      .data;
-  const terminationData =
-    market.tradableInstrument.instrument.product
-      .dataSourceSpecForTradingTermination.data;
-
-  const getSigners = (data: DataSourceDefinition) => {
-    if (data.sourceType.__typename === 'DataSourceDefinitionExternal') {
-      const signers = data.sourceType.sourceType.signers || [];
-
-      return signers.map(({ signer }, i) => {
-        return (
-          (signer.__typename === 'ETHAddress' && signer.address) ||
-          (signer.__typename === 'PubKey' && signer.key)
-        );
-      });
-    }
-    return [];
-  };
-
-  const oraclePanels = isEqual(
-    getSigners(settlementData),
-    getSigners(terminationData)
-  )
-    ? [
-        {
-          title: t('Settlement Oracle'),
-          content: (
-            <OracleInfoPanel
-              noBorder={false}
-              market={market}
-              type="settlementData"
-            />
-          ),
-        },
-        {
-          title: t('Termination Oracle'),
-          content: (
-            <OracleInfoPanel
-              noBorder={false}
-              market={market}
-              type="termination"
-            />
-          ),
-        },
-      ]
-    : [
-        {
-          title: t('Oracle'),
-          content: (
-            <OracleInfoPanel
-              noBorder={false}
-              market={market}
-              type="settlementData"
-            />
-          ),
-        },
-      ];
-
   const panels = [
     {
       title: t('Key details'),
@@ -157,7 +96,25 @@ export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
         <LiquidityPriceRangeInfoPanel market={market} noBorder={false} />
       ),
     },
-    ...oraclePanels,
+    {
+      title: t('Oracle'),
+      content: (
+        <OracleInfoPanel noBorder={false} market={market}>
+          <Link
+            className="text-xs hover:underline"
+            to={`/oracles#${market.tradableInstrument.instrument.product.dataSourceSpecForSettlementData.id}`}
+          >
+            {t('View settlement data oracle specification')}
+          </Link>
+          <Link
+            className="text-xs hover:underline"
+            to={`/oracles#${market.tradableInstrument.instrument.product.dataSourceSpecForTradingTermination.id}`}
+          >
+            {t('View termination oracle specification')}
+          </Link>
+        </OracleInfoPanel>
+      ),
+    },
   ];
 
   return (

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

@@ -3,7 +3,7 @@ import { t } from '@vegaprotocol/i18n';
 import { ButtonLink } from '@vegaprotocol/ui-toolkit';
 import type { AgGridReact } from 'ag-grid-react';
 import { AgGridColumn } from 'ag-grid-react';
-import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
+import { AgGridDynamic as AgGrid } from '@vegaprotocol/datagrid';
 import type {
   VegaICellRendererParams,
   VegaValueGetterParams,

apps/explorer/src/app/components/order-details/deterministic-order-details.tsx

@@ -9,7 +9,7 @@ import SizeInMarket from '../size-in-market/size-in-market';
 export interface DeterministicOrderDetailsProps {
   id: string;
   // Version to fetch, with 0 being 'latest' and 1 being 'first'. Defaults to 0
-  version?: number | null;
+  version?: number;
 }
 
 export const wrapperClasses =
@@ -28,7 +28,7 @@ export const wrapperClasses =
  */
 const DeterministicOrderDetails = ({
   id,
-  version = null,
+  version = 0,
 }: DeterministicOrderDetailsProps) => {
   const { data, error } = useExplorerDeterministicOrderQuery({
     variables: { orderId: id, version },

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

@@ -3,7 +3,7 @@ import { VoteProgress } from '@vegaprotocol/proposals';
 import type { AgGridReact } from 'ag-grid-react';
 import { AgGridColumn } from 'ag-grid-react';
 import { ExternalLink } from '@vegaprotocol/ui-toolkit';
-import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
+import { AgGridDynamic as AgGrid } from '@vegaprotocol/datagrid';
 import type {
   VegaICellRendererParams,
   VegaValueFormatterParams,
@@ -12,10 +12,7 @@ import { useLayoutEffect, useMemo, useRef, useState } from 'react';
 import type { RowClickedEvent } from 'ag-grid-community';
 import { getDateTimeFormat } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
-import {
-  NetworkParams,
-  useNetworkParams,
-} from '@vegaprotocol/network-parameters';
+import { NetworkParams, useNetworkParams } from '@vegaprotocol/react-helpers';
 import { ProposalStateMapping } from '@vegaprotocol/types';
 import BigNumber from 'bignumber.js';
 import { DApp, TOKEN_PROPOSAL, useLinks } from '@vegaprotocol/environment';

apps/explorer/src/app/routes/governance/proposals-page.tsx

@@ -1,6 +1,6 @@
 import { proposalsDataProvider } from '@vegaprotocol/proposals';
 import { t } from '@vegaprotocol/i18n';
-import { useDataProvider } from '@vegaprotocol/data-provider';
+import { useDataProvider } from '@vegaprotocol/react-helpers';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { ProposalsTable } from '../../components/proposals/proposals-table';
 import { RouteTitle } from '../../components/route-title';

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

@@ -1,5 +1,5 @@
 import { t } from '@vegaprotocol/i18n';
-import { useDataProvider } from '@vegaprotocol/data-provider';
+import { useDataProvider } from '@vegaprotocol/react-helpers';
 import { AsyncRenderer, Button } from '@vegaprotocol/ui-toolkit';
 import { useState } from 'react';
 import { useParams } from 'react-router-dom';

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

@@ -4,7 +4,7 @@ import { marketsProvider } from '@vegaprotocol/market-list';
 import { RouteTitle } from '../../components/route-title';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { t } from '@vegaprotocol/i18n';
-import { useDataProvider } from '@vegaprotocol/data-provider';
+import { useDataProvider } from '@vegaprotocol/react-helpers';
 import { MarketsTable } from '../../components/markets/markets-table';
 
 export const MarketsPage = () => {

apps/explorer/src/app/routes/network-parameters/network-parameters.spec.tsx

@@ -1,5 +1,5 @@
 import { render, screen } from '@testing-library/react';
-import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
+import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers';
 import { NetworkParametersTable } from './network-parameters';
 
 describe('NetworkParametersTable', () => {

apps/explorer/src/app/routes/network-parameters/network-parameters.tsx

@@ -13,15 +13,14 @@ import {
 import { t } from '@vegaprotocol/i18n';
 import { RouteTitle } from '../../components/route-title';
 import orderBy from 'lodash/orderBy';
-import { useNetworkParamsQuery } from '@vegaprotocol/network-parameters';
-import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
+import { useNetworkParamsQuery } from '@vegaprotocol/react-helpers';
+import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers';
 import { useScrollToLocation } from '../../hooks/scroll-to-location';
 import { useDocumentTitle } from '../../hooks/use-document-title';
 
 const PERCENTAGE_PARAMS = [
   'governance.proposal.asset.requiredMajority',
   'governance.proposal.asset.requiredParticipation',
-  'governance.proposal.updateAsset.requiredParticipation',
   'governance.proposal.freeform.requiredMajority',
   'governance.proposal.freeform.requiredParticipation',
   'governance.proposal.market.requiredMajority',
@@ -54,8 +53,6 @@ const BIG_NUMBER_PARAMS = [
   'governance.proposal.asset.minProposerBalance',
   'governance.proposal.market.minProposerBalance',
   'governance.proposal.market.minVoterBalance',
-  'governance.proposal.updateAsset.minProposerBalance',
-  'governance.proposal.updateAsset.minVoterBalance',
 ];
 
 export const NetworkParameterRow = ({

apps/explorer/src/app/routes/parties/id/components/party-accounts.tsx

@@ -71,7 +71,7 @@ export const PartyAccounts = ({ accounts }: PartyAccountsProps) => {
                 />
               </td>
               <td className="text-md">
-                <AssetLink assetId={account.asset.id} asDialog={true} />
+                <AssetLink assetId={account.asset.id} />
               </td>
             </TableRow>
           );

apps/explorer/src/styles.css

@@ -1,7 +1,3 @@
-@import 'ag-grid-community/dist/styles/ag-grid.css';
-@import 'ag-grid-community/dist/styles/ag-theme-balham.css';
-@import 'ag-grid-community/dist/styles/ag-theme-balham-dark.css';
-
 /* You can add global styles to this file, and also import other style files */
 @tailwind base;
 @tailwind components;
@@ -15,43 +11,3 @@
 .react-markdown-container a:before {
   content: '🔗 ';
 }
-
-/* AG GRID - Do not edit without updating other global stylesheets for each app */
-
-.vega-ag-grid .ag-root-wrapper {
-  border: solid 0px;
-}
-
-.vega-ag-grid .ag-react-container {
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.vega-ag-grid .ag-cell,
-.vega-ag-grid .ag-full-width-row .ag-cell-wrapper.ag-row-group {
-  line-height: calc(min(var(--ag-line-height, 26px), 26px) - 4px);
-}
-
-/* Light variables */
-.ag-theme-balham {
-  --ag-background-color: theme(colors.white);
-  --ag-border-color: theme(colors.neutral[300]);
-  --ag-header-background-color: theme(colors.white);
-  --ag-odd-row-background-color: theme(colors.white);
-  --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 */
-.ag-theme-balham-dark {
-  --ag-background-color: theme(colors.black);
-  --ag-border-color: theme(colors.neutral[700]);
-  --ag-header-background-color: theme(colors.black);
-  --ag-odd-row-background-color: theme(colors.black);
-  --ag-header-column-separator-color: theme(colors.neutral[600]);
-  --ag-row-border-color: theme(colors.black);
-  --ag-row-hover-color: theme(colors.neutral[800]);
-  --ag-font-size: 12px;
-}

apps/governance-e2e/.env

@@ -5,7 +5,7 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_FAIRGROUND=false
 NX_VEGA_NETWORKS={}
 
-NX_VEGA_URL=http://localhost:3008/graphql
+NX_VEGA_URL=http://localhost:3028/query
 NX_ETHEREUM_CHAIN_ID=1440
 NX_ETH_URL_CONNECT=1
 NX_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit supply green clown session
@@ -13,14 +13,14 @@ NX_LOCAL_PROVIDER_URL=http://localhost:8545/
 NX_ETH_LOCAL_PROVIDER_URL=http://localhost:8545/
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
-NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
+NX_TRANCHES_SERVICE_URL=https://tranches-stagnet3-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
 
 #Test configuration variables
 CYPRESS_FAIRGROUND=false
-CYPRESS_VEGA_URL=http://localhost:3008/graphql
+CYPRESS_VEGA_URL=http://localhost:3028/query
 CYPRESS_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit supply green clown session
 CYPRESS_ETHEREUM_PROVIDER_URL=http://localhost:8545
 CYPRESS_EXPLORER_URL=https://explorer.fairground.wtf
@@ -31,5 +31,6 @@ CYPRESS_VEGA_ENV=CUSTOM
 CYPRESS_VEGA_PUBLIC_KEY=02eceaba4df2bef76ea10caf728d8a099a2aa846cced25737cccaa9812342f65
 CYPRESS_VEGA_PUBLIC_KEY2=7f9cf07d3a9905b1a61a1069f7a758855da428bc0f4a97de87f48644bfc25535
 CYPRESS_VEGA_TOKEN_URL=https://token.fairground.wtf
+CYPRESS_VEGA_URL=http://localhost:3028/query
 CYPRESS_VEGA_WALLET_URL=http://localhost:1789
 CYPRESS_VEGA_WALLET_API_TOKEN=

apps/governance-e2e/.env.stagnet3

@@ -0,0 +1,5 @@
+# App configuration variables
+NX_VEGA_ENV=STAGNET3
+NX_VEGA_URL=https://api.stagnet3.vega.xyz/graphql
+NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io

apps/governance-e2e/.env.testnet

@@ -1,5 +1,5 @@
 # App configuration variables
 NX_VEGA_ENV=TESTNET
-NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
+NX_VEGA_URL=https://api.n11.testnet.vega.xyz/graphql
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io

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

@@ -9,7 +9,7 @@
       "name": "Token test market",
       "code": "Token.24h",
       "future": {
-        "settlementAsset": "73174a6fb1d5802ba0ac7bd7ab79e0a3a4837b262de0a4e80815a55442692bd0",
+        "settlementAsset": "fBTC",
         "quoteName": "fBTC",
         "dataSourceSpecForSettlementData": {
           "external": {

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

@@ -49,7 +49,6 @@ describe(
     });
 
     beforeEach('visit proposals tab', function () {
-      cy.clearLocalStorage();
       cy.reload();
       waitForSpinner();
       cy.connectVegaWallet();
@@ -218,9 +217,9 @@ describe(
       vegaWalletSetSpecifiedApprovalAmount('1000');
       createRawProposal();
       cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-        getSubmittedProposalFromProposalList(
-          rawProposal.rationale.title
-        ).within(() => cy.get(viewProposalButton).click());
+        getSubmittedProposalFromProposalList(rawProposal.rationale.title)
+          .as('submittedProposal')
+          .within(() => cy.get(viewProposalButton).click());
       });
       voteForProposal('for');
       // 3001-VOTE-079
@@ -238,9 +237,9 @@ describe(
           );
           navigateTo(navigation.proposals);
           cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-            getSubmittedProposalFromProposalList(
-              rawProposal.rationale.title
-            ).within(() => cy.get(viewProposalButton).click());
+            getSubmittedProposalFromProposalList(rawProposal.rationale.title)
+              .as('submittedProposal')
+              .within(() => cy.get(viewProposalButton).click());
           });
           cy.get(proposalVoteProgressForPercentage)
             .contains('100.00%')

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

@@ -16,7 +16,6 @@ import {
 import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
 import { vegaWalletSetSpecifiedApprovalAmount } from '../../support/wallet-teardown.functions';
 
-const proposalListItem = '[data-testid="proposals-list-item"]';
 const closedProposals = '[data-testid="closed-proposals"]';
 const proposalStatus = '[data-testid="proposal-status"]';
 const viewProposalButton = '[data-testid="view-proposal-btn"]';
@@ -36,7 +35,6 @@ context(
     });
 
     beforeEach('visit proposals', function () {
-      cy.clearLocalStorage();
       cy.reload();
       waitForSpinner();
       cy.connectVegaWallet();
@@ -53,8 +51,7 @@ context(
       waitForSpinner();
       cy.get(closedProposals).within(() => {
         cy.contains(proposalTitle)
-          .parentsUntil(proposalListItem)
-          .last()
+          .parentsUntil('[data-testid="proposals-list-item"]')
           .within(() => {
             cy.get(proposalStatus).should('have.text', 'Enacted ');
             cy.get(viewProposalButton).click();
@@ -81,8 +78,7 @@ context(
       waitForSpinner();
       cy.get(openProposals).within(() => {
         cy.contains(proposalTitle)
-          .parentsUntil(proposalListItem)
-          .last()
+          .parentsUntil('[data-testid="proposals-list-item"]')
           .within(() => cy.get(viewProposalButton).click());
       });
       getProposalInformationFromTable('State')
@@ -115,8 +111,7 @@ context(
       waitForSpinner();
       cy.get(openProposals, { timeout: 6000 }).within(() => {
         cy.contains(proposalTitle)
-          .parentsUntil(proposalListItem)
-          .last()
+          .parentsUntil('[data-testid="proposals-list-item"]')
           .within(() => cy.get(viewProposalButton).click());
       });
       getProposalInformationFromTable('State')
@@ -138,8 +133,7 @@ context(
       waitForSpinner();
       cy.get(openProposals).within(() => {
         cy.contains(proposalTitle)
-          .parentsUntil(proposalListItem)
-          .last()
+          .parentsUntil('[data-testid="proposals-list-item"]')
           .within(() => cy.get(viewProposalButton).click());
       });
       getProposalInformationFromTable('State')

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

@@ -84,7 +84,6 @@ context(
     });
 
     beforeEach('visit governance tab', function () {
-      cy.clearLocalStorage();
       cy.reload();
       waitForSpinner();
       cy.connectVegaWallet();

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

@@ -50,8 +50,6 @@ const liquidityVoteStatus = 'liquidity-votes-status';
 const tokenVoteStatus = 'token-votes-status';
 const proposalTermsSection = 'proposal';
 const vegaWalletPublicKey = Cypress.env('vegaWalletPublicKey');
-const fUSDCId =
-  '816af99af60d684502a40824758f6b5377e6af48e50a9ee8ef478ecb879ea8bc';
 const epochTimeout = Cypress.env('epochTimeout');
 const proposalTimeout = { timeout: 14000 };
 
@@ -76,7 +74,6 @@ context(
     });
 
     beforeEach('visit governance tab', function () {
-      cy.clearLocalStorage();
       cy.reload();
       waitForSpinner();
       cy.connectVegaWallet();
@@ -267,7 +264,7 @@ context(
     it('Unable to submit update market proposal without minimum amount of tokens', function () {
       vegaWalletTeardown();
       vegaWalletFaucetAssetsWithoutCheck(
-        fUSDCId,
+        'fUSDC',
         '1000000',
         vegaWalletPublicKey
       );
@@ -293,7 +290,7 @@ context(
     // 3001-VOTE-092 3004-PMAC-001
     it('Able to submit update market proposal and vote for proposal', function () {
       vegaWalletFaucetAssetsWithoutCheck(
-        fUSDCId,
+        'fUSDC',
         '1000000',
         vegaWalletPublicKey
       );
@@ -305,10 +302,7 @@ context(
         cy.get('dd').eq(0).should('have.text', 'Test market 1');
         cy.get('dd').eq(1).should('have.text', 'TEST.24h');
         cy.get('dd').eq(2).should('not.be.empty');
-        cy.get('dd')
-          .eq(2)
-          .invoke('text')
-          .as('EnactedMarketId', { type: 'static' });
+        cy.get('dd').eq(2).invoke('text').as('EnactedMarketId');
       });
       cy.get('@EnactedMarketId').then((marketId) => {
         cy.VegaWalletSubmitLiquidityProvision(String(marketId), '1');
@@ -326,7 +320,6 @@ context(
       cy.get('@EnactedMarketId').then((marketId) => {
         cy.contains(String(marketId))
           .parentsUntil(proposalListItem)
-          .last()
           .within(() => {
             cy.getByTestId(viewProposalBtn).click();
           });
@@ -380,19 +373,16 @@ context(
       cy.get(newProposalSubmitButton).should('be.visible').click();
       // cannot submit a proposal with ERC20 address already in use
       cy.contains('Proposal rejected', proposalTimeout).should('be.visible');
-      cy.getByTestId('dialog-content')
-        .last()
-        .within(() => {
-          cy.get('p').should(
-            'have.text',
-            'PROPOSAL_ERROR_ERC20_ADDRESS_ALREADY_IN_USE'
-          );
-        });
+      cy.getByTestId('dialog-content').within(() => {
+        cy.get('p').should(
+          'have.text',
+          'PROPOSAL_ERROR_ERC20_ADDRESS_ALREADY_IN_USE'
+        );
+      });
       closeDialog();
       navigateTo(navigation.proposals);
       cy.contains(proposalTitle)
         .parentsUntil(proposalListItem)
-        .last()
         .within(() => {
           cy.getByTestId(viewProposalBtn).click();
         });
@@ -430,7 +420,6 @@ context(
         cy.get(proposalType)
           .contains('Update asset')
           .parentsUntil(proposalListItem)
-          .last()
           .within(() => {
             cy.get(proposalDetails).should('contain.text', assetId); // 3001-VOTE-029
             cy.getByTestId(viewProposalBtn).click();

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

@@ -35,7 +35,6 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
   });
 
   beforeEach('visit proposals tab', function () {
-    cy.clearLocalStorage();
     cy.reload();
     waitForSpinner();
     cy.connectVegaWallet();
@@ -60,10 +59,7 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
     cy.get(openProposals).within(() => {
       cy.get(proposalClosingDate).first().should('contain.text', 'year');
       cy.get(proposalClosingDate).should('contain.text', 'months');
-      cy.get(proposalClosingDate)
-        .last()
-        .invoke('text')
-        .should('match', /days|minutes/);
+      cy.get(proposalClosingDate).last().should('contain.text', 'days');
     });
   });
 

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

@@ -25,10 +25,9 @@ const rewardsTimeOut = { timeout: 60000 };
 
 context('rewards - flow', { tags: '@slow' }, function () {
   before('set up environment to allow rewards', function () {
-    cy.clearLocalStorage();
     cy.visit('/');
     waitForSpinner();
-    depositAsset(vegaAssetAddress, '1000', 18);
+    depositAsset(vegaAssetAddress, '1000');
     cy.validatorsSelfDelegate();
     ethereumWalletConnect();
     cy.connectVegaWallet();
@@ -57,7 +56,7 @@ context('rewards - flow', { tags: '@slow' }, function () {
     cy.getByTestId(rewardsTable)
       .first()
       .within(() => {
-        cy.getByTestId('asset', rewardsTimeOut).should('have.text', 'Vega');
+        cy.getByTestId('asset').should('have.text', 'Vega');
         cy.getByTestId('ACCOUNT_TYPE_GLOBAL_REWARD').should('have.text', '1');
         cy.getByTestId('ACCOUNT_TYPE_FEES_INFRASTRUCTURE').should(
           'have.text',
@@ -94,13 +93,13 @@ context('rewards - flow', { tags: '@slow' }, function () {
       .within(() => {
         cy.get('h2').first().should('contain.text', 'EPOCH');
         cy.getByTestId('individual-rewards-asset').should('have.text', 'Vega');
-        cy.getByTestId('ACCOUNT_TYPE_GLOBAL_REWARD', rewardsTimeOut)
-          .should('contain.text', '0.4415')
-          .and('contain.text', '(44.15%)');
+        cy.getByTestId('ACCOUNT_TYPE_GLOBAL_REWARD')
+          .should('contain.text', '0.1177')
+          .and('contain.text', '(11.7733%)');
         cy.getByTestId('ACCOUNT_TYPE_FEES_INFRASTRUCTURE')
-          .should('contain.text', '0.0004')
-          .and('contain.text', '(44.15%)');
-        cy.getByTestId('total').should('have.text', '0.4419');
+          .should('contain.text', '0.0001')
+          .and('contain.text', '(11.7733%)');
+        cy.getByTestId('total').should('have.text', '0.1179');
       });
   });
 });

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

@@ -55,6 +55,7 @@ context(
   function () {
     // 2001-STKE-002, 2001-STKE-032
     before('visit staking tab and connect vega wallet', function () {
+      cy.clearAllLocalStorage();
       cy.visit('/');
       ethereumWalletConnect();
       // this is a workaround for #2422 which can be removed once issue is resolved
@@ -66,7 +67,6 @@ context(
       beforeEach(
         'teardown wallet & drill into a specific validator',
         function () {
-          cy.clearLocalStorage();
           cy.reload();
           waitForSpinner();
           cy.connectVegaWallet();

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

@@ -53,7 +53,6 @@ context(
       beforeEach(
         'teardown wallet & drill into a specific validator',
         function () {
-          cy.clearLocalStorage();
           cy.reload();
           waitForSpinner();
           cy.connectVegaWallet();
@@ -91,14 +90,9 @@ context(
 
         verifyEthWalletTotalAssociatedBalance('2.0');
 
-        cy.get(vegaWallet)
-          .first()
-          .within(() => {
-            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-              'contain',
-              2.0
-            );
-          });
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 2.0);
+        });
 
         cy.get(vegaWalletUnstakedBalance, txTimeout).should('contain', 2.0);
       });
@@ -134,38 +128,26 @@ context(
         stakingPageAssociateTokens('1001', { approve: true });
         verifyEthWalletAssociatedBalance('1,001.00');
         verifyEthWalletTotalAssociatedBalance('1,001.00');
-        cy.get(vegaWallet)
-          .last()
-          .within(() => {
-            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-              'contain',
-              '1,001.00'
-            );
-          });
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should(
+            'contain',
+            '1,001.00'
+          );
+        });
       });
 
       it('Able to disassociate a partial amount of tokens currently associated', function () {
         stakingPageAssociateTokens('2');
-        cy.get(vegaWallet)
-          .first()
-          .within(() => {
-            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-              'contain',
-              2.0
-            );
-          });
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 2.0);
+        });
 
         cy.get('button').contains('Select a validator to nominate').click();
         stakingPageDisassociateTokens('1');
         verifyEthWalletAssociatedBalance('1.0');
-        cy.get(vegaWallet)
-          .first()
-          .within(() => {
-            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-              'contain',
-              1.0
-            );
-          });
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 1.0);
+        });
       });
 
       it('Able to disassociate all tokens - using max', function () {
@@ -173,40 +155,26 @@ context(
         const warningText =
           'Warning: Any tokens that have been nominated to a node will sacrifice rewards they are due for the current epoch. If you do not wish to sacrifice these, you should remove stake from a node at the end of an epoch before disassociation.';
         stakingPageAssociateTokens('2');
-        cy.get(vegaWallet)
-          .first()
-          .within(() => {
-            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-              'contain',
-              2.0
-            );
-          });
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 2.0);
+        });
         cy.get('button').contains('Select a validator to nominate').click();
         cy.get(ethWalletDissociateButton).click();
         cy.get(disassociationWarning).should('contain', warningText);
         stakingPageDisassociateAllTokens();
-        cy.get(ethWalletContainer)
-          .first()
-          .within(() => {
-            cy.contains(vegaWalletPublicKeyShort, { timeout: 20000 }).should(
-              'not.exist'
-            );
-          });
-        cy.get(ethWalletContainer)
-          .first()
-          .within(() => {
-            cy.contains(vegaWalletPublicKeyShort, { timeout: 20000 }).should(
-              'not.exist'
-            );
-          });
-        cy.get(vegaWallet)
-          .first()
-          .within(() => {
-            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-              'contain',
-              0.0
-            );
-          });
+        cy.get(ethWalletContainer).within(() => {
+          cy.contains(vegaWalletPublicKeyShort, { timeout: 20000 }).should(
+            'not.exist'
+          );
+        });
+        cy.get(ethWalletContainer).within(() => {
+          cy.contains(vegaWalletPublicKeyShort, { timeout: 20000 }).should(
+            'not.exist'
+          );
+        });
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 0.0);
+        });
       });
 
       it('Able to associate and disassociate vesting contract tokens', function () {
@@ -232,14 +200,9 @@ context(
         cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
         verifyEthWalletAssociatedBalance('2.0');
         verifyEthWalletTotalAssociatedBalance('2.0');
-        cy.get(vegaWallet)
-          .first()
-          .within(() => {
-            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-              'contain',
-              2.0
-            );
-          });
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 2.0);
+        });
         cy.get(vegaWalletUnstakedBalance, txTimeout).should('contain', 2.0);
         stakingPageDisassociateTokens('1', {
           type: 'contract',
@@ -265,61 +228,38 @@ context(
         stakingPageAssociateTokens('21', { type: 'wallet' });
         cy.get('button').contains('Select a validator to nominate').click();
         stakingPageAssociateTokens('37', { type: 'contract' });
-        cy.get(vestingContractSection)
-          .first()
-          .within(() => {
-            cy.get(associatedKey).should(
-              'contain',
-              Cypress.env('vegaWalletPublicKeyShort')
-            );
-            cy.get(associatedAmount, txTimeout).should('contain', 37);
-          });
-        cy.get(vegaInWalletSection)
-          .first()
-          .within(() => {
-            cy.get(associatedKey).should(
-              'contain',
-              Cypress.env('vegaWalletPublicKeyShort')
-            );
-            cy.get(associatedAmount, txTimeout).should('contain', 21);
-          });
-        cy.get(vegaWallet)
-          .first()
-          .within(() => {
-            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-              'contain',
-              58
-            );
-          });
+        cy.get(vestingContractSection).within(() => {
+          cy.get(associatedKey).should(
+            'contain',
+            Cypress.env('vegaWalletPublicKeyShort')
+          );
+          cy.get(associatedAmount, txTimeout).should('contain', 37);
+        });
+        cy.get(vegaInWalletSection).within(() => {
+          cy.get(associatedKey).should(
+            'contain',
+            Cypress.env('vegaWalletPublicKeyShort')
+          );
+          cy.get(associatedAmount, txTimeout).should('contain', 21);
+        });
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 58);
+        });
         stakingPageDisassociateTokens('6', { type: 'contract' });
-        cy.get(vestingContractSection)
-          .first()
-          .within(() => {
-            cy.get(associatedAmount, txTimeout).should('contain', 31);
-          });
-        cy.get(vegaWallet)
-          .first()
-          .within(() => {
-            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-              'contain',
-              52
-            );
-          });
+        cy.get(vestingContractSection).within(() => {
+          cy.get(associatedAmount, txTimeout).should('contain', 31);
+        });
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 52);
+        });
         navigateTo(navigation.validators);
         stakingPageDisassociateTokens('9', { type: 'wallet' });
-        cy.get(vegaInWalletSection)
-          .first()
-          .within(() => {
-            cy.get(associatedAmount, txTimeout).should('contain', 12);
-          });
-        cy.get(vegaWallet)
-          .first()
-          .within(() => {
-            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-              'contain',
-              43
-            );
-          });
+        cy.get(vegaInWalletSection).within(() => {
+          cy.get(associatedAmount, txTimeout).should('contain', 12);
+        });
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 43);
+        });
       });
 
       it('Not able to associate more tokens than owned', function () {
@@ -378,14 +318,9 @@ context(
           Cypress.env('vegaWalletPublicKey2')
         );
         stakingPageAssociateTokens('2');
-        cy.get(vegaWallet)
-          .first()
-          .within(() => {
-            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-              'contain',
-              2.0
-            );
-          });
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 2.0);
+        });
         cy.get(associateCompleteText).should(
           'have.text',
           `Vega key ${Cypress.env(

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

@@ -4,7 +4,10 @@ import {
   waitForSpinner,
 } from '../../support/common.functions';
 import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
-import { depositAsset } from '../../support/wallet-teardown.functions';
+import {
+  depositAsset,
+  vegaWalletTeardown,
+} from '../../support/wallet-teardown.functions';
 
 const withdraw = 'withdraw';
 const withdrawalForm = 'withdraw-form';
@@ -22,13 +25,6 @@ const withdrawalAmount = 'withdrawal-amount';
 const withdrawalRecipient = 'withdrawal-recipient';
 const withdrawFundsButton = 'withdraw-funds';
 const completeWithdrawalButton = 'complete-withdrawal';
-const tableTxHash = '[col-id="txHash"]';
-const tableAssetSymbol = '[col-id="asset.symbol"]';
-const tableAmount = '[col-id="amount"]';
-const tableReceiverAddress = '[col-id="details.receiverAddress"]';
-const tableWithdrawnTimeStamp = '[col-id="withdrawnTimestamp"]';
-const tableWithdrawnStatus = '[col-id="status"]';
-const tableCreatedTimeStamp = '[col-id="createdTimestamp"]';
 const usdtName = 'USDC (local)';
 const usdcEthAddress = '0x1b8a1B6CBE5c93609b46D1829Cc7f3Cb8eeE23a0';
 const usdcSymbol = 'tUSDC';
@@ -46,23 +42,26 @@ context(
       cy.visit('/');
       // When running tests locally, will fail if run without restarting capsule
       cy.updateCapsuleMultiSig().then(() => {
-        ethereumWalletConnect();
-        depositAsset(usdcEthAddress, '1000', 5);
+        depositAsset(usdcEthAddress, '100');
       });
     });
 
     beforeEach('Navigate to withdrawal page', function () {
-      cy.clearLocalStorage();
       cy.reload();
       waitForSpinner();
       navigateTo(navigation.withdraw);
       cy.connectVegaWallet();
       ethereumWalletConnect();
+      vegaWalletTeardown();
     });
 
     it('Able to open withdrawal form with vega wallet connected', function () {
+      // needs to reload page for withdrawal form to be displayed in ci - not reproducible outside of ci
+      cy.reload();
+      waitForSpinner();
+      ethereumWalletConnect();
       cy.getByTestId(withdraw).should('be.visible').click();
-      cy.getByTestId(withdrawalForm, txTimeout).within(() => {
+      cy.getByTestId(withdrawalForm).within(() => {
         cy.get('select').find('option').should('have.length.at.least', 2);
         cy.getByTestId(ethAddressInput).should('be.visible');
         cy.getByTestId(amountInput).should('be.visible');
@@ -71,7 +70,7 @@ context(
 
     it('Unable to submit withdrawal with invalid fields', function () {
       cy.getByTestId(withdraw).should('be.visible').click();
-      cy.getByTestId(withdrawalForm, txTimeout).within(() => {
+      cy.getByTestId(withdrawalForm).within(() => {
         cy.get('select').select(usdtSelectValue, { force: true });
         cy.getByTestId(balanceAvailable, txTimeout).should('exist');
         cy.getByTestId(submitWithdrawalButton).click();
@@ -95,7 +94,7 @@ context(
     it('Able to withdraw asset: -eth wallet connected -withdraw funds button', function () {
       // fill in withdrawal form
       cy.getByTestId(withdraw).should('be.visible').click();
-      cy.getByTestId(withdrawalForm, txTimeout).within(() => {
+      cy.getByTestId(withdrawalForm).within(() => {
         cy.get('select').select(usdtSelectValue, { force: true });
         cy.getByTestId(balanceAvailable, txTimeout).should('exist');
         cy.getByTestId(withdrawalThreshold).should(
@@ -103,7 +102,7 @@ context(
           '100,000.00000T'
         );
         cy.getByTestId(delayTime).should('have.text', 'None');
-        cy.getByTestId(amountInput).click().type('120');
+        cy.getByTestId(amountInput).click().type('100');
         cy.getByTestId(submitWithdrawalButton).click();
       });
 
@@ -117,7 +116,7 @@ context(
         .should('have.attr', 'href')
         .and('contain', '/txs/');
       cy.getByTestId(withdrawalAssetSymbol).should('have.text', usdcSymbol);
-      cy.getByTestId(withdrawalAmount).should('have.text', '120.00');
+      cy.getByTestId(withdrawalAmount).should('have.text', '100.00');
       cy.getByTestId(withdrawalRecipient)
         .should('have.text', truncatedWithdrawalEthAddress)
         .and('have.attr', 'href')
@@ -129,20 +128,26 @@ context(
         'Withdraw asset complete'
       );
       cy.getByTestId(dialogClose).click();
+
+      // need to reload page to see withdrawal history complete
+      cy.reload();
+      waitForAssetsDisplayed(usdtName);
+
       // withdrawal history for complete withdrawal displayed
-      cy.get(tableWithdrawnStatus)
-        .eq(1, txTimeout)
-        .should('have.text', 'Completed')
+      cy.get('[col-id="txHash"]', txTimeout)
+        .should('have.length.above', 1)
+        .eq(1)
         .parent()
         .within(() => {
-          cy.get(tableAssetSymbol).should('have.text', usdcSymbol);
-          cy.get(tableAmount).should('have.text', '120.00');
-          cy.get(tableReceiverAddress)
+          cy.get('[col-id="asset.symbol"]').should('have.text', usdcSymbol);
+          cy.get('[col-id="amount"]').should('have.text', '100.00');
+          cy.get('[col-id="details.receiverAddress"]')
             .find('a')
             .should('have.attr', 'href')
             .and('contain', 'https://sepolia.etherscan.io/address/');
-          cy.get(tableWithdrawnTimeStamp).should('not.be.empty');
-          cy.get(tableTxHash)
+          cy.get('[col-id="withdrawnTimestamp"]').should('not.be.empty');
+          cy.get('[col-id="status"]').should('have.text', 'Completed');
+          cy.get('[col-id="txHash"]')
             .find('a')
             .should('have.attr', 'href')
             .and('contain', 'https://sepolia.etherscan.io/tx/');
@@ -150,16 +155,16 @@ context(
     });
 
     // Skipping because of bug #1857
-    it('Able to withdraw asset: -eth wallet not connected', function () {
+    it.skip('Able to withdraw asset: -eth wallet not connected', function () {
       const ethWalletAddress = Cypress.env('ethWalletPublicKey');
       cy.reload();
       waitForAssetsDisplayed(usdtName);
       // fill in withdrawal form
       cy.getByTestId(withdraw).should('be.visible').click();
-      cy.getByTestId(withdrawalForm, txTimeout).within(() => {
+      cy.getByTestId(withdrawalForm).within(() => {
         cy.get('select').select(usdtSelectValue, { force: true });
         cy.getByTestId(ethAddressInput).should('be.empty');
-        cy.getByTestId(amountInput).click().type('110');
+        cy.getByTestId(amountInput).click().type('100');
         cy.getByTestId(submitWithdrawalButton).click();
 
         // Need eth address to submit withdrawal
@@ -175,20 +180,20 @@ context(
         'Transaction complete'
       );
       cy.getByTestId(dialogClose).click();
-      cy.get(tableTxHash)
-        .eq(1)
-        .should('have.text', 'Complete withdrawal')
+
+      cy.getByTestId(completeWithdrawalButton)
+        .eq(0)
+        .parent()
         .parent()
         .within(() => {
-          cy.get(tableAssetSymbol).should('have.text', usdcSymbol);
-          cy.get(tableAmount).should('have.text', '110.00');
-          cy.get(tableReceiverAddress)
+          cy.get('[col-id="asset.symbol"]').should('have.text', usdcSymbol);
+          cy.get('[col-id="amount"]').should('have.text', '100.00');
+          cy.get('[col-id="details.receiverAddress"]')
             .find('a')
             .should('have.attr', 'href')
             .and('contain', 'https://sepolia.etherscan.io/address/');
-          cy.get(tableCreatedTimeStamp).should('not.be.empty');
+          cy.get('[col-id="createdTimestamp"]').should('not.be.empty');
           cy.getByTestId(completeWithdrawalButton).click();
-          // Unable to complete withdrawal in Capsule
         });
     });
 
@@ -197,28 +202,26 @@ context(
       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.`;
 
       // Disconnect vega wallet
-      cy.getByTestId('manage-vega-wallet').last().click();
+      cy.getByTestId('manage-vega-wallet').click();
       cy.getByTestId('disconnect').click();
 
       cy.connectPublicKey(vegaWalletPubKey);
       cy.getByTestId(withdraw).should('be.visible').click();
-      cy.getByTestId(withdrawalForm, txTimeout).within(() => {
+      cy.getByTestId(withdrawalForm).within(() => {
         cy.get('select').select(usdtSelectValue, { force: true });
         cy.getByTestId(balanceAvailable, txTimeout).should('exist');
         cy.getByTestId(amountInput).click().type('100');
         cy.getByTestId(submitWithdrawalButton).click();
       });
 
-      cy.getByTestId('dialog-content')
-        .last()
-        .within(() => {
-          cy.get('h1').should('have.text', 'Transaction failed');
-          cy.getByTestId('Error').should('have.text', expectedErrorTxt);
-        });
+      cy.getByTestId('dialog-content').within(() => {
+        cy.get('h1').should('have.text', 'Transaction failed');
+        cy.getByTestId('Error').should('have.text', expectedErrorTxt);
+      });
     });
 
     function waitForAssetsDisplayed(expectedAsset: string) {
-      cy.getByTestId('currency-title').should('contain.text', expectedAsset);
+      cy.contains(expectedAsset, txTimeout).should('be.visible');
     }
   }
 );

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

@@ -27,7 +27,7 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
       cy.getByTestId('app-announcement').should('not.exist');
     });
 
-    it('should show open or enacted proposals without proposal summary', function () {
+    it('should show open or enacted proposals with proposal summary', function () {
       cy.get('body').then(($body) => {
         if (!$body.find('[data-testid="proposals-list-item"]').length) {
           cy.createMarket();
@@ -43,6 +43,12 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
             .invoke('text')
             .should('not.be.empty');
           cy.getByTestId('proposal-type').invoke('text').should('not.be.empty');
+          cy.getByTestId('proposal-description')
+            .invoke('text')
+            .should('not.be.empty');
+          cy.getByTestId('proposal-details')
+            .invoke('text')
+            .should('not.be.empty');
           cy.getByTestId('proposal-status')
             .invoke('text')
             .should('not.be.empty');
@@ -125,7 +131,7 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
         .within(() => {
           cy.get('span')
             .first()
-            .should('have.text', 'http://localhost:3008/graphql');
+            .should('have.text', 'http://localhost:3028/query');
           cy.getByTestId('link').should('exist');
         });
     });

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

@@ -101,15 +101,15 @@ context(
             );
             cy.getByTestId('protocol-upgrade-proposal-release-tag').should(
               'have.text',
-              'Vega release tag: v1'
+              'Vega release tagv1'
             );
             cy.getByTestId('protocol-upgrade-proposal-block-height').should(
               'have.text',
-              'Upgrade block height: 2015942'
+              'Upgrade block height2015942'
             );
             cy.getByTestId('protocol-upgrade-proposal-status').should(
               'have.text',
-              'Approved '
+              'Approved'
             );
           });
       });

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

@@ -17,15 +17,10 @@ const banner = 'view-banner';
 
 context('View functionality with public key', { tags: '@smoke' }, function () {
   before('send asset to wallet', function () {
-    vegaWalletFaucetAssetsWithoutCheck(
-      '816af99af60d684502a40824758f6b5377e6af48e50a9ee8ef478ecb879ea8bc',
-      '1000000',
-      vegaWalletPubKey
-    );
+    vegaWalletFaucetAssetsWithoutCheck('fUSDC', '1000000', vegaWalletPubKey);
   });
 
   beforeEach('visit home page', function () {
-    cy.clearLocalStorage();
     cy.visit('/');
     waitForSpinner();
     cy.connectPublicKey(vegaWalletPubKey);

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

@@ -13,7 +13,6 @@ context(
   { tags: '@regression' },
   function () {
     before('navigate to rewards page', function () {
-      cy.clearLocalStorage();
       cy.visit('/');
       navigateTo(navigation.rewards);
     });

apps/governance-e2e/src/integration/view/wallet-vega.cy.ts

@@ -282,30 +282,26 @@ context(
       describe('Vega wallet with assets', function () {
         const assets = [
           {
-            id: '816af99af60d684502a40824758f6b5377e6af48e50a9ee8ef478ecb879ea8bc',
+            id: 'fUSDC',
             name: 'USDC (fake)',
-            symbol: 'fUSDC',
             amount: '1000000',
             expectedAmount: '10.00',
           },
           {
-            id: '8566db7257222b5b7ef2886394ad28b938b28680a54a169bbc795027b89d6665',
+            id: 'fDAI',
             name: 'DAI (fake)',
-            symbol: 'fDAI',
             amount: '200000',
             expectedAmount: '2.00',
           },
           {
-            id: '73174a6fb1d5802ba0ac7bd7ab79e0a3a4837b262de0a4e80815a55442692bd0',
+            id: 'fBTC',
             name: 'BTC (fake)',
-            symbol: 'fBTC',
             amount: '600000',
             expectedAmount: '6.00',
           },
           {
-            id: 'e02d4c15d790d1d2dffaf2dcd1cf06a1fe656656cf4ed18c8ce99f9e83643567',
+            id: 'fEURO',
             name: 'EURO (fake)',
-            symbol: 'fEURO',
             amount: '800000',
             expectedAmount: '8.00',
           },
@@ -326,15 +322,15 @@ context(
           });
         });
 
-        for (const { name, symbol, expectedAmount } of assets) {
-          it(`should see ${name} within vega wallet`, () => {
+        for (const { id, name, expectedAmount } of assets) {
+          it(`should see ${id} within vega wallet`, () => {
             cy.get(walletContainer).within(() => {
               cy.get(vegaWalletCurrencyTitle)
-                .contains(name, txTimeout)
+                .contains(id, txTimeout)
                 .should('be.visible');
 
               cy.get(vegaWalletCurrencyTitle)
-                .contains(name)
+                .contains(id)
                 .parent()
                 .siblings()
                 .invoke('text')
@@ -342,9 +338,9 @@ context(
                 .should('be.gte', parseFloat(expectedAmount));
 
               cy.get(vegaWalletCurrencyTitle)
-                .contains(name)
+                .contains(id)
                 .parent()
-                .contains(symbol);
+                .contains(name);
             });
           });
         }

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

@@ -90,7 +90,6 @@ export function getSubmittedProposalFromProposalList(proposalTitle: string) {
 export function getProposalIdFromList(proposalTitle: string) {
   cy.contains(proposalTitle)
     .parentsUntil(proposalListItem)
-    .last()
     .within(() => {
       cy.get(proposalDetails)
         .invoke('text')
@@ -134,7 +133,7 @@ export function waitForProposalSync() {
   // before proposal appears in the list - so rather than hard coded wait - we just wait on the
   // delegation checks that are performed on the governance page.
 
-  cy.intercept('POST', '/graphql', (req) => {
+  cy.intercept('POST', '/query', (req) => {
     if (req.body.operationName === 'Delegations') {
       req.alias = 'proposalDelegationsCompletion';
     }
@@ -144,7 +143,7 @@ export function waitForProposalSync() {
   cy.wait(['@proposalDelegationsCompletion', '@proposalDelegationsCompletion']);
 
   // Turn off this intercept from here on in
-  cy.intercept('POST', '/graphql', (req) => {
+  cy.intercept('POST', '/query', (req) => {
     if (req.body.operationName === 'Delegations') {
       req.continue();
     }

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

@@ -89,6 +89,6 @@ export function mockNetworkUpgradeProposal() {
   cy.mockGQL((req) => {
     aliasGQLQuery(req, 'Nodes', nodeData);
     aliasGQLQuery(req, 'Proposals', proposalsData);
-    aliasGQLQuery(req, 'ProtocolUpgradeProposals', upgradeProposalsData);
+    aliasGQLQuery(req, 'ProtocolUpgrades', upgradeProposalsData);
   });
 }

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

@@ -54,7 +54,6 @@ export function stakingValidatorPageRemoveStake(stake: string) {
     .and('contain', `Remove ${stake} $VEGA tokens at the end of epoch`)
     .and('be.visible')
     .click();
-  cy.contains('been removed from validator', txTimeout).should('be.visible');
   closeDialog();
 }
 
@@ -185,7 +184,7 @@ export function validateValidatorListTotalStakeAndShare(
 ) {
   cy.contains('Loading...', epochTimeout).should('not.exist');
   waitForBeginningOfEpoch();
-  cy.get(`[row-id="${positionOnList}"]`)
+  cy.get(`[row-id="${positionOnList}"]:visible`)
     .eq(1)
     .within(() => {
       cy.getByTestId(stakeValidatorListTotalStake, epochTimeout).should(
@@ -221,12 +220,12 @@ export function ensureSpecifiedUnstakedTokensAreAssociated(
 }
 
 export function closeStakingDialog() {
-  cy.getByTestId('dialog-title').should(
+  cy.get('[data-testid="dialog-title"]:visible').should(
     'contain.text',
     'At the beginning of the next epoch'
   );
-  cy.getByTestId('dialog-content')
-    .last()
+  cy.get('[data-testid="dialog-content"]:visible')
+    .first()
     .within(() => {
       cy.get('a').should('have.text', 'Back to Staking').click();
     });

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

@@ -9,7 +9,7 @@ import {
 import { ethers, Wallet } from 'ethers';
 
 const associatedAmountInWallet = '[data-testid="associated-amount"]:visible';
-const vegaWalletContainer = 'aside [data-testid="vega-wallet"]';
+const vegaWalletContainer = 'aside [data-testid="vega-wallet"]:visible';
 const vegaWalletMnemonic = Cypress.env('vegaWalletMnemonic');
 const vegaWalletPubKey = Cypress.env('vegaWalletPublicKey');
 const vegaTokenContractAddress = Cypress.env('vegaTokenContractAddress');
@@ -35,25 +35,18 @@ const stakingBridgeContract = new StakingBridge(
 );
 const vestingContract = new TokenVesting(vegaTokenContractAddress, signer);
 
-export async function depositAsset(
-  assetEthAddress: string,
-  amount: string,
-  decimalPlaces: number
-) {
+export async function depositAsset(assetEthAddress: string, amount: string) {
   // Approve asset
   const faucet = new TokenFaucetable(assetEthAddress, signer);
-  cy.wrap(
-    faucet.approve(Erc20BridgeAddress, amount + '0'.repeat(decimalPlaces + 1)),
-    {
-      timeout: transactionTimeout,
-      log: false,
-    }
-  ).then(() => {
+  cy.wrap(faucet.approve(Erc20BridgeAddress, amount + '0'.repeat(19)), {
+    timeout: transactionTimeout,
+    log: false,
+  }).then(() => {
     const collateralBridge = new CollateralBridge(Erc20BridgeAddress, signer);
     cy.wrap(
       collateralBridge.deposit_asset(
         assetEthAddress,
-        amount + '0'.repeat(decimalPlaces),
+        amount + '0'.repeat(18),
         '0x' + vegaWalletPubKey
       ),
       { timeout: transactionTimeout, log: false }
@@ -109,12 +102,11 @@ async function vegaWalletTeardownStaking(stakingBridgeContract: StakingBridge) {
   cy.highlight('Tearing down staking tokens from vega wallet if present');
   cy.wrap(
     stakingBridgeContract.stake_balance(ethWalletPubKey, vegaWalletPubKey),
-    { timeout: transactionTimeout }
+    { timeout: transactionTimeout, log: false }
   ).then((stakeBalance) => {
     if (Number(stakeBalance) != 0) {
       cy.get(vegaWalletContainer).within(() => {
         cy.getByTestId('currency-value')
-          .first()
           .invoke('text')
           .then(($associatedAmount) => {
             cy.wrap(
@@ -122,34 +114,14 @@ async function vegaWalletTeardownStaking(stakingBridgeContract: StakingBridge) {
                 String(stakeBalance),
                 vegaWalletPubKey
               ),
-              { timeout: transactionTimeout }
+              { timeout: transactionTimeout, log: false }
             );
-            cy.wrap(
-              vestingContract.stake_balance(ethWalletPubKey, vegaWalletPubKey),
-              {
+            cy.get("[data-testid='currency-value']")
+              .first()
+              .invoke('text', {
                 timeout: transactionTimeout,
-                log: false,
-              }
-            ).then((vestingAmount) => {
-              if (Number(vestingAmount) != 0) {
-                cy.contains('Associated', {
-                  timeout: transactionTimeout,
-                })
-                  .parent()
-                  .parent()
-                  .within(() => {
-                    cy.getByTestId('currency-value', {
-                      timeout: transactionTimeout,
-                    })
-                      .should('have.length', 1)
-                      .invoke('text')
-                      .as('displayedAmount');
-                    cy.get('@displayedAmount', {
-                      timeout: transactionTimeout,
-                    }).should('not.eq', $associatedAmount);
-                  });
-              }
-            });
+              })
+              .should('not.eq', $associatedAmount);
           });
       });
     }
@@ -165,7 +137,7 @@ async function vegaWalletTeardownVesting(vestingContract: TokenVesting) {
     if (Number(vestingAmount) != 0) {
       cy.wrap(
         vestingContract.remove_stake(String(vestingAmount), vegaWalletPubKey),
-        { timeout: transactionTimeout }
+        { timeout: transactionTimeout, log: false }
       );
     }
   });

apps/governance/.env

@@ -1,18 +1,18 @@
 # App configuration variables
-NX_VEGA_ENV=STAGNET1
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
-NX_VEGA_URL=https://api.n00.stagnet1.vega.xyz/graphql
+NX_VEGA_ENV=STAGNET3
+NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml
+NX_VEGA_URL=https://api.stagnet3.vega.xyz/graphql
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_FAIRGROUND=false
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET1":"https://stagnet1.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_WALLET_URL=http://localhost:1789
-NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
+NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 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_TRANCHES_SERVICE_URL=https://tranches-stagnet3-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/main/announcements.json
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 

apps/governance/.env.capsule

@@ -3,12 +3,12 @@ NX_VEGA_ENV=CUSTOM
 NX_ETHEREUM_PROVIDER_URL=http://localhost:8545
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_FAIRGROUND=false
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
 NX_VEGA_CONFIG_URL=''
 
-NX_VEGA_URL=http://localhost:3008/graphql
+NX_VEGA_URL=http://localhost:3028/query
 NX_ETHEREUM_CHAIN_ID=1440
 NX_ETH_URL_CONNECT=1
 NX_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit supply green clown session
@@ -16,7 +16,7 @@ NX_LOCAL_PROVIDER_URL=http://localhost:8545/
 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_TRANCHES_SERVICE_URL=https://tranches-stagnet3-k8s.ops.vega.xyz
 
 #Test configuration variables
 CYPRESS_FAIRGROUND=false

apps/governance/.env.devnet

@@ -2,7 +2,7 @@
 NX_VEGA_ENV=DEVNET
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml
 NX_VEGA_URL=https://api.n00.devnet1.vega.xyz/graphql
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions

apps/governance/.env.mainnet

@@ -2,7 +2,7 @@
 NX_VEGA_ENV=MAINNET
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/mainnet1/mainnet1.toml
 NX_VEGA_URL=https://api.vega.xyz/query
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_ETHEREUM_PROVIDER_URL=https://mainnet.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions

apps/governance/.env.stagnet1

@@ -1,7 +1,7 @@
 # App configuration variables
 NX_VEGA_URL=https://api.n00.stagnet1.vega.xyz/graphql
 NX_VEGA_ENV=STAGNET1
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET1":"https://stagnet1.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","STAGNET1":"https://stagnet1.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
 NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet

apps/governance/.env.stagnet3

@@ -0,0 +1,11 @@
+# App configuration variables
+NX_VEGA_URL=https://api.stagnet3.vega.xyz/graphql
+NX_VEGA_ENV=STAGNET3
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml
+NX_VEGA_EXPLORER_URL=https://stagnet3.explorer.vega.xyz
+NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
+NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
+NX_DELEGATIONS_PAGINATION=50
+NX_TRANCHES_SERVICE_URL=https://tranches-stagnet3-k8s.ops.vega.xyz
+NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json

apps/governance/.env.testnet

@@ -1,8 +1,8 @@
 # App configuration variables
 NX_VEGA_ENV=TESTNET
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
-NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_URL=https://api.n08.testnet.vega.xyz/graphql
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions

apps/governance/.env.validator-testnet

@@ -3,7 +3,7 @@ NX_VEGA_ENV=VALIDATOR_TESTNET
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/testnet2/testnet2.toml
 NX_VEGA_URL=https://api-validators-testnet.vega.rocks/graphql
 NX_VEGA_REST=https://api-validators-testnet.vega.rocks/
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions

apps/governance/README.md

@@ -27,11 +27,12 @@ Example configurations are provided here:
 - [Mainnet](./.env.mainnet)
 - [Devnet](./.env.devnet)
 - [Testnet](./.env.testnet)
+- [Stagnet3](./.env.stagnet3)
 
 For convenience, you can boot the app injecting one of the configurations above by running:
 
 ```bash
-yarn nx run governance:serve --env={env} # e.g. stagnet1
+yarn nx run governance:serve --env={env} # e.g. stagnet3
 ```
 
 There are a few different configuration options offered for this app:

apps/governance/src/__mocks__/react-markdown.js

@@ -1,5 +0,0 @@
-function ReactMarkdown({ children }) {
-  return <div>{children}</div>;
-}
-
-export default ReactMarkdown;

apps/governance/src/app.tsx

@@ -3,7 +3,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 { BrowserRouter as Router } from 'react-router-dom';
 import { AppLoader } from './app-loader';
 import { NetworkInfo } from '@vegaprotocol/network-info';
 import { BalanceManager } from './components/balance-manager';
@@ -20,17 +20,12 @@ import type { EthereumConfig } from '@vegaprotocol/web3';
 import {
   createConnectors,
   useEthTransactionManager,
-  useEthTransactionUpdater,
   useEthWithdrawApprovalsManager,
   useWeb3ConnectStore,
 } from '@vegaprotocol/web3';
 import { Web3Provider } from '@vegaprotocol/web3';
 import { VegaWalletDialogs } from './components/vega-wallet-dialogs';
-import {
-  useVegaTransactionManager,
-  useVegaTransactionUpdater,
-  VegaWalletProvider,
-} from '@vegaprotocol/wallet';
+import { VegaWalletProvider } from '@vegaprotocol/wallet';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { useEthereumConfig } from '@vegaprotocol/web3';
 import {
@@ -42,7 +37,6 @@ import { ENV } from './config';
 import type { InMemoryCacheConfig } from '@apollo/client';
 import { WithdrawalDialog } from '@vegaprotocol/withdraws';
 import { SplashLoader } from './components/splash-loader';
-import { ToastsManager } from './toasts-manager';
 
 const cache: InMemoryCacheConfig = {
   typePolicies: {
@@ -87,10 +81,7 @@ const Web3Container = ({
   providerUrl: string;
 }) => {
   const InitializeHandlers = () => {
-    useVegaTransactionManager();
-    useVegaTransactionUpdater();
     useEthTransactionManager();
-    useEthTransactionUpdater();
     useEthWithdrawApprovalsManager();
     return null;
   };
@@ -144,7 +135,6 @@ const Web3Container = ({
                       <NetworkInfo />
                     </footer>
                   </AppLayout>
-                  <ToastsManager />
                   <InitializeHandlers />
                   <VegaWalletDialogs />
                   <TransactionModal />
@@ -159,20 +149,6 @@ const Web3Container = ({
   );
 };
 
-const ScrollToTop = () => {
-  const { pathname } = useLocation();
-
-  useEffect(() => {
-    // "document.documentElement.scrollTo" is the magic for React Router Dom v6
-    document.documentElement.scrollTo({
-      top: 0,
-      left: 0,
-    });
-  }, [pathname]);
-
-  return null;
-};
-
 const AppContainer = () => {
   const { config, loading, error } = useEthereumConfig();
   const { VEGA_ENV, GIT_COMMIT_HASH, GIT_BRANCH, ETHEREUM_PROVIDER_URL } =
@@ -207,7 +183,6 @@ const AppContainer = () => {
 
   return (
     <Router>
-      <ScrollToTop />
       <AppStateProvider>
         <div className="grid min-h-full text-white">
           <AsyncRenderer<EthereumConfig | null>

apps/governance/src/components/connect-to-vega/connect-to-vega.tsx

@@ -23,7 +23,6 @@ export const ConnectToVega = () => {
         openVegaWalletDialog();
       }}
       data-testid="connect-to-vega-wallet-btn"
-      variant="primary"
     >
       {t('connectVegaWallet')}
     </Button>

apps/governance/src/components/disconnected-notice/disconnected-notice.spec.tsx

@@ -1,39 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import { DisconnectedNotice } from './disconnected-notice';
-
-describe('DisconnectedNotice', () => {
-  it('renders Notification when isDisconnected is true and correctNetworkChainId is valid', () => {
-    render(
-      <DisconnectedNotice isDisconnected={true} correctNetworkChainId={'1'} />
-    );
-    const disconnectedNotice = screen.getByTestId('disconnected-notice');
-    expect(disconnectedNotice).toBeInTheDocument();
-  });
-
-  it("doesn't render Notification when isDisconnected is false", () => {
-    render(
-      <DisconnectedNotice isDisconnected={false} correctNetworkChainId={'1'} />
-    );
-    const disconnectedNotice = screen.queryByTestId('disconnected-notice');
-    expect(disconnectedNotice).not.toBeInTheDocument();
-  });
-
-  it("doesn't render Notification when correctNetworkChainId is undefined", () => {
-    render(
-      <DisconnectedNotice
-        isDisconnected={true}
-        correctNetworkChainId={undefined}
-      />
-    );
-    const disconnectedNotice = screen.queryByTestId('disconnected-notice');
-    expect(disconnectedNotice).not.toBeInTheDocument();
-  });
-
-  it("doesn't render Notification when correctNetworkChainId is null", () => {
-    render(
-      <DisconnectedNotice isDisconnected={true} correctNetworkChainId={null} />
-    );
-    const disconnectedNotice = screen.queryByTestId('disconnected-notice');
-    expect(disconnectedNotice).not.toBeInTheDocument();
-  });
-});

apps/governance/src/components/disconnected-notice/disconnected-notice.tsx

@@ -1,33 +0,0 @@
-import { useTranslation } from 'react-i18next';
-import { Intent, Notification } from '@vegaprotocol/ui-toolkit';
-
-interface DisconnectedNoticeProps {
-  isDisconnected: boolean;
-  correctNetworkChainId?: string | null;
-}
-
-export const DisconnectedNotice = ({
-  isDisconnected,
-  correctNetworkChainId,
-}: DisconnectedNoticeProps) => {
-  const { t } = useTranslation();
-
-  if (
-    !isDisconnected ||
-    correctNetworkChainId === undefined ||
-    correctNetworkChainId === null
-  ) {
-    return null;
-  }
-
-  return (
-    <div className="col-span-full" data-testid="disconnected-notice">
-      <Notification
-        message={t('disconnectedNotice', {
-          correctNetwork: correctNetworkChainId,
-        })}
-        intent={Intent.Danger}
-      />
-    </div>
-  );
-};

apps/governance/src/components/disconnected-notice/index.tsx

@@ -1 +0,0 @@
-export * from './disconnected-notice';

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

@@ -3,7 +3,6 @@ import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { Link } from 'react-router-dom';
 import { Button } from '@vegaprotocol/ui-toolkit';
-import { DisconnectedNotice } from '../disconnected-notice';
 
 import {
   AppStateActionType,
@@ -27,8 +26,7 @@ import {
 import { Loader } from '@vegaprotocol/ui-toolkit';
 import colors from 'tailwindcss/colors';
 import { useBalances } from '../../lib/balances/balances-store';
-import { useEthereumConfig, useWeb3Disconnect } from '@vegaprotocol/web3';
-import { getChainName } from '@vegaprotocol/web3';
+import { useWeb3Disconnect } from '@vegaprotocol/web3';
 
 const removeLeadingAddressSymbol = (key: string) => {
   if (key && key.length > 2 && key.slice(0, 2) === '0x') {
@@ -184,21 +182,16 @@ const ConnectedKey = () => {
 
 export const EthWallet = () => {
   const { t } = useTranslation();
-  const { appDispatch, appState } = useAppState();
+  const { appDispatch } = useAppState();
   const { account, connector } = useWeb3React();
   const pendingTxs = usePendingTransactions();
   const disconnect = useWeb3Disconnect(connector);
-  const { config } = useEthereumConfig();
 
   return (
     <WalletCard>
       <section data-testid="ethereum-wallet">
         <WalletCardHeader>
           <h1 className="m-0 uppercase">{t('ethereumKey')}</h1>
-          <DisconnectedNotice
-            isDisconnected={appState.disconnectNotice}
-            correctNetworkChainId={getChainName(Number(config?.chain_id))}
-          />
           {account && (
             <div className="place-self-end font-mono">
               <div

apps/governance/src/components/heading/heading.tsx

@@ -23,7 +23,7 @@ export const Heading = ({
       })}
     >
       <h1
-        className={classNames('font-alpha calt text-5xl break-words', {
+        className={classNames('font-alpha calt text-5xl', {
           'mt-0': !marginTop,
           'mb-0': !marginBottom,
         })}

apps/governance/src/components/page-templates/app-layout.tsx

@@ -14,7 +14,7 @@ export const AppLayout = ({ children }: AppLayoutProps) => {
   const { isReadOnly } = useVegaWallet();
   const AppLayoutClasses = classNames(
     'app w-full max-w-[1500px] mx-auto grid',
-    'font-alpha lg:text-body-large',
+    'lg:text-body-large',
     {
       'grid-rows-[repeat(2,min-content)_1fr_min-content]': !isReadOnly,
       'grid-rows-[repeat(3,min-content)_1fr_min-content]': isReadOnly,

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

@@ -1,12 +1,13 @@
 import { Button, Splash } from '@vegaprotocol/ui-toolkit';
 import {
+  getChainName,
   useWeb3ConnectStore,
   useWeb3Disconnect,
   Web3ConnectDialog,
 } from '@vegaprotocol/web3';
 import { useWeb3React } from '@web3-react/core';
 import type { ReactElement } from 'react';
-import { useCallback, useEffect, useState } from 'react';
+import { useCallback, useEffect } from 'react';
 import {
   AppStateActionType,
   useAppState,
@@ -35,7 +36,9 @@ export function Web3Connector({
   const appChainId = Number(chainId);
   return (
     <>
-      <Web3Content appChainId={appChainId}>{children}</Web3Content>
+      <Web3Content appChainId={appChainId} setDialogOpen={setDialogOpen}>
+        {children}
+      </Web3Content>
       <Web3ConnectDialog
         connectors={connectors}
         dialogOpen={appState.ethConnectOverlay}
@@ -49,59 +52,23 @@ export function Web3Connector({
 interface Web3ContentProps {
   children: ReactElement;
   appChainId: number;
+  setDialogOpen: (isOpen: boolean) => void;
 }
 
 export const Web3Content = ({ children, appChainId }: Web3ContentProps) => {
-  const { appState, appDispatch } = useAppState();
   const { connector, chainId } = useWeb3React();
-  const [previousChainId, setPreviousChainId] = useState(chainId);
   const error = useWeb3ConnectStore((store) => store.error);
   const disconnect = useWeb3Disconnect(connector);
 
-  const showDisconnectNotice = useCallback(
-    (isVisible: boolean) =>
-      appDispatch({
-        type: AppStateActionType.SET_DISCONNECT_NOTICE,
-        isVisible,
-      }),
-    [appDispatch]
-  );
-
   useEffect(() => {
     if (connector?.connectEagerly) {
       connector.connectEagerly();
     }
-    // wallet connect doesn't handle connectEagerly being called when connector is also in the
+    // wallet connect doesnt handle connectEagerly being called when connector is also in the
     // deps array.
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
-  useEffect(() => {
-    if (chainId !== undefined) {
-      // We use this to detect when the user switches networks.
-      setPreviousChainId(chainId);
-
-      if (chainId !== appChainId) {
-        disconnect();
-
-        // If the user was previously connected, show the disconnect explanation notice.
-        if (previousChainId !== undefined && !appState.disconnectNotice) {
-          showDisconnectNotice(true);
-        }
-      } else if (appState.disconnectNotice) {
-        showDisconnectNotice(false);
-      }
-    }
-  }, [
-    appChainId,
-    appDispatch,
-    appState.disconnectNotice,
-    chainId,
-    disconnect,
-    previousChainId,
-    showDisconnectNotice,
-  ]);
-
   if (error) {
     return (
       <Splash>
@@ -113,5 +80,18 @@ export const Web3Content = ({ children, appChainId }: Web3ContentProps) => {
     );
   }
 
+  if (chainId !== undefined && chainId !== appChainId) {
+    return (
+      <Splash>
+        <div className="flex flex-col items-center gap-12">
+          <p className="text-white">
+            This app only works on {getChainName(appChainId)}
+          </p>
+          <Button onClick={() => disconnect()}>Disconnect</Button>
+        </div>
+      </Splash>
+    );
+  }
+
   return children;
 };

apps/governance/src/config/env.ts

@@ -33,6 +33,10 @@ export const ContractAddresses: {
     claimAddress: '0x8Cef746ab7C83B61F6461cC92882bD61AB65a994', // TODO not deployed to this env, but random address so app doesn't error
     lockedAddress: '0x0', // TODO not deployed to this env
   },
+  STAGNET3: {
+    claimAddress: '0x8Cef746ab7C83B61F6461cC92882bD61AB65a994', // TODO not deployed to this env, but random address so app doesn't error
+    lockedAddress: '0x0', // TODO not deployed to this env
+  },
   TESTNET: {
     claimAddress: '0x8Cef746ab7C83B61F6461cC92882bD61AB65a994', // TODO not deployed to this env, but random address so app doesn't error
     lockedAddress: '0x0', // TODO not deployed to this env

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

@@ -43,11 +43,6 @@ export interface AppState {
    * Message to display in a banner at the top of the screen, currently always shown as a warning/error
    */
   bannerMessage: string;
-  /**
-   * Displays a notice to the user that they have been disconnected because they've changed their
-   * ethereum network to an incompatible one.
-   */
-  disconnectNotice: boolean;
 }
 
 export enum AppStateActionType {
@@ -63,7 +58,6 @@ export enum AppStateActionType {
   SET_ASSOCIATION_BREAKDOWN,
   SET_TRANSACTION_OVERLAY,
   SET_BANNER_MESSAGE,
-  SET_DISCONNECT_NOTICE,
 }
 
 export type AppStateAction =
@@ -96,10 +90,6 @@ export type AppStateAction =
   | {
       type: AppStateActionType.SET_BANNER_MESSAGE;
       message: string;
-    }
-  | {
-      type: AppStateActionType.SET_DISCONNECT_NOTICE;
-      isVisible: boolean;
     };
 
 type AppStateContextShape = {

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

@@ -1,8 +1,8 @@
 import React from 'react';
 
 import { BigNumber } from '../../lib/bignumber';
-import type { AppState, AppStateAction } from './app-state-context';
 import { AppStateActionType, AppStateContext } from './app-state-context';
+import type { AppState, AppStateAction } from './app-state-context';
 
 interface AppStateProviderProps {
   children: React.ReactNode;
@@ -19,7 +19,6 @@ const initialAppState: AppState = {
   ethConnectOverlay: false,
   transactionOverlay: false,
   bannerMessage: '',
-  disconnectNotice: false,
 };
 
 function appStateReducer(state: AppState, action: AppStateAction): AppState {
@@ -69,12 +68,6 @@ function appStateReducer(state: AppState, action: AppStateAction): AppState {
         bannerMessage: action.message,
       };
     }
-    case AppStateActionType.SET_DISCONNECT_NOTICE: {
-      return {
-        ...state,
-        disconnectNotice: action.isVisible,
-      };
-    }
   }
 }
 

apps/governance/src/contexts/contracts/contracts-provider.tsx

@@ -14,17 +14,13 @@ import { ContractsContext } from './contracts-context';
 import { createDefaultProvider } from '../../lib/web3-connectors';
 import { useEthereumConfig } from '@vegaprotocol/web3';
 import { useEnvironment } from '@vegaprotocol/environment';
-import { ENV } from '../../config';
+import { ENV } from '../../config/env';
 
 /**
  * Provides Vega Ethereum contract instances to its children.
  */
 export const ContractsProvider = ({ children }: { children: JSX.Element }) => {
-  const {
-    provider: activeProvider,
-    account,
-    chainId: activeChainId,
-  } = useWeb3React();
+  const { provider: activeProvider, account } = useWeb3React();
   const { config } = useEthereumConfig();
   const { VEGA_ENV, ETHEREUM_PROVIDER_URL } = useEnvironment();
   const [contracts, setContracts] =
@@ -43,11 +39,7 @@ export const ContractsProvider = ({ children }: { children: JSX.Element }) => {
           ETHEREUM_PROVIDER_URL,
           Number(config.chain_id)
         );
-
-        const provider =
-          activeProvider && activeChainId === Number(config.chain_id)
-            ? activeProvider
-            : defaultProvider;
+        const provider = activeProvider ? activeProvider : defaultProvider;
 
         if (
           account &&
@@ -92,14 +84,7 @@ export const ContractsProvider = ({ children }: { children: JSX.Element }) => {
       //  TODO: hacky quick fix for release to prevent race condition, find a better fix for this.
       cancelled = true;
     };
-  }, [
-    activeProvider,
-    activeChainId,
-    account,
-    config,
-    VEGA_ENV,
-    ETHEREUM_PROVIDER_URL,
-  ]);
+  }, [activeProvider, account, config, VEGA_ENV, ETHEREUM_PROVIDER_URL]);
 
   if (!contracts) {
     return (

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

@@ -201,7 +201,7 @@
   "NewFreeform": "Freeform",
   "tokenVotes": "Token votes",
   "liquidityVotes": "Liquidity votes",
-  "castYourVote": "Cast your vote",
+  "yourVote": "Your vote",
   "for": "For",
   "against": "Against",
   "majorityRequired": "Majority Required",
@@ -587,7 +587,7 @@
   "tokensAgainstProposal": "Tokens against proposal",
   "participationRequired": "Participation required",
   "numberOfVotingParties": "Number of voting parties",
-  "totalTokensVotes": "Total tokens voted",
+  "totalTokensVotes": "Total yes tokens",
   "totalTokenVotedPercentage": "Total tokens voted percentage",
   "numberOfForVotes": "Number of votes for",
   "numberOfAgainstVotes": "Number of votes against",
@@ -631,10 +631,7 @@
   "New market": "New market",
   "Market change": "Market change",
   "Network parameter": "Network parameter",
-  "Change": "Change",
   "Unknown proposal": "Unknown proposal",
-  "ERC20ContractAddress": "ERC20 contract address",
-  "MaxFaucetAmountMint": "Max faucet amount mint",
   "Code": "Code",
   "settled future": "settled future",
   "Symbol": "Symbol",
@@ -680,7 +677,6 @@
   "NewProposal": "New proposal",
   "ProposalTypeQuestion": "What type of proposal would you like to make?",
   "NetworkParameterProposal": "Update network parameter proposal",
-  "parameter": "parameter",
   "NewMarketProposal": "New market proposal",
   "UpdateMarketProposal": "Update market proposal",
   "NewAssetProposal": "New asset proposal",
@@ -698,7 +694,6 @@
   "UpdateMarket": "Update market",
   "NewAsset": "New asset",
   "UpdateAsset": "Update asset",
-  "AssetID": "Asset ID",
   "Freeform": "Freeform",
   "RawProposal": "Let me choose (raw proposal)",
   "UseMin": "Use minimum",
@@ -742,7 +737,6 @@
   "ProposalNotFound": "Proposal not found",
   "ProposalNotFoundDetails": "The proposal you are looking for is not here, it may have been enacted before the last chain restore. You could check the Vega forums/discord instead for information about it.",
   "FreeformProposal": "Freeform proposal",
-  "Id": "ID",
   "unknownReason": "unknown reason",
   "votingEnded": "Voting has ended.",
   "STATUS": "STATUS",
@@ -796,8 +790,5 @@
   "approval (% validator voting power)": "approval (% validator voting power)",
   "67% voting power required": "67% voting power required",
   "Token": "Token",
-  "associateVegaNow": "Associate $VEGA now",
-  "disconnectedNotice": "You have been disconnected. Connect your ETH wallet to the {{correctNetwork}} network to use this app.",
-  "connectAVegaWalletToVote": "Connect a Vega wallet with $VEGA tokens to vote on a proposal.",
-  "findOutMoreAboutHowToVote": "Find out more about how to vote on Vega"
+  "associateVegaNow": "Associate $VEGA now"
 }

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

@@ -15,6 +15,7 @@ import Routes from '../routes';
 import { ExternalLinks, removePaginationWrapper } from '@vegaprotocol/utils';
 import { useNodesQuery } from '../staking/home/__generated__/Nodes';
 import { useProposalsQuery } from '../proposals/proposals/__generated__/Proposals';
+import { useProtocolUpgradesQuery } from '../proposals/protocol-upgrade/__generated__/ProtocolUpgradeProposals';
 import {
   getNotRejectedProposals,
   getNotRejectedProtocolUpgradeProposals,
@@ -24,8 +25,7 @@ import * as Schema from '@vegaprotocol/types';
 import type { RouteChildProps } from '..';
 import type { ProposalFieldsFragment } from '../proposals/proposals/__generated__/Proposals';
 import type { NodesFragmentFragment } from '../staking/home/__generated__/Nodes';
-import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
-import { useProtocolUpgradeProposalsQuery } from '@vegaprotocol/proposals';
+import type { ProtocolUpgradeProposalFieldsFragment } from '../proposals/protocol-upgrade/__generated__/ProtocolUpgradeProposals';
 
 const nodesToShow = 6;
 
@@ -181,7 +181,7 @@ const GovernanceHome = ({ name }: RouteChildProps) => {
     data: protocolUpgradesData,
     loading: protocolUpgradesLoading,
     error: protocolUpgradesError,
-  } = useProtocolUpgradeProposalsQuery({
+  } = useProtocolUpgradesQuery({
     pollInterval: 5000,
     fetchPolicy: 'network-only',
     errorPolicy: 'ignore',

apps/governance/src/routes/proposals/components/current-proposal-state/current-proposal-state.tsx

@@ -1,11 +1,7 @@
 import { useTranslation } from 'react-i18next';
-import { Icon } from '@vegaprotocol/ui-toolkit';
+import * as Schema from '@vegaprotocol/types';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
-import { ProposalState } from '@vegaprotocol/types';
-import { ProposalInfoLabel } from '../proposal-info-label';
-import type { ReactNode } from 'react';
-import type { ProposalInfoLabelVariant } from '../proposal-info-label';
 
 export const CurrentProposalState = ({
   proposal,
@@ -13,63 +9,19 @@ export const CurrentProposalState = ({
   proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
 }) => {
   const { t } = useTranslation();
-  let proposalStatus: ReactNode;
-  let variant = 'tertiary' as ProposalInfoLabelVariant;
+  let className = 'text-white';
 
-  switch (proposal?.state) {
-    case ProposalState.STATE_ENACTED: {
-      proposalStatus = (
-        <>
-          <span className="mr-2">{t('voteState_Enacted')}</span>
-          <Icon name={'tick'} />
-        </>
-      );
-      break;
-    }
-    case ProposalState.STATE_PASSED: {
-      proposalStatus = (
-        <>
-          <span className="mr-2">{t('voteState_Passed')}</span>
-          <Icon name={'tick'} />
-        </>
-      );
-      break;
-    }
-    case ProposalState.STATE_WAITING_FOR_NODE_VOTE: {
-      proposalStatus = (
-        <>
-          <span className="mr-2">{t('voteState_WaitingForNodeVote')}</span>
-          <Icon name={'time'} />
-        </>
-      );
-      break;
-    }
-    case ProposalState.STATE_OPEN: {
-      variant = 'primary' as ProposalInfoLabelVariant;
-      proposalStatus = <>{t('voteState_Open')}</>;
-      break;
-    }
-    case ProposalState.STATE_DECLINED: {
-      proposalStatus = (
-        <>
-          <span className="mr-2">{t('voteState_Declined')}</span>
-          <Icon name={'cross'} />
-        </>
-      );
-      break;
-    }
-    case ProposalState.STATE_REJECTED: {
-      proposalStatus = (
-        <>
-          <span className="mr-2">{t('voteState_Rejected')}</span>
-          <Icon name={'warning-sign'} />
-        </>
-      );
-      break;
-    }
+  if (
+    proposal?.state === Schema.ProposalState.STATE_DECLINED ||
+    proposal?.state === Schema.ProposalState.STATE_FAILED ||
+    proposal?.state === Schema.ProposalState.STATE_REJECTED
+  ) {
+    className = 'text-danger';
+  } else if (
+    proposal?.state === Schema.ProposalState.STATE_ENACTED ||
+    proposal?.state === Schema.ProposalState.STATE_PASSED
+  ) {
+    className = 'text-white';
   }
-
-  return (
-    <ProposalInfoLabel variant={variant}>{proposalStatus}</ProposalInfoLabel>
-  );
+  return <span className={className}>{t(`${proposal?.state}`)}</span>;
 };

apps/governance/src/routes/proposals/components/current-proposal-status/current-proposal-status.spec.tsx

@@ -2,8 +2,8 @@ import type { MockedResponse } from '@apollo/client/testing';
 import { MockedProvider } from '@apollo/client/testing';
 import { render, screen } from '@testing-library/react';
 import { ProposalRejectionReason, ProposalState } from '@vegaprotocol/types';
-import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
-import { NetworkParamsDocument } from '@vegaprotocol/network-parameters';
+import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers';
+import { NetworkParamsDocument } from '@vegaprotocol/react-helpers';
 import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider';
 import { generateProposal } from '../../test-helpers/generate-proposals';
 import { CurrentProposalStatus } from './current-proposal-status';

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

@@ -56,7 +56,6 @@ const mockAppState: AppState = {
   ethConnectOverlay: false,
   transactionOverlay: false,
   bannerMessage: '',
-  disconnectNotice: false,
 };
 
 jest.mock('../../../contexts/app-state/app-state-context', () => ({

apps/governance/src/routes/proposals/components/proposal-change-table/proposal-change-table.spec.tsx

@@ -1,7 +1,8 @@
 import { render, screen } from '@testing-library/react';
 import { ProposalRejectionReason, ProposalState } from '@vegaprotocol/types';
-import { formatDateWithLocalTimezone } from '@vegaprotocol/utils';
+import { format } from 'date-fns';
 
+import { DATE_FORMAT_DETAILED } from '../../../../lib/date-formats';
 import { generateProposal } from '../../test-helpers/generate-proposals';
 import { ProposalChangeTable } from './proposal-change-table';
 
@@ -16,26 +17,37 @@ it('Renders all data for table', () => {
   render(<ProposalChangeTable proposal={proposal} />);
   expect(screen.getByText('ID')).toBeInTheDocument();
   expect(screen.getByText(proposal?.id as string)).toBeInTheDocument();
+
+  expect(screen.getByText('State')).toBeInTheDocument();
+  expect(screen.getByText('Open')).toBeInTheDocument();
+
   expect(screen.getByText('Closes on')).toBeInTheDocument();
   expect(
     screen.getByText(
-      formatDateWithLocalTimezone(new Date(proposal?.terms.closingDatetime))
+      format(new Date(proposal?.terms.closingDatetime), DATE_FORMAT_DETAILED)
     )
   ).toBeInTheDocument();
+
   expect(screen.getByText('Proposed enactment')).toBeInTheDocument();
   expect(
     screen.getByText(
-      formatDateWithLocalTimezone(
-        new Date(proposal?.terms.enactmentDatetime || 0)
+      format(
+        new Date(proposal?.terms.enactmentDatetime || 0),
+        DATE_FORMAT_DETAILED
       )
     )
   ).toBeInTheDocument();
+
   expect(screen.getByText('Proposed by')).toBeInTheDocument();
   expect(screen.getByText(proposal?.party.id ?? '')).toBeInTheDocument();
+
   expect(screen.getByText('Proposed on')).toBeInTheDocument();
   expect(
-    screen.getByText(formatDateWithLocalTimezone(new Date(proposal?.datetime)))
+    screen.getByText(format(new Date(proposal?.datetime), DATE_FORMAT_DETAILED))
   ).toBeInTheDocument();
+
+  expect(screen.getByText('Type')).toBeInTheDocument();
+  expect(screen.getByText('Network parameter')).toBeInTheDocument();
 });
 
 it('Changes data based on if data is in future or past', () => {
@@ -43,17 +55,23 @@ it('Changes data based on if data is in future or past', () => {
     state: ProposalState.STATE_ENACTED,
   });
   render(<ProposalChangeTable proposal={proposal} />);
+
+  expect(screen.getByText('State')).toBeInTheDocument();
+  expect(screen.getByText('Enacted')).toBeInTheDocument();
+
   expect(screen.getByText('Closed on')).toBeInTheDocument();
   expect(
     screen.getByText(
-      formatDateWithLocalTimezone(new Date(proposal?.terms.closingDatetime))
+      format(new Date(proposal?.terms.closingDatetime), DATE_FORMAT_DETAILED)
     )
   ).toBeInTheDocument();
+
   expect(screen.getByText('Enacted on')).toBeInTheDocument();
   expect(
     screen.getByText(
-      formatDateWithLocalTimezone(
-        new Date(proposal?.terms.enactmentDatetime || 0)
+      format(
+        new Date(proposal?.terms.enactmentDatetime || 0),
+        DATE_FORMAT_DETAILED
       )
     )
   ).toBeInTheDocument();
@@ -73,8 +91,9 @@ it('Does not render enactment time for freeform proposal', () => {
   expect(screen.queryByText('Enacted on')).not.toBeInTheDocument();
   expect(
     screen.queryByText(
-      formatDateWithLocalTimezone(
-        new Date(proposal?.terms.enactmentDatetime || 0)
+      format(
+        new Date(proposal?.terms.enactmentDatetime || 0),
+        DATE_FORMAT_DETAILED
       )
     )
   ).not.toBeInTheDocument();
@@ -89,6 +108,7 @@ it('Renders error details and rejection reason if present', () => {
   render(<ProposalChangeTable proposal={proposal} />);
   expect(screen.getByText('Error details')).toBeInTheDocument();
   expect(screen.getByText(errorDetails)).toBeInTheDocument();
+
   expect(screen.getByText('Rejection reason')).toBeInTheDocument();
   expect(
     screen.getByText(ProposalRejectionReason.PROPOSAL_ERROR_CLOSE_TIME_TOO_LATE)

apps/governance/src/routes/proposals/components/proposal-change-table/proposal-change-table.tsx

@@ -1,11 +1,13 @@
-import { isFuture } from 'date-fns';
+import { format, isFuture } from 'date-fns';
 import { useTranslation } from 'react-i18next';
-import { formatDateWithLocalTimezone } from '@vegaprotocol/utils';
+
 import {
   KeyValueTable,
   KeyValueTableRow,
   RoundedWrapper,
 } from '@vegaprotocol/ui-toolkit';
+import { DATE_FORMAT_DETAILED } from '../../../../lib/date-formats';
+import { CurrentProposalState } from '../current-proposal-state';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 
@@ -19,25 +21,30 @@ export const ProposalChangeTable = ({ proposal }: ProposalChangeTableProps) => {
   const terms = proposal?.terms;
 
   return (
-    <RoundedWrapper paddingBottom={true}>
+    <RoundedWrapper>
       <KeyValueTable data-testid="proposal-change-table">
         <KeyValueTableRow>
           {t('id')}
           {proposal?.id}
         </KeyValueTableRow>
+        <KeyValueTableRow>
+          {t('state')}
+          <CurrentProposalState proposal={proposal} />
+        </KeyValueTableRow>
         <KeyValueTableRow>
           {isFuture(new Date(terms?.closingDatetime))
             ? t('closesOn')
             : t('closedOn')}
-          {formatDateWithLocalTimezone(new Date(terms?.closingDatetime))}
+          {format(new Date(terms?.closingDatetime), DATE_FORMAT_DETAILED)}
         </KeyValueTableRow>
         {terms?.change.__typename !== 'NewFreeform' ? (
           <KeyValueTableRow>
             {isFuture(new Date(terms?.enactmentDatetime || 0))
               ? t('proposedEnactment')
               : t('enactedOn')}
-            {formatDateWithLocalTimezone(
-              new Date(terms?.enactmentDatetime || 0)
+            {format(
+              new Date(terms?.enactmentDatetime || 0),
+              DATE_FORMAT_DETAILED
             )}
           </KeyValueTableRow>
         ) : null}
@@ -45,24 +52,26 @@ export const ProposalChangeTable = ({ proposal }: ProposalChangeTableProps) => {
           {t('proposedBy')}
           <span style={{ wordBreak: 'break-word' }}>{proposal?.party.id}</span>
         </KeyValueTableRow>
-        <KeyValueTableRow
-          noBorder={!proposal?.rejectionReason && !proposal?.errorDetails}
-        >
+        <KeyValueTableRow>
           {t('proposedOn')}
-          {formatDateWithLocalTimezone(new Date(proposal?.datetime))}
+          {format(new Date(proposal?.datetime), DATE_FORMAT_DETAILED)}
         </KeyValueTableRow>
         {proposal?.rejectionReason ? (
-          <KeyValueTableRow noBorder={!proposal?.errorDetails}>
+          <KeyValueTableRow>
             {t('rejectionReason')}
             {proposal.rejectionReason}
           </KeyValueTableRow>
         ) : null}
         {proposal?.errorDetails ? (
-          <KeyValueTableRow noBorder={true}>
+          <KeyValueTableRow>
             {t('errorDetails')}
             {proposal.errorDetails}
           </KeyValueTableRow>
         ) : null}
+        <KeyValueTableRow>
+          {t('type')}
+          {t(`${proposal?.terms.change.__typename}`)}
+        </KeyValueTableRow>
       </KeyValueTable>
     </RoundedWrapper>
   );

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

@@ -1,68 +1,68 @@
 import { render, screen } from '@testing-library/react';
-import {
-  generateNoVotes,
-  generateProposal,
-  generateYesVotes,
-} from '../../test-helpers/generate-proposals';
+import { generateProposal } from '../../test-helpers/generate-proposals';
 import { ProposalHeader } from './proposal-header';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
-import { ProposalRejectionReason, ProposalState } from '@vegaprotocol/types';
-import { lastWeek, nextWeek } from '../../test-helpers/mocks';
 
-const renderComponent = (
-  proposal: ProposalQuery['proposal'],
-  isListItem = true
-) => render(<ProposalHeader proposal={proposal} isListItem={isListItem} />);
+const renderComponent = (proposal: ProposalQuery['proposal']) => (
+  <ProposalHeader proposal={proposal} />
+);
 
 describe('Proposal header', () => {
   it('Renders New market proposal', () => {
-    renderComponent(
-      generateProposal({
-        rationale: {
-          title: 'New some market',
-          description: 'A new some market',
-        },
-        terms: {
-          change: {
-            __typename: 'NewMarket',
-            instrument: {
-              __typename: 'InstrumentConfiguration',
-              name: 'Some market',
-              code: 'FX:BTCUSD/DEC99',
-              futureProduct: {
-                __typename: 'FutureProduct',
-                settlementAsset: {
-                  __typename: 'Asset',
-                  symbol: 'tGBP',
+    render(
+      renderComponent(
+        generateProposal({
+          rationale: {
+            title: 'New some market',
+            description: 'A new some market',
+          },
+          terms: {
+            change: {
+              __typename: 'NewMarket',
+              instrument: {
+                __typename: 'InstrumentConfiguration',
+                name: 'Some market',
+                code: 'FX:BTCUSD/DEC99',
+                futureProduct: {
+                  __typename: 'FutureProduct',
+                  settlementAsset: {
+                    __typename: 'Asset',
+                    symbol: 'tGBP',
+                  },
                 },
               },
             },
           },
-        },
-      })
+        })
+      )
     );
     expect(screen.getByTestId('proposal-title')).toHaveTextContent(
       'New some market'
     );
     expect(screen.getByTestId('proposal-type')).toHaveTextContent('New market');
+    expect(screen.getByTestId('proposal-description')).toHaveTextContent(
+      'A new some market'
+    );
     expect(screen.getByTestId('proposal-details')).toHaveTextContent(
       'tGBP settled future.'
     );
   });
 
   it('Renders Update market proposal', () => {
-    renderComponent(
-      generateProposal({
-        rationale: {
-          title: 'New market id',
-        },
-        terms: {
-          change: {
-            __typename: 'UpdateMarket',
-            marketId: 'MarketId',
+    render(
+      renderComponent(
+        generateProposal({
+          rationale: {
+            title: 'New market id',
           },
-        },
-      })
+          terms: {
+            change: {
+              __typename: 'UpdateMarket',
+              marketId: 'MarketId',
+            },
+          },
+        })
+      )
     );
     expect(screen.getByTestId('proposal-title')).toHaveTextContent(
       'New market id'
@@ -79,49 +79,53 @@ describe('Proposal header', () => {
   });
 
   it('Renders New asset proposal - ERC20', () => {
-    renderComponent(
-      generateProposal({
-        rationale: {
-          title: 'New asset: Fake currency',
-          description: '',
-        },
-        terms: {
-          change: {
-            __typename: 'NewAsset',
-            name: 'Fake currency',
-            symbol: 'FAKE',
-            source: {
-              __typename: 'ERC20',
-              contractAddress: '0x0',
+    render(
+      renderComponent(
+        generateProposal({
+          rationale: {
+            title: 'New asset: Fake currency',
+            description: '',
+          },
+          terms: {
+            change: {
+              __typename: 'NewAsset',
+              name: 'Fake currency',
+              symbol: 'FAKE',
+              source: {
+                __typename: 'ERC20',
+                contractAddress: '0x0',
+              },
             },
           },
-        },
-      })
+        })
+      )
     );
     expect(screen.getByTestId('proposal-title')).toHaveTextContent(
       'New asset: Fake currency'
     );
     expect(screen.getByTestId('proposal-type')).toHaveTextContent('New asset');
     expect(screen.getByTestId('proposal-details')).toHaveTextContent(
-      'Symbol: FAKE. ERC20 contract address: 0x0'
+      'Symbol: FAKE. ERC20 0x0'
     );
   });
 
   it('Renders New asset proposal - BuiltInAsset', () => {
-    renderComponent(
-      generateProposal({
-        terms: {
-          change: {
-            __typename: 'NewAsset',
-            name: 'Fake currency',
-            symbol: 'BIA',
-            source: {
-              __typename: 'BuiltinAsset',
-              maxFaucetAmountMint: '300',
+    render(
+      renderComponent(
+        generateProposal({
+          terms: {
+            change: {
+              __typename: 'NewAsset',
+              name: 'Fake currency',
+              symbol: 'BIA',
+              source: {
+                __typename: 'BuiltinAsset',
+                maxFaucetAmountMint: '300',
+              },
             },
           },
-        },
-      })
+        })
+      )
     );
     expect(screen.getByTestId('proposal-title')).toHaveTextContent(
       'Unknown proposal'
@@ -133,22 +137,24 @@ describe('Proposal header', () => {
   });
 
   it('Renders Update network', () => {
-    renderComponent(
-      generateProposal({
-        rationale: {
-          title: 'Network parameter',
-        },
-        terms: {
-          change: {
-            __typename: 'UpdateNetworkParameter',
-            networkParameter: {
-              __typename: 'NetworkParameter',
-              key: 'Network key',
-              value: 'Network value',
+    render(
+      renderComponent(
+        generateProposal({
+          rationale: {
+            title: 'Network parameter',
+          },
+          terms: {
+            change: {
+              __typename: 'UpdateNetworkParameter',
+              networkParameter: {
+                __typename: 'NetworkParameter',
+                key: 'Network key',
+                value: 'Network value',
+              },
             },
           },
-        },
-      })
+        })
+      )
     );
     expect(screen.getByTestId('proposal-title')).toHaveTextContent(
       'Network parameter'
@@ -161,211 +167,122 @@ describe('Proposal header', () => {
     );
   });
 
-  it('Renders Freeform proposal - short rationale', () => {
-    renderComponent(
-      generateProposal({
-        id: 'short',
-        rationale: {
-          title: '0x0',
-        },
-        terms: {
-          change: {
-            __typename: 'NewFreeform',
+  it('Renders Freeform network - short rationale', () => {
+    render(
+      renderComponent(
+        generateProposal({
+          id: 'short',
+          rationale: {
+            title: '0x0',
           },
-        },
-      })
+          terms: {
+            change: {
+              __typename: 'NewFreeform',
+            },
+          },
+        })
+      )
     );
     expect(screen.getByTestId('proposal-title')).toHaveTextContent('0x0');
     expect(screen.getByTestId('proposal-type')).toHaveTextContent('Freeform');
     expect(
       screen.queryByTestId('proposal-description')
     ).not.toBeInTheDocument();
+    expect(screen.getByTestId('proposal-details')).toHaveTextContent('short');
   });
 
-  it('Renders Freeform proposal - long rationale (105 chars) - listing', () => {
-    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',
+  it('Renders Freeform proposal - long rationale (105 chars)', () => {
+    render(
+      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',
+            },
+          },
+        })
+      )
     );
+    // For a rationale over 100 chars, we expect the header to be truncated at
+    // 100 chars with ellipsis and the details-one element to contain the rest.
     expect(screen.getByTestId('proposal-title')).toHaveTextContent('0x0');
     expect(screen.getByTestId('proposal-type')).toHaveTextContent('Freeform');
-    // Rationale in list view is not rendered
-    expect(
-      screen.queryByTestId('proposal-description')
-    ).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/
+      'Class aptent taciti sociosqu ad litora torquent per conubia'
     );
+    expect(screen.getByTestId('proposal-details')).toHaveTextContent('long');
   });
 
   // Remove once proposals have rationale and re-enable above tests
   it('Renders Freeform proposal - id for title', () => {
-    renderComponent(
-      generateProposal({
-        id: 'freeform id',
-        rationale: {
-          title: 'freeform',
-        },
-        terms: {
-          change: {
-            __typename: 'NewFreeform',
+    render(
+      renderComponent(
+        generateProposal({
+          id: 'freeform id',
+          rationale: {
+            title: 'freeform',
           },
-        },
-      })
+          terms: {
+            change: {
+              __typename: 'NewFreeform',
+            },
+          },
+        })
+      )
     );
     expect(screen.getByTestId('proposal-title')).toHaveTextContent('freeform');
     expect(screen.getByTestId('proposal-type')).toHaveTextContent('Freeform');
     expect(
       screen.queryByTestId('proposal-description')
     ).not.toBeInTheDocument();
+    expect(screen.queryByTestId('proposal-details')).toHaveTextContent(
+      'freeform id'
+    );
   });
 
   it('Renders asset change proposal header', () => {
-    renderComponent(
-      generateProposal({
-        terms: {
-          change: {
-            __typename: 'UpdateAsset',
-            assetId: 'foo',
+    render(
+      renderComponent(
+        generateProposal({
+          terms: {
+            change: {
+              __typename: 'UpdateAsset',
+              assetId: 'foo',
+            },
           },
-        },
-      })
+        })
+      )
     );
     expect(screen.getByTestId('proposal-type')).toHaveTextContent(
       'Update asset'
     );
+    expect(screen.getByTestId('proposal-details')).toHaveTextContent(
+      'Update asset'
+    );
     expect(screen.getByText('foo')).toBeInTheDocument();
   });
 
   it("Renders unknown proposal if it's a different proposal type", () => {
-    renderComponent(
-      generateProposal({
-        terms: {
-          change: {
-            // @ts-ignore unknown proposal
-            __typename: 'Foo',
+    render(
+      renderComponent(
+        generateProposal({
+          terms: {
+            change: {
+              // @ts-ignore unknown proposal
+              __typename: 'Foo',
+            },
           },
-        },
-      })
+        })
+      )
     );
     expect(screen.getByTestId('proposal-title')).toHaveTextContent(
       'Unknown proposal'
     );
   });
-
-  it('Renders proposal state: Enacted', () => {
-    renderComponent(
-      generateProposal({
-        state: ProposalState.STATE_ENACTED,
-        terms: {
-          enactmentDatetime: lastWeek.toString(),
-        },
-      })
-    );
-    expect(screen.getByTestId('proposal-status')).toHaveTextContent('Enacted');
-  });
-
-  it('Renders proposal state: Passed', () => {
-    renderComponent(
-      generateProposal({
-        state: ProposalState.STATE_PASSED,
-        terms: {
-          closingDatetime: lastWeek.toString(),
-          enactmentDatetime: nextWeek.toString(),
-        },
-      })
-    );
-    expect(screen.getByTestId('proposal-status')).toHaveTextContent('Passed');
-  });
-
-  it('Renders proposal state: Waiting for node vote', () => {
-    renderComponent(
-      generateProposal({
-        state: ProposalState.STATE_WAITING_FOR_NODE_VOTE,
-        terms: {
-          enactmentDatetime: nextWeek.toString(),
-        },
-      })
-    );
-    expect(screen.getByTestId('proposal-status')).toHaveTextContent(
-      'Waiting for node vote'
-    );
-  });
-
-  it('Renders proposal state: Open', () => {
-    renderComponent(
-      generateProposal({
-        state: ProposalState.STATE_OPEN,
-        votes: {
-          __typename: 'ProposalVotes',
-          yes: generateYesVotes(3000, 1000000000000000000),
-          no: generateNoVotes(0),
-        },
-        terms: {
-          closingDatetime: nextWeek.toString(),
-        },
-      })
-    );
-    expect(screen.getByTestId('proposal-status')).toHaveTextContent('Open');
-  });
-
-  it('Renders proposal state: Declined - majority not reached', () => {
-    renderComponent(
-      generateProposal({
-        state: ProposalState.STATE_DECLINED,
-        terms: {
-          enactmentDatetime: lastWeek.toString(),
-        },
-        votes: {
-          no: generateNoVotes(1, 1000000000000000000),
-          yes: generateYesVotes(1, 1000000000000000000),
-        },
-      })
-    );
-    expect(screen.getByTestId('proposal-status')).toHaveTextContent('Declined');
-  });
-
-  it('Renders proposal state: Rejected', () => {
-    renderComponent(
-      generateProposal({
-        state: ProposalState.STATE_REJECTED,
-        terms: {
-          enactmentDatetime: lastWeek.toString(),
-        },
-        rejectionReason:
-          ProposalRejectionReason.PROPOSAL_ERROR_INVALID_FUTURE_PRODUCT,
-      })
-    );
-    expect(screen.getByTestId('proposal-status')).toHaveTextContent('Rejected');
-  });
 });

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

@@ -1,27 +1,23 @@
 import { useTranslation } from 'react-i18next';
-import { Lozenge } from '@vegaprotocol/ui-toolkit';
+import { Intent, Lozenge } from '@vegaprotocol/ui-toolkit';
 import { shorten } from '@vegaprotocol/utils';
 import { Heading, SubHeading } from '../../../../components/heading';
 import type { ReactNode } from 'react';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
-import ReactMarkdown from 'react-markdown';
-import { truncateMiddle } from '../../../../lib/truncate-middle';
-import { CurrentProposalState } from '../current-proposal-state';
-import { ProposalInfoLabel } from '../proposal-info-label';
 
 export const ProposalHeader = ({
   proposal,
-  isListItem = true,
+  useSubHeading = true,
 }: {
   proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
-  isListItem?: boolean;
+  useSubHeading?: boolean;
 }) => {
   const { t } = useTranslation();
   const change = proposal?.terms.change;
 
   let details: ReactNode;
-  let proposalType = '';
+  let proposalType: ReactNode;
 
   let title = proposal?.rationale.title.trim();
   let description = proposal?.rationale.description.trim();
@@ -34,12 +30,10 @@ export const ProposalHeader = ({
 
   switch (change?.__typename) {
     case 'NewMarket': {
-      proposalType = 'NewMarket';
+      proposalType = t('NewMarket');
       details = (
         <>
-          <span>
-            {t('Code')}: {change.instrument.code}.
-          </span>{' '}
+          {t('Code')}: {change.instrument.code}.{' '}
           {change.instrument.futureProduct?.settlementAsset.symbol ? (
             <>
               <span className="font-semibold">
@@ -55,61 +49,54 @@ export const ProposalHeader = ({
       break;
     }
     case 'UpdateMarket': {
-      proposalType = 'UpdateMarket';
-      details = (
-        <>
-          <span>{t('Market change')}:</span>{' '}
-          <span>{truncateMiddle(change.marketId)}</span>
-        </>
-      );
+      proposalType = t('UpdateMarket');
+      details = `${t('Market change')}: ${change.marketId}`;
       break;
     }
     case 'NewAsset': {
-      proposalType = 'NewAsset';
+      proposalType = t('NewAsset');
       details = (
         <>
-          <span>{t('Symbol')}:</span> <Lozenge>{change.symbol}.</Lozenge>{' '}
-          {change.source.__typename === 'ERC20' && (
-            <>
-              <span>{t('ERC20ContractAddress')}:</span>{' '}
-              <Lozenge>{change.source.contractAddress}</Lozenge>
-            </>
-          )}{' '}
-          {change.source.__typename === 'BuiltinAsset' && (
-            <>
-              <span>{t('MaxFaucetAmountMint')}:</span>{' '}
-              <Lozenge>{change.source.maxFaucetAmountMint}</Lozenge>
-            </>
-          )}
+          {t('Symbol')}: {change.symbol}.{' '}
+          <Lozenge>
+            {change.source.__typename === 'ERC20' &&
+              `ERC20 ${change.source.contractAddress}`}
+            {change.source.__typename === 'BuiltinAsset' &&
+              `${t('Max faucet amount mint')}: ${
+                change.source.maxFaucetAmountMint
+              }`}
+          </Lozenge>
         </>
       );
       break;
     }
     case 'UpdateNetworkParameter': {
-      proposalType = 'NetworkParameter';
+      proposalType = t('NetworkParameter');
+      const parametersClasses = 'font-mono leading-none';
       details = (
         <>
-          <span>{t('Change')}:</span>{' '}
-          <Lozenge>{change.networkParameter.key}</Lozenge>{' '}
-          <span>{t('to')}</span>{' '}
-          <span className="whitespace-nowrap">
-            <Lozenge>{change.networkParameter.value}</Lozenge>
+          <span className={`${parametersClasses} mr-2`}>
+            {change.networkParameter.key}
+          </span>{' '}
+          {t('to')}{' '}
+          <span className={`${parametersClasses} ml-2`}>
+            {change.networkParameter.value}
           </span>
         </>
       );
       break;
     }
     case 'NewFreeform': {
-      proposalType = 'Freeform';
-      details = <span />;
+      proposalType = t('Freeform');
+      details = `${t('FreeformProposal')}: ${proposal?.id}`;
       break;
     }
     case 'UpdateAsset': {
-      proposalType = 'UpdateAsset';
+      proposalType = t('UpdateAsset');
       details = (
         <>
-          <span>{t('AssetID')}:</span>{' '}
-          <Lozenge>{truncateMiddle(change.assetId)}</Lozenge>
+          `${t('Update asset')}`;
+          <Lozenge>{change.assetId}</Lozenge>
         </>
       );
       break;
@@ -117,9 +104,9 @@ export const ProposalHeader = ({
   }
 
   return (
-    <>
+    <div className="text-sm mb-2">
       <div data-testid="proposal-title">
-        {isListItem ? (
+        {useSubHeading ? (
           <header>
             <SubHeading title={titleContent || t('Unknown proposal')} />
           </header>
@@ -129,39 +116,18 @@ export const ProposalHeader = ({
       </div>
 
       <div className="flex items-center gap-2 mb-4">
-        <div data-testid="proposal-type">
-          <ProposalInfoLabel variant="secondary">
-            {t(`${proposalType}`)}
-          </ProposalInfoLabel>
-        </div>
+        {proposalType && (
+          <div data-testid="proposal-type">
+            <Lozenge variant={Intent.None}>{proposalType}</Lozenge>
+          </div>
+        )}
 
-        <div data-testid="proposal-status">
-          <CurrentProposalState proposal={proposal} />
-        </div>
+        {description && (
+          <div data-testid="proposal-description">{description}</div>
+        )}
       </div>
 
-      {details && (
-        <div data-testid="proposal-details" className="break-words my-10">
-          {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>
-      )}
-    </>
+      {details && <div data-testid="proposal-details">{details}</div>}
+    </div>
   );
 };

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

@@ -1 +0,0 @@
-export * from './proposal-info-label';

apps/governance/src/routes/proposals/components/proposal-info-label/proposal-info-label.tsx

@@ -1,35 +0,0 @@
-import classNames from 'classnames';
-import type { ReactNode } from 'react';
-
-export type ProposalInfoLabelVariant =
-  | 'primary'
-  | 'secondary'
-  | 'tertiary'
-  | 'highlight';
-
-const base = 'rounded-md px-2 py-1 font-alpha';
-const primary = 'bg-vega-light-150 text-black';
-const secondary = 'bg-vega-dark-200 text-white';
-const tertiary = 'bg-vega-dark-150 text-white';
-const highlight = 'bg-vega-yellow text-black';
-
-const getClassname = (variant: ProposalInfoLabelVariant) => {
-  return classNames(base, {
-    [primary]: variant === 'primary',
-    [secondary]: variant === 'secondary',
-    [tertiary]: variant === 'tertiary',
-    [highlight]: variant === 'highlight',
-  });
-};
-
-interface ProposalInfoLabelProps {
-  children: ReactNode;
-  variant?: ProposalInfoLabelVariant;
-}
-
-export const ProposalInfoLabel = ({
-  children,
-  variant = 'primary',
-}: ProposalInfoLabelProps) => {
-  return <div className={getClassname(variant)}>{children}</div>;
-};

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

@@ -1,10 +1,8 @@
 import { useTranslation } from 'react-i18next';
-import { Icon, SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
+import { SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
 import { SubHeading } from '../../../../components/heading';
 import type { PartialDeep } from 'type-fest';
 import type * as Schema from '@vegaprotocol/types';
-import { useState } from 'react';
-import classnames from 'classnames';
 
 export const ProposalTermsJson = ({
   terms,
@@ -12,26 +10,10 @@ export const ProposalTermsJson = ({
   terms: PartialDeep<Schema.ProposalTerms>;
 }) => {
   const { t } = useTranslation();
-  const [showDetails, setShowDetails] = useState(false);
-  const showDetailsIconClasses = classnames('mb-4', {
-    'rotate-180': showDetails,
-  });
-
   return (
     <section>
-      <button
-        onClick={() => setShowDetails(!showDetails)}
-        data-testid="proposal-terms-toggle"
-      >
-        <div className="flex items-center gap-3">
-          <SubHeading title={t('proposalTerms')} />
-          <div className={showDetailsIconClasses}>
-            <Icon name="chevron-down" size={8} />
-          </div>
-        </div>
-      </button>
-
-      {showDetails && <SyntaxHighlighter data={terms} />}
+      <SubHeading title={t('proposalTerms')} />
+      <SyntaxHighlighter data={terms} />
     </section>
   );
 };

apps/governance/src/routes/proposals/components/proposal-votes-table/proposal-votes-table.spec.tsx

@@ -1,4 +1,4 @@
-import { render, screen, fireEvent } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
 import { MockedProvider } from '@apollo/client/testing';
 import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider';
 import { ProposalVotesTable } from './proposal-votes-table';
@@ -46,7 +46,6 @@ describe('Proposal Votes Table', () => {
 
   it('should show vote breakdown fields, excluding custom update market fields', () => {
     renderComponent();
-    fireEvent.click(screen.getByTestId('vote-breakdown-toggle'));
     expect(screen.getByText('Expected to pass')).toBeInTheDocument();
     expect(screen.getByText('Token majority met')).toBeInTheDocument();
     expect(screen.getByText('Token participation met')).toBeInTheDocument();
@@ -56,7 +55,7 @@ describe('Proposal Votes Table', () => {
     expect(screen.getByText('Participation required')).toBeInTheDocument();
     expect(screen.getByText('Majority Required')).toBeInTheDocument();
     expect(screen.getByText('Number of voting parties')).toBeInTheDocument();
-    expect(screen.getByText('Total tokens voted')).toBeInTheDocument();
+    expect(screen.getByText('Total yes tokens')).toBeInTheDocument();
     expect(
       screen.getByText('Total tokens voted percentage')
     ).toBeInTheDocument();
@@ -71,14 +70,13 @@ describe('Proposal Votes Table', () => {
 
   it('displays different breakdown fields for update market proposal', () => {
     renderComponent(updateMarketProposal, updateMarketProposalType);
-    fireEvent.click(screen.getByTestId('vote-breakdown-toggle'));
     expect(screen.getByText('Liquidity majority met')).toBeInTheDocument();
     expect(screen.getByText('Liquidity participation met')).toBeInTheDocument();
     expect(
       screen.getByText('Liquidity shares for proposal')
     ).toBeInTheDocument();
     expect(screen.queryByText('Number of voting parties')).toBeNull();
-    expect(screen.queryByText('Total tokens voted')).toBeNull();
+    expect(screen.queryByText('Total yes tokens')).toBeNull();
     expect(screen.queryByText('Total tokens voted percentage')).toBeNull();
     expect(screen.queryByText('Number of votes for')).toBeNull();
     expect(screen.queryByText('Number of votes against')).toBeNull();
@@ -88,7 +86,6 @@ describe('Proposal Votes Table', () => {
 
   it('displays if an update market proposal will pass by token vote', () => {
     renderComponent(updateMarketProposal, updateMarketProposalType);
-    fireEvent.click(screen.getByTestId('vote-breakdown-toggle'));
     expect(screen.getByText('👍 by token vote')).toBeInTheDocument();
   });
 
@@ -113,7 +110,6 @@ describe('Proposal Votes Table', () => {
       }),
       updateMarketProposalType
     );
-    fireEvent.click(screen.getByTestId('vote-breakdown-toggle'));
     expect(screen.getByText('👍 by liquidity vote')).toBeInTheDocument();
   });
 });

apps/governance/src/routes/proposals/components/proposal-votes-table/proposal-votes-table.tsx

@@ -1,12 +1,9 @@
-import classnames from 'classnames';
-import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import {
   KeyValueTable,
   KeyValueTableRow,
   Thumbs,
   RoundedWrapper,
-  Icon,
 } from '@vegaprotocol/ui-toolkit';
 import { formatNumber, formatNumberPercentage } from '@vegaprotocol/utils';
 import { SubHeading } from '../../../../components/heading';
@@ -29,7 +26,6 @@ export const ProposalVotesTable = ({
   const {
     appState: { totalSupply },
   } = useAppState();
-  const [showDetails, setShowDetails] = useState(false);
   const {
     willPassByTokenVote,
     willPassByLPVote,
@@ -57,130 +53,113 @@ export const ProposalVotesTable = ({
     ? t('byTokenVote')
     : t('byLiquidityVote');
 
-  const showDetailsIconClasses = classnames('mb-4', {
-    'rotate-180': showDetails,
-  });
-
   return (
     <>
-      <button
-        onClick={() => setShowDetails(!showDetails)}
-        data-testid="vote-breakdown-toggle"
-      >
-        <div className="flex items-center gap-3">
-          <SubHeading title={t('voteBreakdown')} />
-          <div className={showDetailsIconClasses}>
-            <Icon name="chevron-down" size={8} />
-          </div>
-        </div>
-      </button>
-
-      {showDetails && (
-        <RoundedWrapper marginBottomLarge={true} paddingBottom={true}>
-          <KeyValueTable
-            data-testid="proposal-votes-table"
-            numerical={true}
-            headingLevel={4}
-          >
+      <SubHeading title={t('voteBreakdown')} />
+      <RoundedWrapper>
+        <KeyValueTable
+          data-testid="proposal-votes-table"
+          numerical={true}
+          headingLevel={4}
+        >
+          <KeyValueTableRow>
+            {t('expectedToPass')}
+            {isUpdateMarket ? (
+              updateMarketWillPass ? (
+                <Thumbs up={true} text={updateMarketVotePassMethod} />
+              ) : (
+                <Thumbs up={false} />
+              )
+            ) : willPassByTokenVote ? (
+              <Thumbs up={true} />
+            ) : (
+              <Thumbs up={false} />
+            )}
+          </KeyValueTableRow>
+          <KeyValueTableRow>
+            {t('majorityMet')}
+            {majorityMet ? <Thumbs up={true} /> : <Thumbs up={false} />}
+          </KeyValueTableRow>
+          {isUpdateMarket && (
             <KeyValueTableRow>
-              {t('expectedToPass')}
-              {isUpdateMarket ? (
-                updateMarketWillPass ? (
-                  <Thumbs up={true} text={updateMarketVotePassMethod} />
-                ) : (
-                  <Thumbs up={false} />
-                )
-              ) : willPassByTokenVote ? (
+              {t('majorityLPMet')}
+              {majorityLPMet ? <Thumbs up={true} /> : <Thumbs up={false} />}
+            </KeyValueTableRow>
+          )}
+          <KeyValueTableRow>
+            {t('participationMet')}
+            {participationMet ? <Thumbs up={true} /> : <Thumbs up={false} />}
+          </KeyValueTableRow>
+          {isUpdateMarket && (
+            <KeyValueTableRow>
+              {t('participationLPMet')}
+              {participationLPMet ? (
                 <Thumbs up={true} />
               ) : (
                 <Thumbs up={false} />
               )}
             </KeyValueTableRow>
+          )}
+          <KeyValueTableRow>
+            {t('tokenForProposal')}
+            {formatNumber(yesTokens, 2)}
+          </KeyValueTableRow>
+          {isUpdateMarket && (
             <KeyValueTableRow>
-              {t('majorityMet')}
-              {majorityMet ? <Thumbs up={true} /> : <Thumbs up={false} />}
+              {t('tokenLPForProposal')}
+              {formatNumber(yesEquityLikeShareWeight, 2)}
             </KeyValueTableRow>
-            {isUpdateMarket && (
+          )}
+          <KeyValueTableRow>
+            {t('totalSupply')}
+            {formatNumber(totalSupply, 2)}
+          </KeyValueTableRow>
+          <KeyValueTableRow>
+            {t('tokensAgainstProposal')}
+            {formatNumber(noTokens, 2)}
+          </KeyValueTableRow>
+          <KeyValueTableRow>
+            {t('participationRequired')}
+            {formatNumberPercentage(requiredParticipation)}
+          </KeyValueTableRow>
+          <KeyValueTableRow>
+            {t('majorityRequired')}
+            {formatNumberPercentage(requiredMajorityPercentage)}
+          </KeyValueTableRow>
+          {!isUpdateMarket && (
+            <>
               <KeyValueTableRow>
-                {t('majorityLPMet')}
-                {majorityLPMet ? <Thumbs up={true} /> : <Thumbs up={false} />}
+                {t('numberOfVotingParties')}
+                {formatNumber(totalVotes, 0)}
               </KeyValueTableRow>
-            )}
-            <KeyValueTableRow>
-              {t('participationMet')}
-              {participationMet ? <Thumbs up={true} /> : <Thumbs up={false} />}
-            </KeyValueTableRow>
-            {isUpdateMarket && (
               <KeyValueTableRow>
-                {t('participationLPMet')}
-                {participationLPMet ? (
-                  <Thumbs up={true} />
-                ) : (
-                  <Thumbs up={false} />
-                )}
+                {t('totalTokensVotes')}
+                {formatNumber(totalTokensVoted, 2)}
               </KeyValueTableRow>
-            )}
-            <KeyValueTableRow>
-              {t('tokenForProposal')}
-              {formatNumber(yesTokens, 2)}
-            </KeyValueTableRow>
-            {isUpdateMarket && (
               <KeyValueTableRow>
-                {t('tokenLPForProposal')}
-                {formatNumber(yesEquityLikeShareWeight, 2)}
+                {t('totalTokenVotedPercentage')}
+                {formatNumberPercentage(totalTokensPercentage, 2)}
               </KeyValueTableRow>
-            )}
-            <KeyValueTableRow>
-              {t('totalSupply')}
-              {formatNumber(totalSupply, 2)}
-            </KeyValueTableRow>
-            <KeyValueTableRow>
-              {t('tokensAgainstProposal')}
-              {formatNumber(noTokens, 2)}
-            </KeyValueTableRow>
-            <KeyValueTableRow>
-              {t('participationRequired')}
-              {formatNumberPercentage(requiredParticipation)}
-            </KeyValueTableRow>
-            <KeyValueTableRow>
-              {t('majorityRequired')}
-              {formatNumberPercentage(requiredMajorityPercentage)}
-            </KeyValueTableRow>
-            {!isUpdateMarket && (
-              <>
-                <KeyValueTableRow>
-                  {t('numberOfVotingParties')}
-                  {formatNumber(totalVotes, 0)}
-                </KeyValueTableRow>
-                <KeyValueTableRow>
-                  {t('totalTokensVotes')}
-                  {formatNumber(totalTokensVoted, 2)}
-                </KeyValueTableRow>
-                <KeyValueTableRow>
-                  {t('totalTokenVotedPercentage')}
-                  {formatNumberPercentage(totalTokensPercentage, 2)}
-                </KeyValueTableRow>
-                <KeyValueTableRow>
-                  {t('numberOfForVotes')}
-                  {formatNumber(yesVotes, 0)}
-                </KeyValueTableRow>
-                <KeyValueTableRow>
-                  {t('numberOfAgainstVotes')}
-                  {formatNumber(noVotes, 0)}
-                </KeyValueTableRow>
-                <KeyValueTableRow>
-                  {t('yesPercentage')}
-                  {formatNumberPercentage(yesPercentage, 2)}
-                </KeyValueTableRow>
-                <KeyValueTableRow noBorder={true}>
-                  {t('noPercentage')}
-                  {formatNumberPercentage(noPercentage, 2)}
-                </KeyValueTableRow>
-              </>
-            )}
-          </KeyValueTable>
-        </RoundedWrapper>
-      )}
+              <KeyValueTableRow>
+                {t('numberOfForVotes')}
+                {formatNumber(yesVotes, 0)}
+              </KeyValueTableRow>
+              <KeyValueTableRow>
+                {t('numberOfAgainstVotes')}
+                {formatNumber(noVotes, 0)}
+              </KeyValueTableRow>
+              <KeyValueTableRow>
+                {t('yesPercentage')}
+                {formatNumberPercentage(yesPercentage, 2)}
+              </KeyValueTableRow>
+              <KeyValueTableRow noBorder={true}>
+                {t('noPercentage')}
+                {formatNumberPercentage(noPercentage, 2)}
+              </KeyValueTableRow>
+            </>
+          )}
+        </KeyValueTable>
+      </RoundedWrapper>
     </>
   );
 };

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

@@ -3,8 +3,8 @@ import { generateProposal } from '../../test-helpers/generate-proposals';
 import { Proposal } from './proposal';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 
-jest.mock('@vegaprotocol/network-parameters', () => ({
-  ...jest.requireActual('@vegaprotocol/network-parameters'),
+jest.mock('@vegaprotocol/react-helpers', () => ({
+  ...jest.requireActual('@vegaprotocol/react-helpers'),
   useNetworkParams: jest.fn(() => ({
     params: {
       governance_proposal_asset_minVoterBalance: '1',

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

@@ -1,8 +1,5 @@
-import {
-  NetworkParams,
-  useNetworkParams,
-} from '@vegaprotocol/network-parameters';
-import { AsyncRenderer, RoundedWrapper } from '@vegaprotocol/ui-toolkit';
+import { NetworkParams, useNetworkParams } from '@vegaprotocol/react-helpers';
+import { AsyncRenderer } 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';
@@ -77,8 +74,8 @@ export const Proposal = ({ proposal }: ProposalProps) => {
   return (
     <AsyncRenderer data={params} loading={loading} error={error}>
       <section data-testid="proposal">
-        <ProposalHeader proposal={proposal} isListItem={false} />
-        <div className="my-10">
+        <ProposalHeader proposal={proposal} useSubHeading={false} />
+        <div className="mb-10">
           <ProposalChangeTable proposal={proposal} />
         </div>
         {proposal.terms.change.__typename === 'NewAsset' &&
@@ -91,18 +88,14 @@ export const Proposal = ({ proposal }: ProposalProps) => {
           />
         ) : null}
         <div className="mb-12">
-          <RoundedWrapper paddingBottom={true}>
-            <VoteDetails
-              proposal={proposal}
-              proposalType={proposalType}
-              minVoterBalance={minVoterBalance}
-              spamProtectionMinTokens={
-                params?.spam_protection_voting_min_tokens
-              }
-            />
-          </RoundedWrapper>
+          <VoteDetails
+            proposal={proposal}
+            proposalType={proposalType}
+            minVoterBalance={minVoterBalance}
+            spamProtectionMinTokens={params?.spam_protection_voting_min_tokens}
+          />
         </div>
-        <div className="mb-4">
+        <div className="mb-10">
           <ProposalVotesTable proposal={proposal} proposalType={proposalType} />
         </div>
         <ProposalTermsJson terms={proposal.terms} />

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

@@ -97,6 +97,7 @@ describe('Proposals list item details', () => {
         },
       })
     );
+    expect(screen.getByTestId('proposal-status')).toHaveTextContent('Enacted');
     expect(screen.getByTestId('vote-details')).toHaveTextContent(
       format(lastWeek, DATE_FORMAT_DETAILED)
     );
@@ -112,6 +113,7 @@ describe('Proposals list item details', () => {
         },
       })
     );
+    expect(screen.getByTestId('proposal-status')).toHaveTextContent('Passed');
     expect(screen.getByTestId('vote-details')).toHaveTextContent(
       `Enacts on ${format(nextWeek, DATE_FORMAT_DETAILED)}`
     );
@@ -126,6 +128,9 @@ describe('Proposals list item details', () => {
         },
       })
     );
+    expect(screen.getByTestId('proposal-status')).toHaveTextContent(
+      'Waiting for node vote'
+    );
     expect(screen.getByTestId('vote-details')).toHaveTextContent(
       `Enacts on ${format(nextWeek, DATE_FORMAT_DETAILED)}`
     );
@@ -216,6 +221,7 @@ describe('Proposals list item details', () => {
         },
       })
     );
+    expect(screen.getByTestId('proposal-status')).toHaveTextContent('Open');
     expect(screen.getByTestId('vote-details')).toHaveTextContent(
       '5 minutes left to vote'
     );
@@ -230,6 +236,7 @@ describe('Proposals list item details', () => {
         },
       })
     );
+    expect(screen.getByTestId('proposal-status')).toHaveTextContent('Open');
     expect(screen.getByTestId('vote-details')).toHaveTextContent(
       '5 hours left to vote'
     );
@@ -244,6 +251,7 @@ describe('Proposals list item details', () => {
         },
       })
     );
+    expect(screen.getByTestId('proposal-status')).toHaveTextContent('Open');
     expect(screen.getByTestId('vote-details')).toHaveTextContent(
       '5 days left to vote'
     );
@@ -260,7 +268,10 @@ describe('Proposals list item details', () => {
       networkParamsQueryMock,
       createUserVoteQueryMock(proposal?.id, VoteValue.VALUE_YES),
     ]);
-    expect(await screen.findByText('You voted For')).toBeInTheDocument();
+    expect(screen.getByTestId('proposal-status')).toHaveTextContent('Open');
+
+    expect(await screen.findByText('You voted')).toBeInTheDocument();
+    expect(await screen.findByText('For')).toBeInTheDocument();
   });
 
   it('Renders proposal state: Open - user voted against', async () => {
@@ -274,7 +285,9 @@ describe('Proposals list item details', () => {
       networkParamsQueryMock,
       createUserVoteQueryMock(proposal?.id, VoteValue.VALUE_NO),
     ]);
-    expect(await screen.findByText('You voted Against')).toBeInTheDocument();
+    expect(screen.getByTestId('proposal-status')).toHaveTextContent('Open');
+    expect(await screen.findByText('You voted')).toBeInTheDocument();
+    expect(await screen.findByText('Against')).toBeInTheDocument();
   });
 
   it('Renders proposal state: Open - participation not reached', () => {
@@ -290,6 +303,7 @@ describe('Proposals list item details', () => {
         },
       })
     );
+    expect(screen.getByTestId('proposal-status')).toHaveTextContent('Open');
     expect(screen.getByTestId('vote-status')).toHaveTextContent(
       'Participation not reached'
     );
@@ -308,6 +322,7 @@ describe('Proposals list item details', () => {
         },
       })
     );
+    expect(screen.getByTestId('proposal-status')).toHaveTextContent('Open');
     expect(screen.getByTestId('vote-status')).toHaveTextContent(
       'Majority not reached'
     );
@@ -327,6 +342,7 @@ describe('Proposals list item details', () => {
         },
       })
     );
+    expect(screen.getByTestId('proposal-status')).toHaveTextContent('Open');
     expect(screen.getByTestId('vote-status')).toHaveTextContent('Set to pass');
   });
 
@@ -343,6 +359,7 @@ describe('Proposals list item details', () => {
         },
       })
     );
+    expect(screen.getByTestId('proposal-status')).toHaveTextContent('Declined');
     expect(screen.getByTestId('vote-status')).toHaveTextContent(
       'Participation not reached'
     );
@@ -361,6 +378,7 @@ describe('Proposals list item details', () => {
         },
       })
     );
+    expect(screen.getByTestId('proposal-status')).toHaveTextContent('Declined');
     expect(screen.getByTestId('vote-status')).toHaveTextContent(
       'Majority not reached'
     );
@@ -377,6 +395,7 @@ describe('Proposals list item details', () => {
           ProposalRejectionReason.PROPOSAL_ERROR_INVALID_FUTURE_PRODUCT,
       })
     );
+    expect(screen.getByTestId('proposal-status')).toHaveTextContent('Rejected');
     expect(screen.getByTestId('vote-status')).toHaveTextContent(
       'Invalid future product'
     );

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

@@ -1,8 +1,11 @@
 import { Link } from 'react-router-dom';
-import { Button } from '@vegaprotocol/ui-toolkit';
+import { Button, Icon } from '@vegaprotocol/ui-toolkit';
 import { useVoteInformation } from '../../hooks';
 import { useUserVote } from '../vote-details/use-user-vote';
-import { StatusPass } from '../current-proposal-status/current-proposal-status';
+import {
+  StatusPass,
+  StatusFail,
+} from '../current-proposal-status/current-proposal-status';
 import { format, formatDistanceToNowStrict } from 'date-fns';
 import { useTranslation } from 'react-i18next';
 import { DATE_FORMAT_DETAILED } from '../../../../lib/date-formats';
@@ -19,7 +22,7 @@ const MajorityNotReached = () => {
   const { t } = useTranslation();
   return (
     <>
-      {t('Majority')} {t('not reached')}
+      {t('Majority')} <StatusFail>{t('not reached')}</StatusFail>
     </>
   );
 };
@@ -27,7 +30,7 @@ const ParticipationNotReached = () => {
   const { t } = useTranslation();
   return (
     <>
-      {t('Participation')} {t('not reached')}
+      {t('Participation')} <StatusFail>{t('not reached')}</StatusFail>
     </>
   );
 };
@@ -54,11 +57,17 @@ export const ProposalsListItemDetails = ({
     ? t('byTokenVote')
     : t('byLPVote');
 
+  let proposalStatus: ReactNode;
   let voteDetails: ReactNode;
   let voteStatus: ReactNode;
 
   switch (state) {
     case ProposalState.STATE_ENACTED: {
+      proposalStatus = (
+        <>
+          {t('voteState_Enacted')} <Icon name={'tick'} />
+        </>
+      );
       voteDetails = proposal?.terms.enactmentDatetime && (
         <>
           {format(
@@ -70,6 +79,11 @@ export const ProposalsListItemDetails = ({
       break;
     }
     case ProposalState.STATE_PASSED: {
+      proposalStatus = (
+        <>
+          {t('voteState_Passed')} <Icon name={'tick'} />
+        </>
+      );
       voteDetails = proposal?.terms.change.__typename !== 'NewFreeform' && (
         <>
           {t('toEnactOn')}{' '}
@@ -83,6 +97,11 @@ export const ProposalsListItemDetails = ({
       break;
     }
     case ProposalState.STATE_WAITING_FOR_NODE_VOTE: {
+      proposalStatus = (
+        <>
+          {t('voteState_WaitingForNodeVote')} <Icon name={'time'} />
+        </>
+      );
       voteDetails = proposal?.terms.change.__typename !== 'NewFreeform' && (
         <>
           {t('toEnactOn')}{' '}
@@ -96,14 +115,19 @@ export const ProposalsListItemDetails = ({
       break;
     }
     case ProposalState.STATE_OPEN: {
+      proposalStatus = (
+        <>
+          {t('voteState_Open')} <Icon name={'hand'} />
+        </>
+      );
       voteDetails = (voteState === 'Yes' && (
         <>
-          {t('youVoted')} {t('voteState_Yes')}
+          {t('youVoted')} <StatusPass>{t('voteState_Yes')}</StatusPass>
         </>
       )) ||
         (voteState === 'No' && (
           <>
-            {t('youVoted')} {t('voteState_No')}
+            {t('youVoted')} <StatusFail>{t('voteState_No')}</StatusFail>
           </>
         )) || (
           <>
@@ -124,29 +148,40 @@ export const ProposalsListItemDetails = ({
             </>
           ) : (
             <>
-              {t('Set to')} {t('fail')}
+              {t('Set to')} <StatusFail>{t('fail')}</StatusFail>
             </>
           ))) ||
         (!participationMet && <ParticipationNotReached />) ||
         (!majorityMet && <MajorityNotReached />) ||
         (willPassByTokenVote ? (
           <>
-            {t('Set to')} {t('pass')}
+            {t('Set to')} <StatusPass>{t('pass')}</StatusPass>
           </>
         ) : (
           <>
-            {t('Set to')} {t('fail')}
+            {t('Set to')} <StatusFail>{t('fail')}</StatusFail>
           </>
         ));
       break;
     }
     case ProposalState.STATE_DECLINED: {
+      proposalStatus = (
+        <>
+          {t('voteState_Declined')} <Icon name={'cross'} />
+        </>
+      );
       voteStatus =
         (!participationMet && <ParticipationNotReached />) ||
         (!majorityMet && <MajorityNotReached />);
       break;
     }
     case ProposalState.STATE_REJECTED: {
+      proposalStatus = (
+        <>
+          <StatusFail>{t('voteState_Rejected')}</StatusFail>{' '}
+          <Icon name={'warning-sign'} />
+        </>
+      );
       voteStatus = proposal?.rejectionReason && (
         <>{t(ProposalRejectionReasonMapping[proposal.rejectionReason])}</>
       );
@@ -155,10 +190,16 @@ export const ProposalsListItemDetails = ({
   }
 
   return (
-    <div className="grid grid-cols-[1fr_auto] mt-4 items-start gap-2 text-sm">
+    <div className="grid grid-cols-[1fr_auto] mt-2 items-start gap-2 text-sm">
+      <div
+        className="col-start-1 row-start-1 flex items-center gap-2 text-white"
+        data-testid="proposal-status"
+      >
+        {proposalStatus}
+      </div>
       {voteDetails && (
         <div
-          className="col-start-1 row-start-2 text-vega-light-300"
+          className="col-start-1 row-start-2 text-neutral-500"
           data-testid="vote-details"
         >
           {voteDetails}
@@ -175,7 +216,9 @@ export const ProposalsListItemDetails = ({
       {proposal?.id && (
         <div className="col-start-2 row-start-2 justify-self-end">
           <Link to={`${Routes.PROPOSALS}/${proposal.id}`}>
-            <Button data-testid="view-proposal-btn">{t('View')}</Button>
+            <Button data-testid="view-proposal-btn" size="sm">
+              {t('View')}
+            </Button>
           </Link>
         </div>
       )}

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

@@ -12,7 +12,7 @@ import { 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 type { ProtocolUpgradeProposalFieldsFragment } from '../../protocol-upgrade/__generated__/ProtocolUpgradeProposals';
 
 interface ProposalsListProps {
   proposals: Array<ProposalFieldsFragment | ProposalQuery['proposal']>;
@@ -106,7 +106,7 @@ export const ProposalsList = ({
       {proposals.length > 0 && (
         <ProposalsListFilter setFilterString={setFilterString} />
       )}
-      <section className="-mx-4 p-4 mb-8 bg-vega-dark-100">
+      <section className="-mx-4 p-4 mb-8 bg-neutral-800">
         <SubHeading title={t('openProposals')} />
         {sortedProposals.open.length > 0 ||
         sortedProtocolUpgradeProposals.open.length > 0 ? (

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

@@ -5,7 +5,7 @@ import {
   RoundedWrapper,
 } from '@vegaprotocol/ui-toolkit';
 import { SubHeading } from '../../../../components/heading';
-import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
+import type { ProtocolUpgradeProposalFieldsFragment } from '../../protocol-upgrade/__generated__/ProtocolUpgradeProposals';
 
 export interface ProtocolUpgradeProposalDetailInfoProps {
   proposal: ProtocolUpgradeProposalFieldsFragment;

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

@@ -3,7 +3,7 @@ import { render, screen } from '@testing-library/react';
 import { BrowserRouter } from 'react-router-dom';
 import { ProtocolUpgradeProposalsListItem } from './protocol-upgrade-proposals-list-item';
 import { ProtocolUpgradeProposalStatus } from '@vegaprotocol/types';
-import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
+import type { ProtocolUpgradeProposalFieldsFragment } from '../../protocol-upgrade/__generated__/ProtocolUpgradeProposals';
 
 const proposal = {
   status:

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

@@ -3,16 +3,16 @@ import { Link } from 'react-router-dom';
 import {
   Button,
   Icon,
+  Intent,
   Lozenge,
   RoundedWrapper,
 } from '@vegaprotocol/ui-toolkit';
 import { stripFullStops } from '@vegaprotocol/utils';
 import { ProtocolUpgradeProposalStatus } from '@vegaprotocol/types';
 import { SubHeading } from '../../../../components/heading';
-import { ProposalInfoLabel } from '../proposal-info-label';
-import Routes from '../../../routes';
 import type { ReactNode } from 'react';
-import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
+import type { ProtocolUpgradeProposalFieldsFragment } from '../../protocol-upgrade/__generated__/ProtocolUpgradeProposals';
+import Routes from '../../../routes';
 
 interface ProtocolProposalsListItemProps {
   proposal: ProtocolUpgradeProposalFieldsFragment;
@@ -29,30 +29,30 @@ export const ProtocolUpgradeProposalsListItem = ({
   switch (proposal.status) {
     case ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_REJECTED:
       proposalStatusIcon = (
-        <span data-testid="protocol-upgrade-proposal-status-icon-rejected">
+        <div data-testid="protocol-upgrade-proposal-status-icon-rejected">
           <Icon name={'cross'} />
-        </span>
+        </div>
       );
       break;
     case ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_PENDING:
       proposalStatusIcon = (
-        <span data-testid="protocol-upgrade-proposal-status-icon-pending">
+        <div data-testid="protocol-upgrade-proposal-status-icon-pending">
           <Icon name={'time'} />
-        </span>
+        </div>
       );
       break;
     case ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_APPROVED:
       proposalStatusIcon = (
-        <span data-testid="protocol-upgrade-proposal-status-icon-approved">
+        <div data-testid="protocol-upgrade-proposal-status-icon-approved">
           <Icon name={'tick'} />
-        </span>
+        </div>
       );
       break;
     case ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_UNSPECIFIED:
       proposalStatusIcon = (
-        <span data-testid="protocol-upgrade-proposal-status-icon-unspecified">
+        <div data-testid="protocol-upgrade-proposal-status-icon-unspecified">
           <Icon name={'disable'} />
-        </span>
+        </div>
       );
       break;
   }
@@ -71,28 +71,18 @@ export const ProtocolUpgradeProposalsListItem = ({
         </div>
 
         <div className="text-sm">
-          <div className="flex gap-2">
-            <div
-              data-testid="protocol-upgrade-proposal-type"
-              className="flex items-center gap-2 mb-4"
-            >
-              <ProposalInfoLabel variant="highlight">
-                {t('networkUpgrade')}
-              </ProposalInfoLabel>
-            </div>
-
-            <div data-testid="protocol-upgrade-proposal-status">
-              <ProposalInfoLabel>
-                {t(`${proposal.status}`)} {proposalStatusIcon}
-              </ProposalInfoLabel>
-            </div>
+          <div
+            data-testid="protocol-upgrade-proposal-type"
+            className="flex items-center gap-2 mb-4"
+          >
+            <Lozenge variant={Intent.Success}>{t('networkUpgrade')}</Lozenge>
           </div>
 
           <div
             data-testid="protocol-upgrade-proposal-release-tag"
             className="mb-2"
           >
-            <span>{t('vegaReleaseTag')}:</span>{' '}
+            <span className="pr-2">{t('vegaReleaseTag')}</span>
             <Lozenge>{proposal.vegaReleaseTag}</Lozenge>
           </div>
 
@@ -100,18 +90,30 @@ export const ProtocolUpgradeProposalsListItem = ({
             data-testid="protocol-upgrade-proposal-block-height"
             className="mb-2"
           >
-            <span>{t('upgradeBlockHeight')}:</span>{' '}
+            <span className="pr-2">{t('upgradeBlockHeight')}</span>
             <Lozenge>{proposal.upgradeBlockHeight}</Lozenge>
           </div>
 
-          <div className="grid grid-cols-1 mt-3">
-            <div className="justify-self-end">
+          <div className="grid grid-cols-[1fr_auto] mt-3 items-start gap-2">
+            <div className="col-start-1 row-start-1 text-white">
+              <div
+                data-testid="protocol-upgrade-proposal-status"
+                className="flex items-center gap-2"
+              >
+                <span>{t(`${proposal.status}`)}</span>
+                <span>{proposalStatusIcon}</span>
+              </div>
+            </div>
+
+            <div className="col-start-2 row-start-2 justify-self-end">
               <Link
                 to={`${Routes.PROPOSALS}/protocol-upgrade/${stripFullStops(
                   proposal.vegaReleaseTag
                 )}`}
               >
-                <Button data-testid="view-proposal-btn">{t('View')}</Button>
+                <Button data-testid="view-proposal-btn" size="sm">
+                  {t('View')}
+                </Button>
               </Link>
             </div>
           </div>