fix(3661): ensure validators consensus table works without previous epoch data

feat(governance): token references to governance (#3657 )
Co-authored-by: Joe <joe@vega.xyz>
2023-05-09 15:42:45 +01:00 · 2023-05-09 14:17:40 +00:00 · 2023-05-09 15:13:53 +01:00 · 2023-05-09 14:33:33 +01:00 · 2023-05-09 13:32:16 +01:00 · 2023-05-09 10:03:17 +00:00
404 changed files with 5187 additions and 2720 deletions
@@ -0,0 +1,16 @@
+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
@@ -105,7 +105,7 @@ 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 )"
+          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"
@@ -66,7 +66,7 @@ jobs:
                fi
              fi
            elif [[ "${{ github.ref }}" =~ .*develop$ ]]; then
-              envName="stagnet3"
+              envName="stagnet1"
            fi
            bucketName="${{ matrix.app }}.${envName}.${domain}"
            echo BUCKET_NAME=${bucketName} >> $GITHUB_ENV
@@ -7,5 +7,4 @@ __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
@@ -2,7 +2,7 @@
 NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
 NX_TENDERMINT_URL=https://mainnet-observer-proxy01.ops.vega.xyz/
 NX_TENDERMINT_WEBSOCKET_URL=wss://mainnet-observer-proxy01.ops.vega.xyz/websocket
-NX_VEGA_URL=https://api.vega.xyz/query
+NX_VEGA_URL=https://api.vega.community/graphql
 NX_VEGA_ENV=MAINNET
 NX_BLOCK_EXPLORER=https://be.explorer.vega.xyz/rest

@@ -1,18 +0,0 @@
-# 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
@@ -10,6 +10,8 @@
    "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",
@@ -19,9 +21,6 @@
    "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",
@@ -77,6 +76,7 @@
    "governance.proposal.updateNetParam.requiredMajority",
    "governance.proposal.updateNetParam.requiredParticipation",
    "governance.proposal.updateMarket.minProposerEquityLikeShare",
+    "governance.proposal.updateAsset.requiredParticipation",
    "validators.vote.required"
  ],
  "duration": [
@@ -138,7 +138,7 @@ context('Network parameters page', { tags: '@smoke' }, function () {
      });
    });

