Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into fix/lp-rows-duplicated

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

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

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

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

apps/explorer/.env

@@ -10,7 +10,6 @@ NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.xyz
 NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket
 NX_BLOCK_EXPLORER=https://be.stagnet1.vega.xyz/rest
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
 NX_VEGA_GOVERNANCE_URL=https://stagnet1.token.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.jsoo
 

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

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

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

@@ -12,10 +12,7 @@ import { useLayoutEffect, useMemo, useRef, useState } from 'react';
 import type { RowClickedEvent } from 'ag-grid-community';
 import { getDateTimeFormat } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
-import {
-  NetworkParams,
-  useNetworkParams,
-} from '@vegaprotocol/network-parameters';
+import { NetworkParams, useNetworkParams } from '@vegaprotocol/react-helpers';
 import { ProposalStateMapping } from '@vegaprotocol/types';
 import BigNumber from 'bignumber.js';
 import { DApp, TOKEN_PROPOSAL, useLinks } from '@vegaprotocol/environment';

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

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

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

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

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

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

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

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

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

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

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

@@ -4,11 +4,12 @@ import {
   navigation,
 } from '../../support/common.functions';
 import {
+  convertUnixTimestampToDateformat,
   createRawProposal,
   createTenDigitUnixTimeStampForSpecifiedDays,
   enterUniqueFreeFormProposalBody,
   generateFreeFormProposalTitle,
-  getDateFormatForSpecifiedDays,
+  getGovernanceProposalDateFormatForSpecifiedDays,
   getProposalIdFromList,
   getProposalInformationFromTable,
   getSubmittedProposalFromProposalList,
@@ -22,7 +23,6 @@ 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"]';
@@ -99,22 +99,20 @@ describe(
       getSubmittedProposalFromProposalList(proposalTitle).within(() =>
         cy.get(viewProposalButton).click()
       );
-      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');
-      });
+      convertUnixTimestampToDateformat(proposalTimeStamp).then(
+        (closingDate) => {
+          getProposalInformationFromTable('Closes on')
+            .contains(closingDate)
+            .should('be.visible');
+        }
+      );
+      getGovernanceProposalDateFormatForSpecifiedDays(0).then(
+        (proposalDate) => {
+          getProposalInformationFromTable('Proposed on')
+            .contains(proposalDate)
+            .should('be.visible');
+        }
+      );
     });
 
     it('Newly created proposal details - shows default status set to fail', function () {
@@ -157,16 +155,18 @@ describe(
       cy.getByTestId('vote-buttons').contains('against').should('be.visible');
       cy.getByTestId('vote-buttons').contains('for').should('be.visible');
       voteForProposal('for');
-      getDateFormatForSpecifiedDays(0).then((votedDate) => {
-        // 3001-VOTE-051
-        // 3001-VOTE-093
-        cy.contains('You voted:')
-          .siblings()
-          .contains('For')
-          .siblings()
-          .contains(votedDate)
-          .should('be.visible');
-      });
+      getGovernanceProposalDateFormatForSpecifiedDays(0, 'shortMonth').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');

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

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

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

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

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

@@ -1,4 +1,3 @@
-import { format } from 'date-fns';
 import { closeDialog, navigateTo, navigation } from './common.functions';
 import { ensureSpecifiedUnstakedTokensAreAssociated } from './staking.functions';
 
@@ -16,6 +15,35 @@ 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
 ) {
@@ -24,13 +52,6 @@ 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;
@@ -83,6 +104,16 @@ 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();
 }

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

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

apps/governance/src/app.tsx

@@ -20,17 +20,12 @@ import type { EthereumConfig } from '@vegaprotocol/web3';
 import {
   createConnectors,
   useEthTransactionManager,
-  useEthTransactionUpdater,
   useEthWithdrawApprovalsManager,
   useWeb3ConnectStore,
 } from '@vegaprotocol/web3';
 import { Web3Provider } from '@vegaprotocol/web3';
 import { VegaWalletDialogs } from './components/vega-wallet-dialogs';
-import {
-  useVegaTransactionManager,
-  useVegaTransactionUpdater,
-  VegaWalletProvider,
-} from '@vegaprotocol/wallet';
+import { VegaWalletProvider } from '@vegaprotocol/wallet';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { useEthereumConfig } from '@vegaprotocol/web3';
 import {
@@ -42,7 +37,6 @@ import { ENV } from './config';
 import type { InMemoryCacheConfig } from '@apollo/client';
 import { WithdrawalDialog } from '@vegaprotocol/withdraws';
 import { SplashLoader } from './components/splash-loader';
-import { ToastsManager } from './toasts-manager';
 
 const cache: InMemoryCacheConfig = {
   typePolicies: {
@@ -87,10 +81,7 @@ const Web3Container = ({
   providerUrl: string;
 }) => {
   const InitializeHandlers = () => {
-    useVegaTransactionManager();
-    useVegaTransactionUpdater();
     useEthTransactionManager();
-    useEthTransactionUpdater();
     useEthWithdrawApprovalsManager();
     return null;
   };
@@ -144,7 +135,6 @@ const Web3Container = ({
                       <NetworkInfo />
                     </footer>
                   </AppLayout>
-                  <ToastsManager />
                   <InitializeHandlers />
                   <VegaWalletDialogs />
                   <TransactionModal />

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

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

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

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

apps/governance/src/hooks/use-get-user-balances.ts

@@ -21,10 +21,10 @@ export const useGetUserBalances = (account: string | undefined) => {
         token.allowance(account, config.staking_bridge_contract.address),
       ]);
 
-      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 balance = toBigNum(b, decimals);
+      const walletBalance = toBigNum(w, decimals);
+      const lien = toBigNum(stats.lien, decimals);
+      const allowance = toBigNum(a, decimals);
 
       return {
         balanceFormatted: balance,

apps/governance/src/hooks/use-refresh-associated-balances.ts

@@ -21,14 +21,8 @@ export function useRefreshAssociatedBalances() {
         ]);
 
       updateBalances({
-        walletAssociatedBalance: toBigNum(
-          walletAssociatedBalance.toString(),
-          decimals
-        ),
-        vestingAssociatedBalance: toBigNum(
-          vestingAssociatedBalance.toString(),
-          decimals
-        ),
+        walletAssociatedBalance: toBigNum(walletAssociatedBalance, decimals),
+        vestingAssociatedBalance: toBigNum(vestingAssociatedBalance, decimals),
       });
     },
     [staking, vesting, updateBalances, decimals]

apps/governance/src/hooks/use-refresh-balances.ts

@@ -31,18 +31,12 @@ export const useRefreshBalances = (address: string) => {
           pubKey ? vesting.stake_balance(address, pubKey) : null,
         ]);
 
-      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
-      );
+      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);
 
       updateBalances({
         balanceFormatted: balance,

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

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

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

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

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

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

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

@@ -16,12 +16,17 @@ 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(
@@ -30,12 +35,17 @@ 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', () => {
@@ -43,12 +53,17 @@ 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(
@@ -89,6 +104,7 @@ it('Renders error details and rejection reason if present', () => {
   render(<ProposalChangeTable proposal={proposal} />);
   expect(screen.getByText('Error details')).toBeInTheDocument();
   expect(screen.getByText(errorDetails)).toBeInTheDocument();
+
   expect(screen.getByText('Rejection reason')).toBeInTheDocument();
   expect(
     screen.getByText(ProposalRejectionReason.PROPOSAL_ERROR_CLOSE_TIME_TOO_LATE)

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

@@ -6,6 +6,7 @@ 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';
 
@@ -19,12 +20,16 @@ export const ProposalChangeTable = ({ proposal }: ProposalChangeTableProps) => {
   const terms = proposal?.terms;
 
   return (
-    <RoundedWrapper paddingBottom={true}>
+    <RoundedWrapper>
       <KeyValueTable data-testid="proposal-change-table">
         <KeyValueTableRow>
           {t('id')}
           {proposal?.id}
         </KeyValueTableRow>
+        <KeyValueTableRow>
+          {t('state')}
+          <CurrentProposalState proposal={proposal} />
+        </KeyValueTableRow>
         <KeyValueTableRow>
           {isFuture(new Date(terms?.closingDatetime))
             ? t('closesOn')
@@ -45,24 +50,26 @@ export const ProposalChangeTable = ({ proposal }: ProposalChangeTableProps) => {
           {t('proposedBy')}
           <span style={{ wordBreak: 'break-word' }}>{proposal?.party.id}</span>
         </KeyValueTableRow>
-        <KeyValueTableRow
-          noBorder={!proposal?.rejectionReason && !proposal?.errorDetails}
-        >
+        <KeyValueTableRow>
           {t('proposedOn')}
           {formatDateWithLocalTimezone(new Date(proposal?.datetime))}
         </KeyValueTableRow>
         {proposal?.rejectionReason ? (
-          <KeyValueTableRow noBorder={!proposal?.errorDetails}>
+          <KeyValueTableRow>
             {t('rejectionReason')}
             {proposal.rejectionReason}
           </KeyValueTableRow>
         ) : null}
         {proposal?.errorDetails ? (
-          <KeyValueTableRow noBorder={true}>
+          <KeyValueTableRow>
             {t('errorDetails')}
             {proposal.errorDetails}
           </KeyValueTableRow>
         ) : null}
+        <KeyValueTableRow>
+          {t('type')}
+          {t(`${proposal?.terms.change.__typename}`)}
+        </KeyValueTableRow>
       </KeyValueTable>
     </RoundedWrapper>
   );

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -106,7 +106,7 @@ export const ProposalsList = ({
       {proposals.length > 0 && (
         <ProposalsListFilter setFilterString={setFilterString} />
       )}
-      <section className="-mx-4 p-4 mb-8 bg-vega-dark-100">
+      <section className="-mx-4 p-4 mb-8 bg-neutral-800">
         <SubHeading title={t('openProposals')} />
         {sortedProposals.open.length > 0 ||
         sortedProtocolUpgradeProposals.open.length > 0 ? (

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

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

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

@@ -107,6 +107,10 @@ export const VoteButtons = ({
       );
     }
 
+    if (currentStakeAvailable.isLessThanOrEqualTo(0)) {
+      return t('noGovernanceTokens');
+    }
+
     if (minVoterBalance && spamProtectionMinTokens) {
       const formattedMinVoterBalance = new BigNumber(
         addDecimal(minVoterBalance, 18)
@@ -159,30 +163,24 @@ export const VoteButtons = ({
   return (
     <>
       {changeVote || (voteState === VoteState.NotCast && proposalVotable) ? (
-        <>
-          {currentStakeAvailable.isLessThanOrEqualTo(0) && (
-            <p data-testid="no-stake-available">{t('noGovernanceTokens')}</p>
-          )}
-
-          <div className="flex gap-4" data-testid="vote-buttons">
+        <div className="flex gap-4" data-testid="vote-buttons">
+          <div className="flex-1">
             <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">

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

@@ -1,6 +1,5 @@
 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';
@@ -200,11 +199,10 @@ export const VoteDetails = ({
         {proposalType === ProposalType.PROPOSAL_UPDATE_MARKET && (
           <p>{t('votingThresholdInfo')}</p>
         )}
-
-        <section className="mt-10">
-          <SubHeading title={t('castYourVote')} />
-          {pubKey ? (
-            proposal && (
+        {pubKey ? (
+          <section className="mt-10">
+            <SubHeading title={t('yourVote')} />
+            {proposal && (
               <VoteButtonsContainer
                 voteState={voteState}
                 voteDatetime={voteDatetime}
@@ -216,19 +214,11 @@ export const VoteDetails = ({
                 submit={submit}
                 dialog={Dialog}
               />
-            )
-          ) : (
-            <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>
+        ) : (
+          <ConnectToVega />
+        )}
       </section>
     </>
   );

apps/governance/src/routes/proposals/hooks/use-proposal-network-params.spec.ts

@@ -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/network-parameters', () => ({
-  ...jest.requireActual('@vegaprotocol/network-parameters'),
+jest.mock('@vegaprotocol/react-helpers', () => ({
+  ...jest.requireActual('@vegaprotocol/react-helpers'),
   useNetworkParams: jest.fn(() => ({
     params: {
       governance_proposal_updateMarket_requiredMajority: '0.1',

apps/governance/src/routes/proposals/hooks/use-proposal-network-params.ts

@@ -1,7 +1,4 @@
-import {
-  NetworkParams,
-  useNetworkParams,
-} from '@vegaprotocol/network-parameters';
+import { NetworkParams, useNetworkParams } from '@vegaprotocol/react-helpers';
 import { BigNumber } from '../../../lib/bignumber';
 import type { ProposalFieldsFragment } from '../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../proposal/__generated__/Proposal';

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

@@ -28,8 +28,8 @@ jest.mock('../../../contexts/app-state/app-state-context', () => ({
   }),
 }));
 
-jest.mock('@vegaprotocol/network-parameters', () => ({
-  ...jest.requireActual('@vegaprotocol/network-parameters'),
+jest.mock('@vegaprotocol/react-helpers', () => ({
+  ...jest.requireActual('@vegaprotocol/react-helpers'),
   useNetworkParams: jest.fn(() => ({
     params: {
       governance_proposal_updateMarket_requiredMajority: '0.5',

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

@@ -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/network-parameters';
+import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers';
 import type { MockedResponse } from '@apollo/client/testing';
-import { NetworkParamsDocument } from '@vegaprotocol/network-parameters';
+import { NetworkParamsDocument } from '@vegaprotocol/react-helpers';
 
 jest.mock('@vegaprotocol/environment', () => ({
   useEnvironment: () => ({

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

@@ -19,10 +19,7 @@ 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/network-parameters';
+import { NetworkParams, useNetworkParams } from '@vegaprotocol/react-helpers';
 import { ProposalUserAction } from '../../components/shared';
 import { downloadJson } from '../../../../lib/download-json';
 

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

@@ -5,8 +5,8 @@ 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/network-parameters';
-import { NetworkParamsDocument } from '@vegaprotocol/network-parameters';
+import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers';
+import { NetworkParamsDocument } from '@vegaprotocol/react-helpers';
 import type { MockedResponse } from '@apollo/client/testing';
 
 jest.mock('@vegaprotocol/environment', () => ({

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

@@ -5,7 +5,7 @@ import {
   createDocsLinks,
   suitableForSyntaxHighlighter,
 } from '@vegaprotocol/utils';
-import { useNetworkParams } from '@vegaprotocol/network-parameters';
+import { useNetworkParams } from '@vegaprotocol/react-helpers';
 import {
   getClosingTimestamp,
   getEnactmentTimestamp,

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

@@ -5,9 +5,9 @@ import { VegaWalletContext } from '@vegaprotocol/wallet';
 import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider';
 import { mockWalletContext } from '../../test-helpers/mocks';
 import { ProposeNewAsset } from './propose-new-asset';
-import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
+import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers';
 import type { MockedResponse } from '@apollo/client/testing';
-import { NetworkParamsDocument } from '@vegaprotocol/network-parameters';
+import { NetworkParamsDocument } from '@vegaprotocol/react-helpers';
 
 jest.mock('@vegaprotocol/environment', () => ({
   useEnvironment: () => ({

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

@@ -9,10 +9,7 @@ import {
 } from '@vegaprotocol/proposals';
 import { useEnvironment } from '@vegaprotocol/environment';
 import { createDocsLinks, validateJson } from '@vegaprotocol/utils';
-import {
-  NetworkParams,
-  useNetworkParams,
-} from '@vegaprotocol/network-parameters';
+import { NetworkParams, useNetworkParams } from '@vegaprotocol/react-helpers';
 import {
   ProposalFormDescription,
   ProposalFormSubheader,

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

@@ -6,8 +6,8 @@ import { AppStateProvider } from '../../../../contexts/app-state/app-state-provi
 import { VegaWalletContext } from '@vegaprotocol/wallet';
 import { BrowserRouter as Router } from 'react-router-dom';
 import type { MockedResponse } from '@apollo/client/testing';
-import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
-import { NetworkParamsDocument } from '@vegaprotocol/network-parameters';
+import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers';
+import { NetworkParamsDocument } from '@vegaprotocol/react-helpers';
 
 jest.mock('@vegaprotocol/environment', () => ({
   useEnvironment: () => ({

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

@@ -8,10 +8,7 @@ import {
 } from '@vegaprotocol/proposals';
 import { useEnvironment } from '@vegaprotocol/environment';
 import { createDocsLinks, validateJson } from '@vegaprotocol/utils';
-import {
-  NetworkParams,
-  useNetworkParams,
-} from '@vegaprotocol/network-parameters';
+import { NetworkParams, useNetworkParams } from '@vegaprotocol/react-helpers';
 import {
   ProposalFormDescription,
   ProposalFormSubheader,

apps/governance/src/routes/proposals/propose/raw/proposal-raw.spec.tsx

@@ -10,8 +10,8 @@ import { ProposeRaw } from './propose-raw';
 import { ProposalEventDocument } from '@vegaprotocol/proposals';
 import type { ProposalEventSubscription } from '@vegaprotocol/proposals';
 
-import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
-import { NetworkParamsDocument } from '@vegaprotocol/network-parameters';
+import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers';
+import { NetworkParamsDocument } from '@vegaprotocol/react-helpers';
 
 const paramsDelay = 20;
 

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

@@ -10,10 +10,7 @@ import {
   TextArea,
 } from '@vegaprotocol/ui-toolkit';
 import { createDocsLinks, validateJson } from '@vegaprotocol/utils';
-import {
-  NetworkParams,
-  useNetworkParams,
-} from '@vegaprotocol/network-parameters';
+import { NetworkParams, useNetworkParams } from '@vegaprotocol/react-helpers';
 import { useProposalSubmit } from '@vegaprotocol/proposals';
 import {
   ProposalFormSubmit,

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

@@ -5,9 +5,9 @@ import { VegaWalletContext } from '@vegaprotocol/wallet';
 import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider';
 import { mockWalletContext } from '../../test-helpers/mocks';
 import { ProposeUpdateAsset } from './propose-update-asset';
-import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
+import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers';
 import type { MockedResponse } from '@apollo/client/testing';
-import { NetworkParamsDocument } from '@vegaprotocol/network-parameters';
+import { NetworkParamsDocument } from '@vegaprotocol/react-helpers';
 
 jest.mock('@vegaprotocol/environment', () => ({
   useEnvironment: () => ({

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

@@ -8,10 +8,7 @@ import {
 } from '@vegaprotocol/proposals';
 import { useEnvironment } from '@vegaprotocol/environment';
 import { createDocsLinks, validateJson } from '@vegaprotocol/utils';
-import {
-  NetworkParams,
-  useNetworkParams,
-} from '@vegaprotocol/network-parameters';
+import { NetworkParams, useNetworkParams } from '@vegaprotocol/react-helpers';
 import {
   ProposalFormDescription,
   ProposalFormSubheader,

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

@@ -6,8 +6,8 @@ import { VegaWalletContext } from '@vegaprotocol/wallet';
 import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider';
 import { mockWalletContext } from '../../test-helpers/mocks';
 import { ProposeUpdateMarket } from './propose-update-market';
-import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
-import { NetworkParamsDocument } from '@vegaprotocol/network-parameters';
+import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers';
+import { NetworkParamsDocument } from '@vegaprotocol/react-helpers';
 import type { ProposalMarketsQueryQuery } from './__generated__/UpdateMarket';
 import { ProposalMarketsQueryDocument } from './__generated__/UpdateMarket';
 import { ProposalState } from '@vegaprotocol/types';

apps/governance/src/routes/proposals/propose/update-market/propose-update-market.tsx

@@ -9,10 +9,7 @@ import {
 } from '@vegaprotocol/proposals';
 import { useEnvironment } from '@vegaprotocol/environment';
 import { createDocsLinks, validateJson } from '@vegaprotocol/utils';
-import {
-  NetworkParams,
-  useNetworkParams,
-} from '@vegaprotocol/network-parameters';
+import { NetworkParams, useNetworkParams } from '@vegaprotocol/react-helpers';
 import {
   ProposalFormDescription,
   ProposalFormDownloadJson,

apps/governance/src/routes/proposals/test-helpers/mocks.ts

@@ -1,6 +1,6 @@
-import { NetworkParamsDocument } from '@vegaprotocol/network-parameters';
+import { NetworkParamsDocument } from '@vegaprotocol/react-helpers';
 import type { MockedResponse } from '@apollo/client/testing';
-import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
+import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers';
 import type { PubKey } from '@vegaprotocol/wallet';
 
 export const mockPubkey: PubKey = {

apps/governance/src/routes/redemption/hooks.ts

@@ -34,9 +34,8 @@ export const useUserTrancheBalances = (address: string | undefined) => {
         vesting.get_vested_for_tranche(address, tId),
       ]);
 
-      // Convert t and v EthersBigNumbers to regular BigNumbers
-      const total = toBigNum(t.toString(), decimals);
-      const vested = toBigNum(v.toString(), decimals);
+      const total = toBigNum(t, decimals);
+      const vested = toBigNum(v, decimals);
 
       return {
         id: tId,

apps/governance/src/routes/rewards/home/rewards-page.tsx

@@ -12,10 +12,7 @@ import {
 } from '@vegaprotocol/ui-toolkit';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { createDocsLinks } from '@vegaprotocol/utils';
-import {
-  useNetworkParams,
-  NetworkParams,
-} from '@vegaprotocol/network-parameters';
+import { useNetworkParams, NetworkParams } from '@vegaprotocol/react-helpers';
 import { useEpochQuery } from './__generated__/Rewards';
 import { EpochCountdown } from '../../../components/epoch-countdown';
 import { Heading, SubHeading } from '../../../components/heading';

apps/governance/src/routes/staking/associate/wallet-associate.tsx

@@ -54,7 +54,7 @@ export const WalletAssociate = ({
           address,
           ethereumConfig.staking_bridge_contract.address
         );
-        const allowance = toBigNum(a.toString(), decimals);
+        const allowance = toBigNum(a, decimals);
         setAllowance(allowance);
       }
     };

apps/governance/src/routes/staking/node/staking-form.tsx

@@ -23,10 +23,7 @@ import {
   addDecimal,
   removePaginationWrapper,
 } from '@vegaprotocol/utils';
-import {
-  useNetworkParam,
-  NetworkParams,
-} from '@vegaprotocol/network-parameters';
+import { useNetworkParam, NetworkParams } from '@vegaprotocol/react-helpers';
 import { useBalances } from '../../../lib/balances/balances-store';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { SubHeading } from '../../../components/heading';

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

@@ -10,7 +10,7 @@ import {
   WithdrawalsTable,
 } from '@vegaprotocol/withdraws';
 import { useVegaWallet } from '@vegaprotocol/wallet';
-import { useDataProvider } from '@vegaprotocol/data-provider';
+import { useDataProvider } from '@vegaprotocol/react-helpers';
 import { useDocumentTitle } from '../../hooks/use-document-title';
 import type { RouteChildProps } from '../index';
 

apps/governance/src/styles.css

@@ -58,39 +58,3 @@
 .validators-table .ag-theme-balham-dark *:hover {
   cursor: pointer;
 }
-
-/* Styles required to (effectively) un-override the 
- * reset styles so that the Proposal description fields
- * render as you'd expect them to.
- *
- * Notes:
- * - image embeds are disabled, so no styles are required
- * - strong may not be required
- * - skipHTML is enabled, so no nested HTML will be rendered. Only
- * . valid markdown
- */
-
-.dark .react-markdown-container,
-.dark .react-markdown-container li,
-.dark .react-markdown-container p {
-  color: #fff;
-}
-.react-markdown-container strong {
-  font-weight: bold;
-}
-
-.react-markdown-container ol {
-  margin-left: 1em;
-}
-.react-markdown-container li {
-  margin-left: 1em;
-  padding-left: 1em;
-}
-
-.react-markdown-container ol li {
-  list-style: decimal;
-}
-
-.react-markdown-container ul li {
-  list-style: circle;
-}

apps/governance/src/toasts-manager.tsx

@@ -1,17 +0,0 @@
-import { ToastsContainer, useToasts } from '@vegaprotocol/ui-toolkit';
-import {
-  useEthereumTransactionToasts,
-  useEthereumWithdrawApprovalsToasts,
-  useVegaTransactionToasts,
-} from '@vegaprotocol/web3';
-
-export const ToastsManager = () => {
-  useVegaTransactionToasts();
-  useEthereumTransactionToasts();
-  useEthereumWithdrawApprovalsToasts();
-
-  const toasts = useToasts((store) => store.toasts);
-  return <ToastsContainer order="desc" toasts={toasts} />;
-};
-
-export default ToastsManager;

apps/liquidity-provision-dashboard/src/app/components/detail/detail.tsx

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

apps/liquidity-provision-dashboard/src/app/components/detail/last-24h-volume/last-24h-volume.tsx

@@ -1,8 +1,7 @@
 import { useState, useMemo, useRef, useCallback } from 'react';
 import throttle from 'lodash/throttle';
 import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
-import { useYesterday } from '@vegaprotocol/react-helpers';
-import { useDataProvider } from '@vegaprotocol/data-provider';
+import { useYesterday, useDataProvider } from '@vegaprotocol/react-helpers';
 import * as Schema from '@vegaprotocol/types';
 import {
   calcDayVolume,

apps/static/src/assets/mainnet-tranches.json

@@ -1,15 +1,4 @@
 [
-  {
-    "tranche_id": 58,
-    "tranche_start": "2023-05-11T00:00:00.000Z",
-    "tranche_end": "2023-06-11T00:00:00.000Z",
-    "total_added": "0",
-    "total_removed": "0",
-    "locked_amount": "0",
-    "deposits": [],
-    "withdrawals": [],
-    "users": []
-  },
   {
     "tranche_id": 57,
     "tranche_start": "2024-04-01T00:00:00.000Z",
@@ -48,8 +37,8 @@
     "tranche_start": "2023-04-20T00:00:00.000Z",
     "tranche_end": "2023-05-20T00:00:00.000Z",
     "total_added": "19242.125",
-    "total_removed": "1523.8177488329475",
-    "locked_amount": "7048.7719635898923554",
+    "total_removed": "959.3245960538025",
+    "locked_amount": "9937.5330975115729338",
     "deposits": [
       {
         "amount": "188",
@@ -223,11 +212,6 @@
       }
     ],
     "withdrawals": [
-      {
-        "amount": "308.82179861382",
-        "user": "0xDd7a98557586ce21f770662319C2047C5a3bD605",
-        "tx": "0x2b3571c143ecebddf91fb62f402d516d51110edfe37b13200a6e5cf682dc5bb0"
-      },
       {
         "amount": "202.093666077975",
         "user": "0x1447Efc62d5077d7AbB20492dF831Dd6c9Eb1756",
@@ -252,11 +236,6 @@
         "amount": "422.1034736680125",
         "user": "0xf915Da10e5136352Ba049acB0545Deb119054256",
         "tx": "0x5932f574afe019060f5812fc89c7298ab9f768cddebe0a803c27e9914b45dc3d"
-      },
-      {
-        "amount": "255.671354165325",
-        "user": "0x1447Efc62d5077d7AbB20492dF831Dd6c9Eb1756",
-        "tx": "0x92cd553dcee22eb58abadc7aab2dc8d4d9b2285943b41aacea8ed09eff5a0914"
       }
     ],
     "users": [
@@ -318,17 +297,11 @@
             "user": "0x1447Efc62d5077d7AbB20492dF831Dd6c9Eb1756",
             "tranche_id": 56,
             "tx": "0x5f544a659ae728cc7b1a29dcda14740425cadf1f47aa74bae92bf2ade3c8093d"
-          },
-          {
-            "amount": "255.671354165325",
-            "user": "0x1447Efc62d5077d7AbB20492dF831Dd6c9Eb1756",
-            "tranche_id": 56,
-            "tx": "0x92cd553dcee22eb58abadc7aab2dc8d4d9b2285943b41aacea8ed09eff5a0914"
           }
         ],
         "total_tokens": "1207.5",
-        "withdrawn_tokens": "597.002068860225",
-        "remaining_tokens": "610.497931139775"
+        "withdrawn_tokens": "341.3307146949",
+        "remaining_tokens": "866.1692853051"
       },
       {
         "address": "0x33Ce1D9E53AFb7367E34749517C086405a651a95",
@@ -356,12 +329,6 @@
           }
         ],
         "withdrawals": [
-          {
-            "amount": "308.82179861382",
-            "user": "0xDd7a98557586ce21f770662319C2047C5a3bD605",
-            "tranche_id": 56,
-            "tx": "0x2b3571c143ecebddf91fb62f402d516d51110edfe37b13200a6e5cf682dc5bb0"
-          },
           {
             "amount": "195.89040769089",
             "user": "0xDd7a98557586ce21f770662319C2047C5a3bD605",
@@ -370,8 +337,8 @@
           }
         ],
         "total_tokens": "914.25",
-        "withdrawn_tokens": "504.71220630471",
-        "remaining_tokens": "409.53779369529"
+        "withdrawn_tokens": "195.89040769089",
+        "remaining_tokens": "718.35959230911"
       },
       {
         "address": "0x9573BDF7FfC5519912d293e4D1f750eab2E471E7",
@@ -876,15 +843,10 @@
     "tranche_id": 54,
     "tranche_start": "2023-04-06T00:00:00.000Z",
     "tranche_end": "2023-05-06T00:00:00.000Z",
-    "total_added": "14610",
-    "total_removed": "6141.45090157707",
-    "locked_amount": "0",
+    "total_added": "14520",
+    "total_removed": "5079.76864115505",
+    "locked_amount": "722.8069444444451328",
     "deposits": [
-      {
-        "amount": "90",
-        "user": "0x05659B08a8079E003eE37F26c29e52532728c034",
-        "tx": "0x83cb92910e0725b82b3459e025260c448f931224f7cb00a376351dbd75ae2733"
-      },
       {
         "amount": "111",
         "user": "0x90Cf7B9958C3BbBCddAb52Ecc408535D4f3C4241",
@@ -1037,46 +999,6 @@
       }
     ],
     "withdrawals": [
-      {
-        "amount": "191.85071991228",
-        "user": "0x6F32AA5A6198329c16e438512F992a0548C856f9",
-        "tx": "0x1438ad7d4c51ec6cb9b8f9d67b05583915099427035179baf996fd208fd76603"
-      },
-      {
-        "amount": "309",
-        "user": "0x21770cCAb229Bd1509609fFFa35bEB16b73A657c",
-        "tx": "0x264f4b3c5dc43cd5afaa5954b50ba7885ce3091b11ae51ba19b8a5851a5a4fc7"
-      },
-      {
-        "amount": "116.83154050974",
-        "user": "0x15024E62134A8BFFCce11f5ce58CeCDe853038D7",
-        "tx": "0x130c439ea764588c13cd825ae89767bea04064bd3d76b762b7148e5373857b9b"
-      },
-      {
-        "amount": "0",
-        "user": "0x15024E62134A8BFFCce11f5ce58CeCDe853038D7",
-        "tx": "0x9be84231ff156bc8b8de9a99250f03b8ebf9d59c252e3b778f10051489e5758a"
-      },
-      {
-        "amount": "111",
-        "user": "0x90Cf7B9958C3BbBCddAb52Ecc408535D4f3C4241",
-        "tx": "0xdfae5add3e12eed919c0481d9289aa33688884db68ca90332d1df31107e4fbc6"
-      },
-      {
-        "amount": "111",
-        "user": "0xAc1c2783d64c29CDB79608f5B66a37Fd1ea35dD6",
-        "tx": "0x7195dc5808870b0f00824c6593eda1e994976189cf3373cf84c5dae7a60d8b62"
-      },
-      {
-        "amount": "90",
-        "user": "0x05659B08a8079E003eE37F26c29e52532728c034",
-        "tx": "0x016970cfdaaab7a663a5c8b897b44c5d302e5cd110638de231073c3b5e23ddf8"
-      },
-      {
-        "amount": "132",
-        "user": "0x9E53F72210479BF46aE7ABF77c48B0d611b3c3dB",
-        "tx": "0x1dbcf713b48965a82aa2e17cb3e7db9a491668d859d408a39c8a74b0ea860b6b"
-      },
       {
         "amount": "106.53500000286",
         "user": "0x6F32AA5A6198329c16e438512F992a0548C856f9",
@@ -1124,28 +1046,6 @@
       }
     ],
     "users": [
-      {
-        "address": "0x05659B08a8079E003eE37F26c29e52532728c034",
-        "deposits": [
-          {
-            "amount": "90",
-            "user": "0x05659B08a8079E003eE37F26c29e52532728c034",
-            "tranche_id": 54,
-            "tx": "0x83cb92910e0725b82b3459e025260c448f931224f7cb00a376351dbd75ae2733"
-          }
-        ],
-        "withdrawals": [
-          {
-            "amount": "90",
-            "user": "0x05659B08a8079E003eE37F26c29e52532728c034",
-            "tranche_id": 54,
-            "tx": "0x016970cfdaaab7a663a5c8b897b44c5d302e5cd110638de231073c3b5e23ddf8"
-          }
-        ],
-        "total_tokens": "90",
-        "withdrawn_tokens": "90",
-        "remaining_tokens": "0"
-      },
       {
         "address": "0x90Cf7B9958C3BbBCddAb52Ecc408535D4f3C4241",
         "deposits": [
@@ -1156,17 +1056,10 @@
             "tx": "0x1229e077f48b796678436bfa8143cea3ae71df58b589ac922be205c4482be235"
           }
         ],
-        "withdrawals": [
-          {
-            "amount": "111",
-            "user": "0x90Cf7B9958C3BbBCddAb52Ecc408535D4f3C4241",
-            "tranche_id": 54,
-            "tx": "0xdfae5add3e12eed919c0481d9289aa33688884db68ca90332d1df31107e4fbc6"
-          }
-        ],
+        "withdrawals": [],
         "total_tokens": "111",
-        "withdrawn_tokens": "111",
-        "remaining_tokens": "0"
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "111"
       },
       {
         "address": "0x83D7eD53E7CB97b542F1F71f40561d51F8019C8B",
@@ -1411,12 +1304,6 @@
           }
         ],
         "withdrawals": [
-          {
-            "amount": "191.85071991228",
-            "user": "0x6F32AA5A6198329c16e438512F992a0548C856f9",
-            "tranche_id": 54,
-            "tx": "0x1438ad7d4c51ec6cb9b8f9d67b05583915099427035179baf996fd208fd76603"
-          },
           {
             "amount": "106.53500000286",
             "user": "0x6F32AA5A6198329c16e438512F992a0548C856f9",
@@ -1455,8 +1342,8 @@
           }
         ],
         "total_tokens": "858",
-        "withdrawn_tokens": "858",
-        "remaining_tokens": "0"
+        "withdrawn_tokens": "666.14928008772",
+        "remaining_tokens": "191.85071991228"
       },
       {
         "address": "0x0bBf7580e036eA5D69ABe679CC90117EeC2e3dc1",
@@ -1484,18 +1371,6 @@
           }
         ],
         "withdrawals": [
-          {
-            "amount": "116.83154050974",
-            "user": "0x15024E62134A8BFFCce11f5ce58CeCDe853038D7",
-            "tranche_id": 54,
-            "tx": "0x130c439ea764588c13cd825ae89767bea04064bd3d76b762b7148e5373857b9b"
-          },
-          {
-            "amount": "0",
-            "user": "0x15024E62134A8BFFCce11f5ce58CeCDe853038D7",
-            "tranche_id": 54,
-            "tx": "0x9be84231ff156bc8b8de9a99250f03b8ebf9d59c252e3b778f10051489e5758a"
-          },
           {
             "amount": "60.16845949026",
             "user": "0x15024E62134A8BFFCce11f5ce58CeCDe853038D7",
@@ -1504,8 +1379,8 @@
           }
         ],
         "total_tokens": "177",
-        "withdrawn_tokens": "177",
-        "remaining_tokens": "0"
+        "withdrawn_tokens": "60.16845949026",
+        "remaining_tokens": "116.83154050974"
       },
       {
         "address": "0xAc1c2783d64c29CDB79608f5B66a37Fd1ea35dD6",
@@ -1517,17 +1392,10 @@
             "tx": "0x99aeaedef27b5fb693485f4e21d434e343b30fa100945a4ff65386de8801c87e"
           }
         ],
-        "withdrawals": [
-          {
-            "amount": "111",
-            "user": "0xAc1c2783d64c29CDB79608f5B66a37Fd1ea35dD6",
-            "tranche_id": 54,
-            "tx": "0x7195dc5808870b0f00824c6593eda1e994976189cf3373cf84c5dae7a60d8b62"
-          }
-        ],
+        "withdrawals": [],
         "total_tokens": "111",
-        "withdrawn_tokens": "111",
-        "remaining_tokens": "0"
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "111"
       },
       {
         "address": "0x8D416A61bCccf4E6aF5598302BC4e41f97401652",
@@ -1554,17 +1422,10 @@
             "tx": "0xcb0f255003872ac506798efa97744868e11ceab2f2f03d96da605d8674f783f6"
           }
         ],
-        "withdrawals": [
-          {
-            "amount": "132",
-            "user": "0x9E53F72210479BF46aE7ABF77c48B0d611b3c3dB",
-            "tranche_id": 54,
-            "tx": "0x1dbcf713b48965a82aa2e17cb3e7db9a491668d859d408a39c8a74b0ea860b6b"
-          }
-        ],
+        "withdrawals": [],
         "total_tokens": "132",
-        "withdrawn_tokens": "132",
-        "remaining_tokens": "0"
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "132"
       },
       {
         "address": "0xC0f02AA8bA8b509D223C9De6108AFA1C03f03341",
@@ -1591,17 +1452,10 @@
             "tx": "0xf6467d54c2de5c5d21fd3ac174ac6bf51b6fc675cf81dedcb143679f28caa46a"
           }
         ],
-        "withdrawals": [
-          {
-            "amount": "309",
-            "user": "0x21770cCAb229Bd1509609fFFa35bEB16b73A657c",
-            "tranche_id": 54,
-            "tx": "0x264f4b3c5dc43cd5afaa5954b50ba7885ce3091b11ae51ba19b8a5851a5a4fc7"
-          }
-        ],
+        "withdrawals": [],
         "total_tokens": "309",
-        "withdrawn_tokens": "309",
-        "remaining_tokens": "0"
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "309"
       },
       {
         "address": "0x0629D3C608e1E8e9B88a1B00e1422e4B33276a98",
@@ -4861,7 +4715,7 @@
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "86666.297",
     "total_removed": "0",
-    "locked_amount": "49860.3304086439895572664",
+    "locked_amount": "50929.7231498068801776055",
     "deposits": [
       {
         "amount": "86666.297",
@@ -4927,7 +4781,7 @@
     "tranche_end": "2023-06-01T00:00:00.000Z",
     "total_added": "2500",
     "total_removed": "0",
-    "locked_amount": "315.79113883801385",
+    "locked_amount": "377.65663156288155",
     "deposits": [
       {
         "amount": "2500",
@@ -4960,7 +4814,7 @@
     "tranche_end": "2023-11-01T00:00:00.000Z",
     "total_added": "15000.000000000000015",
     "total_removed": "0",
-    "locked_amount": "14346.9778457125605143469778457125605",
+    "locked_amount": "14714.136096014493014714136096014493",
     "deposits": [
       {
         "amount": "1.5e-14",
@@ -5048,7 +4902,7 @@
     "tranche_end": "2023-09-01T00:00:00.000Z",
     "total_added": "17500",
     "total_removed": "0",
-    "locked_amount": "10936.51038521537825",
+    "locked_amount": "11364.8616772342995",
     "deposits": [
       {
         "amount": "12500",
@@ -5314,8 +5168,8 @@
     "tranche_start": "2023-02-01T00:00:00.000Z",
     "tranche_end": "2023-08-01T00:00:00.000Z",
     "total_added": "37500",
-    "total_removed": "18077.0118744",
-    "locked_amount": "17401.159165899324375",
+    "total_removed": "17836.1796921",
+    "locked_amount": "18334.268531307550125",
     "deposits": [
       {
         "amount": "7500",
@@ -5344,11 +5198,6 @@
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
         "tx": "0x6bb6303a6a322698e6e295ad38b2a22bd20d8b44306d423a3e513bb0b858ad56"
       },
-      {
-        "amount": "240.8321823",
-        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
-        "tx": "0xe27cfead07bc34f4270f7f87b9146e9f6fa35d0cc5e20b2378a03265de432289"
-      },
       {
         "amount": "126.30064455",
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -5519,12 +5368,6 @@
             "tranche_id": 34,
             "tx": "0x6bb6303a6a322698e6e295ad38b2a22bd20d8b44306d423a3e513bb0b858ad56"
           },
-          {
-            "amount": "240.8321823",
-            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
-            "tranche_id": 34,
-            "tx": "0xe27cfead07bc34f4270f7f87b9146e9f6fa35d0cc5e20b2378a03265de432289"
-          },
           {
             "amount": "126.30064455",
             "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -5689,8 +5532,8 @@
           }
         ],
         "total_tokens": "7500",
-        "withdrawn_tokens": "3867.2532036",
-        "remaining_tokens": "3632.7467964"
+        "withdrawn_tokens": "3626.4210213",
+        "remaining_tokens": "3873.5789787"
       },
       {
         "address": "0x0B4e6fcE839B01ef43DA6F890FAC7B1Afb004600",
@@ -5734,7 +5577,7 @@
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "129999.45",
     "total_removed": "0",
-    "locked_amount": "49814.839130813438918838",
+    "locked_amount": "50883.256185656170147137",
     "deposits": [
       {
         "amount": "129999.45",
@@ -5767,7 +5610,7 @@
     "tranche_end": "2024-04-01T00:00:00.000Z",
     "total_added": "54144.7663",
     "total_removed": "0",
-    "locked_amount": "48521.63924888864092183046",
+    "locked_amount": "49187.91691173374041346364",
     "deposits": [
       {
         "amount": "54144.7663",
@@ -5800,7 +5643,7 @@
     "tranche_end": "2023-09-03T00:00:00.000Z",
     "total_added": "62600",
     "total_removed": "0",
-    "locked_amount": "20064.516825215627982",
+    "locked_amount": "20836.950722983256762",
     "deposits": [
       {
         "amount": "10000",
@@ -5993,7 +5836,7 @@
     "tranche_end": "2023-09-17T00:00:00.000Z",
     "total_added": "5000",
     "total_removed": "0",
-    "locked_amount": "1794.3780124302383",
+    "locked_amount": "1856.07401065448985",
     "deposits": [
       {
         "amount": "5000",
@@ -6533,7 +6376,7 @@
     "tranche_start": "2022-11-01T00:00:00.000Z",
     "tranche_end": "2023-05-01T00:00:00.000Z",
     "total_added": "22500",
-    "total_removed": "7500",
+    "total_removed": "7438.558452225",
     "locked_amount": "0",
     "deposits": [
       {
@@ -6558,11 +6401,6 @@
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
         "tx": "0xb76564ca91603758216069d7b139c683037029425e10b1694af25b478c19e26f"
       },
-      {
-        "amount": "61.441547775",
-        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
-        "tx": "0xbf247e382e7cbfd131b20942525b6a11a8d71b5dae727cf8ad0f0801a48572b7"
-      },
       {
         "amount": "126.2948895",
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -6788,12 +6626,6 @@
             "tranche_id": 33,
             "tx": "0xb76564ca91603758216069d7b139c683037029425e10b1694af25b478c19e26f"
           },
-          {
-            "amount": "61.441547775",
-            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
-            "tranche_id": 33,
-            "tx": "0xbf247e382e7cbfd131b20942525b6a11a8d71b5dae727cf8ad0f0801a48572b7"
-          },
           {
             "amount": "126.2948895",
             "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -7036,8 +6868,8 @@
           }
         ],
         "total_tokens": "7500",
-        "withdrawn_tokens": "7500",
-        "remaining_tokens": "0"
+        "withdrawn_tokens": "7438.558452225",
+        "remaining_tokens": "61.441547775"
       },
       {
         "address": "0x2539b51EbDE65a75672aBcfE9439a706a99D18D1",
@@ -7062,7 +6894,7 @@
     "tranche_end": "2023-06-02T00:00:00.000Z",
     "total_added": "1939928.38",
     "total_removed": "1709370.7872515768348",
-    "locked_amount": "127501.632837213895787904",
+    "locked_amount": "151438.7964147451270015398",
     "deposits": [
       {
         "amount": "1852091.69",
@@ -40934,7 +40766,7 @@
     "tranche_end": "2023-06-05T00:00:00.000Z",
     "total_added": "3732368.4671",
     "total_removed": "715655.108029600523393",
-    "locked_amount": "220426.943046411634396105333",
+    "locked_amount": "257209.934903168881888467304",
     "deposits": [
       {
         "amount": "1998.95815",
@@ -42326,8 +42158,8 @@
     "tranche_start": "2022-06-05T00:00:00.000Z",
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "15870102.715470999700000001",
-    "total_removed": "871680.07831804700259352",
-    "locked_amount": "6081307.37292098829210815160177023943687484",
+    "total_removed": "869802.17678213314859352",
+    "locked_amount": "6211737.5003512443867025914959180178169776",
     "deposits": [
       {
         "amount": "16249.93",
@@ -42831,11 +42663,6 @@
       }
     ],
     "withdrawals": [
-      {
-        "amount": "967.6813834225175",
-        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
-        "tx": "0x625e0c8fb8d5e2dd7fef0359bb396571f7d8aed05a601ddf0f6e6577edb26a13"
-      },
       {
         "amount": "10150.87581603206683",
         "user": "0xe3eB4CF43C072658401996b71D43eE26E573562D",
@@ -42891,11 +42718,6 @@
         "user": "0xe3eB4CF43C072658401996b71D43eE26E573562D",
         "tx": "0xa809dbfa0c31522127924306a6117331a578dfc402cf5fa464832baec46e4ac2"
       },
-      {
-        "amount": "910.2201524913365",
-        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
-        "tx": "0x24d004bb729a8d3e7df9be45895e411b7c3f8341a08737d41284acf79b3e9e53"
-      },
       {
         "amount": "981.387731774910625",
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -45004,12 +44826,6 @@
           }
         ],
         "withdrawals": [
-          {
-            "amount": "967.6813834225175",
-            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
-            "tranche_id": 2,
-            "tx": "0x625e0c8fb8d5e2dd7fef0359bb396571f7d8aed05a601ddf0f6e6577edb26a13"
-          },
           {
             "amount": "913.910324501590625",
             "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -45052,12 +44868,6 @@
             "tranche_id": 2,
             "tx": "0xc5cea08b124cdf6264d5b0c7494d63d9de264b429822d9a4e4cfadc43e611a1b"
           },
-          {
-            "amount": "910.2201524913365",
-            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
-            "tranche_id": 2,
-            "tx": "0x24d004bb729a8d3e7df9be45895e411b7c3f8341a08737d41284acf79b3e9e53"
-          },
           {
             "amount": "981.387731774910625",
             "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -46566,8 +46376,8 @@
           }
         ],
         "total_tokens": "259998.8875",
-        "withdrawn_tokens": "159590.522104386423875",
-        "remaining_tokens": "100408.365395613576125"
+        "withdrawn_tokens": "157712.620568472569875",
+        "remaining_tokens": "102286.266931527430125"
       },
       {
         "address": "0x89051CAb67Bc7F8CC44F7e270c6EDaf1EC57676c",
@@ -48948,8 +48758,8 @@
     "tranche_start": "2021-11-05T00:00:00.000Z",
     "tranche_end": "2023-05-05T00:00:00.000Z",
     "total_added": "14597706.0446472999",
-    "total_removed": "6170228.182342542771392682",
-    "locked_amount": "0",
+    "total_removed": "6169862.126766503085603932",
+    "locked_amount": "13191.17171553312990484487088804078",
     "deposits": [
       {
         "amount": "129284.449",
@@ -49213,11 +49023,6 @@
         "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
         "tx": "0x35f722557b9bc3a2dc314f9fac173013697c484059bd8d5c65497f8df72b9097"
       },
-      {
-        "amount": "366.05557603968578875",
-        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
-        "tx": "0xf03a210cb8c386c7bae72a07c1d20e50eb9a9743c5cd5df4b5e016f1e103f73f"
-      },
       {
         "amount": "1360.32447632896938825",
         "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
@@ -52566,12 +52371,6 @@
             "tranche_id": 3,
             "tx": "0x35f722557b9bc3a2dc314f9fac173013697c484059bd8d5c65497f8df72b9097"
           },
-          {
-            "amount": "366.05557603968578875",
-            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
-            "tranche_id": 3,
-            "tx": "0xf03a210cb8c386c7bae72a07c1d20e50eb9a9743c5cd5df4b5e016f1e103f73f"
-          },
           {
             "amount": "1360.32447632896938825",
             "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
@@ -55394,8 +55193,8 @@
           }
         ],
         "total_tokens": "359123.469575",
-        "withdrawn_tokens": "359123.469575",
-        "remaining_tokens": "0"
+        "withdrawn_tokens": "358757.41399896031421125",
+        "remaining_tokens": "366.05557603968578875"
       },
       {
         "address": "0xBdd412797c1B78535Afc5F71503b91fAbD0160fB",
@@ -59069,8 +58868,8 @@
     "tranche_start": "2022-06-05T00:00:00.000Z",
     "tranche_end": "2023-06-05T00:00:00.000Z",
     "total_added": "472355.6199999996",
-    "total_removed": "44479.0535455583416",
-    "locked_amount": "34927.90913982811608735474530694",
+    "total_removed": "44078.8527972103416",
+    "locked_amount": "40756.38446007669418433357128362",
     "deposits": [
       {
         "amount": "3000",
@@ -65689,11 +65488,6 @@
       }
     ],
     "withdrawals": [
-      {
-        "amount": "368.722818364",
-        "user": "0x0436E2E4EA467f9958403dc56635404EE1bb1E94",
-        "tx": "0x97f5b5ec5ac839a8d182b9267b5d052cb70f9a18b648874337e3d5360b21a5fb"
-      },
       {
         "amount": "182.662252664",
         "user": "0xb1169C6daAc76bAcaf0D8f87641Fc38fbabe569F",
@@ -65729,11 +65523,6 @@
         "user": "0x4d4AA3f302cbA998AAFC03F9d73484434ed9Fd53",
         "tx": "0x1e4902d0a3cb7b4f2ba7119dfcaa681a784e1d724c984961767e9feaa078fe54"
       },
-      {
-        "amount": "31.477929984",
-        "user": "0xcB555C5602cC0b2434A27d277e14Cb5C7bF4Ead1",
-        "tx": "0x1b9ddd24634b4c6eab202f0a65dc0d3119fbc5502cbac5086352eab14ebd7b02"
-      },
       {
         "amount": "168.502276762",
         "user": "0x38A292CB98Dc602ECAFF94E8E5fADD9800e4bA13",
@@ -81903,17 +81692,10 @@
             "tx": "0xb1425d9b0d5f10c5b06236d6f9d61ebddd21c4027e0f41deb5ec227a1753c715"
           }
         ],
-        "withdrawals": [
-          {
-            "amount": "368.722818364",
-            "user": "0x0436E2E4EA467f9958403dc56635404EE1bb1E94",
-            "tranche_id": 5,
-            "tx": "0x97f5b5ec5ac839a8d182b9267b5d052cb70f9a18b648874337e3d5360b21a5fb"
-          }
-        ],
+        "withdrawals": [],
         "total_tokens": "400",
-        "withdrawn_tokens": "368.722818364",
-        "remaining_tokens": "31.277181636"
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "400"
       },
       {
         "address": "0x6672F8789C54b49C596E6e7Ca3A72726Fc4C400E",
@@ -84566,12 +84348,6 @@
           }
         ],
         "withdrawals": [
-          {
-            "amount": "31.477929984",
-            "user": "0xcB555C5602cC0b2434A27d277e14Cb5C7bF4Ead1",
-            "tranche_id": 5,
-            "tx": "0x1b9ddd24634b4c6eab202f0a65dc0d3119fbc5502cbac5086352eab14ebd7b02"
-          },
           {
             "amount": "19.918569252",
             "user": "0xcB555C5602cC0b2434A27d277e14Cb5C7bF4Ead1",
@@ -84616,8 +84392,8 @@
           }
         ],
         "total_tokens": "400",
-        "withdrawn_tokens": "365.936821408",
-        "remaining_tokens": "34.063178592"
+        "withdrawn_tokens": "334.458891424",
+        "remaining_tokens": "65.541108576"
       },
       {
         "address": "0x3738bec36216eA2F11B954891C65AAd1Bc852156",

apps/trading-e2e/src/integration/capsule.cy.ts

@@ -9,7 +9,6 @@ import {
 import { isBefore, isAfter, addSeconds, subSeconds } from 'date-fns';
 import { createOrder } from '../support/create-order';
 import { connectEthereumWallet } from '../support/ethereum-wallet';
-import { selectAsset } from '../support/helpers';
 
 const orderSize = 'size';
 const orderType = 'type';
@@ -23,13 +22,15 @@ const assetSelectField = 'select[name="asset"]';
 const amountField = 'input[name="amount"]';
 const txTimeout = Cypress.env('txTimeout');
 const sepoliaUrl = Cypress.env('ETHERSCAN_URL');
-const btcName = 0;
-const vegaName = 4;
+const btcName =
+  'BTC (local)5cfa87844724df6069b94e4c8a6f03af21907d7bc251593d08e4251043ee9f7c - tBTC';
+const vegaName =
+  'Vegab4f2726571fbe8e33b442dc92ed2d7f0d810e21835b7371a7915a365f07ccd9b - VEGA';
 const btcSymbol = 'tBTC';
 const vegaSymbol = 'VEGA';
 const usdcSymbol = 'fUSDC';
 const toastContent = 'toast-content';
-const openOrdersTab = 'Open';
+const ordersTab = 'Orders';
 const depositsTab = 'Deposits';
 const collateralTab = 'Collateral';
 const toastCloseBtn = 'toast-close';
@@ -49,7 +50,6 @@ describe('capsule - without MultiSign', { tags: '@slow' }, () => {
     cy.get('@markets').then((markets) => {
       cy.wrap(markets[0]).as('market');
     });
-    cy.visit('/#/portfolio');
   });
 
   beforeEach(() => {
@@ -73,7 +73,7 @@ describe('capsule - without MultiSign', { tags: '@slow' }, () => {
     cy.getByTestId(depositsTab).click();
     cy.getByTestId('deposit-button').click();
     connectEthereumWallet('Unknown');
-    selectAsset(btcName);
+    cy.get(assetSelectField, txTimeout).select(btcName, { force: true });
     cy.getByTestId('approve-default').should(
       'contain.text',
       `Before you can make a deposit of your chosen asset, ${btcSymbol}, you need to approve its use in your Ethereum wallet`
@@ -81,7 +81,6 @@ describe('capsule - without MultiSign', { tags: '@slow' }, () => {
     cy.getByTestId(approveSubmit).click();
     cy.getByTestId('approve-pending').should('exist');
     cy.getByTestId('approve-confirmed').should('exist');
-    cy.get(amountField).focus();
     cy.get(amountField).clear().type('10');
     cy.getByTestId(depositSubmit).click();
     cy.getByTestId(toastContent, txTimeout).should(
@@ -116,6 +115,7 @@ describe('capsule - without MultiSign', { tags: '@slow' }, () => {
   });
 
   it('can key to key transfers', function () {
+    cy.visit('/#/portfolio');
     cy.get('main[data-testid="/portfolio"]').should('exist');
 
     cy.getByTestId(collateralTab).click();
@@ -147,8 +147,8 @@ describe('capsule - without MultiSign', { tags: '@slow' }, () => {
 
     cy.getByTestId('Withdrawals').click();
     cy.getByTestId('withdraw-dialog-button').click();
-    selectAsset(0);
-    cy.get(amountField).focus();
+    connectEthereumWallet('Unknown');
+    cy.get(assetSelectField, txTimeout).select(btcName, { force: true });
     cy.get(amountField).clear().type('1');
     cy.getByTestId('submit-withdrawal').click();
     cy.getByTestId(toastContent, txTimeout).should(
@@ -170,7 +170,7 @@ describe('capsule - without MultiSign', { tags: '@slow' }, () => {
 
     cy.getByTestId(toastContent, txTimeout).should(
       'contain.text',
-      'Error occurredcannot estimate gas'
+      'Error occurredprocessing response error'
     );
     cy.getByTestId(toastCloseBtn).click({ multiple: true });
     cy.getByTestId(completeWithdrawalBtn).should(
@@ -180,7 +180,7 @@ describe('capsule - without MultiSign', { tags: '@slow' }, () => {
   });
 });
 
-describe('capsule', { tags: '@slow', testIsolation: true }, () => {
+describe('capsule', { tags: '@slow' }, () => {
   before(() => {
     cy.updateCapsuleMultiSig();
   });
@@ -231,7 +231,7 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {
 
     cy.getByTestId(toastContent).should(
       'contain.text',
-      `Order submittedYour transaction has been confirmed View in block explorerSubmit order - activeTEST.24h+${order.size} @ ${order.price}.00 ${usdcSymbol}`,
+      `ConfirmedYour transaction has been confirmed View in block explorerSubmit order - activeTEST.24h+${order.size} @ ${order.price}.00 ${usdcSymbol}`,
       { matchCase: false }
     );
     cy.getByTestId(toastCloseBtn).click();
@@ -242,9 +242,9 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {
       .get(`[data-testid="bid-vol-${rawPrice}"]`)
       .should('contain.text', order.size);
 
-    cy.getByTestId(openOrdersTab).click();
+    cy.getByTestId(ordersTab).click();
     cy.getByTestId('edit', txTimeout).should('contain.text', 'Edit');
-    cy.getByTestId('tab-open-orders').within(() => {
+    cy.getByTestId('tab-orders').within(() => {
       cy.get('.ag-center-cols-container')
         .children()
         .first()
@@ -283,9 +283,7 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {
     });
   });
   it('can edit order', function () {
-    const market = this.market;
-    cy.visit(`/#/markets/${market.id}`);
-    cy.getByTestId(openOrdersTab).click();
+    cy.getByTestId(ordersTab).click();
     cy.getByTestId('edit').first().should('be.visible').click();
     cy.getByTestId('dialog-title').should('contain.text', 'Edit order');
     cy.get('#limitPrice').focus().clear().type(newPrice);
@@ -293,12 +291,12 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {
 
     cy.getByTestId(toastContent).should(
       'contain.text',
-      `Order submittedYour transaction has been confirmed View in block explorerEdit order - activeTEST.24h+${size} @ ${price}.00 ${usdcSymbol}+${size} @ ${newPrice}.00 ${usdcSymbol}`,
+      `ConfirmedYour transaction has been confirmed View in block explorerEdit order - activeTEST.24h+${size} @ ${price}.00 ${usdcSymbol}+${size} @ ${newPrice}.00 ${usdcSymbol}`,
       { matchCase: false }
     );
 
     cy.getByTestId(toastCloseBtn).click({ multiple: true });
-    cy.getByTestId(openOrdersTab).click();
+    cy.getByTestId(ordersTab).click();
     cy.get('.ag-center-cols-container')
       .children()
       .first()
@@ -309,20 +307,18 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {
         checkIfDataAndTimeOfCreationAndUpdateIsEqual(orderUpdatedAt);
       });
   });
-
-  it('can cancel order', function () {
-    const market = this.market;
-    cy.visit(`/#/markets/${market.id}`);
-    cy.getByTestId(openOrdersTab).click();
+  // comment because of bug #2695
+  it.skip('can cancel order', function () {
+    cy.getByTestId(ordersTab).click();
     cy.getByTestId('cancel').first().click();
     cy.getByTestId(toastContent).should(
       'contain.text',
-      `Order cancelledYour transaction has been confirmed View in block explorerCancel order - cancelledTEST.24h+${size} @ ${newPrice}.00 ${usdcSymbol}`,
+      `ConfirmedYour transaction has been confirmed View in block explorerCancel order - cancelledTEST.24h+${size} @ ${newPrice}.00 ${usdcSymbol}`,
       { matchCase: false }
     );
     cy.getByTestId(toastCloseBtn).click({ multiple: true });
-    cy.getByTestId('Closed').click();
-    cy.getByTestId('tab-closed-orders')
+
+    cy.getByTestId('tab-orders')
       .get('.ag-center-cols-container')
       .children()
       .first()
@@ -352,7 +348,7 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {
     cy.getByTestId('Withdrawals').click();
     cy.getByTestId('withdraw-dialog-button').click();
     connectEthereumWallet('Unknown');
-    selectAsset(btcName);
+    cy.get(assetSelectField, txTimeout).select(btcName, { force: true });
     cy.get(amountField).clear().type('1');
     cy.getByTestId('submit-withdrawal').click();
     cy.getByTestId(toastContent, txTimeout).should(
@@ -375,15 +371,19 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {
       'contain.text',
       'Transaction confirmed'
     );
-    cy.getByTestId(toastContent, txTimeout).should(
-      'contain.text',
-      'Funds unlockedYour funds have been unlocked for withdrawalView in block explorerWithdraw 1.00 tBTCComplete withdrawal'
-    );
+    cy.getByTestId(toastCloseBtn).click({ multiple: true });
 
-    cy.get('.ag-center-cols-container')
-      .find('[col-id="status"]')
-      .eq(0, txTimeout)
-      .should('contain.text', 'Completed');
+    cy.wrap(null).then(() => {
+      try {
+        cy.getByTestId(completeWithdrawalBtn)
+          .eq(0, txTimeout)
+          .should('not.exist');
+      } catch (error) {
+        console.log(
+          'Assertion failed, but we are continuing because this is our wait to complete transaction'
+        );
+      }
+    });
 
     cy.get('[col-id="txHash"]', txTimeout)
       .should('have.length.above', 1)
@@ -404,20 +404,17 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {
           .should('have.attr', 'href')
           .and('contain', `${sepoliaUrl}/tx/0x`);
       });
-
-    cy.getByTestId('withdraw-dialog-button').click({ force: true });
-    cy.getByTestId('BALANCE_AVAILABLE_value').should('have.text', '7.999');
+    // comment because of bug #2819
+    // cy.getByTestId('withdraw-dialog-button').click();
+    // cy.getByTestId('BALANCE_AVAILABLE_value').should('have.text', '0')
   });
 
   it('approved amount is less than deposit', function () {
     // 1001-DEPO-006
     // 1001-DEPO-007
-    cy.visit('/#/portfolio');
-    cy.get('main[data-testid="/portfolio"]').should('exist');
     cy.getByTestId(depositsTab).click();
     cy.getByTestId('deposit-button').click();
-    connectEthereumWallet('Unknown');
-    selectAsset(btcName);
+    cy.get(assetSelectField, txTimeout).select(btcName, { force: true });
     cy.contains('Deposits of tBTC not approved').should('not.exist');
     cy.contains('Use maximum').should('be.visible');
     cy.get(amountField).clear().type('20000000');
@@ -425,7 +422,11 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {
     cy.getByTestId(depositSubmit).click();
     cy.getByTestId('input-error-text').should(
       'contain.text',
-      `You can't deposit more than you have in your Ethereum wallet`
+      'Amount is above approved amount'
+    );
+    cy.getByTestId('reapprove-default').should(
+      'contain.text',
+      'Approve again to deposit more than'
     );
   });
 
@@ -439,11 +440,11 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {
     cy.getByTestId(depositsTab).click();
     cy.getByTestId('deposit-button').click();
     connectEthereumWallet('Unknown');
-    selectAsset(vegaName);
+    cy.get(assetSelectField, txTimeout).select(vegaName, { force: true });
     cy.getByTestId('approve-submit').click();
     cy.getByTestId('approve-confirmed').should(
       'contain.text',
-      'You approved deposits of up to VEGA'
+      'You can now make deposits in VEGA, up to a maximum of'
     );
     cy.get(amountField).clear().type('10000');
     cy.getByTestId('deposit-submit').click();
@@ -477,9 +478,9 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {
           .and('contain', `${sepoliaUrl}/tx/0x`);
       });
 
-    cy.getByTestId('Withdrawals').click(txTimeout);
+    cy.getByTestId('Withdrawals').click();
     cy.getByTestId('withdraw-dialog-button').click();
-    selectAsset(1);
+    cy.get(assetSelectField, txTimeout).select(vegaName, { force: true });
     cy.get(amountField).clear().type('10000');
     cy.getByTestId('DELAY_TIME_value').should('have.text', '5 days');
     cy.getByTestId('submit-withdrawal').click();

apps/trading-e2e/src/integration/live-env.cy.ts

@@ -14,226 +14,210 @@ const itemHeader = 'item-header';
 const itemValue = 'item-value';
 const marketListContent = 'popover-content';
 
-describe(
-  'Console - market list - live env',
-  { tags: '@live', testIsolation: true },
-  () => {
-    beforeEach(() => {
-      cy.visit('/');
+describe('Console - market list - live env', { tags: '@live' }, () => {
+  beforeEach(() => {
+    cy.visit('/');
+  });
+
+  it('shows the market list page', () => {
+    cy.get('main', { timeout: 20000 });
+
+    // Overlay should be shown
+    cy.getByTestId(selectMarketOverlay).should('exist');
+    cy.contains('Select a market to get started').should('be.visible');
+
+    // I expect the market overlay table to contain at least one row
+    cy.getByTestId(selectMarketOverlay)
+      .get('table tr')
+      .should('have.length.greaterThan', 1);
+
+    // each market shown in overlay table contains content under the last price and change fields
+    cy.getByTestId(selectMarketOverlay)
+      .get('table tr')
+      .getByTestId('price')
+      .should('not.be.empty');
+  });
+
+  it('redirects to a default market', () => {
+    cy.getByTestId('dialog-close').click();
+    cy.getByTestId(selectMarketOverlay).should('not.exist');
+
+    // the choose market overlay is no longer showing
+    cy.contains('Select a market to get started').should('not.exist');
+    cy.contains('Loading...').should('not.exist');
+    cy.getByTestId('popover-trigger').should('not.be.empty');
+  });
+});
+
+describe('Console - market info - live env', { tags: '@live' }, () => {
+  before(() => {
+    cy.visit('/');
+    cy.contains('Loading market data...').should('not.exist');
+    cy.getByTestId('link').should('be.visible');
+    cy.getByTestId('dialog-close').click();
+    cy.getByTestId(marketInfoBtn).click();
+  });
+  const titles = ['Market data', 'Market specification', 'Market governance'];
+  const subtitles = [
+    'Current fees',
+    'Market price',
+    'Market volume',
+    'Insurance pool',
+    'Key details',
+    'Instrument',
+    'Settlement asset',
+    'Metadata',
+    'Risk model',
+    'Risk parameters',
+    'Risk factors',
+    'Price monitoring bounds 1',
+    'Liquidity monitoring parameters',
+    'Liquidity',
+    'Liquidity price range',
+    'Oracle',
+    'Proposal',
+  ];
+
+  it('market info titles are displayed', () => {
+    cy.getByTestId('split-view-view')
+      .find('.text-lg')
+      .each((element, index) => {
+        cy.wrap(element).should('have.text', titles[index]);
+      });
+  });
+
+  it('market info subtitles are displayed', () => {
+    cy.getByTestId('popover-trigger').click();
+    cy.contains('Loading market data...').should('not.exist');
+    cy.contains('[data-testid="link"]', 'AAVEDAI.MF21').click();
+    cy.getByTestId(marketInfoBtn).click();
+    cy.getByTestId(marketInfoSubtitle).each((element, index) => {
+      cy.wrap(element).should('have.text', subtitles[index]);
     });
+  });
 
-    it('shows the market list page', () => {
-      cy.get('main', { timeout: 20000 });
-
-      // Overlay should be shown
-      cy.getByTestId(selectMarketOverlay).should('exist');
-      cy.contains('Select a market to get started').should('be.visible');
-
-      // I expect the market overlay table to contain at least one row
-      cy.getByTestId(selectMarketOverlay)
-        .get('table tr')
-        .should('have.length.greaterThan', 1);
-
-      // each market shown in overlay table contains content under the last price and change fields
-      cy.getByTestId(selectMarketOverlay)
-        .get('table tr')
-        .getByTestId('price')
-        .should('not.be.empty');
+  it('renders correctly liquidity in trading tab', () => {
+    cy.getByTestId('Liquidity').click();
+    cy.contains('Loading').should('not.exist');
+    cy.contains('Something went wrong').should('not.exist');
+    cy.contains('Application error').should('not.exist');
+    cy.getByTestId('tab-liquidity').within(() => {
+      cy.get('[col-id="party.id"]').eq(1).should('not.be.empty');
     });
+  });
+});
 
-    it('redirects to a default market', () => {
-      cy.getByTestId('dialog-close').click();
-      cy.getByTestId(selectMarketOverlay).should('not.exist');
+describe('Console - market summary - live env', { tags: '@live' }, () => {
+  before(() => {
+    cy.visit('/');
+    cy.getByTestId('dialog-close').click();
+    cy.getByTestId(marketSummaryBlock).should('be.visible');
+  });
 
-      // the choose market overlay is no longer showing
-      cy.contains('Select a market to get started').should('not.exist');
-      cy.contains('Loading...').should('not.exist');
-      cy.getByTestId('popover-trigger').should('not.be.empty');
-    });
-  }
-);
+  it('must display market name', () => {
+    cy.getByTestId('popover-trigger').should('not.be.empty');
+  });
 
-describe(
-  'Console - market info - live env',
-  { tags: '@live', testIsolation: true },
-  () => {
-    before(() => {
-      cy.visit('/');
-      cy.contains('Loading market data...').should('not.exist');
-      cy.getByTestId('link').should('be.visible');
-      cy.getByTestId('dialog-close').click();
-      cy.getByTestId(marketInfoBtn).click();
-    });
-    const titles = ['Market data', 'Market specification', 'Market governance'];
-    const subtitles = [
-      'Current fees',
-      'Market price',
-      'Market volume',
-      'Insurance pool',
-      'Key details',
-      'Instrument',
-      'Settlement asset',
-      'Metadata',
-      'Risk model',
-      'Risk parameters',
-      'Risk factors',
-      'Price monitoring bounds 1',
-      'Liquidity monitoring parameters',
-      'Liquidity',
-      'Liquidity price range',
-      'Oracle',
-      'Proposal',
-    ];
-
-    it('market info titles are displayed', () => {
-      cy.getByTestId('split-view-view')
-        .find('.text-lg')
-        .each((element, index) => {
-          cy.wrap(element).should('have.text', titles[index]);
-        });
-    });
-
-    it('market info subtitles are displayed', () => {
-      cy.getByTestId('popover-trigger').click();
-      cy.contains('Loading market data...').should('not.exist');
-      cy.contains('[data-testid="link"]', 'AAVEDAI.MF21').click();
-      cy.getByTestId(marketInfoBtn).click();
-      cy.getByTestId(marketInfoSubtitle).each((element, index) => {
-        cy.wrap(element).should('have.text', subtitles[index]);
+  it('must see market expiry', () => {
+    cy.getByTestId(marketSummaryBlock).within(() => {
+      cy.getByTestId(marketExpiry).within(() => {
+        cy.getByTestId(itemHeader).should('have.text', 'Expiry');
+        cy.getByTestId(itemValue).should('not.be.empty');
       });
     });
+  });
 
-    it('renders correctly liquidity in trading tab', () => {
-      cy.getByTestId('Liquidity').click();
-      cy.contains('Loading').should('not.exist');
-      cy.contains('Something went wrong').should('not.exist');
-      cy.contains('Application error').should('not.exist');
-      cy.getByTestId('tab-liquidity').within(() => {
-        cy.get('[col-id="party.id"]').eq(1).should('not.be.empty');
+  it('must see market price', () => {
+    cy.getByTestId(marketSummaryBlock).within(() => {
+      cy.getByTestId(marketPrice).within(() => {
+        cy.getByTestId(itemHeader).should('have.text', 'Price');
+        cy.getByTestId(itemValue).should('not.be.empty');
       });
     });
-  }
-);
+  });
 
-describe(
-  'Console - market summary - live env',
-  { tags: '@live', testIsolation: true },
-  () => {
-    before(() => {
-      cy.visit('/');
-      cy.getByTestId('dialog-close').click();
-      cy.getByTestId(marketSummaryBlock).should('be.visible');
-    });
-
-    it('must display market name', () => {
-      cy.getByTestId('popover-trigger').should('not.be.empty');
-    });
-
-    it('must see market expiry', () => {
-      cy.getByTestId(marketSummaryBlock).within(() => {
-        cy.getByTestId(marketExpiry).within(() => {
-          cy.getByTestId(itemHeader).should('have.text', 'Expiry');
-          cy.getByTestId(itemValue).should('not.be.empty');
-        });
+  it('must see market change', () => {
+    cy.getByTestId(marketSummaryBlock).within(() => {
+      cy.getByTestId(marketChange).within(() => {
+        cy.getByTestId(itemHeader).should('have.text', 'Change (24h)');
+        cy.getByTestId(percentageValue).should('not.be.empty');
+        cy.getByTestId(priceChangeValue).should('not.be.empty');
       });
     });
+  });
 
-    it('must see market price', () => {
-      cy.getByTestId(marketSummaryBlock).within(() => {
-        cy.getByTestId(marketPrice).within(() => {
-          cy.getByTestId(itemHeader).should('have.text', 'Price');
-          cy.getByTestId(itemValue).should('not.be.empty');
-        });
+  it('must see market volume', () => {
+    cy.getByTestId(marketSummaryBlock).within(() => {
+      cy.getByTestId(marketVolume).within(() => {
+        cy.getByTestId(itemHeader).should('have.text', 'Volume (24h)');
+        cy.getByTestId(itemValue).should('not.be.empty');
       });
     });
+  });
 
-    it('must see market change', () => {
-      cy.getByTestId(marketSummaryBlock).within(() => {
-        cy.getByTestId(marketChange).within(() => {
-          cy.getByTestId(itemHeader).should('have.text', 'Change (24h)');
-          cy.getByTestId(percentageValue).should('not.be.empty');
-          cy.getByTestId(priceChangeValue).should('not.be.empty');
-        });
+  it('must see market mode', () => {
+    cy.getByTestId(marketSummaryBlock).within(() => {
+      cy.getByTestId(marketMode).within(() => {
+        cy.getByTestId(itemHeader).should('have.text', 'Trading mode');
+        cy.getByTestId(itemValue).should('not.be.empty');
       });
     });
+  });
 
-    it('must see market volume', () => {
-      cy.getByTestId(marketSummaryBlock).within(() => {
-        cy.getByTestId(marketVolume).within(() => {
-          cy.getByTestId(itemHeader).should('have.text', 'Volume (24h)');
-          cy.getByTestId(itemValue).should('not.be.empty');
-        });
+  it('must see market settlement', () => {
+    cy.getByTestId(marketSummaryBlock).within(() => {
+      cy.getByTestId(marketSettlement).within(() => {
+        cy.getByTestId(itemHeader).should('have.text', 'Settlement asset');
+        cy.getByTestId(itemValue).should('not.be.empty');
       });
     });
+  });
+});
 
-    it('must see market mode', () => {
-      cy.getByTestId(marketSummaryBlock).within(() => {
-        cy.getByTestId(marketMode).within(() => {
-          cy.getByTestId(itemHeader).should('have.text', 'Trading mode');
-          cy.getByTestId(itemValue).should('not.be.empty');
-        });
+describe('Console - markets table - live env', { tags: '@live' }, () => {
+  beforeEach(() => {
+    cy.visit('/');
+  });
+
+  it('renders markets correctly', () => {
+    cy.get('[data-testid^="market-link-"]').should('not.be.empty');
+    cy.getByTestId('price').invoke('text').should('not.be.empty');
+    cy.getByTestId('settlement-asset').should('not.be.empty');
+    cy.getByTestId('price-change-percentage').should('not.be.empty');
+    cy.getByTestId('price-change').should('not.be.empty');
+    cy.getByTestId('sparkline-svg').should('be.visible');
+  });
+
+  it('renders market list drop down', () => {
+    openMarketDropDown();
+    cy.getByTestId(marketListContent)
+      .find('[data-testid="price"]')
+      .invoke('text')
+      .should('not.be.empty');
+    cy.getByTestId(marketListContent)
+      .find('[data-testid="trading-mode-col"]')
+      .should('not.be.empty');
+    cy.getByTestId(marketListContent)
+      .find('[data-testid="taker-fee"]')
+      .should('contain.text', '%');
+    cy.getByTestId(marketListContent)
+      .find('[data-testid="market-volume"]')
+      .should('not.be.empty');
+    cy.getByTestId(marketListContent)
+      .find('[data-testid="market-name"]')
+      .should('not.be.empty');
+  });
+
+  it('Able to select market from dropdown', () => {
+    cy.getByTestId('popover-trigger')
+      .invoke('text')
+      .then((marketName) => {
+        openMarketDropDown();
+        cy.get('[data-testid^=market-link]').eq(1).click();
+        cy.getByTestId('popover-trigger').should('not.be.equal', marketName);
       });
-    });
-
-    it('must see market settlement', () => {
-      cy.getByTestId(marketSummaryBlock).within(() => {
-        cy.getByTestId(marketSettlement).within(() => {
-          cy.getByTestId(itemHeader).should('have.text', 'Settlement asset');
-          cy.getByTestId(itemValue).should('not.be.empty');
-        });
-      });
-    });
-  }
-);
-
-describe(
-  'Console - markets table - live env',
-  { tags: '@live', testIsolation: true },
-  () => {
-    beforeEach(() => {
-      cy.visit('/');
-    });
-
-    it('renders markets correctly', () => {
-      cy.get('[data-testid^="market-link-"]').should('not.be.empty');
-      cy.getByTestId('price').invoke('text').should('not.be.empty');
-      cy.getByTestId('settlement-asset').should('not.be.empty');
-      cy.getByTestId('price-change-percentage').should('not.be.empty');
-      cy.getByTestId('price-change').should('not.be.empty');
-      cy.getByTestId('sparkline-svg').should('be.visible');
-    });
-
-    it('renders market list drop down', () => {
-      openMarketDropDown();
-      cy.getByTestId(marketListContent)
-        .find('[data-testid="price"]')
-        .invoke('text')
-        .should('not.be.empty');
-      cy.getByTestId(marketListContent)
-        .find('[data-testid="trading-mode-col"]')
-        .should('not.be.empty');
-      cy.getByTestId(marketListContent)
-        .find('[data-testid="taker-fee"]')
-        .should('contain.text', '%');
-      cy.getByTestId(marketListContent)
-        .find('[data-testid="market-volume"]')
-        .should('not.be.empty');
-      cy.getByTestId(marketListContent)
-        .find('[data-testid="market-name"]')
-        .should('not.be.empty');
-    });
-
-    it('Able to select market from dropdown', () => {
-      cy.getByTestId('popover-trigger')
-        .invoke('text')
-        .then((marketName) => {
-          openMarketDropDown();
-          cy.get('[data-testid^=market-link]').eq(1).click();
-          cy.getByTestId('popover-trigger').should('not.be.equal', marketName);
-        });
-    });
-  }
-);
+  });
+});
 
 function openMarketDropDown() {
   cy.contains('Loading...').should('not.exist');

apps/trading-e2e/src/integration/market-info.cy.ts

@@ -184,9 +184,17 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
       .getByTestId('provider-name')
       .and('contain', 'Another oracle');
 
+    cy.getByTestId(accordionContent)
+      .getByTestId('signed-proofs')
+      .and('contain', '1');
+
     cy.getByTestId(accordionContent)
       .getByTestId('verified-proofs')
       .and('contain', '1');
+
+    cy.getByTestId(accordionContent)
+      .getByTestId('signed-proofs')
+      .and('contain', '1');
   });
 
   it('proposal displayed', () => {

apps/trading/client-pages/home/home.tsx

@@ -1,7 +1,7 @@
 import { useEffect } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { marketsWithDataProvider } from '@vegaprotocol/market-list';
-import { useDataProvider } from '@vegaprotocol/data-provider';
+import { useDataProvider } from '@vegaprotocol/react-helpers';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { Links, Routes } from '../../pages/client-router';
 import { useGlobalStore } from '../../stores';

apps/trading/client-pages/liquidity/liquidity.tsx

@@ -12,12 +12,12 @@ import {
   formatNumberPercentage,
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
-import { updateGridData } from '@vegaprotocol/react-helpers';
 import {
   NetworkParams,
+  useDataProvider,
   useNetworkParams,
-} from '@vegaprotocol/network-parameters';
-import { useDataProvider } from '@vegaprotocol/data-provider';
+  updateGridData,
+} from '@vegaprotocol/react-helpers';
 import {
   AsyncRenderer,
   Tab,

apps/trading/client-pages/market/market.tsx

@@ -1,11 +1,11 @@
 import React, { useEffect, useMemo } from 'react';
 import { addDecimalsFormatNumber, titlefy } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
-import { useScreenDimensions } from '@vegaprotocol/react-helpers';
 import {
   useDataProvider,
+  useScreenDimensions,
   useThrottledDataProvider,
-} from '@vegaprotocol/data-provider';
+} from '@vegaprotocol/react-helpers';
 import { AsyncRenderer, ExternalLink, Splash } from '@vegaprotocol/ui-toolkit';
 import { marketProvider, marketDataProvider } from '@vegaprotocol/market-list';
 import { useGlobalStore, usePageTitleStore } from '../../stores';

apps/trading/client-pages/markets/closed.tsx

@@ -20,7 +20,7 @@ import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
 import type { ColDef } from 'ag-grid-community';
 import { SettlementDateCell } from './settlement-date-cell';
 import { SettlementPriceCell } from './settlement-price-cell';
-import { useDataProvider } from '@vegaprotocol/data-provider';
+import { useDataProvider } from '@vegaprotocol/react-helpers';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 
 type SettlementAsset =

apps/trading/client-pages/portfolio/account-history-container.tsx

@@ -24,8 +24,7 @@ import { PriceChart } from 'pennant';
 import 'pennant/dist/style.css';
 import type { Account } from '@vegaprotocol/accounts';
 import { accountsDataProvider } from '@vegaprotocol/accounts';
-import { useThemeSwitcher } from '@vegaprotocol/react-helpers';
-import { useDataProvider } from '@vegaprotocol/data-provider';
+import { useDataProvider, useThemeSwitcher } from '@vegaprotocol/react-helpers';
 import type { Market } from '@vegaprotocol/market-list';
 
 const DateRange = {

apps/trading/client-pages/portfolio/deposits-container.tsx

@@ -2,8 +2,10 @@ import { AsyncRenderer, Button } from '@vegaprotocol/ui-toolkit';
 import { useDepositDialog, DepositsTable } from '@vegaprotocol/deposits';
 import { depositsProvider } from '@vegaprotocol/deposits';
 import { t } from '@vegaprotocol/i18n';
-import { useBottomPlaceholder } from '@vegaprotocol/react-helpers';
-import { useDataProvider } from '@vegaprotocol/data-provider';
+import {
+  useDataProvider,
+  useBottomPlaceholder,
+} from '@vegaprotocol/react-helpers';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { useRef } from 'react';
 import type { AgGridReact } from 'ag-grid-react';

apps/trading/client-pages/portfolio/withdrawals-container.tsx

@@ -6,7 +6,7 @@ import {
 } from '@vegaprotocol/withdraws';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { t } from '@vegaprotocol/i18n';
-import { useDataProvider } from '@vegaprotocol/data-provider';
+import { useDataProvider } from '@vegaprotocol/react-helpers';
 import { VegaWalletContainer } from '../../components/vega-wallet-container';
 
 export const WithdrawalsContainer = () => {

apps/trading/components/liquidity-supplied/liquidity-supplied.tsx

@@ -1,9 +1,9 @@
 import { useCallback, useMemo, useState } from 'react';
 import {
   NetworkParams,
+  useDataProvider,
   useNetworkParams,
-} from '@vegaprotocol/network-parameters';
-import { useDataProvider } from '@vegaprotocol/data-provider';
+} from '@vegaprotocol/react-helpers';
 import type { MarketData } from '@vegaprotocol/market-list';
 import { marketDataProvider, marketProvider } from '@vegaprotocol/market-list';
 import { HeaderStat } from '../header';

apps/trading/components/market-mark-price/market-mark-price.tsx

@@ -1,7 +1,7 @@
 import type { RefObject } from 'react';
 import { useInView } from 'react-intersection-observer';
 import { addDecimalsFormatNumber, isNumeric } from '@vegaprotocol/utils';
-import { useThrottledDataProvider } from '@vegaprotocol/data-provider';
+import { useThrottledDataProvider } from '@vegaprotocol/react-helpers';
 import { PriceCell } from '@vegaprotocol/datagrid';
 import { marketDataProvider } from '@vegaprotocol/market-list';
 import { THROTTLE_UPDATE_TIME } from '../constants';

apps/trading/components/market-state/market-state.tsx

@@ -2,7 +2,7 @@ import throttle from 'lodash/throttle';
 import type { MarketData, Market } from '@vegaprotocol/market-list';
 import { marketDataProvider } from '@vegaprotocol/market-list';
 import { t } from '@vegaprotocol/i18n';
-import { useDataProvider } from '@vegaprotocol/data-provider';
+import { useDataProvider } from '@vegaprotocol/react-helpers';
 import * as Schema from '@vegaprotocol/types';
 import { HeaderStat } from '../header';
 import { useCallback, useRef, useState } from 'react';

apps/trading/components/market-volume/market-volume.tsx

@@ -2,7 +2,7 @@ import { useCallback, useRef, useState } from 'react';
 import throttle from 'lodash/throttle';
 import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
-import { useDataProvider } from '@vegaprotocol/data-provider';
+import { useDataProvider } from '@vegaprotocol/react-helpers';
 import type { MarketData } from '@vegaprotocol/market-list';
 import { marketDataProvider, marketProvider } from '@vegaprotocol/market-list';
 import { HeaderStat } from '../header';

apps/trading/components/select-market/select-market.tsx

@@ -3,7 +3,7 @@ import type { RefObject } from 'react';
 import { useMarketList } from '@vegaprotocol/market-list';
 import { positionsDataProvider } from '@vegaprotocol/positions';
 import { t } from '@vegaprotocol/i18n';
-import { useDataProvider } from '@vegaprotocol/data-provider';
+import { useDataProvider } from '@vegaprotocol/react-helpers';
 import { ExternalLink, Icon, Loader, Popover } from '@vegaprotocol/ui-toolkit';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import {

apps/trading/components/welcome-dialog/proposed-markets.tsx

@@ -1,6 +1,6 @@
 import { useMemo } from 'react';
 import { t } from '@vegaprotocol/i18n';
-import { useDataProvider } from '@vegaprotocol/data-provider';
+import { useDataProvider } from '@vegaprotocol/react-helpers';
 import { proposalsDataProvider } from '@vegaprotocol/proposals';
 import take from 'lodash/take';
 import * as Types from '@vegaprotocol/types';

apps/trading/components/welcome-dialog/welcome-dialog.tsx

@@ -2,8 +2,7 @@ import React, { useCallback } from 'react';
 import { useLocation } from 'react-router-dom';
 import { Dialog } from '@vegaprotocol/ui-toolkit';
 import { t } from '@vegaprotocol/i18n';
-import { useLocalStorage } from '@vegaprotocol/react-helpers';
-import { useDataProvider } from '@vegaprotocol/data-provider';
+import { useDataProvider, useLocalStorage } from '@vegaprotocol/react-helpers';
 import { activeMarketsProvider } from '@vegaprotocol/market-list';
 import * as constants from '../constants';
 import { RiskNoticeDialog } from './risk-notice-dialog';

apps/trading/lib/hooks/use-ethereum-transaction-toasts.tsx

@@ -11,11 +11,13 @@ import { useToasts } from '@vegaprotocol/ui-toolkit';
 import { Intent, ProgressBar } from '@vegaprotocol/ui-toolkit';
 import { useCallback } from 'react';
 import compact from 'lodash/compact';
-import type { EthStoredTxState } from './use-ethereum-transaction-store';
-import { EthTxStatus } from './use-ethereum-transaction';
-import { isEthereumError } from './ethereum-error';
-import { TransactionContent } from './ethereum-transaction-dialog';
-import { useEthTransactionStore } from './use-ethereum-transaction-store';
+import type { EthStoredTxState } from '@vegaprotocol/web3';
+import {
+  EthTxStatus,
+  isEthereumError,
+  TransactionContent,
+  useEthTransactionStore,
+} from '@vegaprotocol/web3';
 
 const intentMap: { [s in EthTxStatus]: Intent } = {
   Default: Intent.Primary,

apps/trading/lib/hooks/use-ethereum-withdraw-approval-toasts.tsx

@@ -6,12 +6,11 @@ import { Panel } from '@vegaprotocol/ui-toolkit';
 import { CLOSE_AFTER } from '@vegaprotocol/ui-toolkit';
 import { useToasts } from '@vegaprotocol/ui-toolkit';
 import { Intent } from '@vegaprotocol/ui-toolkit';
+import { ApprovalStatus, VerificationStatus } from '@vegaprotocol/withdraws';
 import { useCallback } from 'react';
 import compact from 'lodash/compact';
-import type { EthWithdrawalApprovalState } from './use-ethereum-withdraw-approvals-store';
-import { useEthWithdrawApprovalsStore } from './use-ethereum-withdraw-approvals-store';
-import { ApprovalStatus } from './use-ethereum-withdraw-approvals-store';
-import { VerificationStatus } from './withdrawal-approval-status';
+import type { EthWithdrawalApprovalState } from '@vegaprotocol/web3';
+import { useEthWithdrawApprovalsStore } from '@vegaprotocol/web3';
 
 const intentMap: { [s in ApprovalStatus]: Intent } = {
   Pending: Intent.Warning,

apps/trading/lib/hooks/use-vega-transaction-toasts.tsx

@@ -37,7 +37,7 @@ import {
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { useAssetsDataProvider } from '@vegaprotocol/assets';
-import { useEthWithdrawApprovalsStore } from './use-ethereum-withdraw-approvals-store';
+import { useEthWithdrawApprovalsStore } from '@vegaprotocol/web3';
 import { DApp, EXPLORER_TX, useLinks } from '@vegaprotocol/environment';
 import {
   getOrderToastIntent,

apps/trading/pages/_app.page.tsx

@@ -34,7 +34,7 @@ import { AnnouncementBanner } from '../components/banner';
 import { AppLoader, DynamicLoader } from '../components/app-loader';
 import { Navbar } from '../components/navbar';
 import { ENV } from '../lib/config';
-import { useDataProvider } from '@vegaprotocol/data-provider';
+import { useDataProvider } from '@vegaprotocol/react-helpers';
 import { activeOrdersProvider, allOrdersProvider } from '@vegaprotocol/orders';
 import { useTelemetryApproval } from '../lib/hooks/use-telemetry-approval';
 import {

apps/trading/pages/toasts-manager.tsx

@@ -1,8 +1,8 @@
 import { ToastsContainer, useToasts } from '@vegaprotocol/ui-toolkit';
 import { useUpdateNetworkParametersToasts } from '@vegaprotocol/proposals';
-import { useVegaTransactionToasts } from '@vegaprotocol/web3';
-import { useEthereumTransactionToasts } from '@vegaprotocol/web3';
-import { useEthereumWithdrawApprovalsToasts } from '@vegaprotocol/web3';
+import { useVegaTransactionToasts } from '../lib/hooks/use-vega-transaction-toasts';
+import { useEthereumTransactionToasts } from '../lib/hooks/use-ethereum-transaction-toasts';
+import { useEthereumWithdrawApprovalsToasts } from '../lib/hooks/use-ethereum-withdraw-approval-toasts';
 
 export const ToastsManager = () => {
   useUpdateNetworkParametersToasts();

libs/accounts/src/lib/accounts-data-provider.ts

@@ -1,10 +1,10 @@
 import { assetsProvider } from '@vegaprotocol/assets';
 import { marketsProvider } from '@vegaprotocol/market-list';
-import { removePaginationWrapper } from '@vegaprotocol/utils';
 import {
   makeDataProvider,
   makeDerivedDataProvider,
-} from '@vegaprotocol/data-provider';
+  removePaginationWrapper,
+} from '@vegaprotocol/utils';
 import * as Schema from '@vegaprotocol/types';
 import produce from 'immer';
 

libs/accounts/src/lib/accounts-manager.spec.tsx

@@ -5,12 +5,12 @@ import {
   screen,
   waitFor,
 } from '@testing-library/react';
-import * as helpers from '@vegaprotocol/data-provider';
+import * as helpers from '@vegaprotocol/react-helpers';
 import { AccountManager } from './accounts-manager';
 
 const mockedUseDataProvider = jest.fn();
-jest.mock('@vegaprotocol/data-provider', () => ({
-  ...jest.requireActual('@vegaprotocol/data-provider'),
+jest.mock('@vegaprotocol/react-helpers', () => ({
+  ...jest.requireActual('@vegaprotocol/react-helpers'),
   useDataProvider: jest.fn(() => mockedUseDataProvider()),
 }));
 

libs/accounts/src/lib/accounts-manager.tsx

@@ -1,7 +1,9 @@
 import { useRef, useMemo, memo, useCallback } from 'react';
 import { t } from '@vegaprotocol/i18n';
-import { useBottomPlaceholder } from '@vegaprotocol/react-helpers';
-import { useDataProvider } from '@vegaprotocol/data-provider';
+import {
+  useDataProvider,
+  useBottomPlaceholder,
+} from '@vegaprotocol/react-helpers';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import type { AgGridReact } from 'ag-grid-react';
 import type { AccountFields } from './accounts-data-provider';

libs/accounts/src/lib/asset-balance.tsx

@@ -1,7 +1,7 @@
 import { useMemo } from 'react';
 import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
 import { accountsDataProvider } from './accounts-data-provider';
-import { useDataProvider } from '@vegaprotocol/data-provider';
+import { useDataProvider } from '@vegaprotocol/react-helpers';
 
 interface AssetBalanceProps {
   partyId: string;

libs/accounts/src/lib/transfer-container.tsx

@@ -3,9 +3,9 @@ import { addDecimal, truncateByChars } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import {
   NetworkParams,
+  useDataProvider,
   useNetworkParam,
-} from '@vegaprotocol/network-parameters';
-import { useDataProvider } from '@vegaprotocol/data-provider';
+} from '@vegaprotocol/react-helpers';
 import type { Transfer } from '@vegaprotocol/wallet';
 import { useVegaTransactionStore, useVegaWallet } from '@vegaprotocol/wallet';
 import { useCallback, useMemo } from 'react';

libs/accounts/src/lib/use-account-balance.tsx

@@ -1,6 +1,6 @@
 import { useCallback, useMemo, useState } from 'react';
 import { useVegaWallet } from '@vegaprotocol/wallet';
-import { useDataProvider } from '@vegaprotocol/data-provider';
+import { useDataProvider } from '@vegaprotocol/react-helpers';
 import { accountsDataProvider } from './accounts-data-provider';
 import type { Account } from './accounts-data-provider';
 import { getSettlementAccount } from './get-settlement-account';

libs/accounts/src/lib/use-market-account-balance.tsx

@@ -1,6 +1,6 @@
 import { useCallback, useMemo, useState } from 'react';
 import { useVegaWallet } from '@vegaprotocol/wallet';
-import { useDataProvider } from '@vegaprotocol/data-provider';
+import { useDataProvider } from '@vegaprotocol/react-helpers';
 import { accountsDataProvider } from './accounts-data-provider';
 import type { Account } from './accounts-data-provider';
 import { getMarketAccount } from './get-market-account';

libs/assets/src/lib/asset-data-provider.ts

@@ -1,4 +1,5 @@
-import { makeDataProvider, useDataProvider } from '@vegaprotocol/data-provider';
+import { makeDataProvider } from '@vegaprotocol/utils';
+import { useDataProvider } from '@vegaprotocol/react-helpers';
 
 import type {
   AssetQuery,