-    it('should list each network parameter displayed as a currency value with four decimals - in the correct format', function () {
+    it.skip('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) => {
@@ -1,13 +1,18 @@
-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_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.governance.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_BLOCK_EXPLORER=https://be.stagnet3.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.governance.vega.xyz
+NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.jsoo

 # App flags
 NX_EXPLORER_ASSETS=1
@@ -4,14 +4,7 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket
 NX_VEGA_ENV=CUSTOM
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
+NX_VEGA_EXPLORER_URL=/

 # 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
@@ -5,7 +5,8 @@ NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-inter
 NX_VEGA_ENV=DEVNET
 NX_BLOCK_EXPLORER=https://be.devnet1.vega.xyz/rest
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_VEGA_GOVERNANCE_URL=https://dev.token.vega.xyz
+NX_VEGA_GOVERNANCE_URL=https://dev.governance.vega.xyz
 NX_VEGA_URL=https://api.devnet1.vega.xyz/graphql
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
+NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
+NX_VEGA_EXPLORER_URL=/
@@ -1,9 +1,10 @@
 # App configuration variables
-NX_TENDERMINT_URL=https://be.explorer.vega.xyz
-NX_TENDERMINT_WEBSOCKET_URL=wss://be.explorer.vega.xyz/websocket
+NX_TENDERMINT_URL=https://be.vega.community
+NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/mainnet1/mainnet1.toml
 NX_VEGA_ENV=MAINNET
-NX_BLOCK_EXPLORER=https://be.explorer.vega.xyz/rest/
+NX_BLOCK_EXPLORER=https://be.vega.community/rest/
 NX_ETHERSCAN_URL=https://etherscan.io
-NX_VEGA_GOVERNANCE_URL=https://token.vega.xyz
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
+NX_VEGA_GOVERNANCE_URL=https://governance.vega.xyz
+NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
+NX_VEGA_EXPLORER_URL=https://explorer.vega.xyz/
@@ -1,14 +1 @@
-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
+# .env is stagnet1, so there are no overrides required
@@ -1,8 +0,0 @@
-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
@@ -7,5 +7,6 @@ NX_VEGA_ENV=TESTNET
 NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_VEGA_GOVERNANCE_URL=https://token.fairground.wtf
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
+NX_VEGA_GOVERNANCE_URL=https://governance.fairground.wtf
+NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
+NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
@@ -11,3 +11,4 @@ NX_VEGA_GOVERNANCE_URL=https://validator-testnet.governance.vega.xyz
 NX_TENDERMINT_URL=https://tm-be.validators-testnet.vega.rocks
 NX_BLOCK_EXPLORER=https://be.validators-testnet.vega.rocks/rest
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.xyz/websocket
+NX_VEGA_EXPLORER_URL=https://validator-testnet.explorer.vega.xyz/
@@ -5,3 +5,4 @@ NX_VEGA_ENV=CUSTOM
 NX_BLOCK_EXPLORER=
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
+NX_VEGA_EXPLORER_URL=/
@@ -35,12 +35,11 @@ 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. stagnet3
+yarn nx run explorer:serve --env={env} # e.g. stagnet1
 ```

 There are a few different configuration options offered for this app:
@@ -14,10 +14,72 @@ import {
  SettlementAssetInfoPanel,
 } from '@vegaprotocol/market-info';
 import { MarketInfoTable } from '@vegaprotocol/market-info';
+import type { DataSourceDefinition } from '@vegaprotocol/types';
+import isEqual from 'lodash/isEqual';

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

+  const settlementData =
+    market.tradableInstrument.instrument.product.dataSourceSpecForSettlementData
+      .data;
+  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'),
@@ -95,22 +157,7 @@ export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
        <LiquidityPriceRangeInfoPanel market={market} noBorder={false} />
      ),
    },
-    {
-      title: t('Settlement Oracle'),
-      content: (
-        <OracleInfoPanel
-          noBorder={false}
-          market={market}
-          type="settlementData"
-        />
-      ),
-    },
-    {
-      title: t('Termination Oracle'),
-      content: (
-        <OracleInfoPanel noBorder={false} market={market} type="termination" />
-      ),
-    },
+    ...oraclePanels,
  ];

  return (
@@ -12,7 +12,10 @@ 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/react-helpers';
+import {
+  NetworkParams,
+  useNetworkParams,
+} from '@vegaprotocol/network-parameters';
 import { ProposalStateMapping } from '@vegaprotocol/types';
 import BigNumber from 'bignumber.js';
 import { DApp, TOKEN_PROPOSAL, useLinks } from '@vegaprotocol/environment';
@@ -1,6 +1,6 @@
 import { proposalsDataProvider } from '@vegaprotocol/proposals';
 import { t } from '@vegaprotocol/i18n';
-import { useDataProvider } from '@vegaprotocol/react-helpers';
+import { useDataProvider } from '@vegaprotocol/data-provider';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { ProposalsTable } from '../../components/proposals/proposals-table';
 import { RouteTitle } from '../../components/route-title';
@@ -1,5 +1,5 @@
 import { t } from '@vegaprotocol/i18n';
-import { useDataProvider } from '@vegaprotocol/react-helpers';
+import { useDataProvider } from '@vegaprotocol/data-provider';
 import { AsyncRenderer, Button } from '@vegaprotocol/ui-toolkit';
 import { useState } from 'react';
 import { useParams } from 'react-router-dom';
@@ -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/react-helpers';
+import { useDataProvider } from '@vegaprotocol/data-provider';
 import { MarketsTable } from '../../components/markets/markets-table';

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

 describe('NetworkParametersTable', () => {
@@ -13,14 +13,15 @@ import {
 import { t } from '@vegaprotocol/i18n';
 import { RouteTitle } from '../../components/route-title';
 import orderBy from 'lodash/orderBy';
-import { useNetworkParamsQuery } from '@vegaprotocol/react-helpers';
-import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers';
+import { useNetworkParamsQuery } from '@vegaprotocol/network-parameters';
+import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
 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',
@@ -53,6 +54,8 @@ 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 = ({
@@ -1,8 +1,5 @@
 import { t } from '@vegaprotocol/i18n';
-import {
-  useDataProvider,
-  useScreenDimensions,
-} from '@vegaprotocol/react-helpers';
+import { useScreenDimensions } from '@vegaprotocol/react-helpers';
 import { useMemo } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 import { SubHeading } from '../../../components/sub-heading';
@@ -16,6 +13,7 @@ import { aggregatedAccountsDataProvider } from '@vegaprotocol/accounts';
 import { PartyBlockStake } from './components/party-block-stake';
 import { PartyBlockAccounts } from './components/party-block-accounts';
 import { isValidPartyId } from './components/party-id-error';
+import { useDataProvider } from '@vegaprotocol/data-provider';

 const Party = () => {
  const { party } = useParams<{ party: string }>();
@@ -32,6 +32,11 @@
  line-height: calc(min(var(--ag-line-height, 26px), 26px) - 4px);
 }

+.vega-ag-grid .ag-row {
+  border-width: 1px 0;
+  border-bottom: 1px solid transparent;
+}
+
 /* Light variables */
 .ag-theme-balham {
  --ag-background-color: theme(colors.white);
@@ -13,7 +13,7 @@ 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-stagnet3-k8s.ops.vega.xyz
+NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
@@ -30,6 +30,6 @@ CYPRESS_TRUNCATED_VEGA_PUBLIC_KEY2=7f9cf0…c25535
 CYPRESS_VEGA_ENV=CUSTOM
 CYPRESS_VEGA_PUBLIC_KEY=02eceaba4df2bef76ea10caf728d8a099a2aa846cced25737cccaa9812342f65
 CYPRESS_VEGA_PUBLIC_KEY2=7f9cf07d3a9905b1a61a1069f7a758855da428bc0f4a97de87f48644bfc25535
-CYPRESS_VEGA_TOKEN_URL=https://token.fairground.wtf
+CYPRESS_VEGA_TOKEN_URL=https://governance.fairground.wtf
 CYPRESS_VEGA_WALLET_URL=http://localhost:1789
 CYPRESS_VEGA_WALLET_API_TOKEN=
@@ -1,5 +1,5 @@
 # App configuration variables
 NX_VEGA_ENV=MAINNET
-NX_VEGA_URL=https://api.vega.xyz/query
+NX_VEGA_URL=https://api.vega.community/graphql
 NX_ETHEREUM_PROVIDER_URL=https://mainnet.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://etherscan.io
@@ -1,5 +0,0 @@
-# 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
@@ -2,14 +2,14 @@ import {
  navigateTo,
  waitForSpinner,
  navigation,
+  turnTelemetryOff,
 } from '../../support/common.functions';
 import {
-  convertUnixTimestampToDateformat,
  createRawProposal,
  createTenDigitUnixTimeStampForSpecifiedDays,
  enterUniqueFreeFormProposalBody,
  generateFreeFormProposalTitle,
-  getGovernanceProposalDateFormatForSpecifiedDays,
+  getDateFormatForSpecifiedDays,
  getProposalIdFromList,
  getProposalInformationFromTable,
  getSubmittedProposalFromProposalList,
@@ -23,6 +23,7 @@ import { ensureSpecifiedUnstakedTokensAreAssociated } from '../../../../governan
 import { ethereumWalletConnect } from '../../../../governance-e2e/src/support/wallet-eth.functions';
 import { vegaWalletSetSpecifiedApprovalAmount } from '../../../../governance-e2e/src/support/wallet-teardown.functions';
 import type { testFreeformProposal } from '../../support/common-interfaces';
+import { formatDateWithLocalTimezone } from '@vegaprotocol/utils';

 const proposalVoteProgressForPercentage =
  '[data-testid="vote-progress-indicator-percentage-for"]';
@@ -50,6 +51,7 @@ describe(

    beforeEach('visit proposals tab', function () {
      cy.clearLocalStorage();
+      turnTelemetryOff();
      cy.reload();
      waitForSpinner();
      cy.connectVegaWallet();
@@ -99,20 +101,22 @@ describe(
      getSubmittedProposalFromProposalList(proposalTitle).within(() =>
        cy.get(viewProposalButton).click()
      );
-      convertUnixTimestampToDateformat(proposalTimeStamp).then(
-        (closingDate) => {
-          getProposalInformationFromTable('Closes on')
-            .contains(closingDate)
-            .should('be.visible');
-        }
-      );
-      getGovernanceProposalDateFormatForSpecifiedDays(0).then(
-        (proposalDate) => {
-          getProposalInformationFromTable('Proposed on')
-            .contains(proposalDate)
-            .should('be.visible');
-        }
-      );
+      cy.wrap(
+        formatDateWithLocalTimezone(new Date(proposalTimeStamp * 1000))
+      ).then((closingDate) => {
+        getProposalInformationFromTable('Closes on')
+          .contains(closingDate)
+          .should('be.visible');
+      });
+      cy.wrap(
+        formatDateWithLocalTimezone(
+          new Date(createTenDigitUnixTimeStampForSpecifiedDays(0) * 1000)
+        )
+      ).then((proposalDate) => {
+        getProposalInformationFromTable('Proposed on')
+          .contains(proposalDate)
+          .should('be.visible');
+      });
    });

    it('Newly created proposal details - shows default status set to fail', function () {
@@ -155,18 +159,16 @@ describe(
      cy.getByTestId('vote-buttons').contains('against').should('be.visible');
      cy.getByTestId('vote-buttons').contains('for').should('be.visible');
      voteForProposal('for');
-      getGovernanceProposalDateFormatForSpecifiedDays(0, 'shortMonth').then(
-        (votedDate) => {
-          // 3001-VOTE-051
-          // 3001-VOTE-093
-          cy.contains('You voted:')
-            .siblings()
-            .contains('For')
-            .siblings()
-            .contains(votedDate)
-            .should('be.visible');
-        }
-      );
+      getDateFormatForSpecifiedDays(0).then((votedDate) => {
+        // 3001-VOTE-051
+        // 3001-VOTE-093
+        cy.contains('You voted:')
+          .siblings()
+          .contains('For')
+          .siblings()
+          .contains(votedDate)
+          .should('be.visible');
+      });
      cy.get(proposalVoteProgressForPercentage) // 3001-VOTE-072
        .contains('100.00%')
        .and('be.visible');
@@ -2,6 +2,7 @@
 import {
  navigateTo,
  navigation,
+  turnTelemetryOff,
  waitForSpinner,
 } from '../../support/common.functions';
 import {
@@ -37,6 +38,7 @@ context(

    beforeEach('visit proposals', function () {
      cy.clearLocalStorage();
+      turnTelemetryOff();
      cy.reload();
      waitForSpinner();
      cy.connectVegaWallet();
@@ -20,6 +20,7 @@ import {
  navigateTo,
  navigation,
  closeDialog,
+  turnTelemetryOff,
 } from '../../support/common.functions';
 import {
  clickOnValidatorFromList,
@@ -85,6 +86,7 @@ context(

    beforeEach('visit governance tab', function () {
      cy.clearLocalStorage();
+      turnTelemetryOff();
      cy.reload();
      waitForSpinner();
      cy.connectVegaWallet();
@@ -2,6 +2,7 @@ import {
  closeDialog,
  navigateTo,
  navigation,
+  turnTelemetryOff,
  waitForSpinner,
 } from '../../support/common.functions';
 import {
@@ -77,6 +78,7 @@ context(

    beforeEach('visit governance tab', function () {
      cy.clearLocalStorage();
+      turnTelemetryOff();
      cy.reload();
      waitForSpinner();
      cy.connectVegaWallet();
@@ -2,6 +2,7 @@ import type { testFreeformProposal } from '../../support/common-interfaces';
 import {
  navigateTo,
  navigation,
+  turnTelemetryOff,
  waitForSpinner,
 } from '../../support/common.functions';
 import {
@@ -36,6 +37,7 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {

  beforeEach('visit proposals tab', function () {
    cy.clearLocalStorage();
+    turnTelemetryOff();
    cy.reload();
    waitForSpinner();
    cy.connectVegaWallet();
@@ -1,6 +1,7 @@
 import {
  navigateTo,
  navigation,
+  turnTelemetryOff,
  waitForSpinner,
 } from '../../support/common.functions';
 import {
@@ -26,6 +27,7 @@ const rewardsTimeOut = { timeout: 60000 };
 context('rewards - flow', { tags: '@slow' }, function () {
  before('set up environment to allow rewards', function () {
    cy.clearLocalStorage();
+    turnTelemetryOff();
    cy.visit('/');
    waitForSpinner();
    depositAsset(vegaAssetAddress, '1000', 18);
@@ -4,6 +4,7 @@ import {
  waitForSpinner,
  navigateTo,
  navigation,
+  turnTelemetryOff,
 } from '../../support/common.functions';
 import {
  stakingPageAssociateTokens,
@@ -54,6 +55,7 @@ context(
        'teardown wallet & drill into a specific validator',
        function () {
          cy.clearLocalStorage();
+          turnTelemetryOff();
          cy.reload();
          waitForSpinner();
          cy.connectVegaWallet();
@@ -1,6 +1,7 @@
 import {
  navigateTo,
  navigation,
+  turnTelemetryOff,
  waitForSpinner,
 } from '../../support/common.functions';
 import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
@@ -29,6 +30,8 @@ const tableReceiverAddress = '[col-id="details.receiverAddress"]';
 const tableWithdrawnTimeStamp = '[col-id="withdrawnTimestamp"]';
 const tableWithdrawnStatus = '[col-id="status"]';
 const tableCreatedTimeStamp = '[col-id="createdTimestamp"]';
+const toastContent = 'toast-content';
+const toastPanel = 'toast-panel';
 const usdtName = 'USDC (local)';
 const usdcEthAddress = '0x1b8a1B6CBE5c93609b46D1829Cc7f3Cb8eeE23a0';
 const usdcSymbol = 'tUSDC';
@@ -53,6 +56,7 @@ context(

    beforeEach('Navigate to withdrawal page', function () {
      cy.clearLocalStorage();
+      turnTelemetryOff();
      cy.reload();
      waitForSpinner();
      navigateTo(navigation.withdraw);
@@ -149,7 +153,6 @@ context(
        });
    });

-    // Skipping because of bug #1857
    it('Able to withdraw asset: -eth wallet not connected', function () {
      const ethWalletAddress = Cypress.env('ethWalletPublicKey');
      cy.reload();
@@ -187,8 +190,26 @@ context(
            .should('have.attr', 'href')
            .and('contain', 'https://sepolia.etherscan.io/address/');
          cy.get(tableCreatedTimeStamp).should('not.be.empty');
-          cy.getByTestId(completeWithdrawalButton).click();
-          // Unable to complete withdrawal in Capsule
+        });
+      ethereumWalletConnect();
+      cy.getByTestId(completeWithdrawalButton).click();
+      cy.getByTestId(toastContent)
+        .last()
+        .should('contain.text', 'Awaiting confirmation')
+        .within(() => {
+          cy.getByTestId('external-link').should('exist');
+        });
+      cy.getByTestId(toastContent)
+        .first()
+        .should('contain.text', 'The withdrawal has been approved.')
+        .within(() => {
+          cy.getByTestId(toastPanel).should('contain.text', '110.00', 'tUSDC');
+        });
+      cy.getByTestId(toastContent)
+        .last()
+        .should('contain.text', 'Transaction confirmed')
+        .within(() => {
+          cy.getByTestId('external-link').should('exist');
        });
    });

@@ -218,7 +239,10 @@ context(
    });

    function waitForAssetsDisplayed(expectedAsset: string) {
-      cy.getByTestId('currency-title').should('contain.text', expectedAsset);
+      cy.getByTestId('currency-title', txTimeout).should(
+        'contain.text',
+        expectedAsset
+      );
    }
  }
 );
@@ -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 with proposal summary', function () {
+    it('should show open or enacted proposals without proposal summary', function () {
      cy.get('body').then(($body) => {
        if (!$body.find('[data-testid="proposals-list-item"]').length) {
          cy.createMarket();
@@ -43,12 +43,6 @@ 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');
@@ -101,15 +101,15 @@ context(
            );
            cy.getByTestId('protocol-upgrade-proposal-release-tag').should(
              'have.text',
-              'Vega release tagv1'
+              'Vega release tag: v1'
            );
            cy.getByTestId('protocol-upgrade-proposal-block-height').should(
              'have.text',
-              'Upgrade block height2015942'
+              'Upgrade block height: 2015942'
            );
            cy.getByTestId('protocol-upgrade-proposal-status').should(
              'have.text',
-              'Approved'
+              'Approved '
            );
          });
      });
@@ -3,6 +3,7 @@
 import {
  navigateTo,
  navigation,
+  turnTelemetryOff,
  waitForSpinner,
 } from '../../support/common.functions';
 import {
@@ -26,6 +27,7 @@ context('View functionality with public key', { tags: '@smoke' }, function () {

  beforeEach('visit home page', function () {
    cy.clearLocalStorage();
+    turnTelemetryOff();
    cy.visit('/');
    waitForSpinner();
    cy.connectPublicKey(vegaWalletPubKey);
@@ -13,7 +13,6 @@ context(
  { tags: '@regression' },
  function () {
    before('navigate to rewards page', function () {
-      cy.clearLocalStorage();
      cy.visit('/');
      navigateTo(navigation.rewards);
    });
@@ -33,7 +33,6 @@ const stakeNumberRegex = /^\d*\.?\d*$/;

 context('Validators Page - verify elements on page', function () {
  before('navigate to validators page', function () {
-    cy.clearAllLocalStorage();
    cy.visit('/validators');
  });

@@ -35,7 +35,6 @@ context(
  { tags: '@regression' },
  () => {
    before('visit token home page', () => {
-      cy.clearAllLocalStorage();
      cy.visit('/');
      cy.get(walletContainer, { timeout: 60000 }).should('be.visible');
    });
@@ -12,7 +12,6 @@ context(
  { tags: '@smoke' },
  function () {
    before('navigate to withdrawals page', function () {
-      cy.clearAllLocalStorage();
      cy.visit('/');
      navigateTo(navigation.withdraw);
    });
@@ -90,3 +90,10 @@ export function verifyEthWalletAssociatedBalance(amount: string) {
 export function closeDialog() {
  cy.getByTestId('dialog-close').click();
 }
+
+export function turnTelemetryOff() {
+  // Ensuring the telemetry modal doesn't disrupt the tests
+  cy.window().then((win) =>
+    win.localStorage.setItem('vega_telemetry_on', 'false')
+  );
+}
@@ -1,3 +1,4 @@
+import { format } from 'date-fns';
 import { closeDialog, navigateTo, navigation } from './common.functions';
 import { ensureSpecifiedUnstakedTokensAreAssociated } from './staking.functions';

@@ -15,35 +16,6 @@ const newProposalSubmitButton = '[data-testid="proposal-submit"]';
 const epochTimeout = Cypress.env('epochTimeout');
 const proposalTimeout = { timeout: 14000 };

-export function convertUnixTimestampToDateformat(
-  unixTimestamp: number,
-  monthTextLength = 'longMonth'
-) {
-  const dateSupplied = new Date(unixTimestamp * 1000);
-  const year = dateSupplied.getFullYear();
-  const months = [
-    'January',
-    'February',
-    'March',
-    'April',
-    'May',
-    'June',
-    'July',
-    'August',
-    'September',
-    'October',
-    'November',
-    'December',
-  ];
-  const month = months[dateSupplied.getMonth()];
-  const shortMonth = months[dateSupplied.getMonth()].substring(0, 3),
-    date = dateSupplied.getDate();
-
-  if (monthTextLength === 'longMonth') {
-    return cy.wrap(`${date} ${month} ${year}`);
-  } else return cy.wrap(`${date} ${shortMonth} ${year}`);
-}
-
 export function createTenDigitUnixTimeStampForSpecifiedDays(
  durationDays: number
 ) {
@@ -52,6 +24,13 @@ export function createTenDigitUnixTimeStampForSpecifiedDays(
  return (timestamp = Math.floor(timestamp / 1000));
 }

+export function getDateFormatForSpecifiedDays(days: number) {
+  const date = new Date(
+    createTenDigitUnixTimeStampForSpecifiedDays(days) * 1000
+  );
+  return cy.wrap(format(date, 'dd MMM yyyy'));
+}
+
 export function enterRawProposalBody(timestamp: number) {
  cy.fixture('/proposals/raw.json').then((rawProposal) => {
    rawProposal.terms.closingTimestamp = timestamp;
@@ -104,16 +83,6 @@ export function getProposalIdFromList(proposalTitle: string) {
    });
 }

-export function getGovernanceProposalDateFormatForSpecifiedDays(
-  days: number,
-  shortOrLong?: string
-) {
-  return convertUnixTimestampToDateformat(
-    createTenDigitUnixTimeStampForSpecifiedDays(days),
-    shortOrLong
-  );
-}
-
 export function getProposalInformationFromTable(heading: string) {
  return cy.get(proposalInformationTableRows).contains(heading).siblings();
 }
@@ -11,6 +11,7 @@ import './proposal.functions.ts';
 import registerCypressGrep from '@cypress/grep';
 import { aliasGQLQuery } from '@vegaprotocol/cypress';
 import { chainIdQuery, statisticsQuery } from '@vegaprotocol/mock';
+import { turnTelemetryOff } from './common.functions.ts';
 registerCypressGrep();

 // Hide fetch/XHR requests - They create a lot of noise in command log
@@ -24,6 +25,9 @@ if (!app.document.head.querySelector('[data-hide-command-log-request]')) {
 }

 before(() => {
+  cy.clearLocalStorage();
+  // // Ensuring the telemetry modal doesn't disrupt the tests
+  turnTelemetryOff();
  // Mock chainId fetch which happens on every page for wallet connection
  cy.mockGQL((req) => {
    aliasGQLQuery(req, 'ChainId', chainIdQuery());
@@ -89,6 +89,6 @@ export function mockNetworkUpgradeProposal() {
  cy.mockGQL((req) => {
    aliasGQLQuery(req, 'Nodes', nodeData);
    aliasGQLQuery(req, 'Proposals', proposalsData);
-    aliasGQLQuery(req, 'ProtocolUpgrades', upgradeProposalsData);
+    aliasGQLQuery(req, 'ProtocolUpgradeProposals', upgradeProposalsData);
  });
 }
@@ -1,18 +1,18 @@
 # App configuration variables
-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_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_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","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","STAGNET1":"https://stagnet1.governance.vega.xyz","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.vega.xyz"}'
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_WALLET_URL=http://localhost:1789
-NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
+NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
 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-stagnet3-k8s.ops.vega.xyz
+NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/main/announcements.json
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72

@@ -3,7 +3,7 @@ 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","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.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=''
@@ -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-stagnet3-k8s.ops.vega.xyz
+NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz

 #Test configuration variables
 CYPRESS_FAIRGROUND=false
@@ -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","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.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
@@ -10,4 +10,4 @@ NX_VEGA_EXPLORER_URL=https://dev.explorer.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-devnet1-k8s.ops.vega.xyz
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
+NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
@@ -1,8 +1,8 @@
 # App configuration variables
 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","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_URL=https://api.vega.community/graphql
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.vega.xyz"}'
 NX_ETHEREUM_PROVIDER_URL=https://mainnet.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
@@ -1,10 +1,10 @@
 # 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","STAGNET3":"https://stagnet3.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.governance.vega.xyz","STAGNET1":"https://stagnet1.governance.vega.xyz","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.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
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
+NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
@@ -1,11 +0,0 @@
-# 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
@@ -2,7 +2,7 @@
 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","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.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
@@ -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","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.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
@@ -27,12 +27,11 @@ 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. stagnet3
+yarn nx run governance:serve --env={env} # e.g. stagnet1
 ```

 There are a few different configuration options offered for this app:
@@ -0,0 +1,5 @@
+function ReactMarkdown({ children }) {
+  return <div>{children}</div>;
+}
+
+export default ReactMarkdown;
@@ -20,12 +20,17 @@ 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 { VegaWalletProvider } from '@vegaprotocol/wallet';
+import {
+  useVegaTransactionManager,
+  useVegaTransactionUpdater,
+  VegaWalletProvider,
+} from '@vegaprotocol/wallet';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { useEthereumConfig } from '@vegaprotocol/web3';
 import {
@@ -37,6 +42,12 @@ 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';
+import {
+  TelemetryDialog,
+  TELEMETRY_ON,
+} from './components/telemetry-dialog/telemetry-dialog';
+import { useLocalStorage } from '@vegaprotocol/react-helpers';

 const cache: InMemoryCacheConfig = {
  typePolicies: {
@@ -81,7 +92,10 @@ const Web3Container = ({
  providerUrl: string;
 }) => {
  const InitializeHandlers = () => {
+    useVegaTransactionManager();
+    useVegaTransactionUpdater();
    useEthTransactionManager();
+    useEthTransactionUpdater();
    useEthWithdrawApprovalsManager();
    return null;
  };
@@ -135,10 +149,12 @@ const Web3Container = ({
                      <NetworkInfo />
                    </footer>
                  </AppLayout>
+                  <ToastsManager />
                  <InitializeHandlers />
                  <VegaWalletDialogs />
                  <TransactionModal />
                  <WithdrawalDialog />
+                  <TelemetryDialog />
                </>
              </BalanceManager>
            </AppLoader>
@@ -167,9 +183,10 @@ const AppContainer = () => {
  const { config, loading, error } = useEthereumConfig();
  const { VEGA_ENV, GIT_COMMIT_HASH, GIT_BRANCH, ETHEREUM_PROVIDER_URL } =
    useEnvironment();
+  const [telemetryOn] = useLocalStorage(TELEMETRY_ON);

  useEffect(() => {
-    if (ENV.dsn) {
+    if (ENV.dsn && telemetryOn) {
      Sentry.init({
        dsn: ENV.dsn,
        integrations: [new Integrations.BrowserTracing()],
@@ -192,8 +209,10 @@ const AppContainer = () => {
      });
      Sentry.setTag('branch', GIT_BRANCH);
      Sentry.setTag('commit', GIT_COMMIT_HASH);
+    } else {
+      Sentry.close();
    }
-  }, [GIT_COMMIT_HASH, GIT_BRANCH, VEGA_ENV]);
+  }, [GIT_COMMIT_HASH, GIT_BRANCH, VEGA_ENV, telemetryOn]);

  return (
    <Router>
@@ -23,6 +23,7 @@ export const ConnectToVega = () => {
        openVegaWalletDialog();
      }}
      data-testid="connect-to-vega-wallet-btn"
+      variant="primary"
    >
      {t('connectVegaWallet')}
    </Button>
@@ -23,7 +23,7 @@ export const Heading = ({
      })}
    >
      <h1
-        className={classNames('font-alpha calt text-5xl', {
+        className={classNames('font-alpha calt text-5xl break-words', {
          'mt-0': !marginTop,
          'mb-0': !marginBottom,
        })}
@@ -11,11 +11,26 @@ import {
  NavigationLink,
  NavigationList,
  NavigationTrigger,
+  Icon,
 } from '@vegaprotocol/ui-toolkit';
 import { EthWallet } from '../eth-wallet';
 import { VegaWallet } from '../vega-wallet';
 import { useLocation, useMatch } from 'react-router-dom';
 import { useEffect } from 'react';
+import { useTelemetryDialog } from '../telemetry-dialog/telemetry-dialog';
+
+export const SettingsLink = () => {
+  const { open, isOpen, close } = useTelemetryDialog();
+  return (
+    <button
+      type="button"
+      onClick={() => (isOpen ? close() : open())}
+      aria-label="Open Telemetry Settings"
+    >
+      <Icon name="cog" className="w-5 h-5 mr-2" />
+    </button>
+  );
+};

 export const Nav = ({ theme }: Pick<NavigationProps, 'theme'>) => {
  const { t } = useTranslation();
@@ -42,7 +57,12 @@ export const Nav = ({ theme }: Pick<NavigationProps, 'theme'>) => {
  ));

  return (
-    <Navigation appName="Governance" theme={theme} breakpoints={[458, 959]}>
+    <Navigation
+      appName="Governance"
+      theme={theme}
+      breakpoints={[458, 959]}
+      actions={<SettingsLink />}
+    >
      <NavigationList
        className="[.drawer-content_&]:border-b [.drawer-content_&]:border-b-vega-light-200 dark:[.drawer-content_&]:border-b-vega-dark-200 [.drawer-content_&]:pb-8 [.drawer-content_&]:mb-2"
        hide={[NavigationBreakpoint.Small]}
@@ -0,0 +1,53 @@
+import { renderHook, act } from '@testing-library/react';
+import { useTelemetryDialog, TELEMETRY_ON } from './telemetry-dialog';
+
+describe('useTelemetryDialog', () => {
+  beforeEach(() => {
+    localStorage.clear();
+  });
+
+  it('should have the correct initial state based on localStorage', () => {
+    localStorage.setItem(TELEMETRY_ON, 'true');
+
+    const { result } = renderHook(() => useTelemetryDialog());
+
+    expect(result.current.isOpen).toBe(false);
+    expect(result.current.telemetryAccepted).toBe(true);
+  });
+
+  it('should update localStorage and the telemetryAccepted state when setTelemetryAccepted is called', () => {
+    const { result } = renderHook(() => useTelemetryDialog());
+
+    act(() => {
+      result.current.setTelemetryAccepted(true);
+    });
+
+    expect(result.current.telemetryAccepted).toBe(true);
+    expect(localStorage.getItem(TELEMETRY_ON)).toBe('true');
+  });
+
+  it('should update localStorage and the isOpen state when close is called', () => {
+    const { result } = renderHook(() => useTelemetryDialog());
+
+    act(() => {
+      result.current.close();
+    });
+
+    expect(result.current.isOpen).toBe(false);
+  });
+
+  it('should update the isOpen state when open is called', () => {
+    const { result } = renderHook(() => useTelemetryDialog());
+
+    act(() => {
+      result.current.open();
+    });
+
+    expect(result.current.isOpen).toBe(true);
+  });
+
+  it('should open the dialog if TELEMETRY_ON is not set', () => {
+    const { result } = renderHook(() => useTelemetryDialog());
+    expect(result.current.isOpen).toBe(true);
+  });
+});
@@ -0,0 +1,102 @@
+import { create } from 'zustand';
+import { useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useLocalStorage } from '@vegaprotocol/react-helpers';
+import { Dialog, Icon, Button } from '@vegaprotocol/ui-toolkit';
+import { Networks, useEnvironment } from '@vegaprotocol/environment';
+
+type TelemetryDialogState = {
+  isOpen: boolean;
+  open: () => void;
+  close: () => void;
+};
+
+const useTelemetryDialogStore = create<TelemetryDialogState>((set) => ({
+  isOpen: false,
+  open: () => set({ isOpen: true }),
+  close: () => set({ isOpen: false }),
+}));
+
+export const TELEMETRY_ON = 'vega_telemetry_on';
+
+export const useTelemetryDialog = () => {
+  const [telemetryOn, setTelemetryOn] = useLocalStorage(TELEMETRY_ON);
+  const { VEGA_ENV } = useEnvironment();
+  const isMainnet = VEGA_ENV === Networks.MAINNET;
+
+  const defaultTelemetryAccepted = isMainnet ? 'false' : 'true';
+
+  const { isOpen, open, close } = useTelemetryDialogStore();
+
+  useEffect(() => {
+    if (telemetryOn === null || telemetryOn === undefined) {
+      open();
+      setTelemetryOn(defaultTelemetryAccepted);
+    }
+  }, [defaultTelemetryAccepted, open, setTelemetryOn, telemetryOn]);
+
+  return {
+    isOpen,
+    open: open,
+    close: close,
+    telemetryAccepted: telemetryOn === 'true',
+    setTelemetryAccepted: (value: boolean) => {
+      setTelemetryOn(value.toString());
+    },
+  };
+};
+
+export const TelemetryDialog = () => {
+  const { t } = useTranslation();
+  const { isOpen, open, close, telemetryAccepted, setTelemetryAccepted } =
+    useTelemetryDialog();
+  return (
+    <Dialog
+      title={t('ImproveVegaGovernance')}
+      open={isOpen}
+      onChange={(isOpen) => (isOpen ? open() : close())}
+      size="small"
+    >
+      <div className="mt-6">{t('TelemetryModalIntro')}</div>
+      <div className="flex items-center mt-6">
+        <Icon name="eye-off" className="mr-6" size={6} />
+        <div className="flex flex-col gap-1">
+          <div className="font-semibold">{t('Anonymous')}</div>
+          <div>{t('YourIdentityAnonymous')}</div>
+        </div>
+      </div>
+
+      <div className="flex items-center mt-6">
+        <Icon name="cog" className="mr-6" size={6} />
+        <div className="flex flex-col gap-1">
+          <div className="font-semibold">{t('Optional')}</div>
+          <div>{t('OptOutOfTelemetry')}</div>
+        </div>
+      </div>
+
+      <div className="flex items-center mt-10 gap-4">
+        <Button
+          onClick={() => {
+            setTelemetryAccepted(false);
+            close();
+          }}
+          variant="default"
+          data-testid="do-not-share-data-button"
+        >
+          {t('NoThanks')}
+        </Button>
+
+        <Button
+          onClick={() => {
+            setTelemetryAccepted(true);
+            close();
+          }}
+          variant="primary"
+          data-testid="share-data-button"
+        >
+          {telemetryAccepted ? t('ContinueSharingData') : t('ShareData')}
+        </Button>
+      </div>
+    </Dialog>
+  );
+};
@@ -33,10 +33,6 @@ 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
@@ -1,7 +1,7 @@
 import React from 'react';

 export function useDocumentTitle(name?: string) {
-  const base = 'VEGA token';
+  const base = 'VEGA Governance';

  React.useEffect(() => {
    if (name) {
@@ -21,10 +21,10 @@ export const useGetUserBalances = (account: string | undefined) => {
        token.allowance(account, config.staking_bridge_contract.address),
      ]);

-      const balance = toBigNum(b, decimals);
-      const walletBalance = toBigNum(w, decimals);
-      const lien = toBigNum(stats.lien, decimals);
-      const allowance = toBigNum(a, decimals);
+      const balance = toBigNum(b.toString(), decimals);
+      const walletBalance = toBigNum(w.toString(), decimals);
+      const lien = toBigNum(stats.lien.toString(), decimals);
+      const allowance = toBigNum(a.toString(), decimals);

      return {
        balanceFormatted: balance,
@@ -21,8 +21,14 @@ export function useRefreshAssociatedBalances() {
        ]);

      updateBalances({
-        walletAssociatedBalance: toBigNum(walletAssociatedBalance, decimals),
-        vestingAssociatedBalance: toBigNum(vestingAssociatedBalance, decimals),
+        walletAssociatedBalance: toBigNum(
+          walletAssociatedBalance.toString(),
+          decimals
+        ),
+        vestingAssociatedBalance: toBigNum(
+          vestingAssociatedBalance.toString(),
+          decimals
+        ),
      });
    },
    [staking, vesting, updateBalances, decimals]
@@ -31,12 +31,18 @@ export const useRefreshBalances = (address: string) => {
          pubKey ? vesting.stake_balance(address, pubKey) : null,
        ]);

-      const balance = toBigNum(b, decimals);
-      const walletBalance = toBigNum(w, decimals);
-      const lien = toBigNum(stats.lien, decimals);
-      const allowance = toBigNum(a, decimals);
-      const walletAssociatedBalance = toBigNum(walletStakeBalance, decimals);
-      const vestingAssociatedBalance = toBigNum(vestingStakeBalance, decimals);
+      const balance = toBigNum(b.toString(), decimals);
+      const walletBalance = toBigNum(w.toString(), decimals);
+      const lien = toBigNum(stats.lien.toString(), decimals);
+      const allowance = toBigNum(a.toString(), decimals);
+      const walletAssociatedBalance = toBigNum(
+        walletStakeBalance ? walletStakeBalance.toString() : 0,
+        decimals
+      );
+      const vestingAssociatedBalance = toBigNum(
+        vestingStakeBalance ? vestingStakeBalance.toString() : 0,
+        decimals
+      );

      updateBalances({
        balanceFormatted: balance,
@@ -66,7 +66,7 @@
  "claim": "This code ({{code}}) entitles <bold>{{user}}</bold> to <bold>{{amount}} $VEGA</bold> tokens from <trancheLink>{{linkText}}</trancheLink> of the vesting contract. {{expiry}}.",
  "claimExpiry": "The code expires on {{date}}",
  "claimNoExpiry": "It has no expiry date",
-  "showRedeem": "You'll be able to redeem your unlocked tokens at token.vega.xyz/vesting",
+  "showRedeem": "You'll be able to redeem your unlocked tokens at governance.vega.xyz/vesting",
  "codeUsed": "Code already used",
  "codeUsedText": "Looks like that code has already been used. Check the Vesting page to see if you can redeem your tokens.",
  "codeExpired": "Code expired",
@@ -86,7 +86,7 @@
  "Awaiting action in Ethereum wallet (e.g. MetaMask)": "Awaiting action in Ethereum wallet (e.g. MetaMask)",
  "Claim {amount} Vega": "Claim {{amount}} $VEGA",
  "Sorry. It is not possible to claim tokens in your country or region.": "It is not possible to claim tokens in your country or region.",
-  "none redeemable": "Tokens in this tranche unlock on {{unlockDate}} and continue to unlock gradually until {{trancheEndDate}} when all tokens are unlocked. Come back to token.vega.xyz to redeem your tokens once they begin to unlock.",
+  "none redeemable": "Tokens in this tranche unlock on {{unlockDate}} and continue to unlock gradually until {{trancheEndDate}} when all tokens are unlocked. Come back to governance.vega.xyz to redeem your tokens once they begin to unlock.",
  "partially redeemable": "Tokens in this tranche began to unlock on {{unlockDate}} and will continue to unlock gradually until {{trancheEndDate}} when all tokens are unlocked.",
  "fully redeemable": "Tokens in this tranche have fully unlocked and can be redeemed once claimed.",
  "This page can not be found, please check the URL and try again.": "This page can not be found, please check the URL and try again.",
@@ -201,7 +201,7 @@
  "NewFreeform": "Freeform",
  "tokenVotes": "Token votes",
  "liquidityVotes": "Liquidity votes",
-  "yourVote": "Your vote",
+  "castYourVote": "Cast 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 yes tokens",
+  "totalTokensVotes": "Total tokens voted",
  "totalTokenVotedPercentage": "Total tokens voted percentage",
  "numberOfForVotes": "Number of votes for",
  "numberOfAgainstVotes": "Number of votes against",
@@ -631,7 +631,10 @@
  "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",
@@ -677,6 +680,7 @@
  "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",
@@ -694,6 +698,7 @@
  "UpdateMarket": "Update market",
  "NewAsset": "New asset",
  "UpdateAsset": "Update asset",
+  "AssetID": "Asset ID",
  "Freeform": "Freeform",
  "RawProposal": "Let me choose (raw proposal)",
  "UseMin": "Use minimum",
@@ -737,6 +742,7 @@
  "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",
@@ -791,5 +797,16 @@
  "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."
+  "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",
+  "ImproveVegaGovernance": "Improve Vega governance",
+  "TelemetryModalIntro": "Help us identify bugs and improve Vega Governance by sharing anonymous usage data.",
+  "Anonymous": "Anonymous",
+  "YourIdentityAnonymous": "Your identity is always anonymous on Vega",
+  "Optional": "Optional",
+  "OptOutOfTelemetry": "You can opt out any time via settings",
+  "NoThanks": "No thanks",
+  "ShareData": "Share data",
+  "ContinueSharingData": "Continue sharing data"
 }
@@ -24,7 +24,7 @@
      type="font/woff2"
      crossorigin="anonymous"
    />
-    <title>Vega Token dApp</title>
+    <title>Vega Governance dApp</title>
    <script src="./assets/env-config.js"></script>
  </head>
  <body class="h-full">
@@ -15,7 +15,6 @@ 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,
@@ -25,7 +24,8 @@ 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 '../proposals/protocol-upgrade/__generated__/ProtocolUpgradeProposals';
+import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
+import { useProtocolUpgradeProposalsQuery } from '@vegaprotocol/proposals';

 const nodesToShow = 6;

@@ -181,7 +181,7 @@ const GovernanceHome = ({ name }: RouteChildProps) => {
    data: protocolUpgradesData,
    loading: protocolUpgradesLoading,
    error: protocolUpgradesError,
-  } = useProtocolUpgradesQuery({
+  } = useProtocolUpgradeProposalsQuery({
    pollInterval: 5000,
    fetchPolicy: 'network-only',
    errorPolicy: 'ignore',
@@ -1,7 +1,11 @@
 import { useTranslation } from 'react-i18next';
-import * as Schema from '@vegaprotocol/types';
+import { Icon } from '@vegaprotocol/ui-toolkit';
 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,
@@ -9,19 +13,63 @@ export const CurrentProposalState = ({
  proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
 }) => {
  const { t } = useTranslation();
-  let className = 'text-white';
+  let proposalStatus: ReactNode;
+  let variant = 'tertiary' as ProposalInfoLabelVariant;

-  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';
+  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;
+    }
  }
-  return <span className={className}>{t(`${proposal?.state}`)}</span>;
+
+  return (
+    <ProposalInfoLabel variant={variant}>{proposalStatus}</ProposalInfoLabel>
+  );
 };
@@ -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/react-helpers';
-import { NetworkParamsDocument } from '@vegaprotocol/react-helpers';
+import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
+import { NetworkParamsDocument } from '@vegaprotocol/network-parameters';
 import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider';
 import { generateProposal } from '../../test-helpers/generate-proposals';
 import { CurrentProposalStatus } from './current-proposal-status';
@@ -16,17 +16,12 @@ 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))
    )
  ).toBeInTheDocument();
-
  expect(screen.getByText('Proposed enactment')).toBeInTheDocument();
  expect(
    screen.getByText(
@@ -35,17 +30,12 @@ it('Renders all data for table', () => {
      )
    )
  ).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)))
  ).toBeInTheDocument();
-
-  expect(screen.getByText('Type')).toBeInTheDocument();
-  expect(screen.getByText('Network parameter')).toBeInTheDocument();
 });

 it('Changes data based on if data is in future or past', () => {
@@ -53,17 +43,12 @@ 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))
    )
  ).toBeInTheDocument();
-
  expect(screen.getByText('Enacted on')).toBeInTheDocument();
  expect(
    screen.getByText(
@@ -104,7 +89,6 @@ 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)
@@ -6,7 +6,6 @@ import {
  KeyValueTableRow,
  RoundedWrapper,
 } from '@vegaprotocol/ui-toolkit';
-import { CurrentProposalState } from '../current-proposal-state';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';

@@ -20,16 +19,12 @@ export const ProposalChangeTable = ({ proposal }: ProposalChangeTableProps) => {
  const terms = proposal?.terms;

  return (
-    <RoundedWrapper>
+    <RoundedWrapper paddingBottom={true}>
      <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')
@@ -50,26 +45,24 @@ export const ProposalChangeTable = ({ proposal }: ProposalChangeTableProps) => {
          {t('proposedBy')}
          <span style={{ wordBreak: 'break-word' }}>{proposal?.party.id}</span>
        </KeyValueTableRow>
-        <KeyValueTableRow>
+        <KeyValueTableRow
+          noBorder={!proposal?.rejectionReason && !proposal?.errorDetails}
+        >
          {t('proposedOn')}
          {formatDateWithLocalTimezone(new Date(proposal?.datetime))}
        </KeyValueTableRow>
        {proposal?.rejectionReason ? (
-          <KeyValueTableRow>
+          <KeyValueTableRow noBorder={!proposal?.errorDetails}>
            {t('rejectionReason')}
            {proposal.rejectionReason}
          </KeyValueTableRow>
        ) : null}
        {proposal?.errorDetails ? (
-          <KeyValueTableRow>
+          <KeyValueTableRow noBorder={true}>
            {t('errorDetails')}
            {proposal.errorDetails}
          </KeyValueTableRow>
        ) : null}
-        <KeyValueTableRow>
-          {t('type')}
-          {t(`${proposal?.terms.change.__typename}`)}
-        </KeyValueTableRow>
      </KeyValueTable>
    </RoundedWrapper>
  );
@@ -1,68 +1,68 @@
 import { render, screen } from '@testing-library/react';
-import { generateProposal } from '../../test-helpers/generate-proposals';
+import {
+  generateNoVotes,
+  generateProposal,
+  generateYesVotes,
+} 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']) => (
-  <ProposalHeader proposal={proposal} />
-);
+const renderComponent = (
+  proposal: ProposalQuery['proposal'],
+  isListItem = true
+) => render(<ProposalHeader proposal={proposal} isListItem={isListItem} />);

 describe('Proposal header', () => {
  it('Renders New market proposal', () => {
-    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',
-                  },
+    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', () => {
-    render(
-      renderComponent(
-        generateProposal({
-          rationale: {
-            title: 'New market id',
+    renderComponent(
+      generateProposal({
+        rationale: {
+          title: 'New market id',
+        },
+        terms: {
+          change: {
+            __typename: 'UpdateMarket',
+            marketId: 'MarketId',
          },
-          terms: {
-            change: {
-              __typename: 'UpdateMarket',
-              marketId: 'MarketId',
-            },
-          },
-        })
-      )
+        },
+      })
    );
    expect(screen.getByTestId('proposal-title')).toHaveTextContent(
      'New market id'
@@ -79,53 +79,49 @@ describe('Proposal header', () => {
  });

  it('Renders New asset proposal - ERC20', () => {
-    render(
-      renderComponent(
-        generateProposal({
-          rationale: {
-            title: 'New asset: Fake currency',
-            description: '',
-          },
-          terms: {
-            change: {
-              __typename: 'NewAsset',
-              name: 'Fake currency',
-              symbol: 'FAKE',
-              source: {
-                __typename: 'ERC20',
-                contractAddress: '0x0',
-              },
+    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 0x0'
+      'Symbol: FAKE. ERC20 contract address: 0x0'
    );
  });

  it('Renders New asset proposal - BuiltInAsset', () => {
-    render(
-      renderComponent(
-        generateProposal({
-          terms: {
-            change: {
-              __typename: 'NewAsset',
-              name: 'Fake currency',
-              symbol: 'BIA',
-              source: {
-                __typename: 'BuiltinAsset',
-                maxFaucetAmountMint: '300',
-              },
+    renderComponent(
+      generateProposal({
+        terms: {
+          change: {
+            __typename: 'NewAsset',
+            name: 'Fake currency',
+            symbol: 'BIA',
+            source: {
+              __typename: 'BuiltinAsset',
+              maxFaucetAmountMint: '300',
            },
          },
-        })
-      )
+        },
+      })
    );
    expect(screen.getByTestId('proposal-title')).toHaveTextContent(
      'Unknown proposal'
@@ -137,24 +133,22 @@ describe('Proposal header', () => {
  });

  it('Renders Update network', () => {
-    render(
-      renderComponent(
-        generateProposal({
-          rationale: {
-            title: 'Network parameter',
-          },
-          terms: {
-            change: {
-              __typename: 'UpdateNetworkParameter',
-              networkParameter: {
-                __typename: 'NetworkParameter',
-                key: 'Network key',
-                value: 'Network value',
-              },
+    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'
@@ -167,122 +161,211 @@ describe('Proposal header', () => {
    );
  });

-  it('Renders Freeform network - short rationale', () => {
-    render(
-      renderComponent(
-        generateProposal({
-          id: 'short',
-          rationale: {
-            title: '0x0',
+  it('Renders Freeform proposal - short rationale', () => {
+    renderComponent(
+      generateProposal({
+        id: 'short',
+        rationale: {
+          title: '0x0',
+        },
+        terms: {
+          change: {
+            __typename: 'NewFreeform',
          },
-          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)', () => {
-    render(
-      renderComponent(
-        generateProposal({
-          id: 'long',
-          rationale: {
-            title: '0x0',
-            description:
-              'Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Aenean dolor.',
+  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',
          },
-          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 taciti sociosqu ad litora torquent per conubia'
+      /Class aptent/
    );
-    expect(screen.getByTestId('proposal-details')).toHaveTextContent('long');
  });

  // Remove once proposals have rationale and re-enable above tests
  it('Renders Freeform proposal - id for title', () => {
-    render(
-      renderComponent(
-        generateProposal({
-          id: 'freeform id',
-          rationale: {
-            title: 'freeform',
+    renderComponent(
+      generateProposal({
+        id: 'freeform id',
+        rationale: {
+          title: 'freeform',
+        },
+        terms: {
+          change: {
+            __typename: 'NewFreeform',
          },
-          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', () => {
-    render(
-      renderComponent(
-        generateProposal({
-          terms: {
-            change: {
-              __typename: 'UpdateAsset',
-              assetId: 'foo',
-            },
+    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", () => {
-    render(
-      renderComponent(
-        generateProposal({
-          terms: {
-            change: {
-              // @ts-ignore unknown proposal
-              __typename: 'Foo',
-            },
+    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');
+  });
 });
@@ -1,23 +1,27 @@
 import { useTranslation } from 'react-i18next';
-import { Intent, Lozenge } from '@vegaprotocol/ui-toolkit';
+import { 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,
-  useSubHeading = true,
+  isListItem = true,
 }: {
  proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
-  useSubHeading?: boolean;
+  isListItem?: boolean;
 }) => {
  const { t } = useTranslation();
  const change = proposal?.terms.change;

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

  let title = proposal?.rationale.title.trim();
  let description = proposal?.rationale.description.trim();
@@ -30,10 +34,12 @@ export const ProposalHeader = ({

  switch (change?.__typename) {
    case 'NewMarket': {
-      proposalType = t('NewMarket');
+      proposalType = 'NewMarket';
      details = (
        <>
-          {t('Code')}: {change.instrument.code}.{' '}
+          <span>
+            {t('Code')}: {change.instrument.code}.
+          </span>{' '}
          {change.instrument.futureProduct?.settlementAsset.symbol ? (
            <>
              <span className="font-semibold">
@@ -49,54 +55,61 @@ export const ProposalHeader = ({
      break;
    }
    case 'UpdateMarket': {
-      proposalType = t('UpdateMarket');
-      details = `${t('Market change')}: ${change.marketId}`;
+      proposalType = 'UpdateMarket';
+      details = (
+        <>
+          <span>{t('Market change')}:</span>{' '}
+          <span>{truncateMiddle(change.marketId)}</span>
+        </>
+      );
      break;
    }
    case 'NewAsset': {
-      proposalType = t('NewAsset');
+      proposalType = 'NewAsset';
      details = (
        <>
-          {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>
+          <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>
+            </>
+          )}
        </>
      );
      break;
    }
    case 'UpdateNetworkParameter': {
-      proposalType = t('NetworkParameter');
-      const parametersClasses = 'font-mono leading-none';
+      proposalType = 'NetworkParameter';
      details = (
        <>
-          <span className={`${parametersClasses} mr-2`}>
-            {change.networkParameter.key}
-          </span>{' '}
-          {t('to')}{' '}
-          <span className={`${parametersClasses} ml-2`}>
-            {change.networkParameter.value}
+          <span>{t('Change')}:</span>{' '}
+          <Lozenge>{change.networkParameter.key}</Lozenge>{' '}
+          <span>{t('to')}</span>{' '}
+          <span className="whitespace-nowrap">
+            <Lozenge>{change.networkParameter.value}</Lozenge>
          </span>
        </>
      );
      break;
    }
    case 'NewFreeform': {
-      proposalType = t('Freeform');
-      details = `${t('FreeformProposal')}: ${proposal?.id}`;
+      proposalType = 'Freeform';
+      details = <span />;
      break;
    }
    case 'UpdateAsset': {
-      proposalType = t('UpdateAsset');
+      proposalType = 'UpdateAsset';
      details = (
        <>
-          `${t('Update asset')}`;
-          <Lozenge>{change.assetId}</Lozenge>
+          <span>{t('AssetID')}:</span>{' '}
+          <Lozenge>{truncateMiddle(change.assetId)}</Lozenge>
        </>
      );
      break;
@@ -104,9 +117,9 @@ export const ProposalHeader = ({
  }

  return (
-    <div className="text-sm mb-2">
+    <>
      <div data-testid="proposal-title">
-        {useSubHeading ? (
+        {isListItem ? (
          <header>
            <SubHeading title={titleContent || t('Unknown proposal')} />
          </header>
@@ -116,18 +129,39 @@ export const ProposalHeader = ({
      </div>

      <div className="flex items-center gap-2 mb-4">
-        {proposalType && (
-          <div data-testid="proposal-type">
-            <Lozenge variant={Intent.None}>{proposalType}</Lozenge>
-          </div>
-        )}
+        <div data-testid="proposal-type">
+          <ProposalInfoLabel variant="secondary">
+            {t(`${proposalType}`)}
+          </ProposalInfoLabel>
+        </div>

-        {description && (
-          <div data-testid="proposal-description">{description}</div>
-        )}
+        <div data-testid="proposal-status">
+          <CurrentProposalState proposal={proposal} />
+        </div>
      </div>

-      {details && <div data-testid="proposal-details">{details}</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>
+      )}
+    </>
  );
 };
@@ -0,0 +1 @@
+export * from './proposal-info-label';
@@ -0,0 +1,35 @@
+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>;
+};
@@ -1,8 +1,10 @@
 import { useTranslation } from 'react-i18next';
-import { SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
+import { Icon, 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,
@@ -10,10 +12,26 @@ 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>
-      <SubHeading title={t('proposalTerms')} />
-      <SyntaxHighlighter data={terms} />
+      <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} />}
    </section>
  );
 };
@@ -1,4 +1,4 @@
-import { render, screen } from '@testing-library/react';
+import { render, screen, fireEvent } 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,6 +46,7 @@ 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();
@@ -55,7 +56,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 yes tokens')).toBeInTheDocument();
+    expect(screen.getByText('Total tokens voted')).toBeInTheDocument();
    expect(
      screen.getByText('Total tokens voted percentage')
    ).toBeInTheDocument();
@@ -70,13 +71,14 @@ 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 yes tokens')).toBeNull();
+    expect(screen.queryByText('Total tokens voted')).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();
@@ -86,6 +88,7 @@ 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();
  });

@@ -110,6 +113,7 @@ describe('Proposal Votes Table', () => {
      }),
      updateMarketProposalType
    );
+    fireEvent.click(screen.getByTestId('vote-breakdown-toggle'));
    expect(screen.getByText('👍 by liquidity vote')).toBeInTheDocument();
  });
 });
@@ -1,9 +1,12 @@
+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';
@@ -26,6 +29,7 @@ export const ProposalVotesTable = ({
  const {
    appState: { totalSupply },
  } = useAppState();
+  const [showDetails, setShowDetails] = useState(false);
  const {
    willPassByTokenVote,
    willPassByLPVote,
@@ -53,113 +57,130 @@ export const ProposalVotesTable = ({
    ? t('byTokenVote')
    : t('byLiquidityVote');

+  const showDetailsIconClasses = classnames('mb-4', {
+    'rotate-180': showDetails,
+  });
+
  return (
    <>
-      <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 && (
+      <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}
+          >
            <KeyValueTableRow>
-              {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 ? (
+              {t('expectedToPass')}
+              {isUpdateMarket ? (
+                updateMarketWillPass ? (
+                  <Thumbs up={true} text={updateMarketVotePassMethod} />
+                ) : (
+                  <Thumbs up={false} />
+                )
+              ) : willPassByTokenVote ? (
                <Thumbs up={true} />
              ) : (
                <Thumbs up={false} />
              )}
            </KeyValueTableRow>
-          )}
-          <KeyValueTableRow>
-            {t('tokenForProposal')}
-            {formatNumber(yesTokens, 2)}
-          </KeyValueTableRow>
-          {isUpdateMarket && (
            <KeyValueTableRow>
-              {t('tokenLPForProposal')}
-              {formatNumber(yesEquityLikeShareWeight, 2)}
+              {t('majorityMet')}
+              {majorityMet ? <Thumbs up={true} /> : <Thumbs up={false} />}
            </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 && (
-            <>
+            {isUpdateMarket && (
              <KeyValueTableRow>
-                {t('numberOfVotingParties')}
-                {formatNumber(totalVotes, 0)}
+                {t('majorityLPMet')}
+                {majorityLPMet ? <Thumbs up={true} /> : <Thumbs up={false} />}
              </KeyValueTableRow>
+            )}
+            <KeyValueTableRow>
+              {t('participationMet')}
+              {participationMet ? <Thumbs up={true} /> : <Thumbs up={false} />}
+            </KeyValueTableRow>
+            {isUpdateMarket && (
              <KeyValueTableRow>
-                {t('totalTokensVotes')}
-                {formatNumber(totalTokensVoted, 2)}
+                {t('participationLPMet')}
+                {participationLPMet ? (
+                  <Thumbs up={true} />
+                ) : (
+                  <Thumbs up={false} />
+                )}
              </KeyValueTableRow>
+            )}
+            <KeyValueTableRow>
+              {t('tokenForProposal')}
+              {formatNumber(yesTokens, 2)}
+            </KeyValueTableRow>
+            {isUpdateMarket && (
              <KeyValueTableRow>
-                {t('totalTokenVotedPercentage')}
-                {formatNumberPercentage(totalTokensPercentage, 2)}
+                {t('tokenLPForProposal')}
+                {formatNumber(yesEquityLikeShareWeight, 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('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>
+      )}
    </>
  );
 };
@@ -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/react-helpers', () => ({
-  ...jest.requireActual('@vegaprotocol/react-helpers'),
+jest.mock('@vegaprotocol/network-parameters', () => ({
+  ...jest.requireActual('@vegaprotocol/network-parameters'),
  useNetworkParams: jest.fn(() => ({
    params: {
      governance_proposal_asset_minVoterBalance: '1',
@@ -1,5 +1,8 @@
-import { NetworkParams, useNetworkParams } from '@vegaprotocol/react-helpers';
-import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
+import {
+  NetworkParams,
+  useNetworkParams,
+} from '@vegaprotocol/network-parameters';
+import { AsyncRenderer, RoundedWrapper } from '@vegaprotocol/ui-toolkit';
 import { ProposalHeader } from '../proposal-detail-header/proposal-header';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
@@ -74,8 +77,8 @@ export const Proposal = ({ proposal }: ProposalProps) => {
  return (
    <AsyncRenderer data={params} loading={loading} error={error}>
      <section data-testid="proposal">
-        <ProposalHeader proposal={proposal} useSubHeading={false} />
-        <div className="mb-10">
+        <ProposalHeader proposal={proposal} isListItem={false} />
+        <div className="my-10">
          <ProposalChangeTable proposal={proposal} />
        </div>
        {proposal.terms.change.__typename === 'NewAsset' &&
@@ -88,14 +91,18 @@ export const Proposal = ({ proposal }: ProposalProps) => {
          />
        ) : null}
        <div className="mb-12">
-          <VoteDetails
-            proposal={proposal}
-            proposalType={proposalType}
-            minVoterBalance={minVoterBalance}
-            spamProtectionMinTokens={params?.spam_protection_voting_min_tokens}
-          />
+          <RoundedWrapper paddingBottom={true}>
+            <VoteDetails
+              proposal={proposal}
+              proposalType={proposalType}
+              minVoterBalance={minVoterBalance}
+              spamProtectionMinTokens={
+                params?.spam_protection_voting_min_tokens
+              }
+            />
+          </RoundedWrapper>
        </div>
-        <div className="mb-10">
+        <div className="mb-4">
          <ProposalVotesTable proposal={proposal} proposalType={proposalType} />
        </div>
        <ProposalTermsJson terms={proposal.terms} />
@@ -97,7 +97,6 @@ describe('Proposals list item details', () => {
        },
      })
    );
-    expect(screen.getByTestId('proposal-status')).toHaveTextContent('Enacted');
    expect(screen.getByTestId('vote-details')).toHaveTextContent(
      format(lastWeek, DATE_FORMAT_DETAILED)
    );
@@ -113,7 +112,6 @@ 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)}`
    );
@@ -128,9 +126,6 @@ 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)}`
    );
@@ -221,7 +216,6 @@ describe('Proposals list item details', () => {
        },
      })
    );
-    expect(screen.getByTestId('proposal-status')).toHaveTextContent('Open');
    expect(screen.getByTestId('vote-details')).toHaveTextContent(
      '5 minutes left to vote'
    );
@@ -236,7 +230,6 @@ describe('Proposals list item details', () => {
        },
      })
    );
-    expect(screen.getByTestId('proposal-status')).toHaveTextContent('Open');
    expect(screen.getByTestId('vote-details')).toHaveTextContent(
      '5 hours left to vote'
    );
@@ -251,7 +244,6 @@ describe('Proposals list item details', () => {
        },
      })
    );
-    expect(screen.getByTestId('proposal-status')).toHaveTextContent('Open');
    expect(screen.getByTestId('vote-details')).toHaveTextContent(
      '5 days left to vote'
    );
@@ -268,10 +260,7 @@ describe('Proposals list item details', () => {
      networkParamsQueryMock,
      createUserVoteQueryMock(proposal?.id, VoteValue.VALUE_YES),
    ]);
-    expect(screen.getByTestId('proposal-status')).toHaveTextContent('Open');
-
-    expect(await screen.findByText('You voted')).toBeInTheDocument();
-    expect(await screen.findByText('For')).toBeInTheDocument();
+    expect(await screen.findByText('You voted For')).toBeInTheDocument();
  });

  it('Renders proposal state: Open - user voted against', async () => {
@@ -285,9 +274,7 @@ describe('Proposals list item details', () => {
      networkParamsQueryMock,
      createUserVoteQueryMock(proposal?.id, VoteValue.VALUE_NO),
    ]);
-    expect(screen.getByTestId('proposal-status')).toHaveTextContent('Open');
-    expect(await screen.findByText('You voted')).toBeInTheDocument();
-    expect(await screen.findByText('Against')).toBeInTheDocument();
+    expect(await screen.findByText('You voted Against')).toBeInTheDocument();
  });

  it('Renders proposal state: Open - participation not reached', () => {
@@ -303,7 +290,6 @@ describe('Proposals list item details', () => {
        },
      })
    );
-    expect(screen.getByTestId('proposal-status')).toHaveTextContent('Open');
    expect(screen.getByTestId('vote-status')).toHaveTextContent(
      'Participation not reached'
    );
@@ -322,7 +308,6 @@ describe('Proposals list item details', () => {
        },
      })
    );
-    expect(screen.getByTestId('proposal-status')).toHaveTextContent('Open');
    expect(screen.getByTestId('vote-status')).toHaveTextContent(
      'Majority not reached'
    );
@@ -342,7 +327,6 @@ describe('Proposals list item details', () => {
        },
      })
    );
-    expect(screen.getByTestId('proposal-status')).toHaveTextContent('Open');
    expect(screen.getByTestId('vote-status')).toHaveTextContent('Set to pass');
  });

@@ -359,7 +343,6 @@ describe('Proposals list item details', () => {
        },
      })
    );
-    expect(screen.getByTestId('proposal-status')).toHaveTextContent('Declined');
    expect(screen.getByTestId('vote-status')).toHaveTextContent(
      'Participation not reached'
    );
@@ -378,7 +361,6 @@ describe('Proposals list item details', () => {
        },
      })
    );
-    expect(screen.getByTestId('proposal-status')).toHaveTextContent('Declined');
    expect(screen.getByTestId('vote-status')).toHaveTextContent(
      'Majority not reached'
    );
@@ -395,7 +377,6 @@ 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'
    );
@@ -1,11 +1,8 @@
 import { Link } from 'react-router-dom';
-import { Button, Icon } from '@vegaprotocol/ui-toolkit';
+import { Button } from '@vegaprotocol/ui-toolkit';
 import { useVoteInformation } from '../../hooks';
 import { useUserVote } from '../vote-details/use-user-vote';
-import {
-  StatusPass,
-  StatusFail,
-} from '../current-proposal-status/current-proposal-status';
+import { StatusPass } 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';
@@ -22,7 +19,7 @@ const MajorityNotReached = () => {
  const { t } = useTranslation();
  return (
    <>
-      {t('Majority')} <StatusFail>{t('not reached')}</StatusFail>
+      {t('Majority')} {t('not reached')}
    </>
  );
 };
@@ -30,7 +27,7 @@ const ParticipationNotReached = () => {
  const { t } = useTranslation();
  return (
    <>
-      {t('Participation')} <StatusFail>{t('not reached')}</StatusFail>
+      {t('Participation')} {t('not reached')}
    </>
  );
 };
@@ -57,17 +54,11 @@ 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(
@@ -79,11 +70,6 @@ export const ProposalsListItemDetails = ({
      break;
    }
    case ProposalState.STATE_PASSED: {
-      proposalStatus = (
-        <>
-          {t('voteState_Passed')} <Icon name={'tick'} />
-        </>
-      );
      voteDetails = proposal?.terms.change.__typename !== 'NewFreeform' && (
        <>
          {t('toEnactOn')}{' '}
@@ -97,11 +83,6 @@ 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')}{' '}
@@ -115,19 +96,14 @@ export const ProposalsListItemDetails = ({
      break;
    }
    case ProposalState.STATE_OPEN: {
-      proposalStatus = (
-        <>
-          {t('voteState_Open')} <Icon name={'hand'} />
-        </>
-      );
      voteDetails = (voteState === 'Yes' && (
        <>
-          {t('youVoted')} <StatusPass>{t('voteState_Yes')}</StatusPass>
+          {t('youVoted')} {t('voteState_Yes')}
        </>
      )) ||
        (voteState === 'No' && (
          <>
-            {t('youVoted')} <StatusFail>{t('voteState_No')}</StatusFail>
+            {t('youVoted')} {t('voteState_No')}
          </>
        )) || (
          <>
@@ -148,40 +124,29 @@ export const ProposalsListItemDetails = ({
            </>
          ) : (
            <>
-              {t('Set to')} <StatusFail>{t('fail')}</StatusFail>
+              {t('Set to')} {t('fail')}
            </>
          ))) ||
        (!participationMet && <ParticipationNotReached />) ||
        (!majorityMet && <MajorityNotReached />) ||
        (willPassByTokenVote ? (
          <>
-            {t('Set to')} <StatusPass>{t('pass')}</StatusPass>
+            {t('Set to')} {t('pass')}
          </>
        ) : (
          <>
-            {t('Set to')} <StatusFail>{t('fail')}</StatusFail>
+            {t('Set to')} {t('fail')}
          </>
        ));
      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])}</>
      );
@@ -190,16 +155,10 @@ export const ProposalsListItemDetails = ({
  }

  return (
-    <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>
+    <div className="grid grid-cols-[1fr_auto] mt-4 items-start gap-2 text-sm">
      {voteDetails && (
        <div
-          className="col-start-1 row-start-2 text-neutral-500"
+          className="col-start-1 row-start-2 text-vega-light-300"
          data-testid="vote-details"
        >
          {voteDetails}
@@ -216,9 +175,7 @@ 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" size="sm">
-              {t('View')}
-            </Button>
+            <Button data-testid="view-proposal-btn">{t('View')}</Button>
          </Link>
        </div>
      )}
@@ -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 '../../protocol-upgrade/__generated__/ProtocolUpgradeProposals';
+import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';

 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-neutral-800">
+      <section className="-mx-4 p-4 mb-8 bg-vega-dark-100">
        <SubHeading title={t('openProposals')} />
        {sortedProposals.open.length > 0 ||
        sortedProtocolUpgradeProposals.open.length > 0 ? (
@@ -5,7 +5,7 @@ import {
  RoundedWrapper,
 } from '@vegaprotocol/ui-toolkit';
 import { SubHeading } from '../../../../components/heading';
-import type { ProtocolUpgradeProposalFieldsFragment } from '../../protocol-upgrade/__generated__/ProtocolUpgradeProposals';
+import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';

 export interface ProtocolUpgradeProposalDetailInfoProps {
  proposal: ProtocolUpgradeProposalFieldsFragment;
@@ -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 '../../protocol-upgrade/__generated__/ProtocolUpgradeProposals';
+import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';

 const proposal = {
  status:
@@ -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 type { ReactNode } from 'react';
-import type { ProtocolUpgradeProposalFieldsFragment } from '../../protocol-upgrade/__generated__/ProtocolUpgradeProposals';
+import { ProposalInfoLabel } from '../proposal-info-label';
 import Routes from '../../../routes';
+import type { ReactNode } from 'react';
+import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';

 interface ProtocolProposalsListItemProps {
  proposal: ProtocolUpgradeProposalFieldsFragment;
@@ -29,30 +29,30 @@ export const ProtocolUpgradeProposalsListItem = ({
  switch (proposal.status) {
    case ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_REJECTED:
      proposalStatusIcon = (
-        <div data-testid="protocol-upgrade-proposal-status-icon-rejected">
+        <span data-testid="protocol-upgrade-proposal-status-icon-rejected">
          <Icon name={'cross'} />
-        </div>
+        </span>
      );
      break;
    case ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_PENDING:
      proposalStatusIcon = (
-        <div data-testid="protocol-upgrade-proposal-status-icon-pending">
+        <span data-testid="protocol-upgrade-proposal-status-icon-pending">
          <Icon name={'time'} />
-        </div>
+        </span>
      );
      break;
    case ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_APPROVED:
      proposalStatusIcon = (
-        <div data-testid="protocol-upgrade-proposal-status-icon-approved">
+        <span data-testid="protocol-upgrade-proposal-status-icon-approved">
          <Icon name={'tick'} />
-        </div>
+        </span>
      );
      break;
    case ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_UNSPECIFIED:
      proposalStatusIcon = (
-        <div data-testid="protocol-upgrade-proposal-status-icon-unspecified">
+        <span data-testid="protocol-upgrade-proposal-status-icon-unspecified">
          <Icon name={'disable'} />
-        </div>
+        </span>
      );
      break;
  }
@@ -71,18 +71,28 @@ export const ProtocolUpgradeProposalsListItem = ({
        </div>

        <div className="text-sm">
-          <div
-            data-testid="protocol-upgrade-proposal-type"
-            className="flex items-center gap-2 mb-4"
-          >
-            <Lozenge variant={Intent.Success}>{t('networkUpgrade')}</Lozenge>
+          <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>

          <div
            data-testid="protocol-upgrade-proposal-release-tag"
            className="mb-2"
          >
-            <span className="pr-2">{t('vegaReleaseTag')}</span>
+            <span>{t('vegaReleaseTag')}:</span>{' '}
            <Lozenge>{proposal.vegaReleaseTag}</Lozenge>
          </div>

@@ -90,30 +100,18 @@ export const ProtocolUpgradeProposalsListItem = ({
            data-testid="protocol-upgrade-proposal-block-height"
            className="mb-2"
          >
-            <span className="pr-2">{t('upgradeBlockHeight')}</span>
+            <span>{t('upgradeBlockHeight')}:</span>{' '}
            <Lozenge>{proposal.upgradeBlockHeight}</Lozenge>
          </div>

-          <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">
+          <div className="grid grid-cols-1 mt-3">
+            <div className="justify-self-end">
              <Link
                to={`${Routes.PROPOSALS}/protocol-upgrade/${stripFullStops(
                  proposal.vegaReleaseTag
                )}`}
              >
-                <Button data-testid="view-proposal-btn" size="sm">
-                  {t('View')}
-                </Button>
+                <Button data-testid="view-proposal-btn">{t('View')}</Button>
              </Link>
            </div>
          </div>
@@ -107,10 +107,6 @@ export const VoteButtons = ({
      );
    }

-    if (currentStakeAvailable.isLessThanOrEqualTo(0)) {
-      return t('noGovernanceTokens');
-    }
-
    if (minVoterBalance && spamProtectionMinTokens) {
      const formattedMinVoterBalance = new BigNumber(
        addDecimal(minVoterBalance, 18)
@@ -163,24 +159,30 @@ export const VoteButtons = ({
  return (
    <>
      {changeVote || (voteState === VoteState.NotCast && proposalVotable) ? (
-        <div className="flex gap-4" data-testid="vote-buttons">
-          <div className="flex-1">
+        <>
+          {currentStakeAvailable.isLessThanOrEqualTo(0) && (
+            <p data-testid="no-stake-available">{t('noGovernanceTokens')}</p>
+          )}
+
+          <div className="flex gap-4" data-testid="vote-buttons">
            <Button
              data-testid="vote-for"
              onClick={() => submitVote(VoteValue.VALUE_YES)}
+              variant="primary"
+              disabled={currentStakeAvailable.isLessThanOrEqualTo(0)}
            >
              {t('voteFor')}
            </Button>
-          </div>
-          <div className="flex-1">
            <Button
              data-testid="vote-against"
              onClick={() => submitVote(VoteValue.VALUE_NO)}
+              variant="primary"
+              disabled={currentStakeAvailable.isLessThanOrEqualTo(0)}
            >
              {t('voteAgainst')}
            </Button>
          </div>
-        </div>
+        </>
      ) : (
        (voteState === VoteState.Yes || voteState === VoteState.No) && (
          <p data-testid="you-voted">
@@ -1,5 +1,6 @@
 import { useTranslation } from 'react-i18next';
 import { formatDistanceToNow } from 'date-fns';
+import { RoundedWrapper, Icon } from '@vegaprotocol/ui-toolkit';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { ProposalState } from '@vegaprotocol/types';
 import { useVoteSubmit, VoteProgress } from '@vegaprotocol/proposals';
@@ -199,10 +200,11 @@ export const VoteDetails = ({
        {proposalType === ProposalType.PROPOSAL_UPDATE_MARKET && (
          <p>{t('votingThresholdInfo')}</p>
        )}
-        {pubKey ? (
-          <section className="mt-10">
-            <SubHeading title={t('yourVote')} />
-            {proposal && (
+
+        <section className="mt-10">
+          <SubHeading title={t('castYourVote')} />
+          {pubKey ? (
+            proposal && (
              <VoteButtonsContainer
                voteState={voteState}
                voteDatetime={voteDatetime}
@@ -214,11 +216,19 @@ export const VoteDetails = ({
                submit={submit}
                dialog={Dialog}
              />
-            )}
-          </section>
-        ) : (
-          <ConnectToVega />
-        )}
+            )
+          ) : (
+            <RoundedWrapper paddingBottom={true}>
+              <div className="mb-4">
+                <div className="flex items-center gap-2 mb-2">
+                  <Icon name={'info-sign'} />
+                  <div>{t('connectAVegaWalletToVote')}</div>
+                </div>
+              </div>
+              <ConnectToVega />
+            </RoundedWrapper>
+          )}
+        </section>
      </section>
    </>
  );
@@ -3,8 +3,8 @@ import { BigNumber } from '../../../lib/bignumber';
 import { useProposalNetworkParams } from './use-proposal-network-params';
 import { generateProposal } from '../test-helpers/generate-proposals';

-jest.mock('@vegaprotocol/react-helpers', () => ({
-  ...jest.requireActual('@vegaprotocol/react-helpers'),
+jest.mock('@vegaprotocol/network-parameters', () => ({
+  ...jest.requireActual('@vegaprotocol/network-parameters'),
  useNetworkParams: jest.fn(() => ({
    params: {
      governance_proposal_updateMarket_requiredMajority: '0.1',
@@ -1,4 +1,7 @@
-import { NetworkParams, useNetworkParams } from '@vegaprotocol/react-helpers';
+import {
+  NetworkParams,
+  useNetworkParams,
+} from '@vegaprotocol/network-parameters';
 import { BigNumber } from '../../../lib/bignumber';
 import type { ProposalFieldsFragment } from '../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../proposal/__generated__/Proposal';
@@ -28,8 +28,8 @@ jest.mock('../../../contexts/app-state/app-state-context', () => ({
  }),
 }));

-jest.mock('@vegaprotocol/react-helpers', () => ({
-  ...jest.requireActual('@vegaprotocol/react-helpers'),
+jest.mock('@vegaprotocol/network-parameters', () => ({
+  ...jest.requireActual('@vegaprotocol/network-parameters'),
  useNetworkParams: jest.fn(() => ({
    params: {
      governance_proposal_updateMarket_requiredMajority: '0.5',
@@ -13,10 +13,9 @@ import {
 } from '@vegaprotocol/types';
 import type { NodeConnection, NodeEdge } from '@vegaprotocol/utils';
 import type { ProposalFieldsFragment } from './__generated__/Proposals';
-import type { ProtocolUpgradeProposalFieldsFragment } from '../protocol-upgrade/__generated__/ProtocolUpgradeProposals';
-
 import orderBy from 'lodash/orderBy';
-import { useProtocolUpgradesQuery } from '../protocol-upgrade/__generated__/ProtocolUpgradeProposals';
+import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
+import { useProtocolUpgradeProposalsQuery } from '@vegaprotocol/proposals';

 const orderByDate = (arr: ProposalFieldsFragment[]) =>
  orderBy(
@@ -73,7 +72,7 @@ export const ProposalsContainer = () => {
    data: protocolUpgradesData,
    loading: protocolUpgradesLoading,
    error: protocolUpgradesError,
-  } = useProtocolUpgradesQuery({
+  } = useProtocolUpgradeProposalsQuery({
    pollInterval: 5000,
    fetchPolicy: 'network-only',
    errorPolicy: 'ignore',
@@ -5,9 +5,9 @@ import { mockWalletContext } from '../../test-helpers/mocks';
 import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider';
 import { VegaWalletContext } from '@vegaprotocol/wallet';
 import { MemoryRouter as Router } from 'react-router-dom';
-import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers';
+import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
 import type { MockedResponse } from '@apollo/client/testing';
-import { NetworkParamsDocument } from '@vegaprotocol/react-helpers';
+import { NetworkParamsDocument } from '@vegaprotocol/network-parameters';

 jest.mock('@vegaprotocol/environment', () => ({
  useEnvironment: () => ({
@@ -19,7 +19,10 @@ import { ProposalMinRequirements } from '../../components/shared';
 import { AsyncRenderer, ExternalLink } from '@vegaprotocol/ui-toolkit';
 import { Heading } from '../../../../components/heading';
 import { createDocsLinks } from '@vegaprotocol/utils';
-import { NetworkParams, useNetworkParams } from '@vegaprotocol/react-helpers';
+import {
+  NetworkParams,
+  useNetworkParams,
+} from '@vegaprotocol/network-parameters';
 import { ProposalUserAction } from '../../components/shared';
 import { downloadJson } from '../../../../lib/download-json';

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
sam-keen	77b7d7739d	fix(3661): ensure validators consensus table works without previous epoch data	2023-05-09 15:42:45 +01:00
Sam KeenandJoe	3740a97d7e	feat(governance): token references to governance (#3657 ) Co-authored-by: Joe <joe@vega.xyz>	2023-05-09 14:17:40 +00:00
Dexter	20350ae2cf	ci: force build	2023-05-09 15:13:53 +01:00
Dexter Edwards	50e93dad64	chore(explorer,trading,governance): new data node & explorer service urls (#3653 )	2023-05-09 14:33:33 +01:00
Sam KeenandJoe	c87c4bbc91	feat(governance): opt in/out telemetry (#3638 ) Co-authored-by: Joe <joe@vega.xyz>	2023-05-09 13:32:16 +01:00
m.ray	00679c75f2	fix(toasts): proposal toasts timeout (#3645 )	2023-05-09 10:03:17 +00:00
Art	7fe722dad0	fix(explorer): use data provider import (#3648 )	2023-05-09 09:46:24 +00:00
Maciek	0d8a74dfd0	fix(trading): wrong hover effect on datagrid (#3647 )	2023-05-09 09:26:59 +00:00
Edd	928b899c46	fix(explorer): improve party page loading (#3274 )	2023-05-09 09:43:12 +01:00
Bartłomiej Głownia	72d93bb568	feat(trading): update fills queries, fix empty fills list issue (#3636 )	2023-05-09 08:40:06 +00:00
Matthew Russell	db75261cd5	chore(react-helpers): remove ag-grid deps (#3628 )	2023-05-09 09:04:33 +01:00
Joe Tsang	66fbe28cf0	test(governance): e2e test to include withdrawal toasts (#3624 )	2023-05-09 09:03:45 +01:00
Edd	9f3b8ecade	fix(explorer): set explorer url env var in explorer (#3622 )	2023-05-09 09:03:35 +01:00
Matthew Russell	cd13c61e90	fix(datagrid): remove default balham borders (#3642 )	2023-05-09 09:02:39 +01:00
Maciek	246577f401	feat(trading): persist table column sizes (#3595 )	2023-05-09 08:09:53 +02:00
dexturr	503ca26f68	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-09 06:07:05 +00:00
dexturr	13e374a6bb	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-09 00:15:01 +00:00
Art	bed411040c	chore(trading): make limit default order type (#3619 )	2023-05-08 15:48:43 -07:00
Joe Tsang	d0173f15b2	chore(governance): assert proposal dates (#3610 )	2023-05-08 15:48:14 -07:00
Matthew Russell	106b040977	chore(utils): remove ethers deps from ui-toolkit (#3627 )	2023-05-08 14:40:31 -07:00
dexturr	bf84b04a30	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-08 18:07:04 +00:00
Matthew Russell	9f442698a4	fix(explorer): network params fixture lookup for updateAsset proposals (#3633 )	2023-05-08 17:29:29 +01:00
daro-maj	d1265a6af7	test(trading): update of capsule and live tests (#3635 )	2023-05-08 16:52:33 +02:00
Sam Keen	313eff1c95	feat(governance): proposal details page improvements (#3611 )	2023-05-08 12:41:55 +00:00
dexturr	7f949a276c	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-08 12:10:52 +00:00
dexturr	76a53dc7e3	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-08 06:08:30 +00:00
Matthew Russell	72821dd183	chore(utils,react-helpers,data-provider): remove apollo deps from ui-toolkit (#3626 )	2023-05-07 18:01:07 -07:00
dexturr	40d2e033e0	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-08 00:15:27 +00:00
Edd	e6d0b6ac1f	fix(explorer): number formatting for updateasset proposals (#3630 )	2023-05-07 18:17:57 +00:00
dexturr	99161497fe	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-07 18:08:18 +00:00
Edd	bf6ab32230	feat(governance): render markdown in proposal view (#3632 )	2023-05-07 17:45:19 +01:00
dexturr	28bcb4ada1	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-07 12:10:24 +00:00
dexturr	5812c8858d	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-07 06:07:03 +00:00
dexturr	abf146895d	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-07 00:16:07 +00:00
dexturr	4476e6c6d1	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-06 18:09:41 +00:00
dexturr	d967000e8f	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-06 12:09:52 +00:00
dexturr	91d3d97399	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-06 06:07:05 +00:00
dexturr	ca700aa103	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-06 00:14:21 +00:00
dexturr	265bf7fb35	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-05 18:08:29 +00:00
Sam Keen	7a5c6f3a25	fix(governance): added toasts for withdrawals (#3621 )	2023-05-05 14:10:21 +00:00
dexturr	91e3460e9d	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-05 12:10:43 +00:00
Art	cf0c45aaa5	fix(trading): asset balance being rendered when disconnected from eth… (#3618 )	2023-05-05 13:00:15 +02:00
m.rayandasiaznik	bf63f9d46d	feat(oracles): oracle full profile (#3545 ) Co-authored-by: asiaznik <artur@vegaprotocol.io>	2023-05-05 09:52:03 +00:00
dexturr	023a83e0f7	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-05 06:08:12 +00:00
dexturr	4f6ed1eadf	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-05 00:14:53 +00:00
m.ray	85e293f3ec	fix(liquidity): use LP order ID as ag-grid row ID (#3615 )	2023-05-04 16:23:33 -07:00
dexturr	7b15d2db10	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-04 18:07:23 +00:00
m.ray	b1b9695998	fix(liquidity): rows duplicated wrong ag-grid row ID (#3614 )	2023-05-04 17:23:52 +00:00
Edd	6b8b33a78b	chore(explorer,trading,governance): remove stagnet3 (#3608 )	2023-05-04 16:50:39 +00:00
Mikołaj Młodzikowski	4fd0f6819a	feat(ci): deploy develop to stagnet1 (#3609 )	2023-05-04 14:29:31 +00:00
Mikołaj Młodzikowski	5032d87f98	feat(ci): define max lenght of a branch (#3607 )	2023-05-04 16:06:46 +02:00
Matthew Russell	b15d9cb7dc	fix(governance,trading): validator testnet link for governance app (#3599 )	2023-05-04 15:21:24 +02:00
dexturr	6aa7cc5bab	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-04 12:09:32 +00:00
Bartłomiej Głownia	c37f9ebe66	feat(trading): divide order tab into open, closed, rejected and all (#3541 )	2023-05-04 12:09:55 +02:00
Art	768b3b29f0	feat(trading): protocol upgrade notification (#3517 )	2023-05-04 09:51:24 +02:00
dexturr	378946f22b	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-04 06:07:49 +00:00
dexturr	523598645a	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-04 00:13:39 +00:00
Art	a9267de653	feat(trading): asset balances inside asset selector (deposit, withdraw form) (#3590 )	2023-05-03 20:35:05 +01:00
dexturr	ce22da1c9a	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-03 18:09:05 +00:00