chore: update checkbox test

Co-authored-by: Matthew Russell <mattrussell36@gmail.com>

.github/workflows/cypress-run.yml

@@ -20,7 +20,7 @@ jobs:
         project: ${{ fromJSON(inputs.projects) }}
     name: ${{ matrix.project }}
     runs-on: self-hosted-runner
-    timeout-minutes: 100
+    timeout-minutes: 120
     steps:
       # Checks if skip cache was requested
       - name: Set skip-nx-cache flag

apps/explorer/.env.capsule

@@ -1,6 +1,4 @@
 # App configuration variables
-NX_TENDERMINT_URL=http://localhost:26617
-NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket
 NX_VEGA_ENV=CUSTOM
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
@@ -8,3 +6,6 @@ NX_VEGA_EXPLORER_URL=/
 
 # App flags
 NX_EXPLORER_TXS_LIST=0
+
+NX_TENDERMINT_URL=http://localhost:26617
+NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket

apps/explorer/.env.devnet

@@ -1,6 +1,4 @@
 # App configuration variables
-NX_TENDERMINT_URL=https://tm.be.devnet1.vega.xyz/
-NX_TENDERMINT_WEBSOCKET_URL=wss://be.devnet1.vega.xyz/websocket
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml
 NX_VEGA_ENV=DEVNET
 NX_BLOCK_EXPLORER=https://be.devnet1.vega.xyz/rest
@@ -10,3 +8,6 @@ NX_VEGA_URL=https://api.devnet1.vega.xyz/graphql
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_EXPLORER_URL=/
+
+NX_TENDERMINT_URL=https://tm.be.devnet1.vega.xyz/
+NX_TENDERMINT_WEBSOCKET_URL=wss://be.devnet1.vega.xyz/websocket

apps/explorer/.env.mainnet

@@ -1,6 +1,4 @@
 # App configuration variables
-NX_TENDERMINT_URL=https://be.vega.community
-NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket
 NX_SENTRY_DSN=https://b3a56b03eda842faad731f3ea9dfd1bc@o286262.ingest.sentry.io/6242427
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/mainnet1/mainnet1.toml
 NX_VEGA_URL=https://api.vega.community/graphql
@@ -11,3 +9,6 @@ NX_VEGA_GOVERNANCE_URL=https://governance.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
 NX_VEGA_EXPLORER_URL=https://explorer.vega.xyz/
 NX_VEGA_CONSOLE_URL=https://console.vega.xyz
+
+NX_TENDERMINT_URL=https://be.vega.community
+NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket

apps/explorer/.env.mainnet-mirror

@@ -1,6 +1,4 @@
 # App configuration variables
-NX_TENDERMINT_URL=https://be.mainnet-mirror.vega.rocks
-NX_TENDERMINT_WEBSOCKET_URL=wss://be.mainnet-mirror.vega.rocks/websocket
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/mainnet-mirror/vegawallet-mainnet-mirror.toml
 NX_VEGA_URL=https://api.mainnet-mirror.vega.rocks/graphql
@@ -10,4 +8,7 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_VEGA_GOVERNANCE_URL=https://governance.mainnet-mirror.vega.rocks
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
 NX_VEGA_EXPLORER_URL=https://explorer.mainnet-mirror.vega.rocks/
-NX_VEGA_CONSOLE_URL=https://console.mainnet-mirror.vega.rocks
+NX_VEGA_CONSOLE_URL=https://console.mainnet-mirror.vega.rocks
+
+NX_TENDERMINT_URL=https://be.mainnet-mirror.vega.rocks
+NX_TENDERMINT_WEBSOCKET_URL=wss://be.mainnet-mirror.vega.rocks/websocket

apps/explorer/.env.testnet

@@ -1,7 +1,5 @@
 # App configuration variables
-NX_TENDERMINT_URL=https://tm.be.testnet.vega.xyz
 NX_BLOCK_EXPLORER=https://be.testnet.vega.xyz/rest
-NX_TENDERMINT_WEBSOCKET_URL=wss://be.testnet.vega.xyz/websocket
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
 NX_VEGA_ENV=TESTNET
 NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
@@ -11,3 +9,6 @@ NX_VEGA_GOVERNANCE_URL=https://governance.fairground.wtf
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
 NX_VEGA_CONSOLE_URL=https://console.fairground.wtf
+
+NX_TENDERMINT_URL=https://tm.be.testnet.vega.xyz
+NX_TENDERMINT_WEBSOCKET_URL=wss://be.testnet.vega.xyz/websocket

apps/explorer/.env.validators-testnet

@@ -7,9 +7,10 @@ NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 
-NX_TENDERMINT_URL=https://tm.be.validators-testnet.vega.rocks
 NX_BLOCK_EXPLORER=https://be.validators-testnet.vega.rocks/rest
-NX_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.xyz/websocket
 NX_VEGA_GOVERNANCE_URL=https://governance.validators-testnet.vega.rocks
 NX_VEGA_EXPLORER_URL=https://explorer.validators-testnet.vega.rocks/
 NX_VEGA_CONSOLE_URL=https://trading.validators-testnet.vega.rocks/
+
+NX_TENDERMINT_URL=https://tm.be.validators-testnet.vega.rocks
+NX_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.xyz/websocket

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

@@ -11,6 +11,7 @@ import { TxDetailsBatch } from './tx-batch';
 import { TxDetailsChainEvent } from './tx-chain-event';
 import { TxDetailsNodeVote } from './tx-node-vote';
 import { TxDetailsOrderCancel } from './tx-order-cancel';
+import { TxDetailsStopOrderCancel } from './tx-stop-order-cancel';
 import { TxDetailsOrderAmend } from './tx-order-amend';
 import { TxDetailsWithdrawSubmission } from './tx-withdraw-submission';
 import { TxDetailsDelegate } from './tx-delegation';
@@ -85,6 +86,8 @@ function getTransactionComponent(txData?: BlockExplorerTransactionResult) {
       return TxDetailsProtocolUpgrade;
     case 'Cancel Order':
       return TxDetailsOrderCancel;
+    case 'Stop Orders Cancellation':
+      return TxDetailsStopOrderCancel;
     case 'Amend Order':
       return TxDetailsOrderAmend;
     case 'Validator Heartbeat':

apps/explorer/src/app/components/txs/details/tx-stop-order-cancel.tsx

@@ -0,0 +1,60 @@
+import { t } from '@vegaprotocol/i18n';
+import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response';
+import { MarketLink } from '../../links/';
+import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response';
+import { TxDetailsShared } from './shared/tx-details-shared';
+import { TableCell, TableRow, TableWithTbody } from '../../table';
+import { CancelSummary } from '../../order-summary/order-cancellation';
+import Hash from '../../links/hash';
+import type { components } from '../../../../types/explorer';
+
+export type StopOrderCancellationTransaction =
+  components['schemas']['v1StopOrdersCancellation'];
+
+interface TxDetailsStopOrderCancelProps {
+  txData: BlockExplorerTransactionResult | undefined;
+  pubKey: string | undefined;
+  blockData: TendermintBlocksResponse | undefined;
+}
+
+/**
+ * Someone cancelled a stop order
+ */
+export const TxDetailsStopOrderCancel = ({
+  txData,
+  pubKey,
+  blockData,
+}: TxDetailsStopOrderCancelProps) => {
+  if (!txData || !txData.command) {
+    return <>{t('Awaiting Block Explorer transaction details')}</>;
+  }
+
+  const command: StopOrderCancellationTransaction =
+    txData.command.stopOrdersCancellation;
+
+  const { marketId, stopOrderId } = command;
+
+  return (
+    <TableWithTbody className="mb-8" allowWrap={true}>
+      <TxDetailsShared txData={txData} pubKey={pubKey} blockData={blockData} />
+      <TableRow modifier="bordered">
+        <TableCell>{t('Cancel stop order')}</TableCell>
+        <TableCell>
+          {stopOrderId ? (
+            <Hash text={stopOrderId} />
+          ) : (
+            <CancelSummary orderId={stopOrderId} marketId={marketId} />
+          )}
+        </TableCell>
+      </TableRow>
+      {marketId ? (
+        <TableRow modifier="bordered">
+          <TableCell>{t('Market')}</TableCell>
+          <TableCell>
+            <MarketLink id={marketId} />
+          </TableCell>
+        </TableRow>
+      ) : null}
+    </TableWithTbody>
+  );
+};

apps/explorer/src/app/components/txs/tx-filter.tsx

@@ -34,6 +34,7 @@ export type FilterOption =
   | 'Protocol Upgrade'
   | 'Register new Node'
   | 'State Variable Proposal'
+  | 'Stop Orders Cancellation'
   | 'Submit Oracle Data'
   | 'Submit Order'
   | 'Transfer Funds'
@@ -53,6 +54,7 @@ export const PrimaryFilterOptions: FilterOption[] = [
   'Delegate',
   'Liquidity Provision Order',
   'Proposal',
+  'Stop Orders Cancellation',
   'Submit Oracle Data',
   'Submit Order',
   'Transfer Funds',

apps/explorer/src/app/routes/layout.tsx

@@ -22,6 +22,11 @@ import { Footer } from '../components/footer/footer';
 import { Header } from '../components/header';
 import { Routes } from './route-names';
 import { useExplorerNodeNamesLazyQuery } from './validators/__generated__/NodeNames';
+import {
+  ProtocolUpgradeCountdownMode,
+  ProtocolUpgradeInProgressNotification,
+  ProtocolUpgradeProposalNotification,
+} from '@vegaprotocol/proposals';
 
 const DialogsContainer = () => {
   const { isOpen, id, trigger, asJson, setOpen } = useAssetDetailsDialogStore();
@@ -62,6 +67,10 @@ export const Layout = () => {
             />
           )}
           <Header />
+          <ProtocolUpgradeProposalNotification
+            mode={ProtocolUpgradeCountdownMode.IN_ESTIMATED_TIME_REMAINING}
+          />
+          <ProtocolUpgradeInProgressNotification />
         </div>
         <div className={fixedWidthClasses}>
           <main className="p-4">

apps/explorer/src/app/routes/parties/id/Party-assets.graphql

@@ -29,6 +29,37 @@ fragment ExplorerPartyAssetsAccounts on AccountBalance {
   }
 }
 
+fragment ExplorerPartyLinks on AccountBalance {
+  asset {
+    name
+    id
+    decimals
+    symbol
+    source {
+      __typename
+      ... on ERC20 {
+        contractAddress
+      }
+    }
+  }
+  type
+  balance
+  market {
+    id
+    decimalPlaces
+    tradableInstrument {
+      instrument {
+        name
+        product {
+          ... on Future {
+            quoteName
+          }
+        }
+      }
+    }
+  }
+}
+
 query ExplorerPartyAssets($partyId: ID!) {
   partiesConnection(id: $partyId) {
     edges {
@@ -48,9 +79,11 @@ query ExplorerPartyAssets($partyId: ID!) {
         }
         stakingSummary {
           currentStakeAvailable
-          linkings(pagination: { first: 100 }) {
+          linkings(pagination: { last: 100 }) {
             edges {
               node {
+                type
+                status
                 amount
               }
             }

apps/explorer/src/app/routes/parties/id/__generated__/Party-assets.ts

@@ -10,7 +10,7 @@ export type ExplorerPartyAssetsQueryVariables = Types.Exact<{
 }>;
 
 
-export type ExplorerPartyAssetsQuery = { __typename?: 'Query', partiesConnection?: { __typename?: 'PartyConnection', edges: Array<{ __typename?: 'PartyEdge', node: { __typename?: 'Party', id: string, delegationsConnection?: { __typename?: 'DelegationsConnection', edges?: Array<{ __typename?: 'DelegationEdge', node: { __typename?: 'Delegation', amount: string, epoch: number, node: { __typename?: 'Node', id: string, name: string } } } | null> | null } | null, stakingSummary: { __typename?: 'StakingSummary', currentStakeAvailable: string, linkings: { __typename?: 'StakesConnection', edges?: Array<{ __typename?: 'StakeLinkingEdge', node: { __typename?: 'StakeLinking', amount: string } } | null> | null } }, accountsConnection?: { __typename?: 'AccountsConnection', edges?: Array<{ __typename?: 'AccountEdge', node: { __typename?: 'AccountBalance', type: Types.AccountType, balance: string, asset: { __typename?: 'Asset', name: string, id: string, decimals: number, symbol: string, source: { __typename: 'BuiltinAsset' } | { __typename: 'ERC20', contractAddress: string } }, market?: { __typename?: 'Market', id: string, decimalPlaces: number, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, product: { __typename?: 'Future', quoteName: string } } } } | null } } | null> | null } | null } }> } | null };
+export type ExplorerPartyAssetsQuery = { __typename?: 'Query', partiesConnection?: { __typename?: 'PartyConnection', edges: Array<{ __typename?: 'PartyEdge', node: { __typename?: 'Party', id: string, delegationsConnection?: { __typename?: 'DelegationsConnection', edges?: Array<{ __typename?: 'DelegationEdge', node: { __typename?: 'Delegation', amount: string, epoch: number, node: { __typename?: 'Node', id: string, name: string } } } | null> | null } | null, stakingSummary: { __typename?: 'StakingSummary', currentStakeAvailable: string, linkings: { __typename?: 'StakesConnection', edges?: Array<{ __typename?: 'StakeLinkingEdge', node: { __typename?: 'StakeLinking', type: Types.StakeLinkingType, status: Types.StakeLinkingStatus, amount: string } } | null> | null } }, accountsConnection?: { __typename?: 'AccountsConnection', edges?: Array<{ __typename?: 'AccountEdge', node: { __typename?: 'AccountBalance', type: Types.AccountType, balance: string, asset: { __typename?: 'Asset', name: string, id: string, decimals: number, symbol: string, source: { __typename: 'BuiltinAsset' } | { __typename: 'ERC20', contractAddress: string } }, market?: { __typename?: 'Market', id: string, decimalPlaces: number, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, product: { __typename?: 'Future', quoteName: string } } } } | null } } | null> | null } | null } }> } | null };
 
 export const ExplorerPartyAssetsAccountsFragmentDoc = gql`
     fragment ExplorerPartyAssetsAccounts on AccountBalance {
@@ -67,6 +67,8 @@ export const ExplorerPartyAssetsDocument = gql`
           linkings(pagination: {first: 100}) {
             edges {
               node {
+                type
+                status
                 amount
               }
             }
@@ -111,4 +113,4 @@ export function useExplorerPartyAssetsLazyQuery(baseOptions?: Apollo.LazyQueryHo
         }
 export type ExplorerPartyAssetsQueryHookResult = ReturnType<typeof useExplorerPartyAssetsQuery>;
 export type ExplorerPartyAssetsLazyQueryHookResult = ReturnType<typeof useExplorerPartyAssetsLazyQuery>;
-export type ExplorerPartyAssetsQueryResult = Apollo.QueryResult<ExplorerPartyAssetsQuery, ExplorerPartyAssetsQueryVariables>;
+export type ExplorerPartyAssetsQueryResult = Apollo.QueryResult<ExplorerPartyAssetsQuery, ExplorerPartyAssetsQueryVariables>;

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

@@ -42,9 +42,15 @@ export const PartyBlockStake = ({
     linkedLength && linkedLength > 0
       ? p?.stakingSummary?.linkings?.edges
           ?.reduce((total, e) => {
-            return new BigNumber(total).plus(
-              new BigNumber(e?.node.amount || 0)
-            );
+            const accumulator = new BigNumber(total)
+            const diff = new BigNumber(e?.node.amount || 0)
+            if (e?.node.type === 'TYPE_LINK') {
+              return accumulator.plus(diff);
+            } else if (e?.node.type === 'TYPE_UNLINK') {
+              return accumulator.minus(diff);
+            } else {
+              return accumulator
+            }
           }, new BigNumber(0))
           .toString()
       : '0';

apps/explorer/src/index.html

@@ -17,7 +17,7 @@
     <meta name="og:site_name" content="Vega Protocol - Explorer" />
     <meta name="og:image" content="https://static.vega.xyz/favicon.ico" />
 
-    <meta name="twitter:card" content="summary_large_image" />
+    <meta name="twitter:card" content="https://static.vega.xyz/favicon.ico" />
     <meta name="twitter:title" content="Vega Protocol - Explorer" />
     <meta name="twitter:description" content="Vega Protocol - Explorer" />
     <meta name="twitter:image" content="https://static.vega.xyz/favicon.ico" />

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

@@ -220,6 +220,7 @@ describe(
       cy.getByTestId(changeVoteButton).should('be.visible').click();
       voteForProposal('for');
       // 3001-VOTE-064
+      cy.getByTestId('user-voted-yes').should('exist');
       getProposalInformationFromTable('Tokens for proposal')
         .should('have.text', (1).toFixed(2))
         .and('be.visible');

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

@@ -29,6 +29,7 @@ const toastPanel = 'toast-panel';
 const toastClose = 'toast-close';
 const withdrawalDialogContent = 'dialog-content';
 const toastCompleteWithdrawal = 'toast-complete-withdrawal';
+const scrollBar = '.ag-body-horizontal-scroll-viewport';
 const usdtName = 'USDC (local)';
 const usdcEthAddress = '0x1b8a1B6CBE5c93609b46D1829Cc7f3Cb8eeE23a0';
 const usdcSymbol = 'tUSDC';
@@ -199,20 +200,17 @@ context(
           );
           cy.getByTestId(toastClose).click();
         });
-      cy.get(tableTxHash)
-        .eq(1)
-        .should('have.text', 'Complete withdrawal')
-        .parent()
-        .within(() => {
-          cy.get(tableAssetSymbol).should('have.text', usdcSymbol);
-          cy.get(tableAmount).should('have.text', '110.00');
-          cy.get(tableReceiverAddress)
-            .find('a')
-            .should('have.attr', 'href')
-            .and('contain', 'https://sepolia.etherscan.io/address/');
-          cy.get(tableCreatedTimeStamp).should('not.be.empty');
-        });
+      cy.get("[row-id='0']").within(() => {
+        cy.get(tableAssetSymbol).should('have.text', usdcSymbol);
+        cy.get(tableAmount).should('have.text', '110.00');
+        cy.get(tableReceiverAddress)
+          .find('a')
+          .should('have.attr', 'href')
+          .and('contain', 'https://sepolia.etherscan.io/address/');
+        cy.get(tableCreatedTimeStamp).should('not.be.empty');
+      });
       ethereumWalletConnect();
+      cy.get(scrollBar).scrollTo('right');
       cy.getByTestId(completeWithdrawalButton).first().click();
       cy.getByTestId(toast)
         .last(txTimeout)

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

@@ -84,9 +84,10 @@ export function stakingPageAssociateTokens(
           .length
       ) {
         cy.get(tokenInputApprove, txTimeout).should('be.enabled').click();
-        cy.contains('Approve $VEGA Tokens for staking on Vega').should(
-          'be.visible'
-        );
+        cy.contains(
+          'Approve $VEGA Tokens for staking on Vega',
+          txTimeout
+        ).should('be.visible');
         cy.contains(
           'Approve $VEGA Tokens for staking on Vega',
           txTimeout
@@ -181,9 +182,10 @@ export function clickOnValidatorFromList(
   } else {
     cy.get(`[row-id="${validatorNumber}"]`)
       .should('be.visible')
-      .find(stakeValidatorListName)
-      .as('validatorOnList');
-    cy.get('@validatorOnList').click();
+      .first()
+      .within(() => {
+        cy.get(stakeValidatorListName).click();
+      });
   }
 }
 

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

@@ -6,6 +6,7 @@ import { Nav } from '../nav';
 import { Networks, useEnvironment } from '@vegaprotocol/environment';
 import {
   ProtocolUpgradeCountdownMode,
+  ProtocolUpgradeInProgressNotification,
   ProtocolUpgradeProposalNotification,
 } from '@vegaprotocol/proposals';
 import { ViewingAsBanner } from '@vegaprotocol/ui-toolkit';
@@ -49,6 +50,7 @@ const NotificationsContainer = () => {
       <ProtocolUpgradeProposalNotification
         mode={ProtocolUpgradeCountdownMode.IN_ESTIMATED_TIME_REMAINING}
       />
+      <ProtocolUpgradeInProgressNotification />
       {isReadOnly ? (
         <ViewingAsBanner pubKey={pubKey} disconnect={disconnect} />
       ) : null}

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

@@ -626,7 +626,8 @@
   "status-tendermint": "Consensus",
   "status-ersatz": "Standby",
   "status-pending": "Candidate",
-  "ersatzDescription": "To be promoted, a standby validator must have more than the lowest consensus stake, plus a bonus given to existing validators. This currently requires a minimum of {{stakeNeededForPromotion}} stake assuming no penalties. Only one validator per epoch can be promoted.",
+  "ersatzDescription1": "To be promoted, a standby validator must have more than the lowest consensus stake, plus a bonus given to existing validators, and only one standby validator can be promoted per epoch. Currently this requires a minimum of",
+  "ersatzDescription2": "stake assuming no performance penalty incurred.",
   "pendingDescription1": "Anyone can",
   "pendingDescriptionLinkText": "set up and run a node on Vega",
   "pendingDescription2": ". A node can move from being a candidate into standby based on how much nomination it attracts, assuming it has proven reliability by sending heartbeats to the network.",
@@ -784,6 +785,7 @@
   "PerformancePenaltyDescription": "Performance score is a measure of how often a validator proposed blocks in the last epoch relative to how many they should be expected to propose based on their voting power. Performance penalty is applied for having a performance score of less than 1",
   "UnnormalisedVotingPowerDescription": "The voting power of the validator based on their final validator score after all penalties have been applied",
   "NormalisedVotingPowerDescription": "The voting power of the validator, adjusted to ensure all validator scores sum to 1, used for distribution of rewards",
+  "NonConsensusVotingPowerDescription": "The voting power of the validator. Only consensus validators have voting power",
   "Score": "Score",
   "performancePenalty": "Performance penalty",
   "overstaked": "Overstaked",

apps/governance/src/index.html

@@ -17,7 +17,7 @@
     <meta name="og:site_name" content="Vega Protocol - Governance" />
     <meta name="og:image" content="https://static.vega.xyz/favicon.ico" />
 
-    <meta name="twitter:card" content="summary_large_image" />
+    <meta name="twitter:card" content="https://static.vega.xyz/favicon.ico" />
     <meta name="twitter:title" content="Vega Protocol - Governance" />
     <meta name="twitter:description" content="Vega Protocol - Governance" />
     <meta name="twitter:image" content="https://static.vega.xyz/favicon.ico" />

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

@@ -24,6 +24,7 @@ import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 import type { MockedResponse } from '@apollo/client/testing';
 import { FLAGS } from '@vegaprotocol/environment';
 import { BrowserRouter } from 'react-router-dom';
+import { VoteState } from '../vote-details/use-user-vote';
 
 jest.mock('@vegaprotocol/proposals', () => ({
   ...jest.requireActual('@vegaprotocol/proposals'),
@@ -36,7 +37,8 @@ jest.mock('@vegaprotocol/proposals', () => ({
 const renderComponent = (
   proposal: ProposalQuery['proposal'],
   isListItem = true,
-  mocks: MockedResponse[] = []
+  mocks: MockedResponse[] = [],
+  voteState?: VoteState
 ) =>
   render(
     <AppStateProvider>
@@ -47,6 +49,7 @@ const renderComponent = (
               proposal={proposal}
               isListItem={isListItem}
               networkParams={mockNetworkParams}
+              voteState={voteState}
             />
           </VegaWalletContext.Provider>
         </MockedProvider>
@@ -386,10 +389,15 @@ describe('Proposal header', () => {
         closingDatetime: nextWeek.toString(),
       },
     });
-    renderComponent(proposal, true, [
-      // @ts-ignore generateProposal always creates an id
-      createUserVoteQueryMock(proposal.id, VoteValue.VALUE_NO),
-    ]);
+    renderComponent(
+      proposal,
+      true,
+      [
+        // @ts-ignore generateProposal always creates an id
+        createUserVoteQueryMock(proposal.id, VoteValue.VALUE_NO),
+      ],
+      VoteState.No
+    );
     expect(await screen.findByTestId('user-voted-no')).toBeInTheDocument();
   });
 
@@ -400,10 +408,15 @@ describe('Proposal header', () => {
         closingDatetime: nextWeek.toString(),
       },
     });
-    renderComponent(proposal, true, [
-      // @ts-ignore generateProposal always creates an id
-      createUserVoteQueryMock(proposal.id, VoteValue.VALUE_YES),
-    ]);
+    renderComponent(
+      proposal,
+      true,
+      [
+        // @ts-ignore generateProposal always creates an id
+        createUserVoteQueryMock(proposal.id, VoteValue.VALUE_YES),
+      ],
+      VoteState.Yes
+    );
     expect(await screen.findByTestId('user-voted-yes')).toBeInTheDocument();
   });
 });

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

@@ -8,25 +8,26 @@ import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 import { truncateMiddle } from '../../../../lib/truncate-middle';
 import { CurrentProposalState } from '../current-proposal-state';
 import { ProposalInfoLabel } from '../proposal-info-label';
-import { useUserVote } from '../vote-details/use-user-vote';
 import { ProposalVotingStatus } from '../proposal-voting-status';
 import type { NetworkParamsResult } from '@vegaprotocol/network-parameters';
 import { useSuccessorMarketProposalDetails } from '@vegaprotocol/proposals';
 import { FLAGS } from '@vegaprotocol/environment';
 import Routes from '../../../routes';
 import { Link } from 'react-router-dom';
+import type { VoteState } from '../vote-details/use-user-vote';
 
 export const ProposalHeader = ({
   proposal,
   networkParams,
   isListItem = true,
+  voteState,
 }: {
   proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
   networkParams: Partial<NetworkParamsResult>;
   isListItem?: boolean;
+  voteState?: VoteState | null;
 }) => {
   const { t } = useTranslation();
-  const { voteState } = useUserVote(proposal?.id);
   const change = proposal?.terms.change;
 
   let details: ReactNode;

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

@@ -1,4 +1,6 @@
 import { MemoryRouter } from 'react-router-dom';
+import { MockedProvider } from '@apollo/client/testing';
+import { VegaWalletProvider } from '@vegaprotocol/wallet';
 import { render, screen } from '@testing-library/react';
 import { generateProposal } from '../../test-helpers/generate-proposals';
 import { Proposal } from './proposal';
@@ -44,11 +46,15 @@ jest.mock('../list-asset', () => ({
 const renderComponent = (proposal: ProposalQuery['proposal']) => {
   render(
     <MemoryRouter>
-      <Proposal
-        restData={{}}
-        proposal={proposal as ProposalQuery['proposal']}
-        networkParams={mockNetworkParams}
-      />
+      <MockedProvider>
+        <VegaWalletProvider>
+          <Proposal
+            restData={{}}
+            proposal={proposal as ProposalQuery['proposal']}
+            networkParams={mockNetworkParams}
+          />
+        </VegaWalletProvider>
+      </MockedProvider>
     </MemoryRouter>
   );
 };

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

@@ -19,6 +19,8 @@ import { removePaginationWrapper } from '@vegaprotocol/utils';
 import { ProposalState } from '@vegaprotocol/types';
 import { ProposalMarketChanges } from '../proposal-market-changes';
 import type { NetworkParamsResult } from '@vegaprotocol/network-parameters';
+import { useVoteSubmit } from '@vegaprotocol/proposals';
+import { useUserVote } from '../vote-details/use-user-vote';
 
 export enum ProposalType {
   PROPOSAL_NEW_MARKET = 'PROPOSAL_NEW_MARKET',
@@ -53,6 +55,8 @@ export const Proposal = ({
   mostRecentlyEnactedAssociatedMarketProposal,
 }: ProposalProps) => {
   const { t } = useTranslation();
+  const { submit, Dialog, finalizedVote, transaction } = useVoteSubmit();
+  const { voteState, voteDatetime } = useUserVote(proposal?.id, finalizedVote);
 
   if (!proposal) {
     return null;
@@ -132,10 +136,12 @@ export const Proposal = ({
           </div>
         )}
       </div>
+
       <ProposalHeader
         proposal={proposal}
         isListItem={false}
         networkParams={networkParams}
+        voteState={voteState}
       />
 
       <div id="details">
@@ -207,6 +213,11 @@ export const Proposal = ({
               spamProtectionMinTokens={
                 networkParams?.spam_protection_voting_min_tokens
               }
+              submit={submit}
+              dialog={Dialog}
+              transaction={transaction}
+              voteState={voteState}
+              voteDatetime={voteDatetime}
             />
           </RoundedWrapper>
         </div>

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

@@ -1,6 +1,7 @@
 import { RoundedWrapper } from '@vegaprotocol/ui-toolkit';
 import { ProposalHeader } from '../proposal-detail-header/proposal-header';
 import { ProposalsListItemDetails } from './proposals-list-item-details';
+import { useUserVote } from '../vote-details/use-user-vote';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 import type { NetworkParamsResult } from '@vegaprotocol/network-parameters';
@@ -14,12 +15,17 @@ export const ProposalsListItem = ({
   proposal,
   networkParams,
 }: ProposalsListItemProps) => {
+  const { voteState } = useUserVote(proposal?.id);
   if (!proposal || !proposal.id || !networkParams) return null;
 
   return (
     <li id={proposal.id} data-testid="proposals-list-item">
       <RoundedWrapper paddingBottom={true} heightFull={true}>
-        <ProposalHeader proposal={proposal} networkParams={networkParams} />
+        <ProposalHeader
+          proposal={proposal}
+          networkParams={networkParams}
+          voteState={voteState}
+        />
         <ProposalsListItemDetails proposal={proposal} />
       </RoundedWrapper>
     </li>

apps/governance/src/routes/proposals/components/vote-details/vega-transaction-dialog.spec.tsx

@@ -0,0 +1,110 @@
+import { render, screen } from '@testing-library/react';
+import { VoteTransactionDialog } from './vote-transaction-dialog';
+import { VoteState } from './use-user-vote';
+import { VegaTxStatus } from '@vegaprotocol/wallet';
+
+describe('VoteTransactionDialog', () => {
+  const mockTransactionDialog = jest.fn(({ title, content }) => (
+    <div>
+      <div>{title}</div>
+      <div>{content?.Complete}</div>
+    </div>
+  ));
+
+  it('renders without crashing', () => {
+    render(
+      <VoteTransactionDialog
+        voteState={VoteState.Yes}
+        transaction={null}
+        TransactionDialog={mockTransactionDialog}
+      />
+    );
+
+    expect(screen.getByTestId('vote-transaction-dialog')).toBeInTheDocument();
+  });
+
+  it('renders with txRequested title when voteState is Requested', () => {
+    render(
+      <VoteTransactionDialog
+        voteState={VoteState.Requested}
+        transaction={null}
+        TransactionDialog={mockTransactionDialog}
+      />
+    );
+
+    expect(screen.getByText('txRequested')).toBeInTheDocument();
+  });
+
+  it('renders with votePending title when voteState is Pending', () => {
+    render(
+      <VoteTransactionDialog
+        voteState={VoteState.Pending}
+        transaction={null}
+        TransactionDialog={mockTransactionDialog}
+      />
+    );
+
+    expect(screen.getByText('votePending')).toBeInTheDocument();
+  });
+
+  it('renders with no title when voteState is neither Requested nor Pending', () => {
+    render(
+      <VoteTransactionDialog
+        voteState={VoteState.Yes} // or any other state other than Requested or Pending
+        transaction={null}
+        TransactionDialog={mockTransactionDialog}
+      />
+    );
+
+    expect(screen.queryByText('txRequested')).not.toBeInTheDocument();
+    expect(screen.queryByText('votePending')).not.toBeInTheDocument();
+  });
+
+  it('renders custom error message when voteState is Failed and error message exists', () => {
+    render(
+      <VoteTransactionDialog
+        voteState={VoteState.Failed}
+        transaction={{
+          error: { message: 'Custom error test message', name: 'blah' },
+          txHash: null,
+          signature: null,
+          status: VegaTxStatus.Error,
+          dialogOpen: false,
+        }}
+        TransactionDialog={mockTransactionDialog}
+      />
+    );
+
+    expect(screen.getByText('Custom error test message')).toBeInTheDocument();
+  });
+
+  it('renders default error message when voteState is failed and no error message exists on the tx', () => {
+    render(
+      <VoteTransactionDialog
+        voteState={VoteState.Failed}
+        transaction={{
+          error: null,
+          txHash: null,
+          signature: null,
+          status: VegaTxStatus.Error,
+          dialogOpen: false,
+        }}
+        TransactionDialog={mockTransactionDialog}
+      />
+    );
+
+    expect(screen.getByText('voteError')).toBeInTheDocument();
+  });
+
+  it('renders default ui (i.e. not error) when not in a failed state', () => {
+    render(
+      <VoteTransactionDialog
+        voteState={VoteState.Yes}
+        transaction={null}
+        TransactionDialog={mockTransactionDialog}
+      />
+    );
+
+    expect(screen.queryByText('voteError')).not.toBeInTheDocument();
+  });
+});

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

@@ -1,4 +1,4 @@
-import { render, screen, fireEvent } from '@testing-library/react';
+import { fireEvent, render, screen } from '@testing-library/react';
 import BigNumber from 'bignumber.js';
 import { VoteButtons } from './vote-buttons';
 import { VoteState } from './use-user-vote';
@@ -24,6 +24,7 @@ describe('Vote buttons', () => {
               currentStakeAvailable={new BigNumber(1)}
               dialog={() => <div>Blah</div>}
               submit={() => Promise.resolve()}
+              transaction={null}
             />
           </VegaWalletContext.Provider>
         </MockedProvider>
@@ -47,6 +48,7 @@ describe('Vote buttons', () => {
               currentStakeAvailable={new BigNumber(1)}
               dialog={() => <div>Blah</div>}
               submit={() => Promise.resolve()}
+              transaction={null}
             />
           </VegaWalletContext.Provider>
         </MockedProvider>
@@ -81,6 +83,7 @@ describe('Vote buttons', () => {
               currentStakeAvailable={new BigNumber(1)}
               dialog={() => <div>Blah</div>}
               submit={() => Promise.resolve()}
+              transaction={null}
             />
           </VegaWalletContext.Provider>
         </MockedProvider>
@@ -105,6 +108,7 @@ describe('Vote buttons', () => {
               currentStakeAvailable={new BigNumber(0)}
               dialog={() => <div>Blah</div>}
               submit={() => Promise.resolve()}
+              transaction={null}
             />
           </VegaWalletContext.Provider>
         </MockedProvider>
@@ -132,6 +136,7 @@ describe('Vote buttons', () => {
               currentStakeAvailable={new BigNumber(1)}
               dialog={() => <div>Blah</div>}
               submit={() => Promise.resolve()}
+              transaction={null}
             />
           </VegaWalletContext.Provider>
         </MockedProvider>
@@ -159,6 +164,7 @@ describe('Vote buttons', () => {
               currentStakeAvailable={new BigNumber(10)}
               dialog={() => <div>Blah</div>}
               submit={() => Promise.resolve()}
+              transaction={null}
             />
           </VegaWalletContext.Provider>
         </MockedProvider>
@@ -183,6 +189,7 @@ describe('Vote buttons', () => {
               currentStakeAvailable={new BigNumber(10)}
               dialog={() => <div>Blah</div>}
               submit={() => Promise.resolve()}
+              transaction={null}
             />
           </VegaWalletContext.Provider>
         </MockedProvider>

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

@@ -17,7 +17,7 @@ import { VoteState } from './use-user-vote';
 import { ProposalMinRequirements, ProposalUserAction } from '../shared';
 import { VoteTransactionDialog } from './vote-transaction-dialog';
 import { useVoteButtonsQuery } from './__generated__/Stake';
-import type { DialogProps } from '@vegaprotocol/wallet';
+import type { DialogProps, VegaTxState } from '@vegaprotocol/wallet';
 
 interface VoteButtonsContainerProps {
   voteState: VoteState | null;
@@ -27,6 +27,7 @@ interface VoteButtonsContainerProps {
   minVoterBalance: string | null | undefined;
   spamProtectionMinTokens: string | null | undefined;
   submit: (voteValue: VoteValue, proposalId: string | null) => Promise<void>;
+  transaction: VegaTxState | null;
   dialog: (props: DialogProps) => JSX.Element;
   className?: string;
 }
@@ -67,6 +68,7 @@ export const VoteButtons = ({
   minVoterBalance,
   spamProtectionMinTokens,
   submit,
+  transaction,
   dialog: Dialog,
 }: VoteButtonsProps) => {
   const { t } = useTranslation();
@@ -188,11 +190,7 @@ export const VoteButtons = ({
         (voteState === VoteState.Yes || voteState === VoteState.No) && (
           <p data-testid="you-voted">
             <span>{t('youVoted')}:</span>{' '}
-            <span
-              className={
-                voteState === VoteState.Yes ? 'text-success' : 'text-danger'
-              }
-            >
+            <span className="text-white font-bold">
               {t(`voteState_${voteState}`)}
             </span>{' '}
             {voteDatetime ? (
@@ -212,7 +210,11 @@ export const VoteButtons = ({
           </p>
         )
       )}
-      <VoteTransactionDialog voteState={voteState} TransactionDialog={Dialog} />
+      <VoteTransactionDialog
+        voteState={voteState}
+        transaction={transaction}
+        TransactionDialog={Dialog}
+      />
     </>
   );
 };

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

@@ -3,23 +3,30 @@ import { formatDistanceToNow } from 'date-fns';
 import { RoundedWrapper, Icon, ExternalLink } from '@vegaprotocol/ui-toolkit';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { ProposalState } from '@vegaprotocol/types';
-import { useVoteSubmit, VoteProgress } from '@vegaprotocol/proposals';
+import { VoteProgress } from '@vegaprotocol/proposals';
 import { formatNumber } from '../../../../lib/format-number';
 import { ConnectToVega } from '../../../../components/connect-to-vega';
 import { useVoteInformation } from '../../hooks';
-import { useUserVote } from './use-user-vote';
 import { CurrentProposalStatus } from '../current-proposal-status';
 import { VoteButtonsContainer } from './vote-buttons';
 import { SubHeading } from '../../../../components/heading';
 import { ProposalType } from '../proposal/proposal';
+import type { VoteValue } from '@vegaprotocol/types';
+import type { DialogProps, VegaTxState } from '@vegaprotocol/wallet';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
+import type { VoteState } from './use-user-vote';
 
 interface VoteDetailsProps {
   proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
   minVoterBalance: string | null | undefined;
   spamProtectionMinTokens: string | null | undefined;
   proposalType: ProposalType | null;
+  transaction: VegaTxState | null;
+  submit: (voteValue: VoteValue, proposalId: string | null) => Promise<void>;
+  dialog: (props: DialogProps) => JSX.Element;
+  voteState: VoteState | null;
+  voteDatetime: Date | null;
 }
 
 export const VoteDetails = ({
@@ -27,6 +34,11 @@ export const VoteDetails = ({
   minVoterBalance,
   spamProtectionMinTokens,
   proposalType,
+  submit,
+  transaction,
+  dialog,
+  voteState,
+  voteDatetime,
 }: VoteDetailsProps) => {
   const { pubKey } = useVegaWallet();
   const {
@@ -48,8 +60,7 @@ export const VoteDetails = ({
   } = useVoteInformation({ proposal });
 
   const { t } = useTranslation();
-  const { submit, Dialog, finalizedVote } = useVoteSubmit();
-  const { voteState, voteDatetime } = useUserVote(proposal?.id, finalizedVote);
+
   const defaultDecimals = 2;
   const daysLeft = t('daysLeft', {
     daysLeft: formatDistanceToNow(new Date(proposal?.terms.closingDatetime)),
@@ -219,7 +230,8 @@ export const VoteDetails = ({
                 spamProtectionMinTokens={spamProtectionMinTokens}
                 className="flex"
                 submit={submit}
-                dialog={Dialog}
+                transaction={transaction}
+                dialog={dialog}
               />
             )
           ) : (

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

@@ -1,9 +1,10 @@
 import { t } from '@vegaprotocol/i18n';
 import { VoteState } from './use-user-vote';
-import type { DialogProps } from '@vegaprotocol/wallet';
+import type { DialogProps, VegaTxState } from '@vegaprotocol/wallet';
 
 interface VoteTransactionDialogProps {
   voteState: VoteState;
+  transaction: VegaTxState | null;
   TransactionDialog: (props: DialogProps) => JSX.Element;
 }
 
@@ -20,12 +21,15 @@ const dialogTitle = (voteState: VoteState): string | undefined => {
 
 export const VoteTransactionDialog = ({
   voteState,
+  transaction,
   TransactionDialog,
 }: VoteTransactionDialogProps) => {
   // Render a custom message if the voting fails otherwise
   // pass undefined so that the default vega transaction dialog UI gets used
   const customMessage =
-    voteState === VoteState.Failed ? <p>{t('voteError')}</p> : undefined;
+    voteState === VoteState.Failed ? (
+      <p>{transaction?.error?.message || t('voteError')}</p>
+    ) : undefined;
 
   return (
     <div data-testid="vote-transaction-dialog">

apps/governance/src/routes/staking/home/validator-tables/consensus-validators-table.tsx

@@ -389,10 +389,10 @@ export const ConsensusValidatorsTable = ({
         },
         {
           field: ValidatorFields.NORMALISED_VOTING_POWER,
-          headerName: t(ValidatorFields.NORMALISED_VOTING_POWER).toString(),
+          headerName: t('votingPower').toString(),
           headerTooltip: t('NormalisedVotingPowerDescription').toString(),
           cellRenderer: VotingPowerRenderer,
-          width: 200,
+          width: 120,
         },
         {
           field: ValidatorFields.TOTAL_PENALTIES,

apps/governance/src/routes/staking/home/validator-tables/standby-pending-validators-table.tsx

@@ -20,6 +20,7 @@ import {
   TotalStakeRenderer,
   StakeShareRenderer,
   PendingStakeRenderer,
+  VotingPowerRenderer,
 } from './shared';
 import type { AgGridReact } from 'ag-grid-react';
 import type { ColDef } from 'ag-grid-community';
@@ -39,7 +40,6 @@ interface StandbyPendingValidatorsTableProps extends ValidatorsTableProps {
 export const StandbyPendingValidatorsTable = ({
   data,
   previousEpochData,
-  totalStake,
   stakeNeededForPromotion,
   stakeNeededForPromotionDescription,
   validatorsView,
@@ -132,6 +132,8 @@ export const StandbyPendingValidatorsTable = ({
               name,
             },
             [ValidatorFields.STAKE]: stakedTotal,
+            [ValidatorFields.NORMALISED_VOTING_POWER]: '0%',
+            [ValidatorFields.UNNORMALISED_VOTING_POWER]: '0%',
             [ValidatorFields.STAKE_NEEDED_FOR_PROMOTION]:
               individualStakeNeededForPromotion || null,
             [ValidatorFields.STAKE_NEEDED_FOR_PROMOTION_DESCRIPTION]:
@@ -223,7 +225,14 @@ export const StandbyPendingValidatorsTable = ({
           headerName: t(ValidatorFields.STAKE_SHARE).toString(),
           headerTooltip: t('StakeShareDescription').toString(),
           cellRenderer: StakeShareRenderer,
-          width: 100,
+          width: 120,
+        },
+        {
+          field: ValidatorFields.NORMALISED_VOTING_POWER,
+          headerName: t('votingPower').toString(),
+          headerTooltip: t('NonConsensusVotingPowerDescription').toString(),
+          cellRenderer: VotingPowerRenderer,
+          width: 120,
         },
         // {
         //   field: ValidatorFields.STAKE_NEEDED_FOR_PROMOTION,

apps/governance/src/routes/staking/home/validator-tables/validator-tables.tsx

@@ -17,6 +17,10 @@ import type { PreviousEpochQuery } from '../../__generated__/PreviousEpoch';
 import type { StakingQuery } from '../../__generated__/Staking';
 import type { StakingDelegationFieldsFragment } from '../../__generated__/Staking';
 import type { ValidatorWithUserData } from './shared';
+import {
+  NetworkParams,
+  useNetworkParams,
+} from '@vegaprotocol/network-parameters';
 
 export interface ValidatorsTableProps {
   nodesData: NodesQuery | undefined;
@@ -41,6 +45,9 @@ export const ValidatorTables = ({
   const {
     appState: { decimals },
   } = useAppState();
+  const { params } = useNetworkParams([
+    NetworkParams.network_validators_incumbentBonus,
+  ]);
 
   const [validatorsView, setValidatorsView] = useState<ValidatorsView>('all');
   const totalStake = useMemo(
@@ -52,6 +59,10 @@ export const ValidatorTables = ({
     () => userStakingData?.party?.stakingSummary.currentStakeAvailable || '0',
     [userStakingData?.party?.stakingSummary.currentStakeAvailable]
   );
+  const incumbentBonus = useMemo(
+    () => new BigNumber(params?.network_validators_incumbentBonus),
+    [params?.network_validators_incumbentBonus]
+  );
 
   let stakeNeededForPromotion = undefined;
   let delegations: StakingDelegationFieldsFragment[] | undefined = undefined;
@@ -126,28 +137,23 @@ export const ValidatorTables = ({
     consensusValidators.length &&
     (standbyValidators.length || pendingValidators.length)
   ) {
-    const lowestRankingConsensusScore = consensusValidators.reduce(
+    const lowestConsensusStake = consensusValidators.reduce(
       (lowest: ValidatorWithUserData, validator: ValidatorWithUserData) => {
-        if (
-          Number(validator.rankingScore.rankingScore) <
-          Number(lowest.rankingScore.rankingScore)
-        ) {
+        if (Number(validator.stakedTotal) < Number(lowest.stakedTotal)) {
           lowest = validator;
         }
         return lowest;
       }
-    ).rankingScore.rankingScore;
+    ).stakedTotal;
 
-    const lowestRankingBigNum = toBigNum(lowestRankingConsensusScore, 0);
-    const consensusStakedTotal = consensusValidators.reduce((acc, cur) => {
-      return acc.plus(toBigNum(cur.stakedTotal, decimals));
-    }, new BigNumber(0));
+    const lowestRankingBigNum = toBigNum(lowestConsensusStake, decimals);
 
     stakeNeededForPromotion = formatNumber(
-      lowestRankingBigNum.times(consensusStakedTotal),
+      lowestRankingBigNum.multipliedBy(incumbentBonus.plus(1)),
       2
     ).toString();
   }
+
   return (
     <section data-testid="validator-tables">
       <div className="grid w-full justify-end">
@@ -187,12 +193,18 @@ export const ValidatorTables = ({
         <div className="mb-10">
           <SubHeading title={t('status-ersatz')} />
           <p>
-            <Trans
-              i18nKey="ersatzDescription"
-              values={{
-                stakeNeededForPromotion,
-              }}
-            />
+            <span>
+              <Trans i18nKey="ersatzDescription1" />
+            </span>
+
+            <span className="text-white font-bold">
+              {' '}
+              {stakeNeededForPromotion}{' '}
+            </span>
+
+            <span>
+              <Trans i18nKey="ersatzDescription2" />
+            </span>
           </p>
           <StandbyPendingValidatorsTable
             data={standbyValidators}

apps/governance/src/routes/staking/shared.ts

@@ -68,7 +68,7 @@ export const calculateOverstakedPenalty = (nodeId: string, nodes: Node[]) => {
   }
   const penalty = new BigNumber(1)
     .minus(
-      new BigNumber(node.rewardScore?.rawValidatorScore || 0).dividedBy(tts)
+      new BigNumber(node.rewardScore?.rawValidatorScore || 1).dividedBy(tts)
     )
     .times(100);
   return penalty.isLessThan(0) ? new BigNumber(0) : penalty;

apps/trading-e2e/src/integration/closed-markets.cy.ts

@@ -256,6 +256,7 @@ describe('Closed markets', { tags: '@smoke' }, () => {
     cy.get(rowSelector)
       .first()
       .find('[col-id="code"]')
+      .find('[data-testid="market-code"]')
       .should('have.text', settledMarket.tradableInstrument.instrument.code);
 
     // 6001-MARK-002

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

@@ -4,7 +4,8 @@ import * as Schema from '@vegaprotocol/types';
 
 const rowSelector =
   '[data-testid="tab-open-markets"] .ag-center-cols-container .ag-row';
-const colInstrumentCode = '[col-id="tradableInstrument.instrument.code"]';
+const colInstrumentCode =
+  '[col-id="tradableInstrument.instrument.code"] [data-testid="market-code"]';
 
 describe('markets all table', { tags: '@smoke' }, () => {
   beforeEach(() => {

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

@@ -1,130 +0,0 @@
-import {
-  AuctionTrigger,
-  MarketState,
-  MarketTradingMode,
-} from '@vegaprotocol/types';
-
-describe('markets selector', { tags: '@smoke' }, () => {
-  const list = 'market-selector-list';
-  const searchInput = 'search-term';
-
-  beforeEach(() => {
-    cy.window().then((window) => {
-      window.localStorage.setItem('marketId', 'market-1');
-    });
-    cy.setOnBoardingViewed();
-    cy.mockTradingPage(
-      MarketState.STATE_ACTIVE,
-      MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
-      AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
-    );
-    cy.mockSubscription();
-    cy.visit('/');
-
-    cy.wait('@Markets');
-    cy.wait('@MarketsData');
-  });
-
-  // 6001-MARK-066
-  it('can open popover to view markets', () => {
-    cy.getByTestId('market-selector').should('not.exist');
-    cy.getByTestId('header-title').should('be.visible').click();
-    cy.getByTestId('market-selector').should('be.visible');
-  });
-
-  // need function keyword as we need 'this' to access market data
-  it('displays data as expected', () => {
-    // TODO: load data from mocks in. Using alias and wrap intermittently fails
-    const data = [
-      {
-        code: 'SOLUSD',
-        markPrice: '84.41',
-        vol: '0.00',
-      },
-      {
-        code: 'ETHBTC.QM21',
-        markPrice: '46,126.90058',
-        vol: '0.00',
-      },
-      {
-        code: 'BTCUSD.MF21',
-        markPrice: '46,126.90058',
-        vol: '0.00',
-      },
-      {
-        code: 'AAPL.MF21',
-        markPrice: '46,126.90058',
-        vol: '0.00',
-      },
-    ];
-    cy.getByTestId('header-title').should('be.visible').click();
-    cy.getByTestId(list)
-      .find('a')
-      .each((item, i) => {
-        const market = data[i];
-        // 6001-MARK-021
-        // 6001-MARK-022
-        expect(item.find('h3').text()).equals(market.code);
-        expect(
-          item.find('[data-testid="market-selector-volume"]').text()
-        ).contains(market.vol);
-        // 6001-MARK-024
-        expect(
-          item.find('[data-testid="market-selector-price"]').text()
-        ).contains(market.markPrice);
-        // 6001-MARK-025
-        expect(item.find('[data-testid="sparkline-svg"]')).to.not.exist;
-      });
-  });
-
-  it('can use the filter options', () => {
-    cy.getByTestId('header-title').should('be.visible').click();
-
-    // 6001-MARK-027
-    // product type
-    cy.getByTestId('product-Spot').click();
-    cy.getByTestId(list).contains('Spot markets coming soon.');
-    cy.getByTestId('product-Perpetual').click();
-    cy.getByTestId(list).contains('Perpetual markets coming soon.');
-    cy.getByTestId('product-Future').click();
-    cy.getByTestId(list).find('a').should('have.length', 4);
-
-    // 6001-MARK-029
-    cy.getByTestId(searchInput).clear().type('btc');
-    cy.getByTestId(list).find('a').should('have.length', 2);
-    cy.getByTestId(list).find('a').eq(1).contains('BTCUSD.MF21');
-    cy.getByTestId(list).find('a').eq(0).contains('ETHBTC.QM21');
-
-    cy.getByTestId(searchInput).clear();
-    cy.getByTestId(list).find('a').should('have.length', 4);
-  });
-
-  it('can sort by by top gaining and top losing market', () => {
-    cy.getByTestId('header-title').should('be.visible').click();
-
-    // 6001-MARK-030
-    // 6001-MARK-031
-    // 6001-MARK-032
-    // 6001-MARK-033
-    cy.getByTestId(' sort-trigger').click();
-    cy.getByTestId('sort-item-Gained')
-      .contains('Top gaining')
-      .should('be.visible');
-    cy.getByTestId('sort-item-Lost')
-      .contains('Top losing')
-      .should('be.visible');
-    cy.getByTestId('sort-item-New')
-      .contains('New markets')
-      .should('be.visible');
-  });
-
-  it('can filter by settlement asset', () => {
-    cy.getByTestId('header-title').should('be.visible').click();
-
-    // 6001-MARK-028
-    cy.getByTestId('asset-trigger').click();
-    cy.getByTestId('asset-id-asset-3').contains('tBTC').click();
-    cy.getByTestId(list).find('a').should('have.length', 1);
-    cy.getByTestId(list).find('a').eq(0).contains('ETHBTC.QM21');
-  });
-});

apps/trading-e2e/src/integration/markets-proposed.cy.ts

@@ -3,7 +3,7 @@ import type { ProposalsListQuery } from '@vegaprotocol/proposals';
 
 const rowSelector =
   '[data-testid="tab-proposed-markets"] .ag-center-cols-container .ag-row';
-const colMarketId = '[col-id="market"]';
+const colMarketId = '[col-id="market"] [data-testid="market-code"]';
 
 describe('markets proposed table', { tags: '@smoke' }, () => {
   before(() => {
@@ -155,7 +155,13 @@ describe('markets proposed table', { tags: '@smoke' }, () => {
       'AAVEDAI.MF21',
       'AAPL.MF21',
     ];
-    checkSorting('market', marketColDefault, marketColAsc, marketColDesc);
+    checkSorting(
+      'market',
+      marketColDefault,
+      marketColAsc,
+      marketColDesc,
+      ' [data-testid="market-code"]'
+    );
 
     const stateColDefault = [
       'Open',

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

@@ -1,30 +0,0 @@
-describe('Settings page', { tags: '@smoke' }, () => {
-  beforeEach(() => {
-    cy.clearLocalStorage();
-
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.setOnBoardingViewed();
-    cy.visit('/');
-
-    // Only click if not already active otherwise sidebar will close
-    cy.get('[data-testid="sidebar-content"]').then(($sidebarContent) => {
-      if ($sidebarContent.find('h2').text() !== 'Settings') {
-        cy.get('[data-testid="sidebar"] [data-testid="Settings"]').click();
-      }
-    });
-  });
-
-  it('telemetry checkbox should work well', () => {
-    const telemetrySwitch = '#switch-settings-telemetry-switch';
-    cy.get(telemetrySwitch).should('have.attr', 'data-state', 'unchecked');
-    cy.get(telemetrySwitch).click();
-    cy.get(telemetrySwitch).should('have.attr', 'data-state', 'checked');
-    cy.reload();
-    cy.get(telemetrySwitch).should('have.attr', 'data-state', 'checked');
-    cy.get(telemetrySwitch).click();
-    cy.get(telemetrySwitch).should('have.attr', 'data-state', 'unchecked');
-    cy.reload();
-    cy.get(telemetrySwitch).should('have.attr', 'data-state', 'unchecked');
-  });
-});

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

@@ -1,186 +0,0 @@
-interface ItemInfoType {
-  name: string;
-  infoText: string;
-}
-
-type CheckMenuItemsFnType = (
-  triggerSelector: string,
-  validTexts: string[],
-  clickItem?: string
-) => void;
-type CheckMenuItemCheckboxFnType = (
-  buttonText: string,
-  items: ItemInfoType[]
-) => void;
-
-const menuItemRadio = 'div[role="menuitemradio"]';
-const menuItemCheckbox = 'div[role="menuitemcheckbox"]';
-const button = 'button';
-const indicatorInfo = '.indicator-info-wrapper';
-
-const checkMenuItems: CheckMenuItemsFnType = (
-  triggerSelector,
-  validTexts,
-  clickItem
-) => {
-  cy.get(triggerSelector).click();
-
-  cy.get(menuItemRadio)
-    .should('have.length', validTexts.length)
-    .each(($el, index) => {
-      const text = $el.text().trim();
-      expect(text).to.equal(validTexts[index]);
-    });
-
-  if (clickItem) {
-    cy.contains(menuItemRadio, clickItem).click();
-    cy.get(triggerSelector).click();
-    cy.get(`${menuItemRadio}[data-state="checked"]`)
-      .invoke('text')
-      .then((text: string) => {
-        expect(text.trim()).to.equal(clickItem);
-      });
-  }
-};
-
-const checkMenuItemCheckbox: CheckMenuItemCheckboxFnType = (
-  buttonText,
-  items
-) => {
-  items.forEach((item) => {
-    cy.contains(button, buttonText).click();
-    cy.contains(menuItemCheckbox, item.name).click();
-  });
-
-  cy.contains(button, buttonText).click();
-  cy.get(menuItemCheckbox)
-    .should('have.length', items.length)
-    .each(($el, index) => {
-      const text = $el.text();
-      expect(text).to.equal(items[index].name);
-    });
-
-  items.forEach((item, index) => {
-    cy.get(indicatorInfo)
-      .eq(index + 1)
-      .invoke('text')
-      .should('eq', item.infoText);
-  });
-
-  cy.contains(button, buttonText).click({ force: true });
-};
-
-function getButtonSelectorByText(text: string): string {
-  return `${button}[aria-haspopup="menu"]:contains(${text})`;
-}
-
-beforeEach(() => {
-  cy.mockTradingPage();
-  cy.mockSubscription();
-  cy.setOnBoardingViewed();
-  cy.visit('/#/markets/market-0');
-  cy.wait('@Markets');
-});
-
-describe(
-  'chart display options',
-  { tags: '@smoke', testIsolation: true },
-  () => {
-    it('change time interval', () => {
-      // 6004-CHAR-001
-      checkMenuItems(
-        getButtonSelectorByText('Interval:'),
-        ['1m', '5m', '15m', '1H', '6H', '1D'],
-        '1m'
-      );
-    });
-
-    it('change display type', () => {
-      // 6004-CHAR-002
-      // 6004-CHAR-003
-      checkMenuItems(
-        '[aria-label$="chart icon"]',
-        ['Mountain', 'Candlestick', 'Line', 'OHLC'],
-        'Mountain'
-      );
-    });
-
-    it('Overlays', () => {
-      // 6004-CHAR-004
-      // 6004-CHAR-008
-      // 6004-CHAR-009
-      // 6004-CHAR-034
-      // 6004-CHAR-037
-      // 6004-CHAR-039
-      // 6004-CHAR-041
-
-      const overlayInfo: ItemInfoType[] = [
-        {
-          name: 'Bollinger bands',
-          infoText: 'Bollinger: Upper 174.78590Lower 173.38014',
-        },
-        {
-          name: 'Envelope',
-          infoText: 'Envelope: Upper 191.29000Lower 156.51000',
-        },
-        { name: 'EMA', infoText: 'EMA: 174.06793' },
-        { name: 'Moving average', infoText: 'Moving average: 174.08302' },
-        {
-          name: 'Price monitoring bounds',
-          infoText:
-            'Price Monitoring Bounds 1: Min 162.56291Max 182.96869Reference 172.47489',
-        },
-      ];
-
-      checkMenuItemCheckbox('Overlays', overlayInfo);
-    });
-
-    it('Studies', () => {
-      // 6004-CHAR-005
-      // 6004-CHAR-006
-      // 6004-CHAR-007
-      // 6004-CHAR-042
-      // 6004-CHAR-045
-      // 6004-CHAR-047
-      // 6004-CHAR-049
-      // 6004-CHAR-051
-      const studyInfo: ItemInfoType[] = [
-        {
-          name: 'Eldar-ray',
-          infoText: 'Eldar-ray: Bull -0.08376Bear -0.58376',
-        },
-        { name: 'Force index', infoText: 'Force index: 987.48858' },
-        { name: 'MACD', infoText: 'MACD: S -0.06420D 0.00359MACD -0.06062' },
-        { name: 'RSI', infoText: 'RSI: 47.08648' },
-        { name: 'Volume', infoText: 'Volume: 55,000' },
-      ];
-      cy.get(indicatorInfo).eq(1).realHover();
-      cy.get('.chart__wrapper [data-testid="split-view-view"]')
-        .last()
-        .find('[role="button"][title="Close"]')
-        .click({ force: true });
-      cy.get(indicatorInfo).should('have.length', 1);
-
-      checkMenuItemCheckbox('Studies', studyInfo);
-    });
-
-    it('price details', () => {
-      // 6004-CHAR-010
-      const expectedDateRegex = new RegExp(
-        /^\d{2}:\d{2} \d{2} [A-Za-z]{3} \d{4}$/
-      );
-      const expectedOhlc = `O 173.60000H 174.00000L 173.50000C 173.90000Change −0.60000(−0.34%)`;
-      cy.get(indicatorInfo)
-        .eq(0)
-        .invoke('text')
-        .then((text) => {
-          const actualDate = text.slice(0, -67);
-          // eslint-disable-next-line no-console
-          console.log(actualDate);
-          const actualOhlc = text.slice(-67);
-          assert.isTrue(expectedDateRegex.test(actualDate));
-          assert.strictEqual(actualOhlc, expectedOhlc);
-        });
-    });
-  }
-);

apps/trading-e2e/src/integration/trading-deal-ticket-basic-submit.cy.ts

@@ -3,7 +3,7 @@ import { testOrderSubmission } from '../support/order-validation';
 import type { OrderSubmission } from '@vegaprotocol/wallet';
 import { createOrder } from '../support/create-order';
 
-describe('must submit order', { tags: '@smoke' }, () => {
+describe.skip('must submit order', { tags: '@smoke' }, () => {
   // 7002-SORD-039
   before(() => {
     cy.setVegaWallet();

apps/trading-e2e/src/integration/trading-deal-ticket-submit-account-validation.cy.ts

@@ -0,0 +1,87 @@
+import { aliasGQLQuery } from '@vegaprotocol/cypress';
+import {
+  accountsQuery,
+  amendGeneralAccountBalance,
+  amendMarginAccountBalance,
+} from '@vegaprotocol/mock';
+
+describe.skip(
+  'account validation',
+  { tags: '@regression', testIsolation: true },
+  () => {
+    describe('zero balance error', () => {
+      beforeEach(() => {
+        cy.setVegaWallet();
+        cy.mockTradingPage();
+        let accounts = accountsQuery();
+        accounts = amendMarginAccountBalance(accounts, 'market-0', '1000');
+        accounts = amendGeneralAccountBalance(accounts, 'market-0', '0');
+        cy.mockGQL((req) => {
+          aliasGQLQuery(req, 'Accounts', accounts);
+        });
+        cy.mockSubscription();
+        cy.visit('/#/markets/market-0');
+        cy.wait('@Markets');
+      });
+
+      it('should show an error if your balance is zero', () => {
+        const accounts = accountsQuery();
+        amendMarginAccountBalance(accounts, 'market-0', '0');
+        cy.mockGQL((req) => {
+          aliasGQLQuery(req, 'Accounts', accounts);
+        });
+        // 7002-SORD-060
+        cy.getByTestId('place-order').should('be.enabled');
+        // 7002-SORD-003
+        cy.getByTestId('deal-ticket-error-message-zero-balance').should(
+          'have.text',
+          'You need ' +
+            'tDAI' +
+            ' in your wallet to trade in this market. See all your collateral.Make a deposit'
+        );
+        cy.getByTestId('deal-ticket-deposit-dialog-button').should('exist');
+      });
+    });
+
+    describe('not enough balance warning', () => {
+      beforeEach(() => {
+        cy.setVegaWallet();
+        cy.mockTradingPage();
+        let accounts = accountsQuery();
+        accounts = amendMarginAccountBalance(accounts, 'market-0', '1000');
+        accounts = amendGeneralAccountBalance(accounts, 'market-0', '1');
+        cy.mockGQL((req) => {
+          aliasGQLQuery(req, 'Accounts', accounts);
+        });
+        cy.mockSubscription();
+        cy.visit('/#/markets/market-0');
+        cy.wait('@Markets');
+
+        cy.get('[data-testid="deal-ticket-form"]').then(($form) => {
+          if (!$form.length) {
+            cy.getByTestId('Order').click();
+          }
+        });
+      });
+
+      it('should display info and button for deposit', () => {
+        // 7002-SORD-003
+
+        // warning should show immediately
+        cy.getByTestId('deal-ticket-warning-margin').should(
+          'contain.text',
+          'You may not have enough margin available to open this position'
+        );
+        cy.getByTestId('deal-ticket-warning-margin').should(
+          'contain.text',
+          'You may not have enough margin available to open this position. 5.00 tDAI is currently required. You have only 0.01001 tDAI available.'
+        );
+        cy.getByTestId('deal-ticket-deposit-dialog-button').click();
+        cy.getByTestId('sidebar-content')
+          .find('h2')
+          .eq(0)
+          .should('have.text', 'Deposit');
+      });
+    });
+  }
+);

apps/trading-e2e/src/integration/trading-deal-ticket-submit-account.cy.ts

@@ -8,7 +8,7 @@ import {
 import type { OrderSubmission } from '@vegaprotocol/wallet';
 import { createOrder } from '../support/create-order';
 
-describe(
+describe.skip(
   'account validation',
   { tags: '@regression', testIsolation: true },
   () => {

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

@@ -120,7 +120,9 @@ describe('orders list', { tags: '@smoke', testIsolation: true }, () => {
     cy.getByTestId('All').click();
 
     cy.getByTestId('tab-orders')
-      .get(`.ag-center-cols-container [col-id='${orderSymbol}']`)
+      .get(
+        `.ag-center-cols-container [col-id='${orderSymbol}'] [data-testid="market-code"]`
+      )
       .should('have.length.at.least', expectedOrderList.length)
       .then(($symbols) => {
         const symbolNames: string[] = [];
@@ -445,8 +447,7 @@ describe('amend and cancel order', { tags: '@smoke' }, () => {
       liquidityProvisionId: null,
     });
     cy.get(`[row-id=${orderId}]`)
-      .find('[data-testid="edit"]')
-      .should('have.text', 'Edit')
+      .find('[data-testid="icon-edit"]')
       .then(($btn) => {
         cy.wrap($btn).click();
         cy.getByTestId('dialog-title').should('have.text', 'Edit order');
@@ -474,8 +475,7 @@ describe('amend and cancel order', { tags: '@smoke' }, () => {
       liquidityProvisionId: null,
     });
     cy.get(`[row-id=${orderId}]`)
-      .find(`[data-testid="cancel"]`)
-      .should('have.text', 'Cancel')
+      .find(`[data-testid="icon-cross"]`)
       .then(($btn) => {
         cy.wrap($btn).click({ force: true });
         const order: OrderCancellation = {
@@ -512,8 +512,7 @@ describe('amend and cancel order', { tags: '@smoke' }, () => {
       liquidityProvisionId: null,
     });
     cy.get(`[row-id=${orderId}]`)
-      .find('[data-testid="edit"]')
-      .should('have.text', 'Edit')
+      .find('[data-testid="icon-edit"]')
       .then(($btn) => {
         cy.wrap($btn).click({ force: true });
         cy.getByTestId('dialog-title').should('have.text', 'Edit order');

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

@@ -1,371 +0,0 @@
-import { checkSorting, aliasGQLQuery } from '@vegaprotocol/cypress';
-import { marketsDataQuery } from '@vegaprotocol/mock';
-import { positionsQuery } from '@vegaprotocol/mock';
-
-// #region consts
-const closePosition = 'close-position';
-const dialogCloseX = 'dialog-close';
-const dialogContent = 'dialog-content';
-const dropDownMenu = 'dropdown-menu';
-const marketActionsContent = 'position-actions-content';
-const positions = 'Positions';
-const tabPositions = 'tab-positions';
-const toastContent = 'toast-content';
-const tooltipContent = 'tooltip-content';
-// #endregion
-
-describe('positions', { tags: '@smoke', testIsolation: true }, () => {
-  beforeEach(() => {
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.setVegaWallet();
-  });
-  it('renders positions on trading page', () => {
-    visitAndClickPositions();
-    // 7004-POSI-001
-    // 7004-POSI-002
-    validatePositionsDisplayed();
-  });
-
-  // TODO: move this to sim, its flakey
-  it.skip('renders positions on portfolio page', () => {
-    cy.mockGQL((req) => {
-      const positions = positionsQuery();
-      if (positions.positions?.edges) {
-        positions.positions.edges.push(
-          ...positions.positions.edges.map((edge) => ({
-            ...edge,
-            node: {
-              ...edge.node,
-              party: {
-                ...edge.node.party,
-                id: 'vega-1',
-              },
-            },
-          }))
-        );
-      }
-      aliasGQLQuery(req, 'Positions', positions);
-    });
-    visitAndClickPositions();
-    // 7004-POSI-001
-    // 7004-POSI-002
-    validatePositionsDisplayed(true);
-  });
-
-  it('Close my position', () => {
-    visitAndClickPositions();
-    cy.getByTestId(closePosition).first().click();
-    // 7004-POSI-010
-    cy.getByTestId(toastContent).should(
-      'contain.text',
-      'Awaiting confirmation'
-    );
-  });
-});
-
-describe('positions', { tags: '@regression', testIsolation: true }, () => {
-  beforeEach(() => {
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.setVegaWallet();
-  });
-
-  it('rows should be displayed despite errors', () => {
-    const errors = [
-      {
-        message:
-          'no market data for market: 9c55fb644c6f7de5422d40d691a62bffd5898384c70135bab29ba1e3e2e5280a',
-        path: ['marketsConnection', 'edges'],
-        extensions: {
-          code: 13,
-          type: 'Internal',
-        },
-      },
-    ];
-    const marketData = marketsDataQuery();
-    const edges = marketData.marketsConnection?.edges.map((market) => {
-      const replace =
-        market.node.data?.market.id === 'market-2' ? null : market.node.data;
-      return { ...market, node: { ...market.node, data: replace } };
-    });
-    const overrides = {
-      ...marketData,
-      marketsConnection: { ...marketData.marketsConnection, edges },
-    };
-    cy.mockGQL((req) => {
-      aliasGQLQuery(req, 'MarketsData', overrides, errors);
-    });
-    cy.visit('/#/markets/market-0');
-    const emptyCells = [
-      'notional',
-      'markPrice',
-      'currentLeverage',
-      'averageEntryPrice',
-    ];
-    cy.getByTestId(tabPositions)
-      .first()
-      .within(() => {
-        cy.get(
-          '[row-id="02eceaba4df2bef76ea10caf728d8a099a2aa846cced25737cccaa9812342f65-market-2"]'
-        )
-          .eq(0)
-          .within(() => {
-            emptyCells.forEach((cell) => {
-              cy.get(`[col-id="${cell}"]`).should('contain.text', '-');
-            });
-          });
-      });
-  });
-
-  it('error message should be displayed', () => {
-    const errors = [
-      {
-        message:
-          'no market data for asset: 9c55fb644c6f7de5422d40d691a62bffd5898384c70135bab29ba1e3e2e5280a',
-        path: ['assets', 'edges'],
-        extensions: {
-          code: 13,
-          type: 'Internal',
-        },
-      },
-    ];
-    const overrides = {
-      marketsConnection: { edges: [] },
-    };
-    cy.mockGQL((req) => {
-      aliasGQLQuery(req, 'MarketsData', overrides, errors);
-    });
-    cy.visit('/#/markets/market-0');
-    cy.getByTestId(tabPositions).contains('no market data');
-  });
-
-  it('sorting by Market', () => {
-    visitAndClickPositions();
-    const marketsSortedDefault = [
-      'AAPL.MF21',
-      'BTCUSD.MF21',
-      'ETHBTC.QM21',
-      'SOLUSD',
-    ];
-    const marketsSortedAsc = [
-      'AAPL.MF21',
-      'BTCUSD.MF21',
-      'ETHBTC.QM21',
-      'SOLUSD',
-    ];
-    const marketsSortedDesc = [
-      'SOLUSD',
-      'ETHBTC.QM21',
-      'BTCUSD.MF21',
-      'AAPL.MF21',
-    ];
-    cy.getByTestId(positions).click();
-    // 7004-POSI-003
-    checkSorting(
-      'marketName',
-      marketsSortedDefault,
-      marketsSortedAsc,
-      marketsSortedDesc
-    );
-  });
-
-  // let elementWidth: number;
-
-  it('Resize column', () => {
-    visitAndClickPositions();
-    cy.get('.ag-overlay-loading-wrapper').should('not.be.visible');
-    cy.get('.ag-header-container').within(() => {
-      cy.get(`[col-id="marketName"]`)
-        .find('.ag-header-cell-resize')
-        .realMouseDown()
-        .realMouseMove(250, 0)
-        .realMouseUp();
-    });
-
-    // 7004-POSI-006
-    cy.get(`[col-id="marketName"]`)
-      .invoke('width')
-      .should('be.greaterThan', 250);
-  });
-
-  // This test depends on the previous one
-  it('Has persisted column widths', () => {
-    const width = 400;
-
-    cy.window().then((win) => {
-      win.localStorage.setItem(
-        'vega_positions_store',
-        JSON.stringify({
-          state: {
-            gridStore: {
-              columnState: [{ colId: 'marketName', width }],
-            },
-          },
-        })
-      );
-    });
-
-    visitAndClickPositions();
-
-    // 7004-POSI-012
-    cy.get('.ag-center-cols-container .ag-row')
-      .first()
-      .find('[col-id="marketName"]')
-      .invoke('outerWidth')
-      .should('equal', width);
-  });
-
-  it('Scroll horizontally', () => {
-    visitAndClickPositions();
-
-    cy.get('.ag-header-container').within(() => {
-      cy.get(`[col-id="marketName"]`)
-        .find('.ag-header-cell-resize')
-        .realMouseDown()
-        .realMouseMove(400, 0)
-        .realMouseUp();
-    });
-    cy.get('[col-id="marketName"]').should('be.visible');
-    cy.get('.ag-body-horizontal-scroll-viewport').realMouseWheel({
-      deltaX: 500,
-    });
-    // 7004-POSI-004
-    cy.get('[col-id="unrealisedPNL"]').should('be.visible');
-  });
-
-  it('Drag and drop columns', () => {
-    visitAndClickPositions();
-    cy.get('.ag-overlay-loading-wrapper').should('not.be.visible');
-    cy.get('[col-id="marketName"]')
-      .realMouseDown()
-      .realMouseMove(700, 15)
-      .realMouseUp();
-
-    // 7004-POSI-005
-    cy.get('[col-id="marketName"]').should(($element) => {
-      const attributeValue = $element.attr('aria-colindex');
-      expect(attributeValue).not.to.equal('1');
-    });
-  });
-
-  it('I can see warnings', () => {
-    visitAndClickPositions();
-
-    cy.get('[col-id="openVolume"]')
-      .eq(3)
-      .within(() => {
-        cy.get('[aria-label="warning-sign icon"]')
-          .should('be.visible')
-          .realHover();
-      });
-    // 7004-POSI-011
-    cy.getByTestId(tooltipContent).should('be.visible');
-  });
-
-  it('Positive and Negative color change', () => {
-    cy.visit('/#/markets/market-0');
-    cy.getByTestId(positions).click();
-    // 7004-POSI-007
-    cy.get('.ag-center-cols-container').within(() => {
-      assertPNLColor(
-        '[col-id="realisedPNL"]',
-        'text-market-green-600',
-        'text-market-red'
-      );
-    });
-    cy.get('.ag-center-cols-container').within(() => {
-      assertPNLColor(
-        '[col-id="unrealisedPNL"]',
-        'text-market-green-600',
-        'text-market-red'
-      );
-    });
-    cy.get('.ag-center-cols-container').within(() => {
-      assertPNLColor(
-        '[col-id="openVolume"]',
-        'text-market-green-600',
-        'text-market-red'
-      );
-    });
-  });
-
-  it('View settlement asset', () => {
-    visitAndClickPositions();
-    cy.get('[col-id="asset"]')
-      .eq(3)
-      .within(() => {
-        cy.get('button[type="button"]').click();
-      });
-    // 7004-POSI-008
-    cy.getByTestId(dialogContent).should('be.visible');
-    cy.getByTestId(dialogCloseX).click();
-    cy.getByTestId(dropDownMenu).first().click();
-    cy.getByTestId(marketActionsContent).click();
-    // 7004-POSI-009
-    cy.getByTestId(dialogContent).should('be.visible');
-  });
-});
-
-function validatePositionsDisplayed(multiKey = false) {
-  cy.getByTestId('tab-positions').should('be.visible');
-  cy.getByTestId('tab-positions')
-    .get('.ag-center-cols-container .ag-row')
-    .eq(multiKey ? 3 : 1)
-    .within(() => {
-      cy.get('[col-id="marketName"]')
-        .should('be.visible')
-        .invoke('text')
-        .should('not.be.empty');
-
-      cy.get('[col-id="openVolume"]').should('not.be.empty');
-
-      // includes average entry price, mark price, realised PNL & leverage
-      cy.getByTestId('flash-cell').should('not.be.empty');
-
-      if (!multiKey) {
-        cy.get('[col-id="currentLeverage"]').should('contain.text', '2,767.3');
-        cy.get('[col-id="marginAccountBalance"]') // margin allocated
-          .should('contain.text', '0.01');
-      }
-
-      cy.get('[col-id="unrealisedPNL"]').should('not.be.empty');
-      cy.get('[col-id="notional"]').should('contain.text', '276,761.40348'); // Total tDAI position
-      cy.get('[col-id="realisedPNL"]').should('contain.text', '2.30'); // Total Realised PNL
-      cy.get('[col-id="unrealisedPNL"]').should('contain.text', '8.95'); // Total Unrealised PNL
-    });
-
-  cy.get('.ag-header-row [col-id="notional"]')
-    .should('contain.text', 'Notional')
-    .realHover();
-  cy.get('.ag-popup').should('contain.text', 'Mark price x open volume');
-
-  cy.getByTestId('close-position').should('be.visible').and('have.length', 3);
-}
-
-function assertPNLColor(
-  pnlSelector: string,
-  positiveClass: string,
-  negativeClass: string
-) {
-  cy.get(pnlSelector).each(($el) => {
-    const value = parseFloat($el.text());
-
-    if (value > 0) {
-      cy.wrap($el).invoke('attr', 'class').should('contain', positiveClass);
-    } else if (value < 0) {
-      cy.wrap($el).invoke('attr', 'class').should('contain', negativeClass);
-    } else if (value == 0) {
-      cy.wrap($el)
-        .invoke('attr', 'class')
-        .should('not.contain', negativeClass, positiveClass);
-    } else {
-      throw new Error('Unexpected value');
-    }
-  });
-}
-
-function visitAndClickPositions() {
-  cy.visit('/#/markets/market-0');
-  cy.getByTestId(positions).click();
-}

apps/trading/.env

@@ -20,3 +20,6 @@ NX_SUCCESSOR_MARKETS=true
 NX_STOP_ORDERS=true
 # NX_ICEBERG_ORDERS
 # NX_PRODUCT_PERPETUALS
+
+NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.rocks
+NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket

apps/trading/.env.capsule

@@ -20,4 +20,7 @@ NX_ETH_WALLET_MNEMONIC="ozone access unlock valid olympic save include omit supp
 NX_SUCCESSOR_MARKETS=false
 NX_STOP_ORDERS=false
 # NX_ICEBERG_ORDERS
-# NX_PRODUCT_PERPETUALS
+# NX_PRODUCT_PERPETUALS
+
+NX_TENDERMINT_URL=http://localhost:26617
+NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket

apps/trading/.env.devnet

@@ -18,4 +18,7 @@ NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
 NX_SUCCESSOR_MARKETS=true
 NX_STOP_ORDERS=true
 # NX_ICEBERG_ORDERS
-# NX_PRODUCT_PERPETUALS
+# NX_PRODUCT_PERPETUALS
+
+NX_TENDERMINT_URL=https://tm.be.devnet1.vega.xyz/
+NX_TENDERMINT_WEBSOCKET_URL=wss://be.devnet1.vega.xyz/websocket

apps/trading/.env.mainnet

@@ -21,3 +21,6 @@ NX_SUCCESSOR_MARKETS=false
 NX_STOP_ORDERS=false
 # NX_ICEBERG_ORDERS
 # NX_PRODUCT_PERPETUALS
+
+NX_TENDERMINT_URL=https://be.vega.community
+NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket

apps/trading/.env.mainnet-mirror

@@ -20,4 +20,7 @@ NX_APP_VERSION=v0.20.19-core-0.71.6
 NX_SUCCESSOR_MARKETS=false
 NX_STOP_ORDERS=false
 # NX_ICEBERG_ORDERS
-# NX_PRODUCT_PERPETUALS
+# NX_PRODUCT_PERPETUALS
+
+NX_TENDERMINT_URL=https://be.mainnet-mirror.vega.rocks
+NX_TENDERMINT_WEBSOCKET_URL=wss://be.mainnet-mirror.vega.rocks/websocket

apps/trading/.env.testnet

@@ -19,4 +19,7 @@ NX_VEGA_CONSOLE_URL=https://console.fairground.wtf
 NX_SUCCESSOR_MARKETS=true
 NX_STOP_ORDERS=true
 NX_ICEBERG_ORDERS=true
-# NX_PRODUCT_PERPETUALS
+# NX_PRODUCT_PERPETUALS
+
+NX_TENDERMINT_URL=https://tm.be.testnet.vega.xyz
+NX_TENDERMINT_WEBSOCKET_URL=wss://be.testnet.vega.xyz/websocket

apps/trading/.env.validators-testnet

@@ -19,4 +19,7 @@ NX_VEGA_CONSOLE_URL=https://trading.validators-testnet.vega.rocks
 NX_SUCCESSOR_MARKETS=false
 NX_STOP_ORDERS=false
 # NX_ICEBERG_ORDERS
-# NX_PRODUCT_PERPETUALS
+# NX_PRODUCT_PERPETUALS
+
+NX_TENDERMINT_URL=https://tm.be.validators-testnet.vega.rocks
+NX_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.xyz/websocket

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

@@ -214,7 +214,6 @@ describe('Closed', () => {
         </MemoryRouter>
       );
     });
-    // screen.debug(document, Infinity);
 
     const headers = screen.getAllByRole('columnheader');
     const expectedHeaders = [
@@ -434,7 +433,7 @@ describe('Closed', () => {
 
     await waitFor(() => {
       expect(
-        screen.getByRole('button', { name: 'SuccessorCode' })
+        screen.getByRole('button', { name: /^SuccessorCode/ })
       ).toBeInTheDocument();
     });
     expect(
@@ -443,6 +442,16 @@ describe('Closed', () => {
           element.getAttribute('col-id') === 'successorMarket',
       })
     ).toBeInTheDocument();
+    screen
+      .getAllByRole('gridcell', {
+        name: (_name, element) =>
+          element.getAttribute('col-id') === 'successorMarket',
+      })
+      .forEach((element) => {
+        expect(element.querySelector('[title="Future"]')?.textContent).toEqual(
+          'Futr'
+        );
+      });
   });
 
   it('feature flag should hide successors', async () => {

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

@@ -4,7 +4,11 @@ import type {
   VegaICellRendererParams,
   VegaValueFormatterParams,
 } from '@vegaprotocol/datagrid';
-import { AgGridLazy as AgGrid, COL_DEFS } from '@vegaprotocol/datagrid';
+import {
+  AgGridLazy as AgGrid,
+  COL_DEFS,
+  MarketNameCell,
+} from '@vegaprotocol/datagrid';
 import { useMemo } from 'react';
 import { t } from '@vegaprotocol/i18n';
 import { MarketState, MarketStateMapping } from '@vegaprotocol/types';
@@ -47,6 +51,7 @@ interface Row {
   setlementDataSourceFilter: DataSourceFilterFragment | undefined;
   tradingTerminationOracleId: string;
   settlementAsset: SettlementAsset;
+  productType: string;
 }
 
 export const Closed = () => {
@@ -90,6 +95,7 @@ export const Closed = () => {
       tradingTerminationOracleId:
         instrument.product.dataSourceSpecForTradingTermination.id,
       settlementAsset: instrument.product.settlementAsset,
+      productType: instrument.product.__typename || '',
     };
 
     return row;
@@ -115,16 +121,7 @@ const ClosedMarketsDataGrid = ({
       {
         headerName: t('Market'),
         field: 'code',
-        cellRenderer: ({
-          value,
-          data,
-        }: VegaICellRendererParams<Row, 'code'>) => {
-          return (
-            <span data-testid="market-code" data-market-id={data?.id}>
-              {value}
-            </span>
-          );
-        },
+        cellRenderer: 'MarketNameCell',
       },
       {
         headerName: t('Description'),
@@ -279,7 +276,7 @@ const ClosedMarketsDataGrid = ({
       rowData={rowData}
       columnDefs={colDefs}
       getRowId={({ data }) => data.id}
-      components={{ SuccessorMarketRenderer }}
+      components={{ SuccessorMarketRenderer, MarketNameCell }}
       overlayNoRowsTemplate={error ? error.message : t('No markets')}
     />
   );

apps/trading/client-pages/markets/successor-market-cell.spec.tsx

@@ -0,0 +1,190 @@
+import { render, screen, act, waitFor } from '@testing-library/react';
+import { MockedProvider } from '@apollo/client/testing';
+import userEvent from '@testing-library/user-event';
+import type { Market } from '@vegaprotocol/markets';
+import { SuccessorMarketRenderer } from './successor-market-cell';
+import {
+  MarketsDocument,
+  SuccessorMarketIdsDocument,
+} from '@vegaprotocol/markets';
+import { createMarketFragment } from '@vegaprotocol/mock';
+
+const mockSuccessorsQuery = [
+  {
+    id: 'market1',
+    parentMarketID: 'parentMarket1',
+    successorMarketID: 'successorMarket1',
+  },
+  { id: 'market2', parentMarketID: 'parentMarket2' },
+  { id: 'market3', successorMarketID: 'successorMarket3' },
+];
+const parentMarket1 = {
+  id: 'parentMarket1',
+  tradableInstrument: {
+    instrument: { code: 'code parent 1', id: '1' },
+  },
+} as unknown as Market;
+const successorMarket1 = {
+  id: 'successorMarket1',
+  tradableInstrument: {
+    instrument: { code: 'code successor 1', id: '2' },
+  },
+} as unknown as Market;
+const parentMarket2 = {
+  id: 'parentMarket2',
+  tradableInstrument: {
+    instrument: { code: 'code parent 2', id: '3' },
+  },
+} as unknown as Market;
+const successorMarket3 = {
+  id: 'successorMarket3',
+  tradableInstrument: {
+    instrument: { code: 'code successor 3', id: '4' },
+  },
+} as unknown as Market;
+
+const mockMarkets = [
+  parentMarket1,
+  successorMarket1,
+  parentMarket2,
+  successorMarket3,
+];
+
+const mockClickHandler = jest.fn();
+jest.mock('../../lib/hooks/use-market-click-handler', () => ({
+  useMarketClickHandler: jest.fn().mockImplementation(() => mockClickHandler),
+}));
+
+const marketMock = {
+  request: {
+    query: MarketsDocument,
+    variables: undefined,
+  },
+  result: {
+    data: {
+      marketsConnection: {
+        edges: mockMarkets.map((item) => ({
+          node: {
+            ...createMarketFragment(item),
+          },
+        })),
+      },
+    },
+  },
+};
+
+const successorMock = {
+  request: {
+    query: SuccessorMarketIdsDocument,
+  },
+  result: {
+    data: {
+      marketsConnection: {
+        edges: mockSuccessorsQuery.map((item) => ({
+          node: {
+            ...item,
+          },
+        })),
+      },
+    },
+  },
+};
+
+const mocks = [marketMock, successorMock];
+
+describe('SuccessorMarketRenderer', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+  it('should properly rendered successor market', async () => {
+    const successorValue = 'market1';
+    render(
+      <MockedProvider mocks={[...mocks]}>
+        <SuccessorMarketRenderer value={successorValue} />
+      </MockedProvider>
+    );
+    await waitFor(() => {
+      expect(screen.getByTestId('market-code')).toBeInTheDocument();
+    });
+    expect(screen.getByText('code successor 1')).toBeInTheDocument();
+    expect(screen.getByText('Futr')).toBeInTheDocument();
+
+    await userEvent.click(screen.getByRole('button'));
+    await waitFor(() => {
+      expect(mockClickHandler).toHaveBeenCalledWith('successorMarket1', false);
+    });
+  });
+  it('should properly rendered parent market', async () => {
+    const successorValue = 'market1';
+    render(
+      <MockedProvider mocks={[...mocks]}>
+        <SuccessorMarketRenderer value={successorValue} parent />
+      </MockedProvider>
+    );
+    await waitFor(() => {
+      expect(screen.getByTestId('market-code')).toBeInTheDocument();
+    });
+    expect(screen.getByText('code parent 1')).toBeInTheDocument();
+    expect(screen.getByText('Futr')).toBeInTheDocument();
+
+    await userEvent.click(screen.getByRole('button'));
+
+    await waitFor(() => {
+      expect(mockClickHandler).toHaveBeenCalledWith('parentMarket1', false);
+    });
+  });
+  it('should properly rendered only parent market', async () => {
+    const successorValue = 'market2';
+    const { rerender } = render(
+      <MockedProvider mocks={[...mocks]}>
+        <SuccessorMarketRenderer value={successorValue} parent />
+      </MockedProvider>
+    );
+    await waitFor(() => {
+      expect(screen.getByTestId('market-code')).toBeInTheDocument();
+    });
+    expect(screen.getByText('code parent 2')).toBeInTheDocument();
+    expect(screen.getByText('Futr')).toBeInTheDocument();
+    await userEvent.click(screen.getByRole('button'));
+
+    await waitFor(() => {
+      expect(mockClickHandler).toHaveBeenCalledWith('parentMarket2', false);
+    });
+
+    rerender(
+      <MockedProvider mocks={[...mocks]}>
+        <SuccessorMarketRenderer value={successorValue} />
+      </MockedProvider>
+    );
+
+    expect(screen.getByText('-')).toBeInTheDocument();
+  });
+  it('should properly rendered only successor market', async () => {
+    const successorValue = 'market3';
+    const { rerender } = render(
+      <MockedProvider mocks={[...mocks]}>
+        <SuccessorMarketRenderer value={successorValue} />
+      </MockedProvider>
+    );
+    await waitFor(() => {
+      expect(screen.getByTestId('market-code')).toBeInTheDocument();
+    });
+    expect(screen.getByText('code successor 3')).toBeInTheDocument();
+    expect(screen.getByText('Futr')).toBeInTheDocument();
+
+    await userEvent.click(screen.getByRole('button'));
+
+    await waitFor(() => {
+      expect(mockClickHandler).toHaveBeenCalledWith('successorMarket3', false);
+    });
+
+    await act(() => {
+      rerender(
+        <MockedProvider mocks={[...mocks]}>
+          <SuccessorMarketRenderer value={successorValue} parent />
+        </MockedProvider>
+      );
+    });
+    expect(screen.getByText('-')).toBeInTheDocument();
+  });
+});

apps/trading/client-pages/markets/successor-market-cell.tsx

@@ -1,8 +1,8 @@
+import React from 'react';
 import { MarketNameCell } from '@vegaprotocol/datagrid';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import { marketProvider, useSuccessorMarketIds } from '@vegaprotocol/markets';
 import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';
-import React from 'react';
 
 export const SuccessorMarketRenderer = ({
   value,
@@ -33,6 +33,7 @@ export const SuccessorMarketRenderer = ({
       value={data.tradableInstrument.instrument.code}
       data={data}
       onMarketClick={onMarketClick}
+      productType={data.tradableInstrument.instrument?.product.__typename}
     />
   ) : (
     '-'

apps/trading/components/market-selector/market-selector-item.spec.tsx

@@ -99,6 +99,7 @@ describe('MarketSelectorItem', () => {
             currentMarketId={market.id}
             style={{}}
             onSelect={jest.fn()}
+            allProducts
           />
         </MockedProvider>
       </MemoryRouter>
@@ -181,5 +182,7 @@ describe('MarketSelectorItem', () => {
         addDecimalsFormatNumber(marketData.markPrice, market.decimalPlaces)
       );
     });
+
+    expect(screen.getByText('Futr')).toBeInTheDocument();
   });
 });

apps/trading/components/market-selector/market-selector-item.tsx

@@ -12,17 +12,20 @@ import {
   MarketTradingModeMapping,
 } from '@vegaprotocol/types';
 import { t } from '@vegaprotocol/i18n';
+import { MarketProductPill } from '@vegaprotocol/datagrid';
 
 export const MarketSelectorItem = ({
   market,
   style,
   currentMarketId,
   onSelect,
+  allProducts,
 }: {
   market: MarketMaybeWithDataAndCandles;
   style: CSSProperties;
   currentMarketId?: string;
   onSelect: (marketId: string) => void;
+  allProducts: boolean;
 }) => {
   return (
     <div style={style} role="row">
@@ -36,13 +39,19 @@ export const MarketSelectorItem = ({
         })}
         onClick={() => onSelect(market.id)}
       >
-        <MarketData market={market} />
+        <MarketData market={market} allProducts={allProducts} />
       </Link>
     </div>
   );
 };
 
-const MarketData = ({ market }: { market: MarketMaybeWithDataAndCandles }) => {
+const MarketData = ({
+  market,
+  allProducts,
+}: {
+  market: MarketMaybeWithDataAndCandles;
+  allProducts: boolean;
+}) => {
   const { data } = useMarketDataUpdateSubscription({
     variables: {
       marketId: market.id,
@@ -80,11 +89,16 @@ const MarketData = ({ market }: { market: MarketMaybeWithDataAndCandles }) => {
       ? addDecimalsFormatNumber(vol, market.positionDecimalPlaces)
       : '0.00';
 
+  const productType = market.tradableInstrument.instrument.product.__typename;
+
   return (
     <>
       <div className="w-2/5" role="gridcell">
         <h3 className="text-ellipsis text-sm lg:text-base whitespace-nowrap overflow-hidden">
-          {market.tradableInstrument.instrument.code}
+          {market.tradableInstrument.instrument.code}{' '}
+          {allProducts && productType && (
+            <MarketProductPill productType={productType} />
+          )}
         </h3>
         {mode && (
           <p className="text-xs text-vega-orange-500 dark:text-vega-orange-550 whitespace-nowrap">

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

@@ -2,7 +2,7 @@ import { t } from '@vegaprotocol/i18n';
 import uniqBy from 'lodash/uniqBy';
 import type { MarketMaybeWithDataAndCandles } from '@vegaprotocol/markets';
 import {
-  Input,
+  TradingInput,
   TinyScroll,
   VegaIcon,
   VegaIconNames,
@@ -43,7 +43,7 @@ export const MarketSelector = ({
     sort: Sort.None,
     assets: [],
   });
-
+  const allProducts = filter.product === Product.All;
   const { markets, data, loading, error } = useMarketSelectorList(filter);
 
   return (
@@ -57,7 +57,7 @@ export const MarketSelector = ({
         />
         <div className="text-sm grid grid-cols-[2fr_1fr_1fr] gap-1 ">
           <div className="flex-1">
-            <Input
+            <TradingInput
               onChange={(e) =>
                 setFilter((curr) => ({ ...curr, searchTerm: e.target.value }))
               }
@@ -128,6 +128,7 @@ export const MarketSelector = ({
               ? t('Spot markets coming soon.')
               : t('No markets')
           }
+          allProducts={allProducts}
         />
       </div>
     </div>
@@ -141,6 +142,7 @@ const MarketList = ({
   currentMarketId,
   onSelect,
   noItems,
+  allProducts,
 }: {
   data: MarketMaybeWithDataAndCandles[];
   error: Error | undefined;
@@ -149,6 +151,7 @@ const MarketList = ({
   currentMarketId?: string;
   onSelect: (marketId: string) => void;
   noItems: string;
+  allProducts: boolean;
 }) => {
   const itemSize = 45;
   const listRef = useRef<HTMLDivElement | null>(null);
@@ -192,6 +195,7 @@ const MarketList = ({
           currentMarketId={currentMarketId}
           onSelect={onSelect}
           noItems={noItems}
+          allProducts={allProducts}
         />
       </div>
     </TinyScroll>
@@ -202,6 +206,7 @@ interface ListItemData {
   data: MarketMaybeWithDataAndCandles[];
   onSelect: (marketId: string) => void;
   currentMarketId?: string;
+  allProducts: boolean;
 }
 
 const ListItem = ({
@@ -218,6 +223,7 @@ const ListItem = ({
     currentMarketId={data.currentMarketId}
     style={style}
     onSelect={data.onSelect}
+    allProducts={data.allProducts}
   />
 );
 
@@ -229,19 +235,21 @@ const List = ({
   onSelect,
   noItems,
   currentMarketId,
+  allProducts,
 }: ListItemData & {
   loading: boolean;
   height: number;
   itemSize: number;
   noItems: string;
+  allProducts: boolean;
 }) => {
   const itemKey = useCallback(
     (index: number, data: ListItemData) => data.data[index].id,
     []
   );
   const itemData = useMemo(
-    () => ({ data, onSelect, currentMarketId }),
-    [data, onSelect, currentMarketId]
+    () => ({ data, onSelect, currentMarketId, allProducts }),
+    [data, onSelect, currentMarketId, allProducts]
   );
   if (!data || loading) {
     return (

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

@@ -1,4 +1,4 @@
-import { Checkbox } from '@vegaprotocol/ui-toolkit';
+import { TradingCheckbox } from '@vegaprotocol/ui-toolkit';
 import { t } from '@vegaprotocol/i18n';
 import { useTelemetryApproval } from '../../lib/hooks/use-telemetry-approval';
 
@@ -7,7 +7,7 @@ export const TelemetryApproval = ({ helpText }: { helpText: string }) => {
   return (
     <div className="flex flex-col py-3">
       <div className="mr-4" role="form">
-        <Checkbox
+        <TradingCheckbox
           label={<span className="text-lg pl-1">{t('Share usage data')}</span>}
           checked={isApproved}
           name="telemetry-approval"

apps/trading/pages/_app.page.tsx

@@ -43,6 +43,7 @@ import { Navbar } from '../components/navbar';
 import classNames from 'classnames';
 import {
   ProtocolUpgradeCountdownMode,
+  ProtocolUpgradeInProgressNotification,
   ProtocolUpgradeProposalNotification,
 } from '@vegaprotocol/proposals';
 import { ViewingBanner } from '../components/viewing-banner';
@@ -111,6 +112,7 @@ function AppBody({ Component }: AppProps) {
           <ProtocolUpgradeProposalNotification
             mode={ProtocolUpgradeCountdownMode.IN_ESTIMATED_TIME_REMAINING}
           />
+          <ProtocolUpgradeInProgressNotification />
           <ViewingBanner />
           <UpgradeBanner showVersionChange={true} />
         </div>

apps/trading/pages/_document.page.tsx

@@ -5,12 +5,45 @@ export default function Document() {
     <Html>
       <Head>
         <link rel="stylesheet" href="https://static.vega.xyz/fonts.css" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <meta charSet="utf-8" />
+        <link
+          rel="icon"
+          type="image/x-icon"
+          href="https://static.vega.xyz/favicon.ico"
+        />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <meta name="theme-color" content="#000000" />
+        <meta name="description" content="Vega Protocol - VEGA Console" />
+        <meta name="og:type" content="website" />
+        <meta name="og:url" content="https://console.vega.xyz/" />
+        <meta name="og:title" content="Vega Protocol - Console" />
+        <meta name="og:site_name" content="Vega Protocol - Console" />
+        <meta name="og:image" content="https://static.vega.xyz/favicon.ico" />
+
+        <meta
+          name="twitter:card"
+          content="https://static.vega.xyz/favicon.ico"
+        />
+        <meta name="twitter:title" content="Vega Protocol - Console" />
+        <meta name="twitter:description" content="Vega Protocol - Console" />
+        <meta
+          name="twitter:image"
+          content="https://static.vega.xyz/favicon.ico"
+        />
+        <meta name="twitter:image:alt" content="VEGA logo" />
+        <meta name="twitter:site" content="@vegaprotocol" />
+
+        <meta name="description" content="Vega Protocol - Console" />
+        <link
+          rel="apple-touch-icon"
+          content="https://static.vega.xyz/favicon.ico"
+        />
         <link
           rel="preload"
           href="https://static.vega.xyz/AlphaLyrae-Medium.woff2"
           as="font"
           type="font/woff2"
-          crossOrigin="anonymous"
         />
         {/* eslint-disable-next-line @next/next/no-css-tags */}
         <link rel="stylesheet" href="/preloader.css" media="all" />

apps/trading/pages/index.page.tsx

@@ -1,4 +1,3 @@
-import Head from 'next/head';
 import { ClientRouter } from './client-router';
 
 /**
@@ -7,30 +6,5 @@ import { ClientRouter } from './client-router';
  * have to serve a static site via next export
  */
 export default function Index() {
-  return (
-    <>
-      <Head>
-        <meta charSet="utf-8" />
-        <link
-          rel="icon"
-          type="image/x-icon"
-          href="https://static.vega.xyz/favicon.ico"
-        />
-        <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <meta name="theme-color" content="#000000" />
-        <meta name="description" content="Vega Protocol - Console" />
-
-        <link rel="apple-touch-icon" href="assets/apple-touch-icon.png" />
-        <link rel="manifest" href="assets/manifest.json" />
-        <link
-          rel="preload"
-          href="https://static.vega.xyz/AlphaLyrae-Medium.woff2"
-          as="font"
-          type="font/woff2"
-        />
-        <title>VEGA Console dApp</title>
-      </Head>
-      <ClientRouter />
-    </>
-  );
+  return <ClientRouter />;
 }

libs/accounts/src/lib/breakdown-table.spec.tsx

@@ -24,6 +24,9 @@ const singleRow = {
         __typename: 'Instrument',
         name: 'BTCUSD Monthly (30 Jun 2022)',
         code: 'BTCUSD.MF21',
+        product: {
+          __typename: 'Future',
+        },
       },
     },
     id: '10cd0a793ad2887b340940337fa6d97a212e0e517fe8e9eab2b5ef3a38633f35',
@@ -120,6 +123,9 @@ describe('BreakdownTable', () => {
                   __typename: 'Instrument',
                   name: 'BTCUSD Monthly (30 Jun 2022)',
                   code: 'BTCUSD.MF21',
+                  product: {
+                    __typename: 'Future',
+                  },
                 },
               },
             },

libs/accounts/src/lib/breakdown-table.tsx

@@ -36,14 +36,24 @@ const BreakdownTable = forwardRef<AgGridReact, BreakdownTableProps>(
         {
           headerName: t('Market'),
           field: 'market.tradableInstrument.instrument.code',
-          valueFormatter: ({
+          minWidth: 200,
+          cellRenderer: ({
             value,
-          }: VegaValueFormatterParams<
+            data,
+          }: VegaICellRendererParams<
             AccountFields,
             'market.tradableInstrument.instrument.code'
           >) => {
-            if (!value) return 'None';
-            return value;
+            return value ? (
+              <MarketNameCell
+                value={value}
+                productType={
+                  data?.market?.tradableInstrument.instrument.product.__typename
+                }
+              />
+            ) : (
+              'None'
+            );
           },
         },
         {
@@ -126,7 +136,7 @@ const BreakdownTable = forwardRef<AgGridReact, BreakdownTableProps>(
         }
         ref={ref}
         rowHeight={34}
-        components={{ PriceCell, MarketNameCell, ProgressBarCell }}
+        components={{ PriceCell, ProgressBarCell }}
         tooltipShowDelay={500}
         defaultColDef={defaultColDef}
         columnDefs={coldefs}

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

@@ -9,13 +9,13 @@ import {
 import { t } from '@vegaprotocol/i18n';
 import {
   Button,
-  FormGroup,
-  Input,
-  InputError,
-  RichSelect,
-  Select,
+  TradingFormGroup,
+  TradingInput,
+  TradingInputError,
+  TradingRichSelect,
+  TradingSelect,
   Tooltip,
-  Checkbox,
+  TradingCheckbox,
 } from '@vegaprotocol/ui-toolkit';
 import type { Transfer } from '@vegaprotocol/wallet';
 import { normalizeTransfer } from '@vegaprotocol/wallet';
@@ -130,12 +130,16 @@ export const TransferForm = ({
       className="text-sm"
       data-testid="transfer-form"
     >
-      <FormGroup label="Vega key" labelFor="to-address">
+      <TradingFormGroup label="Vega key" labelFor="to-address">
         <AddressField
           pubKeys={pubKeys}
           onChange={() => setValue('toAddress', '')}
           select={
-            <Select {...register('toAddress')} id="to-address" defaultValue="">
+            <TradingSelect
+              {...register('toAddress')}
+              id="to-address"
+              defaultValue=""
+            >
               <option value="" disabled={true}>
                 {t('Please select')}
               </option>
@@ -147,10 +151,10 @@ export const TransferForm = ({
                       {pk}
                     </option>
                   ))}
-            </Select>
+            </TradingSelect>
           }
           input={
-            <Input
+            <TradingInput
               // eslint-disable-next-line jsx-a11y/no-autofocus
               autoFocus={true} // focus input immediately after is shown
               id="to-address"
@@ -171,12 +175,12 @@ export const TransferForm = ({
           }
         />
         {errors.toAddress?.message && (
-          <InputError forInput="to-address">
+          <TradingInputError forInput="to-address">
             {errors.toAddress.message}
-          </InputError>
+          </TradingInputError>
         )}
-      </FormGroup>
-      <FormGroup label="Asset" labelFor="asset">
+      </TradingFormGroup>
+      <TradingFormGroup label="Asset" labelFor="asset">
         <Controller
           control={control}
           name="asset"
@@ -186,7 +190,7 @@ export const TransferForm = ({
             },
           }}
           render={({ field }) => (
-            <RichSelect
+            <TradingRichSelect
               data-testid="select-asset"
               id={field.name}
               name={field.name}
@@ -208,15 +212,17 @@ export const TransferForm = ({
                   }
                 />
               ))}
-            </RichSelect>
+            </TradingRichSelect>
           )}
         />
         {errors.asset?.message && (
-          <InputError forInput="asset">{errors.asset.message}</InputError>
+          <TradingInputError forInput="asset">
+            {errors.asset.message}
+          </TradingInputError>
         )}
-      </FormGroup>
-      <FormGroup label="Amount" labelFor="amount">
-        <Input
+      </TradingFormGroup>
+      <TradingFormGroup label="Amount" labelFor="amount">
+        <TradingInput
           id="amount"
           autoComplete="off"
           appendElement={
@@ -239,11 +245,13 @@ export const TransferForm = ({
           })}
         />
         {errors.amount?.message && (
-          <InputError forInput="amount">{errors.amount.message}</InputError>
+          <TradingInputError forInput="amount">
+            {errors.amount.message}
+          </TradingInputError>
         )}
-      </FormGroup>
+      </TradingFormGroup>
       <div className="mb-4">
-        <Checkbox
+        <TradingCheckbox
           name="include-transfer-fee"
           disabled={!transferAmount}
           label={

libs/apollo-client/src/lib/apollo-client.ts

@@ -121,9 +121,12 @@ export function createClient({
     // called on startup, NodeCheck and NodeCheckTimeUpdate are called
     // by the NodeSwitcher component and the useNodeHealth hook
     if (
-      ['NodeGuard', 'NodeCheck', 'NodeCheckTimeUpdate'].includes(
-        operation.operationName
-      )
+      [
+        'NodeGuard',
+        'NodeCheck',
+        'NodeCheckTimeUpdate',
+        'BlockStatistics',
+      ].includes(operation.operationName)
     ) {
       return;
     }

libs/assets/src/lib/asset-option.tsx

@@ -1,4 +1,4 @@
-import { Option } from '@vegaprotocol/ui-toolkit';
+import { TradingOption } from '@vegaprotocol/ui-toolkit';
 import type { AssetFieldsFragment } from './__generated__/Asset';
 import classNames from 'classnames';
 import { t } from '@vegaprotocol/i18n';
@@ -28,7 +28,7 @@ export const Balance = ({
 
 export const AssetOption = ({ asset, balance }: AssetOptionProps) => {
   return (
-    <Option key={asset.id} value={asset.id}>
+    <TradingOption key={asset.id} value={asset.id}>
       <div className="flex flex-col items-start">
         <div className="flex flex-row align-baseline gap-2">
           <span>{asset.name}</span>{' '}
@@ -49,6 +49,6 @@ export const AssetOption = ({ asset, balance }: AssetOptionProps) => {
           </span>
         </div>
       </div>
-    </Option>
+    </TradingOption>
   );
 };

libs/cypress/src/lib/utils.ts

@@ -41,21 +41,22 @@ export const checkSorting = (
   column: string,
   orderTabDefault: string[],
   orderTabAsc: string[],
-  orderTabDesc: string[]
+  orderTabDesc: string[],
+  additionalColumnSelector = ''
 ) => {
-  checkSortChange(orderTabDefault, column);
+  checkSortChange(orderTabDefault, column, additionalColumnSelector);
   cy.get('.ag-header-container')
     .last()
     .within(() => {
       cy.get(`[col-id="${column}"]`).last().click();
     });
-  checkSortChange(orderTabAsc, column);
+  checkSortChange(orderTabAsc, column, additionalColumnSelector);
   cy.get('.ag-header-container')
     .last()
     .within(() => {
       cy.get(`[col-id="${column}"]`).click();
     });
-  checkSortChange(orderTabDesc, column);
+  checkSortChange(orderTabDesc, column, additionalColumnSelector);
   cy.get('.ag-header-container')
     .last()
     .within(() => {
@@ -63,13 +64,20 @@ export const checkSorting = (
     });
 };
 
-const checkSortChange = (tabsArr: string[], column: string) => {
+const checkSortChange = (
+  tabsArr: string[],
+  column: string,
+  additionalColumnSelector = ''
+) => {
   cy.get('.ag-center-cols-container')
     .last()
     .within(() => {
       tabsArr.forEach((entry, i) => {
         cy.get(`[row-index="${i}"]`).within(() => {
-          cy.get(`[col-id="${column}"]`).should('have.text', tabsArr[i]);
+          cy.get(`[col-id="${column}"]${additionalColumnSelector}`).should(
+            'have.text',
+            tabsArr[i]
+          );
         });
       });
     });

libs/datagrid/src/lib/cells/centered-grid-cell.tsx

@@ -9,7 +9,10 @@ export const CenteredGridCellWrapper = ({
   className?: string;
 }) => (
   <div
-    className={classNames('flex h-[20px] p-0 justify-items-center', className)}
+    className={classNames(
+      'flex h-[20px] p-0 justify-items-center items-center',
+      className
+    )}
   >
     <div className="w-full self-center">{children}</div>
   </div>

libs/datagrid/src/lib/cells/market-name-cell.tsx

@@ -1,13 +1,38 @@
-import type { MouseEvent, ReactNode } from 'react';
+import type { MouseEvent } from 'react';
 import { useCallback } from 'react';
 import get from 'lodash/get';
+import { Pill } from '@vegaprotocol/ui-toolkit';
+import {
+  ProductTypeShortName,
+  type Market,
+  type ProductType,
+  ProductTypeMapping,
+} from '@vegaprotocol/types';
+
+export const MarketProductPill = ({
+  productType,
+}: {
+  productType: ProductType;
+}) => {
+  return (
+    <Pill
+      size="xxs"
+      className="uppercase ml-0.5"
+      title={ProductTypeMapping[productType]}
+    >
+      {ProductTypeShortName[productType]}
+    </Pill>
+  );
+};
 
 interface MarketNameCellProps {
   value?: string | null;
-  data?: { id?: string; marketId?: string; market?: { id: string } };
+  data?:
+    | { id?: string; marketId?: string; productType?: string; market?: Market }
+    | Market;
   idPath?: string;
   onMarketClick?: (marketId: string, metaKey?: boolean) => void;
-  defaultValue?: ReactNode;
+  productType?: ProductType;
 }
 
 export const MarketNameCell = ({
@@ -15,29 +40,43 @@ export const MarketNameCell = ({
   data,
   idPath,
   onMarketClick,
+  productType,
 }: MarketNameCellProps) => {
   const id = data ? get(data, idPath ?? 'id', 'all') : '';
   const handleOnClick = useCallback(
     (ev: MouseEvent<HTMLButtonElement>) => {
       ev.preventDefault();
       ev.stopPropagation();
-      if (onMarketClick) {
-        onMarketClick(id, ev.metaKey || ev.ctrlKey);
-      }
+      id && onMarketClick?.(id, ev.metaKey || ev.ctrlKey);
     },
     [id, onMarketClick]
   );
-  if (!value || !data) return null;
-  return onMarketClick ? (
+
+  productType =
+    productType ||
+    (data as { productType?: ProductType }).productType ||
+    (data as Market)?.tradableInstrument?.instrument.product.__typename ||
+    (data as { market: Market })?.market?.tradableInstrument.instrument.product
+      .__typename;
+
+  if (!value) return;
+  const content = (
+    <>
+      <span data-testid="market-code" data-market-id={id}>
+        {value}
+      </span>
+      {productType && <MarketProductPill productType={productType} />}
+    </>
+  );
+  return onMarketClick && id ? (
     <button
       onClick={handleOnClick}
       tabIndex={0}
       className="block text-left text-ellipsis overflow-hidden whitespace-nowrap w-full"
     >
-      {value}
+      {content}
     </button>
   ) : (
-    // eslint-disable-next-line react/jsx-no-useless-fragment
-    <>{value}</>
+    content
   );
 };

libs/datagrid/src/lib/filters/date-range-filter.tsx

@@ -15,7 +15,7 @@ import {
 } from 'date-fns';
 import { formatForInput } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
-import { InputError } from '@vegaprotocol/ui-toolkit';
+import { TradingInputError } from '@vegaprotocol/ui-toolkit';
 
 const defaultValue: Schema.DateRange = {};
 export interface DateRangeFilterProps extends IFilterParams {
@@ -195,7 +195,7 @@ export const DateRangeFilter = forwardRef(
     }, [value, props]);
 
     const notification = useMemo(() => {
-      const not = error ? <InputError>{error}</InputError> : null;
+      const not = error ? <TradingInputError>{error}</TradingInputError> : null;
       return (
         <div className="ag-filter-apply-panel flex min-h-[2rem]">{not}</div>
       );

libs/deal-ticket/src/components/deal-ticket/deal-ticket-limit-amount.tsx

@@ -1,4 +1,8 @@
-import { FormGroup, Input, InputError } from '@vegaprotocol/ui-toolkit';
+import {
+  TradingFormGroup,
+  TradingInput,
+  TradingInputError,
+} from '@vegaprotocol/ui-toolkit';
 import { toDecimal, validateAmount } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import type { DealTicketAmountProps } from './deal-ticket-amount';
@@ -22,17 +26,17 @@ export const DealTicketLimitAmount = ({
   const renderError = () => {
     if (sizeError) {
       return (
-        <InputError testId="deal-ticket-error-message-size-limit">
+        <TradingInputError testId="deal-ticket-error-message-size-limit">
           {sizeError}
-        </InputError>
+        </TradingInputError>
       );
     }
 
     if (priceError) {
       return (
-        <InputError testId="deal-ticket-error-message-price-limit">
+        <TradingInputError testId="deal-ticket-error-message-price-limit">
           {priceError}
-        </InputError>
+        </TradingInputError>
       );
     }
 
@@ -43,7 +47,7 @@ export const DealTicketLimitAmount = ({
     <div className="mb-2">
       <div className="flex items-start gap-4">
         <div className="flex-1">
-          <FormGroup
+          <TradingFormGroup
             label={t('Size')}
             labelFor="input-order-size-limit"
             className="!mb-0"
@@ -59,8 +63,8 @@ export const DealTicketLimitAmount = ({
                 },
                 validate: validateAmount(sizeStep, 'Size'),
               }}
-              render={({ field }) => (
-                <Input
+              render={({ field, fieldState }) => (
+                <TradingInput
                   id="input-order-size-limit"
                   className="w-full"
                   type="number"
@@ -68,15 +72,16 @@ export const DealTicketLimitAmount = ({
                   min={sizeStep}
                   data-testid="order-size"
                   onWheel={(e) => e.currentTarget.blur()}
+                  hasError={!!fieldState.error}
                   {...field}
                 />
               )}
             />
-          </FormGroup>
+          </TradingFormGroup>
         </div>
-        <div className="pt-7 leading-10">@</div>
+        <div className="pt-5 leading-10">@</div>
         <div className="flex-1">
-          <FormGroup
+          <TradingFormGroup
             labelFor="input-price-quote"
             label={t(`Price (${quoteName})`)}
             labelAlign="right"
@@ -93,19 +98,20 @@ export const DealTicketLimitAmount = ({
                 },
                 validate: validateAmount(priceStep, 'Price'),
               }}
-              render={({ field }) => (
-                <Input
+              render={({ field, fieldState }) => (
+                <TradingInput
                   id="input-price-quote"
                   className="w-full"
                   type="number"
                   step={priceStep}
                   data-testid="order-price"
                   onWheel={(e) => e.currentTarget.blur()}
+                  hasError={!!fieldState.error}
                   {...field}
                 />
               )}
             />
-          </FormGroup>
+          </TradingFormGroup>
         </div>
       </div>
       {renderError()}

libs/deal-ticket/src/components/deal-ticket/deal-ticket-market-amount.tsx

@@ -4,7 +4,11 @@ import {
   validateAmount,
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
-import { Input, InputError, Tooltip } from '@vegaprotocol/ui-toolkit';
+import {
+  TradingInput,
+  TradingInputError,
+  Tooltip,
+} from '@vegaprotocol/ui-toolkit';
 import { isMarketInAuction } from '@vegaprotocol/markets';
 import type { DealTicketAmountProps } from './deal-ticket-amount';
 import { Controller } from 'react-hook-form';
@@ -33,7 +37,7 @@ export const DealTicketMarketAmount = ({
     <div className="mb-2">
       <div className="flex items-start gap-4">
         <div className="flex-1">
-          <div className="mb-2 text-sm">{t('Size')}</div>
+          <div className="mb-2 text-xs">{t('Size')}</div>
           <Controller
             name="size"
             control={control}
@@ -45,8 +49,8 @@ export const DealTicketMarketAmount = ({
               },
               validate: validateAmount(sizeStep, 'Size'),
             }}
-            render={({ field }) => (
-              <Input
+            render={({ field, fieldState }) => (
+              <TradingInput
                 id="input-order-size-market"
                 className="w-full"
                 type="number"
@@ -54,12 +58,13 @@ export const DealTicketMarketAmount = ({
                 min={sizeStep}
                 onWheel={(e) => e.currentTarget.blur()}
                 data-testid="order-size"
+                hasError={!!fieldState.error}
                 {...field}
               />
             )}
           />
         </div>
-        <div className="pt-7 leading-10">@</div>
+        <div className="pt-5 leading-10">@</div>
         <div className="flex-1 text-sm text-right">
           {inAuction && (
             <Tooltip
@@ -72,7 +77,7 @@ export const DealTicketMarketAmount = ({
           )}
           <div
             data-testid="last-price"
-            className={classNames('leading-10', { 'pt-7': !inAuction })}
+            className={classNames('leading-10', { 'pt-5': !inAuction })}
           >
             {priceFormatted && quoteName ? (
               <>
@@ -85,12 +90,12 @@ export const DealTicketMarketAmount = ({
         </div>
       </div>
       {sizeError && (
-        <InputError
+        <TradingInputError
           intent="danger"
           testId="deal-ticket-error-message-size-market"
         >
           {sizeError}
-        </InputError>
+        </TradingInputError>
       )}
     </div>
   );

libs/deal-ticket/src/components/deal-ticket/deal-ticket-size-iceberg.tsx

@@ -4,9 +4,9 @@ import type { OrderFormValues } from '../../hooks/use-form-values';
 import { toDecimal, validateAmount } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import {
-  FormGroup,
-  Input,
-  InputError,
+  TradingFormGroup,
+  TradingInput,
+  TradingInputError,
   Tooltip,
 } from '@vegaprotocol/ui-toolkit';
 
@@ -32,9 +32,9 @@ export const DealTicketSizeIceberg = ({
   const renderPeakSizeError = () => {
     if (peakSizeError) {
       return (
-        <InputError testId="deal-ticket-peak-error-message-size-limit">
+        <TradingInputError testId="deal-ticket-peak-error-message-size-limit">
           {peakSizeError}
-        </InputError>
+        </TradingInputError>
       );
     }
 
@@ -44,9 +44,9 @@ export const DealTicketSizeIceberg = ({
   const renderMinimumSizeError = () => {
     if (minimumVisibleSizeError) {
       return (
-        <InputError testId="deal-ticket-minimum-error-message-size-limit">
+        <TradingInputError testId="deal-ticket-minimum-error-message-size-limit">
           {minimumVisibleSizeError}
-        </InputError>
+        </TradingInputError>
       );
     }
 
@@ -57,7 +57,7 @@ export const DealTicketSizeIceberg = ({
     <div className="mb-2">
       <div className="flex items-center gap-4">
         <div className="flex-1">
-          <FormGroup
+          <TradingFormGroup
             label={
               <Tooltip
                 description={
@@ -93,7 +93,7 @@ export const DealTicketSizeIceberg = ({
                 validate: validateAmount(sizeStep, 'peakSize'),
               }}
               render={({ field }) => (
-                <Input
+                <TradingInput
                   id="input-order-peak-size"
                   className="w-full"
                   type="number"
@@ -106,14 +106,14 @@ export const DealTicketSizeIceberg = ({
                 />
               )}
             />
-          </FormGroup>
+          </TradingFormGroup>
         </div>
         <div className="flex-0 items-center">
           <div className="flex"></div>
           <div className="flex"></div>
         </div>
         <div className="flex-1">
-          <FormGroup
+          <TradingFormGroup
             label={
               <Tooltip
                 description={
@@ -151,7 +151,7 @@ export const DealTicketSizeIceberg = ({
                 validate: validateAmount(sizeStep, 'minimumVisibleSize'),
               }}
               render={({ field }) => (
-                <Input
+                <TradingInput
                   id="input-order-minimum-size"
                   className="w-full"
                   type="number"
@@ -164,7 +164,7 @@ export const DealTicketSizeIceberg = ({
                 />
               )}
             />
-          </FormGroup>
+          </TradingFormGroup>
         </div>
       </div>
       {renderPeakSizeError()}

libs/deal-ticket/src/components/deal-ticket/deal-ticket-stop-order.tsx

@@ -10,13 +10,13 @@ import {
 import { useForm, Controller, useController } from 'react-hook-form';
 import * as Schema from '@vegaprotocol/types';
 import {
-  Radio,
-  RadioGroup,
-  Input,
-  Checkbox,
-  FormGroup,
-  InputError,
-  Select,
+  TradingRadio,
+  TradingRadioGroup,
+  TradingInput,
+  TradingCheckbox,
+  TradingFormGroup,
+  TradingInputError,
+  TradingSelect,
   Tooltip,
 } from '@vegaprotocol/ui-toolkit';
 import { getDerivedPrice, type Market } from '@vegaprotocol/markets';
@@ -187,9 +187,9 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
         }}
       />
       {errors.type && (
-        <InputError testId="stop-order-error-message-type">
+        <TradingInputError testId="stop-order-error-message-type">
           {errors.type.message}
-        </InputError>
+        </TradingInputError>
       )}
 
       <Controller
@@ -199,21 +199,21 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
           <SideSelector value={field.value} onValueChange={field.onChange} />
         )}
       />
-      <FormGroup label={t('Trigger')} compact={true} labelFor="">
+      <TradingFormGroup label={t('Trigger')} compact={true} labelFor="">
         <Controller
           name="triggerDirection"
           control={control}
           render={({ field }) => {
             const { onChange, value } = field;
             return (
-              <RadioGroup
+              <TradingRadioGroup
                 name="triggerDirection"
                 onChange={onChange}
                 value={value}
                 orientation="horizontal"
                 className="mb-2"
               >
-                <Radio
+                <TradingRadio
                   value={
                     Schema.StopOrderTriggerDirection
                       .TRIGGER_DIRECTION_RISES_ABOVE
@@ -221,7 +221,7 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
                   id="triggerDirection-risesAbove"
                   label={'Rises above'}
                 />
-                <Radio
+                <TradingRadio
                   value={
                     Schema.StopOrderTriggerDirection
                       .TRIGGER_DIRECTION_FALLS_BELOW
@@ -229,7 +229,7 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
                   id="triggerDirection-fallsBelow"
                   label={'Falls below'}
                 />
-              </RadioGroup>
+              </TradingRadioGroup>
             );
           }}
         />
@@ -246,16 +246,17 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
                 validate: validateAmount(priceStep, 'Price'),
               }}
               control={control}
-              render={({ field }) => {
+              render={({ field, fieldState }) => {
                 const { value, ...props } = field;
                 return (
                   <div className="mb-2">
-                    <Input
+                    <TradingInput
                       data-testid="triggerPrice"
                       type="number"
                       step={priceStep}
                       appendElement={asset.symbol}
                       value={value || ''}
+                      hasError={!!fieldState.error}
                       {...props}
                     />
                   </div>
@@ -263,9 +264,9 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
               }}
             />
             {errors.triggerPrice && (
-              <InputError testId="stop-order-error-message-trigger-price">
+              <TradingInputError testId="stop-order-error-message-trigger-price">
                 {errors.triggerPrice.message}
-              </InputError>
+              </TradingInputError>
             )}
           </div>
         )}
@@ -294,16 +295,17 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
                   'Trailing percentage offset'
                 ),
               }}
-              render={({ field }) => {
+              render={({ field, fieldState }) => {
                 const { value, ...props } = field;
                 return (
                   <div className="mb-2">
-                    <Input
+                    <TradingInput
                       type="number"
                       step={trailingPercentOffsetStep}
                       appendElement="%"
                       data-testid="triggerTrailingPercentOffset"
                       value={value || ''}
+                      hasError={!!fieldState.error}
                       {...props}
                     />
                   </div>
@@ -311,9 +313,9 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
               }}
             />
             {errors.triggerTrailingPercentOffset && (
-              <InputError testId="stop-order-error-message-trigger-trailing-percent-offset">
+              <TradingInputError testId="stop-order-error-message-trigger-trailing-percent-offset">
                 {errors.triggerTrailingPercentOffset.message}
-              </InputError>
+              </TradingInputError>
             )}
           </div>
         )}
@@ -324,25 +326,29 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
           render={({ field }) => {
             const { onChange, value } = field;
             return (
-              <RadioGroup
+              <TradingRadioGroup
                 onChange={onChange}
                 value={value}
                 orientation="horizontal"
               >
-                <Radio value="price" id="triggerType-price" label={'Price'} />
-                <Radio
+                <TradingRadio
+                  value="price"
+                  id="triggerType-price"
+                  label={'Price'}
+                />
+                <TradingRadio
                   value="trailingPercentOffset"
                   id="triggerType-trailingPercentOffset"
                   label={'Trailing Percent Offset'}
                 />
-              </RadioGroup>
+              </TradingRadioGroup>
             );
           }}
         />
-      </FormGroup>
+      </TradingFormGroup>
       <div className="mb-2">
         <div className="flex items-start gap-4">
-          <FormGroup
+          <TradingFormGroup
             labelFor="input-price-quote"
             label={t(`Size`)}
             className="!mb-0 flex-1"
@@ -358,10 +364,10 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
                 },
                 validate: validateAmount(sizeStep, 'Size'),
               }}
-              render={({ field }) => {
+              render={({ field, fieldState }) => {
                 const { value, ...props } = field;
                 return (
-                  <Input
+                  <TradingInput
                     id="order-size"
                     className="w-full"
                     type="number"
@@ -370,16 +376,17 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
                     onWheel={(e) => e.currentTarget.blur()}
                     data-testid="order-size"
                     value={value || ''}
+                    hasError={!!fieldState.error}
                     {...props}
                   />
                 );
               }}
             />
-          </FormGroup>
-          <div className="pt-7 leading-10">@</div>
+          </TradingFormGroup>
+          <div className="pt-5 leading-10">@</div>
           <div className="flex-1">
             {type === Schema.OrderType.TYPE_LIMIT ? (
-              <FormGroup
+              <TradingFormGroup
                 labelFor="input-price-quote"
                 label={t(`Price (${quoteName})`)}
                 labelAlign="right"
@@ -397,10 +404,10 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
                     },
                     validate: validateAmount(priceStep, 'Price'),
                   }}
-                  render={({ field }) => {
+                  render={({ field, fieldState }) => {
                     const { value, ...props } = field;
                     return (
-                      <Input
+                      <TradingInput
                         id="input-price-quote"
                         className="w-full"
                         type="number"
@@ -408,15 +415,16 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
                         data-testid="order-price"
                         onWheel={(e) => e.currentTarget.blur()}
                         value={value || ''}
+                        hasError={!!fieldState.error}
                         {...props}
                       />
                     );
                   }}
                 />
-              </FormGroup>
+              </TradingFormGroup>
             ) : (
               <div
-                className="text-sm text-right pt-7 leading-10"
+                className="text-sm text-right pt-5 leading-10"
                 data-testid="price"
               >
                 {priceFormatted && quoteName
@@ -427,21 +435,21 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
           </div>
         </div>
         {errors.size && (
-          <InputError testId="stop-order-error-message-size">
+          <TradingInputError testId="stop-order-error-message-size">
             {errors.size.message}
-          </InputError>
+          </TradingInputError>
         )}
 
         {!errors.size &&
           errors.price &&
           type === Schema.OrderType.TYPE_LIMIT && (
-            <InputError testId="stop-order-error-message-price">
+            <TradingInputError testId="stop-order-error-message-price">
               {errors.price.message}
-            </InputError>
+            </TradingInputError>
           )}
       </div>
       <div className="mb-2">
-        <FormGroup
+        <TradingFormGroup
           label={t('Time in force')}
           labelFor="select-time-in-force"
           compact={true}
@@ -449,11 +457,12 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
           <Controller
             name="timeInForce"
             control={control}
-            render={({ field }) => (
-              <Select
+            render={({ field, fieldState }) => (
+              <TradingSelect
                 id="select-time-in-force"
                 className="w-full"
                 data-testid="order-tif"
+                hasError={!!fieldState.error}
                 {...field}
               >
                 <option
@@ -468,14 +477,14 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
                 >
                   {timeInForceLabel(Schema.OrderTimeInForce.TIME_IN_FORCE_FOK)}
                 </option>
-              </Select>
+              </TradingSelect>
             )}
           />
-        </FormGroup>
+        </TradingFormGroup>
         {errors.timeInForce && (
-          <InputError testId="stop-error-message-tif">
+          <TradingInputError testId="stop-error-message-tif">
             {errors.timeInForce.message}
-          </InputError>
+          </TradingInputError>
         )}
       </div>
       <div className="flex gap-2 pb-2 justify-between">
@@ -485,29 +494,29 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
           render={({ field }) => {
             const { onChange: onCheckedChange, value } = field;
             return (
-              <Checkbox
+              <TradingCheckbox
                 onCheckedChange={onCheckedChange}
                 checked={value}
                 name="expire"
-                label={<span className="text-xs">{t('Expire')}</span>}
+                label={t('Expire')}
               />
             );
           }}
         />
-        <Checkbox
+        <TradingCheckbox
           name="reduce-only"
           checked={true}
           disabled={true}
           label={
             <Tooltip description={<span>{t(REDUCE_ONLY_TOOLTIP)}</span>}>
-              <span className="text-xs">{t('Reduce only')}</span>
+              <>{t('Reduce only')}</>
             </Tooltip>
           }
         />
       </div>
       {expire && (
         <>
-          <FormGroup
+          <TradingFormGroup
             label={t('Strategy')}
             labelFor="expiryStrategy"
             compact={true}
@@ -517,26 +526,26 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
               control={control}
               render={({ field }) => {
                 return (
-                  <RadioGroup orientation="horizontal" {...field}>
-                    <Radio
+                  <TradingRadioGroup orientation="horizontal" {...field}>
+                    <TradingRadio
                       value={
                         Schema.StopOrderExpiryStrategy.EXPIRY_STRATEGY_SUBMIT
                       }
                       id="expiryStrategy-submit"
                       label={'Submit'}
                     />
-                    <Radio
+                    <TradingRadio
                       value={
                         Schema.StopOrderExpiryStrategy.EXPIRY_STRATEGY_CANCELS
                       }
                       id="expiryStrategy-cancel"
                       label={'Cancel'}
                     />
-                  </RadioGroup>
+                  </TradingRadioGroup>
                 );
               }}
             />
-          </FormGroup>
+          </TradingFormGroup>
           <div className="mb-2">
             <Controller
               name="expiresAt"

libs/deal-ticket/src/components/deal-ticket/deal-ticket.tsx

@@ -17,8 +17,8 @@ import type { OrderSubmission } from '@vegaprotocol/wallet';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { mapFormValuesToOrderSubmission } from '../../utils/map-form-values-to-submission';
 import {
-  Checkbox,
-  InputError,
+  TradingCheckbox,
+  TradingInputError,
   Intent,
   Notification,
   Tooltip,
@@ -417,7 +417,7 @@ export const DealTicket = ({
           name="postOnly"
           control={control}
           render={({ field }) => (
-            <Checkbox
+            <TradingCheckbox
               name="post-only"
               checked={!disablePostOnlyCheckbox && field.value}
               disabled={disablePostOnlyCheckbox}
@@ -449,7 +449,7 @@ export const DealTicket = ({
           name="reduceOnly"
           control={control}
           render={({ field }) => (
-            <Checkbox
+            <TradingCheckbox
               name="reduce-only"
               checked={!disableReduceOnlyCheckbox && field.value}
               disabled={disableReduceOnlyCheckbox}
@@ -483,7 +483,7 @@ export const DealTicket = ({
               name="iceberg"
               control={control}
               render={({ field }) => (
-                <Checkbox
+                <TradingCheckbox
                   name="iceberg"
                   checked={field.value}
                   onCheckedChange={field.onChange}
@@ -572,11 +572,11 @@ export const NoWalletWarning = ({
   if (isReadOnly) {
     return (
       <div className="mb-2">
-        <InputError testId="deal-ticket-error-message-summary">
+        <TradingInputError testId="deal-ticket-error-message-summary">
           {
             'You need to connect your own wallet to start trading on this market'
           }
-        </InputError>
+        </TradingInputError>
       </div>
     );
   }
@@ -613,9 +613,9 @@ const SummaryMessage = memo(
     if (error?.message) {
       return (
         <div className="mb-2">
-          <InputError testId="deal-ticket-error-message-summary">
+          <TradingInputError testId="deal-ticket-error-message-summary">
             {error?.message}
-          </InputError>
+          </TradingInputError>
         </div>
       );
     }

libs/deal-ticket/src/components/deal-ticket/expiry-selector.tsx

@@ -1,4 +1,8 @@
-import { FormGroup, Input, InputError } from '@vegaprotocol/ui-toolkit';
+import {
+  TradingFormGroup,
+  TradingInput,
+  TradingInputError,
+} from '@vegaprotocol/ui-toolkit';
 import { formatForInput } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { useRef } from 'react';
@@ -19,24 +23,25 @@ export const ExpirySelector = ({
   const dateFormatted = formatForInput(date);
   const minDate = formatForInput(date);
   return (
-    <FormGroup
+    <TradingFormGroup
       label={t('Expiry time/date')}
       labelFor="expiration"
       compact={true}
     >
-      <Input
+      <TradingInput
         data-testid="date-picker-field"
         id="expiration"
         type="datetime-local"
         value={dateFormatted}
         onChange={(e) => onSelect(e.target.value)}
         min={minDate}
+        hasError={!!errorMessage}
       />
       {errorMessage && (
-        <InputError testId="deal-ticket-error-message-expiry">
+        <TradingInputError testId="deal-ticket-error-message-expiry">
           {errorMessage}
-        </InputError>
+        </TradingInputError>
       )}
-    </FormGroup>
+    </TradingFormGroup>
   );
 };

libs/deal-ticket/src/components/deal-ticket/time-in-force-selector.tsx

@@ -1,7 +1,7 @@
 import {
-  FormGroup,
-  InputError,
-  Select,
+  TradingFormGroup,
+  TradingInputError,
+  TradingSelect,
   Tooltip,
   SimpleGrid,
 } from '@vegaprotocol/ui-toolkit';
@@ -90,12 +90,12 @@ export const TimeInForceSelector = ({
   };
 
   return (
-    <FormGroup
+    <TradingFormGroup
       label={t('Time in force')}
       labelFor="select-time-in-force"
       compact={true}
     >
-      <Select
+      <TradingSelect
         id="select-time-in-force"
         value={value}
         onChange={(e) => {
@@ -103,18 +103,19 @@ export const TimeInForceSelector = ({
         }}
         className="w-full"
         data-testid="order-tif"
+        hasError={!!errorMessage}
       >
         {options.map(([key, value]) => (
           <option key={key} value={value}>
             {timeInForceLabel(value)}
           </option>
         ))}
-      </Select>
+      </TradingSelect>
       {errorMessage && (
-        <InputError testId="deal-ticket-error-message-tif">
+        <TradingInputError testId="deal-ticket-error-message-tif">
           {renderError(errorMessage)}
-        </InputError>
+        </TradingInputError>
       )}
-    </FormGroup>
+    </TradingFormGroup>
   );
 };

libs/deal-ticket/src/components/deal-ticket/type-selector.tsx

@@ -1,5 +1,5 @@
 import {
-  InputError,
+  TradingInputError,
   SimpleGrid,
   Tooltip,
   TradingDropdown,
@@ -178,9 +178,9 @@ export const TypeSelector = ({
         value={value}
       />
       {errorMessage && (
-        <InputError testId="deal-ticket-error-message-type">
+        <TradingInputError testId="deal-ticket-error-message-type">
           {renderError(errorMessage as MarketModeValidationType)}
-        </InputError>
+        </TradingInputError>
       )}
     </>
   );

libs/deposits/src/lib/deposit-form.tsx

@@ -14,14 +14,14 @@ import { t } from '@vegaprotocol/i18n';
 import { useLocalStorage } from '@vegaprotocol/react-helpers';
 import {
   Button,
-  FormGroup,
-  Input,
-  InputError,
-  RichSelect,
+  TradingFormGroup,
+  TradingInput,
+  TradingInputError,
+  TradingRichSelect,
   Notification,
   Intent,
   ButtonLink,
-  Select,
+  TradingSelect,
 } from '@vegaprotocol/ui-toolkit';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { useWeb3React } from '@web3-react/core';
@@ -151,7 +151,7 @@ export const DepositForm = ({
       noValidate={true}
       data-testid="deposit-form"
     >
-      <FormGroup
+      <TradingFormGroup
         label={t('From (Ethereum address)')}
         labelFor="ethereum-address"
       >
@@ -197,15 +197,17 @@ export const DepositForm = ({
           }}
         />
         {errors.from?.message && (
-          <InputError intent="danger">{errors.from.message}</InputError>
+          <TradingInputError intent="danger">
+            {errors.from.message}
+          </TradingInputError>
         )}
-      </FormGroup>
-      <FormGroup label={t('To (Vega key)')} labelFor="to">
+      </TradingFormGroup>
+      <TradingFormGroup label={t('To (Vega key)')} labelFor="to">
         <AddressField
           pubKeys={pubKeys}
           onChange={() => setValue('to', '')}
           select={
-            <Select {...register('to')} id="to" defaultValue="">
+            <TradingSelect {...register('to')} id="to" defaultValue="">
               <option value="" disabled>
                 {t('Please select')}
               </option>
@@ -215,10 +217,10 @@ export const DepositForm = ({
                     {pk}
                   </option>
                 ))}
-            </Select>
+            </TradingSelect>
           }
           input={
-            <Input
+            <TradingInput
               // eslint-disable-next-line jsx-a11y/no-autofocus
               autoFocus={true} // focus input immediately after is shown
               id="to"
@@ -233,12 +235,12 @@ export const DepositForm = ({
           }
         />
         {errors.to?.message && (
-          <InputError intent="danger" forInput="to">
+          <TradingInputError intent="danger" forInput="to">
             {errors.to.message}
-          </InputError>
+          </TradingInputError>
         )}
-      </FormGroup>
-      <FormGroup label={t('Asset')} labelFor="asset">
+      </TradingFormGroup>
+      <TradingFormGroup label={t('Asset')} labelFor="asset">
         <Controller
           control={control}
           name="asset"
@@ -248,7 +250,7 @@ export const DepositForm = ({
             },
           }}
           render={({ field }) => (
-            <RichSelect
+            <TradingRichSelect
               data-testid="select-asset"
               id={field.name}
               name={field.name}
@@ -271,13 +273,13 @@ export const DepositForm = ({
                     }
                   />
                 ))}
-            </RichSelect>
+            </TradingRichSelect>
           )}
         />
         {errors.asset?.message && (
-          <InputError intent="danger" forInput="asset">
+          <TradingInputError intent="danger" forInput="asset">
             {errors.asset.message}
-          </InputError>
+          </TradingInputError>
         )}
         {isActive && isFaucetable && selectedAsset && (
           <UseButton onClick={submitFaucet}>
@@ -296,7 +298,7 @@ export const DepositForm = ({
             {t('View asset details')}
           </button>
         )}
-      </FormGroup>
+      </TradingFormGroup>
       <FaucetNotification
         isActive={isActive}
         selectedAsset={selectedAsset}
@@ -308,8 +310,8 @@ export const DepositForm = ({
         </div>
       )}
       {approved && (
-        <FormGroup label={t('Amount')} labelFor="amount">
-          <Input
+        <TradingFormGroup label={t('Amount')} labelFor="amount">
+          <TradingInput
             type="number"
             autoComplete="off"
             id="amount"
@@ -374,9 +376,9 @@ export const DepositForm = ({
             })}
           />
           {errors.amount?.message && (
-            <InputError intent="danger" forInput="amount">
+            <TradingInputError intent="danger" forInput="amount">
               {errors.amount.message}
-            </InputError>
+            </TradingInputError>
           )}
           {selectedAsset && balances && (
             <UseButton
@@ -390,7 +392,7 @@ export const DepositForm = ({
               {t('Use maximum')}
             </UseButton>
           )}
-        </FormGroup>
+        </TradingFormGroup>
       )}
       <ApproveNotification
         isActive={isActive}

libs/environment/src/components/node-switcher/node-switcher.tsx

@@ -4,10 +4,10 @@ import { t } from '@vegaprotocol/i18n';
 import {
   Button,
   ButtonLink,
-  Input,
+  TradingInput,
   Loader,
-  Radio,
-  RadioGroup,
+  TradingRadio,
+  TradingRadioGroup,
 } from '@vegaprotocol/ui-toolkit';
 import { useEnvironment } from '../../hooks';
 import { CUSTOM_NODE_KEY } from '../../types';
@@ -76,7 +76,7 @@ export const NodeSwitcher = ({ closeDialog }: { closeDialog: () => void }) => {
               `This app will only work on ${VEGA_ENV}. Select a node to connect to.`
             )}
           </p>
-          <RadioGroup
+          <TradingRadioGroup
             value={nodeRadio}
             onChange={(value) => setNodeRadio(value)}
           >
@@ -112,7 +112,7 @@ export const NodeSwitcher = ({ closeDialog }: { closeDialog: () => void }) => {
                 />
               </div>
             </div>
-          </RadioGroup>
+          </TradingRadioGroup>
           <div className="mt-4">
             <Button
               fill={true}
@@ -161,7 +161,7 @@ const CustomRowWrapper = ({
     <LayoutRow dataTestId="custom-row">
       <div className="flex w-full mb-2">
         {nodes.length > 0 && (
-          <Radio
+          <TradingRadio
             id="node-url-custom"
             value={CUSTOM_NODE_KEY}
             label={nodeRadio === CUSTOM_NODE_KEY ? '' : t('Other')}
@@ -172,7 +172,7 @@ const CustomRowWrapper = ({
             data-testid="custom-node"
             className="flex items-center w-full gap-2"
           >
-            <Input
+            <TradingInput
               placeholder="https://"
               value={inputText}
               hasError={Boolean(error)}

libs/environment/src/components/node-switcher/row-data.tsx

@@ -2,7 +2,7 @@ import type { ApolloError } from '@apollo/client';
 import { useHeaderStore } from '@vegaprotocol/apollo-client';
 import { isValidUrl } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
-import { Radio } from '@vegaprotocol/ui-toolkit';
+import { TradingRadio } from '@vegaprotocol/ui-toolkit';
 import { useEffect, useState } from 'react';
 import { CUSTOM_NODE_KEY } from '../../types';
 import {
@@ -138,7 +138,7 @@ export const RowData = ({
     <>
       {id !== CUSTOM_NODE_KEY && (
         <div className="break-all" data-testid="node">
-          <Radio id={`node-url-${id}`} value={url} label={url} />
+          <TradingRadio id={`node-url-${id}`} value={url} label={url} />
         </div>
       )}
       <LayoutCell

libs/environment/src/hooks/use-links.ts

@@ -29,6 +29,7 @@ const EmptyLinks: DAppLinks = {
 
 const ExplorerLinks = {
   ...EmptyLinks,
+  [Networks.STAGNET1]: 'https://explorer.stagnet1.vega.rocks',
   [Networks.TESTNET]: 'https://explorer.fairground.wtf',
   [Networks.VALIDATOR_TESTNET]:
     'https://explorer.validators-testnet.vega.rocks',
@@ -40,17 +41,18 @@ const ConsoleLinks = {
   ...EmptyLinks,
   [Networks.STAGNET1]: 'https://trading.stagnet1.vega.rocks',
   [Networks.TESTNET]: 'https://console.fairground.wtf',
-  [Networks.MAINNET]: 'https://console.vega.xyz',
-  [Networks.MAINNET_MIRROR]: 'https://console.mainnet-mirror.vega.rocks/',
+  [Networks.MAINNET]: 'https://vega.trading',
+  [Networks.MAINNET_MIRROR]: 'https://console.mainnet-mirror.vega.rocks',
 };
 
 const TokenLinks = {
   ...EmptyLinks,
   [Networks.DEVNET]: 'https://dev.governance.vega.xyz',
+  [Networks.STAGNET1]: 'https://governance.stagnet1.vega.rocks',
   [Networks.TESTNET]: 'https://governance.fairground.wtf',
   [Networks.VALIDATOR_TESTNET]:
     'https://governance.validators-testnet.vega.rocks',
-  [Networks.MAINNET_MIRROR]: 'https://governance.mainnet-mirror.vega.rocks/',
+  [Networks.MAINNET_MIRROR]: 'https://governance.mainnet-mirror.vega.rocks',
   [Networks.MAINNET]: 'https://governance.vega.xyz',
 };
 

libs/ledger/src/lib/ledger-entries-data-provider.ts

@@ -60,7 +60,7 @@ export const ledgerEntriesProvider = makeDerivedDataProvider<
   (partsData) => {
     const entries = partsData[0] as ReturnType<typeof getData>;
     const assets = partsData[1] as Record<string, Asset>;
-    const markets = partsData[1] as Record<string, Market>;
+    const markets = partsData[2] as Record<string, Market>;
     return entries.map((entry) => {
       const asset = entry.assetId
         ? (assets as Record<string, Asset>)[entry.assetId]

libs/ledger/src/lib/ledger-table.tsx

@@ -12,10 +12,12 @@ import type {
 import {
   AgGridLazy as AgGrid,
   DateRangeFilter,
+  MarketNameCell,
   SetFilter,
 } from '@vegaprotocol/datagrid';
 import type * as Types from '@vegaprotocol/types';
 import type { ColDef } from 'ag-grid-community';
+import type { Market } from '@vegaprotocol/markets';
 import {
   AccountTypeMapping,
   DescriptionTransferTypeMapping,
@@ -82,10 +84,14 @@ export const LedgerTable = (props: LedgerEntryProps) => {
         field: 'marketSender.tradableInstrument.instrument.code',
         cellRenderer: ({
           value,
+          data,
         }: VegaValueFormatterParams<
           LedgerEntry,
           'marketSender.tradableInstrument.instrument.code'
-        >) => value || '-',
+        >) =>
+          value && (
+            <MarketNameCell value={value} data={data?.marketSender as Market} />
+          ),
       },
       {
         headerName: t('Receiver'),
@@ -112,10 +118,17 @@ export const LedgerTable = (props: LedgerEntryProps) => {
         field: 'marketReceiver.tradableInstrument.instrument.code',
         cellRenderer: ({
           value,
+          data,
         }: VegaValueFormatterParams<
           LedgerEntry,
           'marketReceiver.tradableInstrument.instrument.code'
-        >) => value || '-',
+        >) =>
+          value && (
+            <MarketNameCell
+              value={value}
+              data={data?.marketReceiver as Market}
+            />
+          ),
       },
       {
         headerName: t('Transfer type'),

libs/network-parameters/src/use-network-params.ts

@@ -107,6 +107,7 @@ export const NetworkParams = {
   market_liquidity_targetstake_triggering_ratio:
     'market_liquidity_targetstake_triggering_ratio',
   transfer_fee_factor: 'transfer_fee_factor',
+  network_validators_incumbentBonus: 'network_validators_incumbentBonus',
 } as const;
 
 type Params = typeof NetworkParams;

libs/orders/src/lib/components/order-data-provider/__generated__/Orders.ts

@@ -34,21 +34,21 @@ export type OrdersUpdateSubscription = { __typename?: 'Subscription', orders?: A
 
 export type OrderSubmissionFieldsFragment = { __typename?: 'OrderSubmission', marketId: string, price: string, size: string, side: Types.Side, timeInForce: Types.OrderTimeInForce, expiresAt: any, type: Types.OrderType, reference?: string | null, postOnly?: boolean | null, reduceOnly?: boolean | null, peggedOrder?: { __typename?: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | null };
 
-export type StopOrderFieldsFragment = { __typename?: 'StopOrder', id: string, ocoLinkId?: string | null, expiresAt?: any | null, expiryStrategy?: Types.StopOrderExpiryStrategy | null, triggerDirection: Types.StopOrderTriggerDirection, status: Types.StopOrderStatus, createdAt: any, updatedAt?: any | null, partyId: string, marketId: string, trigger?: { __typename?: 'StopOrderPrice', price: string } | { __typename?: 'StopOrderTrailingPercentOffset', trailingPercentOffset: string } | null, submission: { __typename?: 'OrderSubmission', marketId: string, price: string, size: string, side: Types.Side, timeInForce: Types.OrderTimeInForce, expiresAt: any, type: Types.OrderType, reference?: string | null, postOnly?: boolean | null, reduceOnly?: boolean | null, peggedOrder?: { __typename?: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | null } };
+export type StopOrderFieldsFragment = { __typename?: 'StopOrder', id: string, ocoLinkId?: string | null, expiresAt?: any | null, expiryStrategy?: Types.StopOrderExpiryStrategy | null, triggerDirection: Types.StopOrderTriggerDirection, status: Types.StopOrderStatus, createdAt: any, updatedAt?: any | null, partyId: string, marketId: string, trigger: { __typename?: 'StopOrderPrice', price: string } | { __typename?: 'StopOrderTrailingPercentOffset', trailingPercentOffset: string }, submission: { __typename?: 'OrderSubmission', marketId: string, price: string, size: string, side: Types.Side, timeInForce: Types.OrderTimeInForce, expiresAt: any, type: Types.OrderType, reference?: string | null, postOnly?: boolean | null, reduceOnly?: boolean | null, peggedOrder?: { __typename?: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | null } };
 
 export type StopOrdersQueryVariables = Types.Exact<{
   partyId: Types.Scalars['ID'];
 }>;
 
 
-export type StopOrdersQuery = { __typename?: 'Query', stopOrders?: { __typename?: 'StopOrderConnection', edges?: Array<{ __typename?: 'StopOrderEdge', node?: { __typename?: 'StopOrder', id: string, ocoLinkId?: string | null, expiresAt?: any | null, expiryStrategy?: Types.StopOrderExpiryStrategy | null, triggerDirection: Types.StopOrderTriggerDirection, status: Types.StopOrderStatus, createdAt: any, updatedAt?: any | null, partyId: string, marketId: string, trigger?: { __typename?: 'StopOrderPrice', price: string } | { __typename?: 'StopOrderTrailingPercentOffset', trailingPercentOffset: string } | null, submission: { __typename?: 'OrderSubmission', marketId: string, price: string, size: string, side: Types.Side, timeInForce: Types.OrderTimeInForce, expiresAt: any, type: Types.OrderType, reference?: string | null, postOnly?: boolean | null, reduceOnly?: boolean | null, peggedOrder?: { __typename?: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | null } } | null }> | null } | null };
+export type StopOrdersQuery = { __typename?: 'Query', stopOrders?: { __typename?: 'StopOrderConnection', edges?: Array<{ __typename?: 'StopOrderEdge', node?: { __typename?: 'StopOrder', id: string, ocoLinkId?: string | null, expiresAt?: any | null, expiryStrategy?: Types.StopOrderExpiryStrategy | null, triggerDirection: Types.StopOrderTriggerDirection, status: Types.StopOrderStatus, createdAt: any, updatedAt?: any | null, partyId: string, marketId: string, trigger: { __typename?: 'StopOrderPrice', price: string } | { __typename?: 'StopOrderTrailingPercentOffset', trailingPercentOffset: string }, submission: { __typename?: 'OrderSubmission', marketId: string, price: string, size: string, side: Types.Side, timeInForce: Types.OrderTimeInForce, expiresAt: any, type: Types.OrderType, reference?: string | null, postOnly?: boolean | null, reduceOnly?: boolean | null, peggedOrder?: { __typename?: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | null } } | null }> | null } | null };
 
 export type StopOrderByIdQueryVariables = Types.Exact<{
   stopOrderId: Types.Scalars['ID'];
 }>;
 
 
-export type StopOrderByIdQuery = { __typename?: 'Query', stopOrder?: { __typename?: 'StopOrder', id: string, ocoLinkId?: string | null, expiresAt?: any | null, expiryStrategy?: Types.StopOrderExpiryStrategy | null, triggerDirection: Types.StopOrderTriggerDirection, status: Types.StopOrderStatus, createdAt: any, updatedAt?: any | null, partyId: string, marketId: string, trigger?: { __typename?: 'StopOrderPrice', price: string } | { __typename?: 'StopOrderTrailingPercentOffset', trailingPercentOffset: string } | null, submission: { __typename?: 'OrderSubmission', marketId: string, price: string, size: string, side: Types.Side, timeInForce: Types.OrderTimeInForce, expiresAt: any, type: Types.OrderType, reference?: string | null, postOnly?: boolean | null, reduceOnly?: boolean | null, peggedOrder?: { __typename?: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | null } } | null };
+export type StopOrderByIdQuery = { __typename?: 'Query', stopOrder?: { __typename?: 'StopOrder', id: string, ocoLinkId?: string | null, expiresAt?: any | null, expiryStrategy?: Types.StopOrderExpiryStrategy | null, triggerDirection: Types.StopOrderTriggerDirection, status: Types.StopOrderStatus, createdAt: any, updatedAt?: any | null, partyId: string, marketId: string, trigger: { __typename?: 'StopOrderPrice', price: string } | { __typename?: 'StopOrderTrailingPercentOffset', trailingPercentOffset: string }, submission: { __typename?: 'OrderSubmission', marketId: string, price: string, size: string, side: Types.Side, timeInForce: Types.OrderTimeInForce, expiresAt: any, type: Types.OrderType, reference?: string | null, postOnly?: boolean | null, reduceOnly?: boolean | null, peggedOrder?: { __typename?: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | null } } | null };
 
 export const OrderFieldsFragmentDoc = gql`
     fragment OrderFields on Order {

libs/orders/src/lib/components/order-list/order-edit-dialog.tsx

@@ -9,9 +9,9 @@ import { t } from '@vegaprotocol/i18n';
 import { Size } from '@vegaprotocol/datagrid';
 import * as Schema from '@vegaprotocol/types';
 import {
-  FormGroup,
-  Input,
-  InputError,
+  TradingFormGroup,
+  TradingInput,
+  TradingInputError,
   Button,
   Dialog,
   Icon,
@@ -102,8 +102,12 @@ export const OrderEditDialog = ({
         noValidate
       >
         <div className="flex flex-col md:flex-row gap-4">
-          <FormGroup label={t('Price')} labelFor="limitPrice" className="grow">
-            <Input
+          <TradingFormGroup
+            label={t('Price')}
+            labelFor="limitPrice"
+            className="grow"
+          >
+            <TradingInput
               type="number"
               step={step}
               {...register('limitPrice', {
@@ -119,13 +123,13 @@ export const OrderEditDialog = ({
               id="limitPrice"
             />
             {errors.limitPrice?.message && (
-              <InputError intent="danger">
+              <TradingInputError intent="danger">
                 {errors.limitPrice.message}
-              </InputError>
+              </TradingInputError>
             )}
-          </FormGroup>
-          <FormGroup label={t('Size')} labelFor="size" className="grow">
-            <Input
+          </TradingFormGroup>
+          <TradingFormGroup label={t('Size')} labelFor="size" className="grow">
+            <TradingInput
               type="number"
               step={stepSize}
               {...register('size', {
@@ -139,9 +143,11 @@ export const OrderEditDialog = ({
               id="size"
             />
             {errors.size?.message && (
-              <InputError intent="danger">{errors.size.message}</InputError>
+              <TradingInputError intent="danger">
+                {errors.size.message}
+              </TradingInputError>
             )}
-          </FormGroup>
+          </TradingFormGroup>
         </div>
         <Button variant="primary" size="md" type="submit">
           {t('Update')}

libs/orders/src/lib/components/order-list/order-list.spec.tsx

@@ -80,7 +80,7 @@ describe('OrderListTable', () => {
       '-',
       Schema.OrderTimeInForceCode[marketOrder.timeInForce],
       getDateTimeFormat().format(new Date(marketOrder.createdAt)),
-      'Edit',
+      '',
     ];
     expectedValues.forEach((expectedValue, i) =>
       expect(cells[i]).toHaveTextContent(expectedValue)
@@ -104,7 +104,7 @@ describe('OrderListTable', () => {
         Schema.OrderTimeInForceCode[limitOrder.timeInForce]
       }: ${getDateTimeFormat().format(new Date(limitOrder.expiresAt ?? ''))}`,
       getDateTimeFormat().format(new Date(limitOrder.createdAt)),
-      'Edit',
+      '',
     ];
     expectedValues.forEach((expectedValue, i) =>
       expect(cells[i]).toHaveTextContent(expectedValue)

libs/orders/src/lib/components/order-list/order-list.tsx

@@ -271,8 +271,8 @@ export const OrderListTable = memo<
           {
             colId: 'amend',
             ...COL_DEFS.actions,
-            minWidth: showAllActions ? 110 : COL_DEFS.actions.minWidth,
-            maxWidth: showAllActions ? 110 : COL_DEFS.actions.minWidth,
+            minWidth: showAllActions ? 90 : COL_DEFS.actions.minWidth,
+            maxWidth: showAllActions ? 90 : COL_DEFS.actions.minWidth,
             cellRenderer: ({ data }: { data?: Order }) => {
               if (!data) return null;
 
@@ -285,14 +285,14 @@ export const OrderListTable = memo<
                           data-testid="edit"
                           onClick={() => onEdit(data)}
                         >
-                          {t('Edit')}
+                          <VegaIcon name={VegaIconNames.EDIT} size={16} />
                         </ButtonLink>
                       )}
                       <ButtonLink
                         data-testid="cancel"
                         onClick={() => onCancel(data)}
                       >
-                        {t('Cancel')}
+                        <VegaIcon name={VegaIconNames.CROSS} size={16} />
                       </ButtonLink>
                     </>
                   )}

libs/positions/src/lib/liquidation-price.tsx

@@ -1,18 +1,18 @@
+import { Tooltip } from '@vegaprotocol/ui-toolkit';
 import { useEstimatePositionQuery } from './__generated__/Positions';
-import { formatRange } from '@vegaprotocol/utils';
+import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
+import { t } from '@vegaprotocol/i18n';
 
 export const LiquidationPrice = ({
   marketId,
   openVolume,
   collateralAvailable,
-  decimalPlaces,
-  formatDecimals,
+  marketDecimalPlaces,
 }: {
   marketId: string;
   openVolume: string;
   collateralAvailable: string;
-  decimalPlaces: number;
-  formatDecimals: number;
+  marketDecimalPlaces: number;
 }) => {
   const { data: currentData, previousData } = useEstimatePositionQuery({
     variables: {
@@ -23,38 +23,47 @@ export const LiquidationPrice = ({
     fetchPolicy: 'no-cache',
     skip: !openVolume || openVolume === '0',
   });
-  const data = currentData || previousData;
-  let value = '-';
 
-  if (data) {
-    const bestCase =
-      data.estimatePosition?.liquidation?.bestCase.open_volume_only.replace(
-        /\..*/,
-        ''
-      );
-    const worstCase =
-      data.estimatePosition?.liquidation?.worstCase.open_volume_only.replace(
-        /\..*/,
-        ''
-      );
-    value =
-      bestCase && worstCase && BigInt(bestCase) < BigInt(worstCase)
-        ? formatRange(
-            bestCase,
-            worstCase,
-            decimalPlaces,
-            undefined,
-            formatDecimals,
-            value
-          )
-        : formatRange(
-            worstCase,
-            bestCase,
-            decimalPlaces,
-            undefined,
-            formatDecimals,
-            value
-          );
+  const data = currentData || previousData;
+
+  if (!data?.estimatePosition?.liquidation) {
+    return <span>-</span>;
   }
-  return <span data-testid="liquidation-price">{value}</span>;
+
+  let bestCase = '-';
+  let worstCase = '-';
+
+  bestCase =
+    data.estimatePosition?.liquidation?.bestCase.open_volume_only.replace(
+      /\..*/,
+      ''
+    );
+  worstCase =
+    data.estimatePosition?.liquidation?.worstCase.open_volume_only.replace(
+      /\..*/,
+      ''
+    );
+  worstCase = addDecimalsFormatNumber(worstCase, marketDecimalPlaces);
+  bestCase = addDecimalsFormatNumber(bestCase, marketDecimalPlaces);
+
+  return (
+    <Tooltip
+      description={
+        <table>
+          <tbody>
+            <tr>
+              <th>{t('Worst case')}</th>
+              <td className="text-right font-mono pl-2">{worstCase}</td>
+            </tr>
+            <tr>
+              <th>{t('Best case')}</th>
+              <td className="text-right font-mono pl-2">{bestCase}</td>
+            </tr>
+          </tbody>
+        </table>
+      }
+    >
+      <span data-testid="liquidation-price">{worstCase}</span>
+    </Tooltip>
+  );
 };

libs/positions/src/lib/positions-data-providers.spec.ts

@@ -180,12 +180,12 @@ describe('getMetrics && rejoinPositionData', () => {
     expect(metrics[0].currentLeverage).toBeCloseTo(1.02);
     expect(metrics[0].marketDecimalPlaces).toEqual(5);
     expect(metrics[0].positionDecimalPlaces).toEqual(0);
-    expect(metrics[0].decimals).toEqual(5);
+    expect(metrics[0].assetDecimals).toEqual(5);
     expect(metrics[0].markPrice).toEqual('9431775');
     expect(metrics[0].marketId).toEqual(
       '5e6035fe6a6df78c9ec44b333c231e63d357acef0a0620d2c243f5865d1dc0d8'
     );
-    expect(metrics[0].marketName).toEqual('AAVEDAI.MF21');
+    expect(metrics[0].marketCode).toEqual('AAVEDAI.MF21');
     expect(metrics[0].marketTradingMode).toEqual(
       'TRADING_MODE_MONITORING_AUCTION'
     );
@@ -205,12 +205,12 @@ describe('getMetrics && rejoinPositionData', () => {
     expect(metrics[1].currentLeverage).toBeCloseTo(0.097);
     expect(metrics[1].marketDecimalPlaces).toEqual(5);
     expect(metrics[1].positionDecimalPlaces).toEqual(0);
-    expect(metrics[1].decimals).toEqual(5);
+    expect(metrics[1].assetDecimals).toEqual(5);
     expect(metrics[1].markPrice).toEqual('869762');
     expect(metrics[1].marketId).toEqual(
       '10c4b1114d2f6fda239b73d018bca55888b6018f0ac70029972a17fea0a6a56e'
     );
-    expect(metrics[1].marketName).toEqual('UNIDAI.MF21');
+    expect(metrics[1].marketCode).toEqual('UNIDAI.MF21');
     expect(metrics[1].marketTradingMode).toEqual('TRADING_MODE_CONTINUOUS');
     expect(metrics[1].notional).toEqual('86976200');
     expect(metrics[1].openVolume).toEqual('-100');

libs/positions/src/lib/positions-data-providers.ts

@@ -26,20 +26,20 @@ import {
   PositionsDocument,
   PositionsSubscriptionDocument,
 } from './__generated__/Positions';
-import type { PositionStatus } from '@vegaprotocol/types';
+import type { PositionStatus, ProductType } from '@vegaprotocol/types';
 
 export interface Position {
   assetId: string;
   assetSymbol: string;
   averageEntryPrice: string;
   currentLeverage: number | undefined;
-  decimals: number;
+  assetDecimals: number;
   quantum: string;
   lossSocializationAmount: string;
   marginAccountBalance: string;
   marketDecimalPlaces: number;
   marketId: string;
-  marketName: string;
+  marketCode: string;
   marketTradingMode: Schema.MarketTradingMode;
   markPrice: string | undefined;
   notional: string | undefined;
@@ -51,6 +51,7 @@ export interface Position {
   totalBalance: string;
   unrealisedPNL: string;
   updatedAt: string | null;
+  productType: ProductType;
 }
 
 export const getMetrics = (
@@ -70,15 +71,10 @@ export const getMetrics = (
     const marginAccount = accounts?.find((account) => {
       return account.market?.id === market?.id;
     });
-    const {
-      decimals,
-      id: assetId,
-      symbol: assetSymbol,
-      quantum,
-    } = market.tradableInstrument.instrument.product.settlementAsset;
+    const asset = market.tradableInstrument.instrument.product.settlementAsset;
     const generalAccount = accounts?.find(
       (account) =>
-        account.asset.id === assetId &&
+        account.asset.id === asset.id &&
         account.type === Schema.AccountType.ACCOUNT_TYPE_GENERAL
     );
 
@@ -88,11 +84,11 @@ export const getMetrics = (
 
     const marginAccountBalance = toBigNum(
       marginAccount?.balance ?? 0,
-      decimals
+      asset.decimals
     );
     const generalAccountBalance = toBigNum(
       generalAccount?.balance ?? 0,
-      decimals
+      asset.decimals
     );
 
     const markPrice = marketData
@@ -111,17 +107,17 @@ export const getMetrics = (
         : notional.dividedBy(totalBalance)
       : undefined;
     metrics.push({
-      assetId,
-      assetSymbol,
+      assetId: asset.id,
+      assetSymbol: asset.symbol,
       averageEntryPrice: position.averageEntryPrice,
       currentLeverage: currentLeverage ? currentLeverage.toNumber() : undefined,
-      decimals,
-      quantum,
+      assetDecimals: asset.decimals,
+      quantum: asset.quantum,
       lossSocializationAmount: position.lossSocializationAmount || '0',
       marginAccountBalance: marginAccount?.balance ?? '0',
       marketDecimalPlaces,
       marketId: market.id,
-      marketName: market.tradableInstrument.instrument.code,
+      marketCode: market.tradableInstrument.instrument.code,
       marketTradingMode: market.tradingMode,
       markPrice: marketData ? marketData.markPrice : undefined,
       notional: notional
@@ -132,9 +128,11 @@ export const getMetrics = (
       positionDecimalPlaces,
       realisedPNL: position.realisedPNL,
       status: position.positionStatus,
-      totalBalance: totalBalance.multipliedBy(10 ** decimals).toFixed(),
+      totalBalance: totalBalance.multipliedBy(10 ** asset.decimals).toFixed(),
       unrealisedPNL: position.unrealisedPNL,
       updatedAt: position.updatedAt || null,
+      productType: market?.tradableInstrument.instrument.product
+        .__typename as ProductType,
     });
   });
   return metrics;
@@ -286,7 +284,7 @@ export const positionsMetricsProvider = makeDerivedDataProvider<
   ([positions, accounts, marketsData]) => {
     const positionsData = rejoinPositionData(positions, marketsData);
     const metrics = getMetrics(positionsData, accounts as Account[] | null);
-    return sortBy(metrics, 'marketName');
+    return sortBy(metrics, 'marketCode');
   },
   (data, delta, previousData) =>
     data.filter((row) => {

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

@@ -15,7 +15,7 @@ interface PositionsManagerProps {
   partyIds: string[];
   onMarketClick?: (marketId: string) => void;
   isReadOnly: boolean;
-  gridProps: ReturnType<typeof useDataGridEvents>;
+  gridProps?: ReturnType<typeof useDataGridEvents>;
 }
 
 export const PositionsManager = ({

libs/positions/src/lib/positions-table.spec.tsx

@@ -1,10 +1,9 @@
-import type { RenderResult } from '@testing-library/react';
 import { act, render, screen, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import PositionsTable, { OpenVolumeCell, PNLCell } from './positions-table';
+import { PositionsTable, OpenVolumeCell, PNLCell } from './positions-table';
 import type { Position } from './positions-data-providers';
 import * as Schema from '@vegaprotocol/types';
-import { PositionStatus, PositionStatusMapping } from '@vegaprotocol/types';
+import { PositionStatus } from '@vegaprotocol/types';
 import type { ICellRendererParams } from 'ag-grid-community';
 import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
 
@@ -20,13 +19,13 @@ const singleRow: Position = {
   assetSymbol: 'BTC',
   averageEntryPrice: '133',
   currentLeverage: 1.1,
-  decimals: 2, // this is settlementAsset.decimals
+  assetDecimals: 2, // this is settlementAsset.decimals
   quantum: '0.1',
   lossSocializationAmount: '0',
   marginAccountBalance: '12345600',
   marketDecimalPlaces: 1,
   marketId: 'string',
-  marketName: 'ETH/BTC (31 july 2022)',
+  marketCode: 'ETHBTC.QM21',
   marketTradingMode: Schema.MarketTradingMode.TRADING_MODE_CONTINUOUS,
   markPrice: '123',
   notional: '12300',
@@ -37,11 +36,16 @@ const singleRow: Position = {
   totalBalance: '123456',
   unrealisedPNL: '456',
   updatedAt: '2022-07-27T15:02:58.400Z',
+  productType: 'Future',
 };
 
-const singleRowData = [singleRow];
-
 describe('Positions', () => {
+  const renderComponent = async (rowData: Position) => {
+    await act(async () => {
+      render(<PositionsTable rowData={[rowData]} isReadOnly={false} />);
+    });
+  };
+
   it('should render successfully', async () => {
     await act(async () => {
       const { baseElement } = render(
@@ -52,157 +56,132 @@ describe('Positions', () => {
   });
 
   it('render correct columns', async () => {
-    await act(async () => {
-      render(<PositionsTable rowData={singleRowData} isReadOnly={true} />);
-    });
-
-    const headers = screen.getAllByRole('columnheader');
-    expect(headers).toHaveLength(11);
-    expect(
-      headers.map((h) => h.querySelector('[ref="eText"]')?.textContent?.trim())
-    ).toEqual([
+    const expectedHeaders = [
       'Market',
-      'Notional',
-      'Open volume',
-      'Mark price',
-      'Liquidation price',
-      'Asset',
-      'Entry price',
-      'Leverage',
+      'Size / Notional',
+      'Entry / Mark',
       'Margin',
+      'Liquidation',
       'Realised PNL',
       'Unrealised PNL',
-    ]);
+    ];
+
+    await renderComponent(singleRow);
+
+    const headers = screen.getAllByRole('columnheader');
+    expect(headers).toHaveLength(expectedHeaders.length);
+    expect(
+      headers.map((h) => h.querySelector('[ref="eText"]')?.textContent?.trim())
+    ).toEqual(expectedHeaders);
   });
 
-  it('renders market name', async () => {
-    await act(async () => {
-      render(<PositionsTable rowData={singleRowData} isReadOnly={false} />);
-    });
-    expect(screen.getByText('ETH/BTC (31 july 2022)')).toBeTruthy();
+  it('renders market code', async () => {
+    await renderComponent(singleRow);
+    expect(screen.getByText(singleRow.marketCode)).toBeTruthy();
+    expect(screen.getByText('Futr')).toBeInTheDocument();
   });
 
   it('Does not fail if the market name does not match the split pattern', async () => {
     const breakingMarketName = 'OP/USD AUG-SEP22 - Incentive';
-    const row = [
-      Object.assign({}, singleRow, { marketName: breakingMarketName }),
-    ];
-    await act(async () => {
-      render(<PositionsTable rowData={row} isReadOnly={false} />);
-    });
-
+    await renderComponent({ ...singleRow, marketCode: breakingMarketName });
     expect(screen.getByText(breakingMarketName)).toBeTruthy();
   });
 
-  it('add color and sign to amount, displays positive notional value', async () => {
-    let result: RenderResult;
-    await act(async () => {
-      result = render(
-        <PositionsTable rowData={singleRowData} isReadOnly={false} />
-      );
-    });
-    let cells = screen.getAllByRole('gridcell');
+  it('displays size / notional correctly for long position', async () => {
+    await renderComponent(singleRow);
+    const cells = screen.getAllByRole('gridcell');
+    const cell = cells[1];
 
-    expect(cells[2].classList.contains('text-market-green-600')).toBeTruthy();
-    expect(cells[2].classList.contains('text-market-red')).toBeFalsy();
-    expect(cells[2].textContent).toEqual('+100');
-    expect(cells[1].textContent).toEqual('1,230.0');
-    await act(async () => {
-      result.rerender(
-        <PositionsTable
-          rowData={[{ ...singleRow, openVolume: '-100' }]}
-          isReadOnly={false}
-        />
-      );
-    });
-    cells = screen.getAllByRole('gridcell');
-    expect(cells[2].classList.contains('text-market-green-600')).toBeFalsy();
-    expect(cells[2].classList.contains('text-market-red')).toBeTruthy();
-    expect(cells[2].textContent?.startsWith('-100')).toBeTruthy();
-    expect(cells[1].textContent).toEqual('1,230.0');
+    expect(cell).toHaveClass('text-market-green-600');
+    expect(cell).not.toHaveClass('text-market-red');
+
+    expect(within(cell).getByTestId('stack-cell-primary')).toHaveTextContent(
+      '+100'
+    );
+    expect(within(cell).getByTestId('stack-cell-secondary')).toHaveTextContent(
+      '1,230.0'
+    );
   });
 
-  it('displays mark price', async () => {
-    let result: RenderResult;
-    await act(async () => {
-      result = render(
-        <PositionsTable rowData={singleRowData} isReadOnly={false} />
-      );
+  it('displays size / notional correctly for short position', async () => {
+    await renderComponent({ ...singleRow, openVolume: '-100' });
+    const cells = screen.getAllByRole('gridcell');
+    const cell = cells[1];
+
+    expect(cell).not.toHaveClass('text-market-green-600');
+    expect(cell).toHaveClass('text-market-red');
+
+    expect(within(cell).getByTestId('stack-cell-primary')).toHaveTextContent(
+      '-100'
+    );
+    expect(within(cell).getByTestId('stack-cell-secondary')).toHaveTextContent(
+      '1,230.0'
+    );
+  });
+
+  it('displays entry / mark price', async () => {
+    await renderComponent(singleRow);
+    const cells = screen.getAllByRole('gridcell');
+    const cell = within(cells[2]);
+    expect(cell.getByTestId('stack-cell-primary')).toHaveTextContent('13.3');
+    expect(cell.getByTestId('stack-cell-secondary')).toHaveTextContent('12.3');
+  });
+
+  it('doesnt render entry / mark if market is in opening auction', async () => {
+    await renderComponent({
+      ...singleRow,
+      marketTradingMode: Schema.MarketTradingMode.TRADING_MODE_OPENING_AUCTION,
     });
 
-    let cells = screen.getAllByRole('gridcell');
-    expect(cells[3].textContent).toEqual('12.3');
-
-    await act(async () => {
-      result.rerender(
-        <PositionsTable
-          rowData={[
-            {
-              ...singleRow,
-              marketTradingMode:
-                Schema.MarketTradingMode.TRADING_MODE_OPENING_AUCTION,
-            },
-          ]}
-          isReadOnly={false}
-        />
-      );
-    });
-
-    cells = screen.getAllByRole('gridcell');
-    expect(cells[3].textContent).toEqual('-');
+    const cells = screen.getAllByRole('gridcell');
+    expect(cells[2].textContent).toEqual('-');
   });
 
   it('displays liquidation price', async () => {
-    await act(async () => {
-      render(<PositionsTable rowData={singleRowData} isReadOnly={false} />);
-    });
+    await renderComponent(singleRow);
     const cells = screen.getAllByRole('gridcell');
     expect(cells[4].textContent).toEqual('liquidation price');
   });
 
-  it('displays leverage', async () => {
-    await act(async () => {
-      render(<PositionsTable rowData={singleRowData} isReadOnly={false} />);
-    });
+  it('displays margin and leverage', async () => {
+    await renderComponent(singleRow);
     const cells = screen.getAllByRole('gridcell');
-    expect(cells[7].textContent).toEqual('1.1');
-  });
 
-  it('displays allocated margin', async () => {
-    await act(async () => {
-      render(<PositionsTable rowData={singleRowData} isReadOnly={false} />);
-    });
-    const cells = screen.getAllByRole('gridcell');
-    const cell = cells[8];
-    expect(cell.textContent).toEqual('123,456.00');
+    // margin
+    expect(
+      within(cells[3]).getByTestId('stack-cell-primary')
+    ).toHaveTextContent('123,456.00');
+
+    // leverage
+    expect(
+      within(cells[3]).getByTestId('stack-cell-secondary')
+    ).toHaveTextContent('1.1');
   });
 
   it('displays realised and unrealised PNL', async () => {
     // pnl cells should be rendered with asset dps
     const expectedRealised = addDecimalsFormatNumber(
       singleRow.realisedPNL,
-      singleRow.decimals
+      singleRow.assetDecimals
     );
     const expectedUnrealised = addDecimalsFormatNumber(
       singleRow.unrealisedPNL,
-      singleRow.decimals
+      singleRow.assetDecimals
     );
 
-    await act(async () => {
-      render(<PositionsTable rowData={singleRowData} isReadOnly={false} />);
-    });
+    await renderComponent(singleRow);
 
     const cells = screen.getAllByRole('gridcell');
-    expect(cells[9].textContent).toEqual(expectedRealised);
-    expect(cells[10].textContent).toEqual(expectedUnrealised);
+    expect(cells[5]).toHaveTextContent(expectedRealised);
+    expect(cells[6]).toHaveTextContent(expectedUnrealised);
   });
 
   it('displays close button', async () => {
     await act(async () => {
       render(
         <PositionsTable
-          rowData={singleRowData}
-          pubKey={singleRowData[0].partyId}
+          rowData={[singleRow]}
+          pubKey={singleRow.partyId}
           onClose={() => {
             return;
           }}
@@ -210,24 +189,15 @@ describe('Positions', () => {
         />
       );
     });
-    const cells = screen.getAllByRole('gridcell');
-    expect(cells[11].textContent).toEqual('Close');
+
+    expect(screen.getByTestId('close-position')).toBeInTheDocument();
   });
 
   it('do not display close button if openVolume is zero', async () => {
-    await act(async () => {
-      render(
-        <PositionsTable
-          rowData={[{ ...singleRow, openVolume: '0' }]}
-          onClose={() => {
-            return;
-          }}
-          isReadOnly={false}
-        />
-      );
-    });
-    const cells = screen.getAllByRole('gridcell');
-    expect(cells[11].textContent).toEqual('');
+    await renderComponent({ ...singleRow, openVolume: '0' });
+    expect(
+      screen.queryByRole('button', { name: 'Close' })
+    ).not.toBeInTheDocument();
   });
 
   describe('PNLCell', () => {
@@ -247,40 +217,27 @@ describe('Positions', () => {
           lossSocialisationAmount: '0',
         },
         valueFormatted: '100',
-      };
-      render(<PNLCell {...(props as ICellRendererParams)} />);
-      expect(screen.getByText(props.valueFormatted)).toBeInTheDocument();
-      expect(screen.queryByRole('img')).not.toBeInTheDocument();
+      } as ICellRendererParams;
+      render(<PNLCell {...props} />);
+      expect(
+        screen.getByText(props.valueFormatted as string)
+      ).toBeInTheDocument();
+      expect(screen.queryByTestId(/icon-/)).not.toBeInTheDocument();
     });
 
-    it('renders value with warning tooltip if loss socialisation occurred', async () => {
+    it('renders value with warning icon if loss socialisation occurred', () => {
       const props = {
         data: {
           ...singleRow,
           lossSocializationAmount: '500',
-          decimals: 2,
+          assetDecimals: 2,
         },
         valueFormatted: '100',
       };
       render(<PNLCell {...(props as ICellRendererParams)} />);
       const content = screen.getByText(props.valueFormatted);
       expect(content).toBeInTheDocument();
-      expect(screen.getByRole('img')).toBeInTheDocument();
-
-      await userEvent.hover(content);
-      const tooltip = await screen.findByRole('tooltip');
-      expect(tooltip).toBeInTheDocument();
-      expect(
-        // using within as radix renders tooltip content twice
-        within(tooltip).getByText(
-          'Lifetime loss socialisation deductions: 5.00'
-        )
-      ).toBeInTheDocument();
-      expect(
-        within(tooltip).getByText(
-          `You received less BTC in gains that you should have when the market moved in your favour. This occurred because one or more other trader(s) were closed out and did not have enough funds to cover their losses, and the market's insurance pool was empty.`
-        )
-      ).toBeInTheDocument();
+      expect(screen.getByTestId(/icon-/)).toBeInTheDocument();
     });
   });
 
@@ -288,9 +245,10 @@ describe('Positions', () => {
     const props = {
       data: undefined,
       valueFormatted: '100',
-    };
+    } as ICellRendererParams;
+
     it('renders a dash if no data', () => {
-      render(<OpenVolumeCell {...(props as ICellRendererParams)} />);
+      render(<OpenVolumeCell {...props} />);
       expect(screen.getByText('-')).toBeInTheDocument();
     });
 
@@ -304,36 +262,21 @@ describe('Positions', () => {
       };
       render(<OpenVolumeCell {...(props as ICellRendererParams)} />);
       expect(screen.getByText(props.valueFormatted)).toBeInTheDocument();
-      expect(screen.queryByRole('img')).not.toBeInTheDocument();
+      expect(screen.queryByTestId(/icon-/)).not.toBeInTheDocument();
     });
 
-    it('renders status with warning tooltip if orders were closed', async () => {
+    it('renders status with warning tooltip if orders were closed', () => {
       const props = {
         data: {
           ...singleRow,
           status: PositionStatus.POSITION_STATUS_ORDERS_CLOSED,
         },
         valueFormatted: '100',
-      };
-      render(<OpenVolumeCell {...(props as ICellRendererParams)} />);
-      const content = screen.getByText(props.valueFormatted);
+      } as ICellRendererParams;
+      render(<OpenVolumeCell {...props} />);
+      const content = screen.getByText(props.valueFormatted as string);
       expect(content).toBeInTheDocument();
-      expect(screen.getByRole('img')).toBeInTheDocument();
-      await userEvent.hover(content);
-      const tooltip = await screen.findByRole('tooltip');
-      expect(tooltip).toBeInTheDocument();
-      expect(
-        // using within as radix renders tooltip content twice
-        within(tooltip).getByText(
-          `Status: ${PositionStatusMapping[props.data.status]}`
-        )
-      ).toBeInTheDocument();
-      expect(
-        // using within as radix renders tooltip content twice
-        within(tooltip).getByText(
-          'The position was distressed, but removing open orders from the book brought the margin level back to a point where the open position could be maintained.'
-        )
-      ).toBeInTheDocument();
+      expect(screen.getByTestId(/icon-/)).toBeInTheDocument();
     });
 
     it('renders status with warning tooltip if position was closed out', async () => {
@@ -343,24 +286,71 @@ describe('Positions', () => {
           status: PositionStatus.POSITION_STATUS_CLOSED_OUT,
         },
         valueFormatted: '100',
-      };
-      render(<OpenVolumeCell {...(props as ICellRendererParams)} />);
-      const content = screen.getByText(props.valueFormatted);
+      } as ICellRendererParams;
+      render(<OpenVolumeCell {...props} />);
+      const content = screen.getByText(props.valueFormatted as string);
       expect(content).toBeInTheDocument();
-      expect(screen.getByRole('img')).toBeInTheDocument();
-      await userEvent.hover(content);
-      const tooltip = await screen.findByRole('tooltip');
-      expect(tooltip).toBeInTheDocument();
+      expect(screen.getByTestId(/icon-/)).toBeInTheDocument();
+    });
+  });
+
+  describe('position status from size column', () => {
+    it('does not show if position status is normal', async () => {
+      await renderComponent({
+        ...singleRow,
+        status: PositionStatus.POSITION_STATUS_UNSPECIFIED,
+      });
+      const cells = screen.getAllByRole('gridcell');
+      const cell = cells[1];
+      await userEvent.hover(cell);
+      expect(screen.queryByRole('tooltip')).not.toBeInTheDocument();
+    });
+
+    it.each([
+      {
+        status: PositionStatus.POSITION_STATUS_CLOSED_OUT,
+        text: 'Your position was closed.',
+      },
+      {
+        status: PositionStatus.POSITION_STATUS_ORDERS_CLOSED,
+        text: 'Your open orders were cancelled.',
+      },
+      {
+        status: PositionStatus.POSITION_STATUS_DISTRESSED,
+        text: 'Your position is distressed.',
+      },
+    ])('renders content for $status', async (data) => {
+      await renderComponent({
+        ...singleRow,
+        status: data.status,
+      });
+      const cells = screen.getAllByRole('gridcell');
+      const cell = cells[1];
+      await userEvent.hover(cell);
+      const tooltip = within(await screen.findByRole('tooltip'));
+      expect(tooltip.getByText(data.text)).toBeInTheDocument();
+    });
+  });
+
+  describe('loss socialization from realised pnl column', () => {
+    it('renders', async () => {
+      await renderComponent({
+        ...singleRow,
+        lossSocializationAmount: '500',
+        assetDecimals: 2,
+      });
+      const cells = screen.getAllByRole('gridcell');
+      const cell = cells[5];
+
+      await userEvent.hover(cell);
+      const tooltip = within(await screen.findByRole('tooltip'));
+      expect(tooltip.getByText('Realised PNL: 1.23')).toBeInTheDocument();
       expect(
-        // using within as radix renders tooltip content twice
-        within(tooltip).getByText(
-          `Status: ${PositionStatusMapping[props.data.status]}`
-        )
+        tooltip.getByText('Lifetime loss socialisation deductions: 5.00')
       ).toBeInTheDocument();
       expect(
-        // using within as radix renders tooltip content twice
-        within(tooltip).getByText(
-          'You did not have enough BTC collateral to meet the maintenance margin requirements for your position, so it was closed by the network.'
+        tooltip.getByText(
+          `You received less BTC in gains that you should have when the market moved in your favour. This occurred because one or more other trader(s) were closed out and did not have enough funds to cover their losses, and the market's insurance pool was empty.`
         )
       ).toBeInTheDocument();
     });

libs/positions/src/lib/positions-table.tsx

@@ -1,44 +1,46 @@
-import classNames from 'classnames';
 import { useMemo } from 'react';
 import type { CSSProperties, ReactNode } from 'react';
-import type { ColDef } from 'ag-grid-community';
+import type { ColDef, ITooltipParams } from 'ag-grid-community';
 import type {
   VegaValueFormatterParams,
   VegaValueGetterParams,
   TypedDataAgGrid,
   VegaICellRendererParams,
 } from '@vegaprotocol/datagrid';
-import { COL_DEFS } from '@vegaprotocol/datagrid';
-import { ProgressBarCell } from '@vegaprotocol/datagrid';
 import {
   AgGridLazy as AgGrid,
+  COL_DEFS,
   PriceFlashCell,
-  signedNumberCssClass,
   signedNumberCssClassRules,
   MarketNameCell,
+  ProgressBarCell,
+  MarketProductPill,
 } from '@vegaprotocol/datagrid';
 import {
   ButtonLink,
-  Tooltip,
   TooltipCellComponent,
   ExternalLink,
-  Icon,
+  VegaIcon,
+  VegaIconNames,
 } from '@vegaprotocol/ui-toolkit';
 import {
   volumePrefix,
   toBigNum,
   formatNumber,
   addDecimalsFormatNumber,
+  addDecimalsFormatNumberQuantum,
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import type { Position } from './positions-data-providers';
-import * as Schema from '@vegaprotocol/types';
-import { PositionStatus, PositionStatusMapping } from '@vegaprotocol/types';
+import {
+  MarketTradingMode,
+  PositionStatus,
+  PositionStatusMapping,
+} from '@vegaprotocol/types';
 import { DocsLinks } from '@vegaprotocol/environment';
 import { PositionActionsDropdown } from './position-actions-dropdown';
-import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
-import type { VegaWalletContextShape } from '@vegaprotocol/wallet';
 import { LiquidationPrice } from './liquidation-price';
+import { StackedCell } from './stacked-cell';
 
 interface Props extends TypedDataAgGrid<Position> {
   onClose?: (data: Position) => void;
@@ -46,44 +48,25 @@ interface Props extends TypedDataAgGrid<Position> {
   style?: CSSProperties;
   isReadOnly: boolean;
   multipleKeys?: boolean;
-  pubKeys?: VegaWalletContextShape['pubKeys'];
-  pubKey?: VegaWalletContextShape['pubKey'];
+  pubKeys?: Array<{ name: string; publicKey: string }> | null;
+  pubKey?: string | null;
 }
 
-export interface AmountCellProps {
-  valueFormatted?: Pick<
-    Position,
-    'openVolume' | 'marketDecimalPlaces' | 'positionDecimalPlaces' | 'notional'
-  >;
-}
-
-export const AmountCell = ({ valueFormatted }: AmountCellProps) => {
-  if (!valueFormatted) {
-    return null;
-  }
-  const { openVolume, positionDecimalPlaces, marketDecimalPlaces, notional } =
-    valueFormatted;
-  return valueFormatted && notional ? (
-    <div className="leading-tight font-mono">
-      <div
-        className={classNames('text-right', signedNumberCssClass(openVolume))}
-      >
-        {volumePrefix(
-          addDecimalsFormatNumber(openVolume, positionDecimalPlaces)
-        )}
-      </div>
-      <div className="text-right">
-        {addDecimalsFormatNumber(notional, marketDecimalPlaces)}
-      </div>
-    </div>
-  ) : null;
-};
-
-AmountCell.displayName = 'AmountCell';
-
 export const getRowId = ({ data }: { data: Position }) =>
   `${data.partyId}-${data.marketId}`;
 
+const realisedPNLValueGetter = ({ data }: { data: Position }) => {
+  return !data
+    ? undefined
+    : toBigNum(data.realisedPNL, data.assetDecimals).toNumber();
+};
+
+const unrealisedPNLValueGetter = ({ data }: { data: Position }) => {
+  return !data
+    ? undefined
+    : toBigNum(data.unrealisedPNL, data.assetDecimals).toNumber();
+};
+
 const defaultColDef = {
   sortable: true,
   filter: true,
@@ -101,7 +84,6 @@ export const PositionsTable = ({
   pubKey,
   ...props
 }: Props) => {
-  const { open: openAssetDetailsDialog } = useAssetDetailsDialogStore();
   return (
     <AgGrid
       overlayNoRowsTemplate={t('No positions')}
@@ -109,11 +91,11 @@ export const PositionsTable = ({
       tooltipShowDelay={500}
       defaultColDef={defaultColDef}
       components={{
-        AmountCell,
         PriceFlashCell,
         ProgressBarCell,
         MarketNameCell,
       }}
+      rowHeight={45}
       columnDefs={useMemo<ColDef[]>(() => {
         const columnDefs: (ColDef | null)[] = [
           multipleKeys
@@ -130,41 +112,37 @@ export const PositionsTable = ({
             : null,
           {
             headerName: t('Market'),
-            field: 'marketName',
-            cellRenderer: 'MarketNameCell',
-            cellRendererParams: { idPath: 'marketId', onMarketClick },
-          },
-          {
-            headerName: t('Notional'),
-            headerTooltip: t('Mark price x open volume.'),
-            field: 'notional',
-            type: 'rightAligned',
-            cellClass: 'font-mono text-right',
-            filter: 'agNumberColumnFilter',
-            valueGetter: ({ data }: VegaValueGetterParams<Position>) => {
-              return !data?.notional
-                ? undefined
-                : toBigNum(data.notional, data.marketDecimalPlaces).toNumber();
+            field: 'marketCode',
+            onCellClicked: ({ data }) => {
+              if (!onMarketClick) return;
+              onMarketClick(data.marketId);
             },
-            valueFormatter: ({
+            cellRenderer: ({
+              value,
               data,
-            }: VegaValueFormatterParams<Position, 'notional'>) => {
-              return !data || !data.notional
-                ? '-'
-                : addDecimalsFormatNumber(
-                    data.notional,
-                    data.marketDecimalPlaces
-                  );
+            }: VegaICellRendererParams<Position, 'marketCode'>) => {
+              if (!data || !value) return '-';
+              return (
+                <StackedCell
+                  primary={value}
+                  secondary={
+                    <>
+                      {data?.assetSymbol}
+                      <MarketProductPill productType={data.productType} />
+                    </>
+                  }
+                />
+              );
             },
           },
           {
-            headerName: t('Open volume'),
+            headerName: t('Size / Notional'),
             field: 'openVolume',
             type: 'rightAligned',
             cellClass: 'font-mono text-right',
             cellClassRules: signedNumberCssClassRules,
             filter: 'agNumberColumnFilter',
-            valueGetter: ({ data }: VegaValueGetterParams<Position>) => {
+            valueGetter: ({ data }: { data: Position }) => {
               return data?.openVolume === undefined
                 ? undefined
                 : toBigNum(
@@ -172,165 +150,205 @@ export const PositionsTable = ({
                     data.positionDecimalPlaces
                   ).toNumber();
             },
+            tooltipValueGetter: ({ data }: ITooltipParams<Position>) => {
+              if (
+                !data ||
+                data.status === PositionStatus.POSITION_STATUS_UNSPECIFIED
+              ) {
+                return null;
+              }
+              return data.status;
+            },
             valueFormatter: ({
               data,
             }: VegaValueFormatterParams<Position, 'openVolume'>): string => {
-              return data?.openVolume === undefined
-                ? ''
-                : volumePrefix(
-                    addDecimalsFormatNumber(
-                      data.openVolume,
-                      data.positionDecimalPlaces
-                    )
+              if (!data?.openVolume) return '-';
+
+              const vol = volumePrefix(
+                addDecimalsFormatNumber(
+                  data.openVolume,
+                  data.positionDecimalPlaces
+                )
+              );
+
+              return vol;
+            },
+            tooltipComponent: (args: ITooltipParams<Position>) => {
+              if (!args.data) {
+                return null;
+              }
+              const POSITION_RESOLUTION_LINK =
+                DocsLinks?.POSITION_RESOLUTION ?? '';
+              let primaryTooltip;
+              switch (args.data.status) {
+                case PositionStatus.POSITION_STATUS_CLOSED_OUT:
+                  primaryTooltip = t('Your position was closed.');
+                  break;
+                case PositionStatus.POSITION_STATUS_ORDERS_CLOSED:
+                  primaryTooltip = t('Your open orders were cancelled.');
+                  break;
+                case PositionStatus.POSITION_STATUS_DISTRESSED:
+                  primaryTooltip = t('Your position is distressed.');
+                  break;
+              }
+
+              let secondaryTooltip;
+              switch (args.data.status) {
+                case PositionStatus.POSITION_STATUS_CLOSED_OUT:
+                  secondaryTooltip = t(
+                    `You did not have enough %s collateral to meet the maintenance margin requirements for your position, so it was closed by the network.`,
+                    args.data.assetSymbol
                   );
+                  break;
+                case PositionStatus.POSITION_STATUS_ORDERS_CLOSED:
+                  secondaryTooltip = t(
+                    'The position was distressed, but removing open orders from the book brought the margin level back to a point where the open position could be maintained.'
+                  );
+                  break;
+                case PositionStatus.POSITION_STATUS_DISTRESSED:
+                  secondaryTooltip = t(
+                    'The position was distressed, but could not be closed out - orders were removed from the book, and the open volume will be closed out once there is sufficient volume on the book.'
+                  );
+                  break;
+                default:
+                  secondaryTooltip = t('Maintained by network');
+              }
+              return (
+                <TooltipCellComponent
+                  {...args}
+                  value={
+                    <>
+                      <p className="mb-2">{primaryTooltip}</p>
+                      <p className="mb-2">{secondaryTooltip}</p>
+                      <p className="mb-2">
+                        {t(
+                          'Status: %s',
+                          PositionStatusMapping[args.data.status]
+                        )}
+                      </p>
+                      {POSITION_RESOLUTION_LINK && (
+                        <ExternalLink href={POSITION_RESOLUTION_LINK}>
+                          {t('Read more about position resolution')}
+                        </ExternalLink>
+                      )}
+                    </>
+                  }
+                />
+              );
             },
             cellRenderer: OpenVolumeCell,
           },
           {
-            headerName: t('Mark price'),
+            headerName: t('Entry / Mark'),
             field: 'markPrice',
             type: 'rightAligned',
-            cellRenderer: PriceFlashCell,
+            cellClass: 'font-mono text-right',
+            cellRenderer: ({
+              data,
+            }: VegaICellRendererParams<Position, 'markPrice'>) => {
+              if (
+                !data?.averageEntryPrice ||
+                !data?.markPrice ||
+                !data?.marketDecimalPlaces
+              ) {
+                return <>-</>;
+              }
+
+              if (
+                data.marketTradingMode ===
+                MarketTradingMode.TRADING_MODE_OPENING_AUCTION
+              ) {
+                return <>-</>;
+              }
+
+              const entry = addDecimalsFormatNumber(
+                data.averageEntryPrice,
+                data.marketDecimalPlaces
+              );
+              const mark = addDecimalsFormatNumber(
+                data.markPrice,
+                data.marketDecimalPlaces
+              );
+              return (
+                <StackedCell
+                  primary={entry}
+                  secondary={
+                    <PriceFlashCell
+                      value={Number(data.markPrice)}
+                      valueFormatted={mark}
+                    />
+                  }
+                />
+              );
+            },
             filter: 'agNumberColumnFilter',
             valueGetter: ({ data }: VegaValueGetterParams<Position>) => {
               return !data ||
                 !data.markPrice ||
                 data.marketTradingMode ===
-                  Schema.MarketTradingMode.TRADING_MODE_OPENING_AUCTION
+                  MarketTradingMode.TRADING_MODE_OPENING_AUCTION
                 ? undefined
                 : toBigNum(data.markPrice, data.marketDecimalPlaces).toNumber();
             },
-            valueFormatter: ({
-              data,
-            }: VegaValueFormatterParams<Position, 'markPrice'>) => {
-              if (!data) {
-                return '';
-              }
+          },
+          {
+            headerName: t('Margin'),
+            colId: 'margin',
+            type: 'rightAligned',
+            cellClass: 'font-mono text-right',
+            filter: 'agNumberColumnFilter',
+            valueGetter: ({ data }: VegaValueGetterParams<Position>) => {
+              return !data
+                ? undefined
+                : toBigNum(
+                    data.marginAccountBalance,
+                    data.assetDecimals
+                  ).toNumber();
+            },
+            cellRenderer: ({ data }: VegaICellRendererParams<Position>) => {
               if (
-                !data.markPrice ||
-                data.marketTradingMode ===
-                  Schema.MarketTradingMode.TRADING_MODE_OPENING_AUCTION
+                !data ||
+                !data.marginAccountBalance ||
+                !data.marketDecimalPlaces
               ) {
-                return '-';
+                return null;
               }
-              return addDecimalsFormatNumber(
-                data.markPrice,
-                data.marketDecimalPlaces
+              const margin = addDecimalsFormatNumberQuantum(
+                data.marginAccountBalance,
+                data.assetDecimals,
+                data.quantum
+              );
+
+              const lev = data?.currentLeverage ? data.currentLeverage : 1;
+              const leverage = formatNumber(Math.max(1, lev), 1);
+              return (
+                <StackedCell primary={margin} secondary={leverage + 'x'} />
               );
             },
           },
           {
-            headerName: t('Liquidation price'),
             colId: 'liquidationPrice',
-            type: 'rightAligned',
+            headerName: 'Liquidation',
+            headerTooltip: t('Worst case liquidation price'),
             cellClass: 'font-mono text-right',
+            type: 'rightAligned',
+            // Cannot be sortable as data is fetched within the cell
+            sortable: false,
+            filter: false,
             cellRenderer: ({ data }: VegaICellRendererParams<Position>) => {
-              if (!data) return null;
+              if (!data) {
+                return '-';
+              }
               return (
                 <LiquidationPrice
                   marketId={data.marketId}
                   openVolume={data.openVolume}
                   collateralAvailable={data.totalBalance}
-                  decimalPlaces={data.decimals}
-                  formatDecimals={data.marketDecimalPlaces}
+                  marketDecimalPlaces={data.marketDecimalPlaces}
                 />
               );
             },
           },
-          {
-            headerName: t('Asset'),
-            field: 'assetSymbol',
-            colId: 'asset',
-            cellRenderer: ({ data }: VegaICellRendererParams<Position>) => {
-              if (!data) return null;
-              return (
-                <ButtonLink
-                  title={t('View settlement asset details')}
-                  onClick={(e) => {
-                    openAssetDetailsDialog(
-                      data.assetId,
-                      e.target as HTMLElement
-                    );
-                  }}
-                >
-                  {data?.assetSymbol}
-                </ButtonLink>
-              );
-            },
-          },
-          {
-            headerName: t('Entry price'),
-            field: 'averageEntryPrice',
-            type: 'rightAligned',
-            cellRenderer: PriceFlashCell,
-            filter: 'agNumberColumnFilter',
-            valueGetter: ({ data }: VegaValueGetterParams<Position>) => {
-              return data?.markPrice === undefined || !data
-                ? undefined
-                : toBigNum(
-                    data.averageEntryPrice,
-                    data.marketDecimalPlaces
-                  ).toNumber();
-            },
-            valueFormatter: ({
-              data,
-            }: VegaValueFormatterParams<
-              Position,
-              'averageEntryPrice'
-            >): string => {
-              if (!data) {
-                return '';
-              }
-              return addDecimalsFormatNumber(
-                data.averageEntryPrice,
-                data.marketDecimalPlaces
-              );
-            },
-          },
-          multipleKeys
-            ? null
-            : {
-                headerName: t('Leverage'),
-                field: 'currentLeverage',
-                type: 'rightAligned',
-                filter: 'agNumberColumnFilter',
-                cellRenderer: PriceFlashCell,
-                valueFormatter: ({
-                  value,
-                }: VegaValueFormatterParams<Position, 'currentLeverage'>) =>
-                  value === undefined ? '' : formatNumber(value.toString(), 1),
-              },
-          multipleKeys
-            ? null
-            : {
-                headerName: t('Margin'),
-                field: 'marginAccountBalance',
-                type: 'rightAligned',
-                filter: 'agNumberColumnFilter',
-                cellRenderer: PriceFlashCell,
-                valueGetter: ({ data }: VegaValueGetterParams<Position>) => {
-                  return !data
-                    ? undefined
-                    : toBigNum(
-                        data.marginAccountBalance,
-                        data.decimals
-                      ).toNumber();
-                },
-                valueFormatter: ({
-                  data,
-                }: VegaValueFormatterParams<
-                  Position,
-                  'marginAccountBalance'
-                >): string => {
-                  if (!data) {
-                    return '';
-                  }
-                  return addDecimalsFormatNumber(
-                    data.marginAccountBalance,
-                    data.decimals
-                  );
-                },
-              },
           {
             headerName: t('Realised PNL'),
             field: 'realisedPNL',
@@ -338,17 +356,71 @@ export const PositionsTable = ({
             cellClassRules: signedNumberCssClassRules,
             cellClass: 'font-mono text-right',
             filter: 'agNumberColumnFilter',
-            valueGetter: ({ data }: VegaValueGetterParams<Position>) => {
-              return !data
-                ? undefined
-                : toBigNum(data.realisedPNL, data.decimals).toNumber();
+            valueGetter: realisedPNLValueGetter,
+            // @ts-ignore no type overlap, but the functions are identical
+            tooltipValueGetter: realisedPNLValueGetter,
+            tooltipComponent: (args: ITooltipParams) => {
+              const LOSS_SOCIALIZATION_LINK =
+                DocsLinks?.LOSS_SOCIALIZATION ?? '';
+
+              if (!args.data) {
+                return <>-</>;
+              }
+
+              const losses = parseInt(
+                args.data?.lossSocializationAmount ?? '0'
+              );
+
+              if (losses <= 0) {
+                // eslint-disable-next-line react/jsx-no-useless-fragment
+                return <>{args.valueFormatted}</>;
+              }
+
+              const lossesFormatted = addDecimalsFormatNumber(
+                args.data.lossSocializationAmount,
+                args.data.assetDecimals
+              );
+
+              return (
+                <TooltipCellComponent
+                  {...args}
+                  value={
+                    <>
+                      <p className="mb-2">
+                        {t('Realised PNL: %s', args.value)}
+                      </p>
+                      <p className="mb-2">
+                        {t(
+                          'Lifetime loss socialisation deductions: %s',
+                          lossesFormatted
+                        )}
+                      </p>
+                      <p className="mb-2">
+                        {t(
+                          `You received less %s in gains that you should have when the market moved in your favour. This occurred because one or more other trader(s) were closed out and did not have enough funds to cover their losses, and the market's insurance pool was empty.`,
+                          args.data.assetSymbol
+                        )}
+                      </p>
+                      {LOSS_SOCIALIZATION_LINK && (
+                        <ExternalLink href={LOSS_SOCIALIZATION_LINK}>
+                          {t('Read more about loss socialisation')}
+                        </ExternalLink>
+                      )}
+                    </>
+                  }
+                />
+              );
             },
             valueFormatter: ({
               data,
             }: VegaValueFormatterParams<Position, 'realisedPNL'>) => {
               return !data
                 ? ''
-                : addDecimalsFormatNumber(data.realisedPNL, data.decimals);
+                : addDecimalsFormatNumberQuantum(
+                    data.realisedPNL,
+                    data.assetDecimals,
+                    data.quantum
+                  );
             },
             headerTooltip: t(
               'Profit or loss is realised whenever your position is reduced to zero and the margin is released back to your collateral balance. P&L excludes any fees paid.'
@@ -362,21 +434,22 @@ export const PositionsTable = ({
             cellClassRules: signedNumberCssClassRules,
             cellClass: 'font-mono text-right',
             filter: 'agNumberColumnFilter',
-            valueGetter: ({ data }: VegaValueGetterParams<Position>) => {
-              return !data
-                ? undefined
-                : toBigNum(data.unrealisedPNL, data.decimals).toNumber();
-            },
+            valueGetter: unrealisedPNLValueGetter,
+            // @ts-ignore no type overlap but function can be identical
+            tooltipValueGetter: unrealisedPNLValueGetter,
             valueFormatter: ({
               data,
             }: VegaValueFormatterParams<Position, 'unrealisedPNL'>) =>
               !data
                 ? ''
-                : addDecimalsFormatNumber(data.unrealisedPNL, data.decimals),
+                : addDecimalsFormatNumberQuantum(
+                    data.unrealisedPNL,
+                    data.assetDecimals,
+                    data.quantum
+                  ),
             headerTooltip: t(
               'Unrealised profit is the current profit on your open position. Margin is still allocated to your position.'
             ),
-            cellRenderer: PNLCell,
           },
           onClose && !isReadOnly
             ? {
@@ -391,7 +464,7 @@ export const PositionsTable = ({
                           data-testid="close-position"
                           onClick={() => data && onClose(data)}
                         >
-                          {t('Close')}
+                          <VegaIcon name={VegaIconNames.CROSS} size={16} />
                         </ButtonLink>
                       ) : null}
                       {data?.assetId && (
@@ -408,28 +481,16 @@ export const PositionsTable = ({
         return columnDefs.filter<ColDef>(
           (colDef: ColDef | null): colDef is ColDef => colDef !== null
         );
-      }, [
-        isReadOnly,
-        multipleKeys,
-        onClose,
-        onMarketClick,
-        openAssetDetailsDialog,
-        pubKey,
-        pubKeys,
-      ])}
+      }, [isReadOnly, multipleKeys, onClose, onMarketClick, pubKey, pubKeys])}
       {...props}
     />
   );
 };
 
-export default PositionsTable;
-
 export const PNLCell = ({
   valueFormatted,
   data,
 }: VegaICellRendererParams<Position, 'realisedPNL'>) => {
-  const LOSS_SOCIALIZATION_LINK = DocsLinks?.LOSS_SOCIALIZATION ?? '';
-
   if (!data) {
     return <>-</>;
   }
@@ -440,121 +501,62 @@ export const PNLCell = ({
     return <>{valueFormatted}</>;
   }
 
-  const lossesFormatted = addDecimalsFormatNumber(
-    data.lossSocializationAmount,
-    data.decimals
-  );
-
-  return (
-    <WarningCell
-      tooltipContent={
-        <>
-          <p className="mb-2">
-            {t('Lifetime loss socialisation deductions: %s', lossesFormatted)}
-          </p>
-          <p className="mb-2">
-            {t(
-              `You received less %s in gains that you should have when the market moved in your favour. This occurred because one or more other trader(s) were closed out and did not have enough funds to cover their losses, and the market's insurance pool was empty.`,
-              [data.assetSymbol]
-            )}
-          </p>
-          {LOSS_SOCIALIZATION_LINK && (
-            <ExternalLink href={LOSS_SOCIALIZATION_LINK}>
-              {t('Read more about loss socialisation')}
-            </ExternalLink>
-          )}
-        </>
-      }
-    >
-      {valueFormatted}
-    </WarningCell>
-  );
+  return <WarningCell>{valueFormatted}</WarningCell>;
 };
 
 export const OpenVolumeCell = ({
   valueFormatted,
   data,
 }: VegaICellRendererParams<Position, 'openVolume'>) => {
-  if (!data) {
+  if (!valueFormatted || !data || !data.notional) {
     return <>-</>;
   }
 
-  const POSITION_RESOLUTION_LINK = DocsLinks?.POSITION_RESOLUTION ?? '';
+  const notional = addDecimalsFormatNumber(
+    data.notional,
+    data.marketDecimalPlaces
+  );
 
-  let primaryTooltip;
-  switch (data.status) {
-    case PositionStatus.POSITION_STATUS_CLOSED_OUT:
-      primaryTooltip = t('Your position was closed.');
-      break;
-    case PositionStatus.POSITION_STATUS_ORDERS_CLOSED:
-      primaryTooltip = t('Your open orders were cancelled.');
-      break;
-    case PositionStatus.POSITION_STATUS_DISTRESSED:
-      primaryTooltip = t('Your position is distressed.');
-      break;
+  const cellContent = (
+    <StackedCell primary={valueFormatted} secondary={notional} />
+  );
+
+  if (data.status === PositionStatus.POSITION_STATUS_UNSPECIFIED) {
+    // eslint-disable-next-line react/jsx-no-useless-fragment
+    return <>{cellContent}</>;
   }
 
-  let secondaryTooltip;
-  switch (data.status) {
-    case PositionStatus.POSITION_STATUS_CLOSED_OUT:
-      secondaryTooltip = t(
-        `You did not have enough %s collateral to meet the maintenance margin requirements for your position, so it was closed by the network.`,
-        [data.assetSymbol]
-      );
-      break;
-    case PositionStatus.POSITION_STATUS_ORDERS_CLOSED:
-      secondaryTooltip = t(
-        'The position was distressed, but removing open orders from the book brought the margin level back to a point where the open position could be maintained.'
-      );
-      break;
-    case PositionStatus.POSITION_STATUS_DISTRESSED:
-      secondaryTooltip = t(
-        'The position was distressed, but could not be closed out - orders were removed from the book, and the open volume will be closed out once there is sufficient volume on the book.'
-      );
-      break;
-    default:
-      secondaryTooltip = t('Maintained by network');
-  }
   return (
     <WarningCell
-      showIcon={data.status !== PositionStatus.POSITION_STATUS_UNSPECIFIED}
-      tooltipContent={
-        <>
-          <p className="mb-2">{primaryTooltip}</p>
-          <p className="mb-2">{secondaryTooltip}</p>
-          <p className="mb-2">
-            {t('Status: %s', PositionStatusMapping[data.status])}
-          </p>
-          {POSITION_RESOLUTION_LINK && (
-            <ExternalLink href={POSITION_RESOLUTION_LINK}>
-              {t('Read more about position resolution')}
-            </ExternalLink>
-          )}
-        </>
+      showIcon={
+        // not sure why but data.status has become a union of all the enum values
+        // rather than just being the enum itself
+        (data.status as PositionStatus) !==
+        PositionStatus.POSITION_STATUS_UNSPECIFIED
       }
     >
-      {valueFormatted}
+      {cellContent}
     </WarningCell>
   );
 };
 
 const WarningCell = ({
   children,
-  tooltipContent,
   showIcon = true,
 }: {
   children: ReactNode;
-  tooltipContent: ReactNode;
   showIcon?: boolean;
 }) => {
   return (
-    <Tooltip description={tooltipContent}>
-      <div className="w-full flex items-center justify-between underline decoration-dashed underline-offest-2">
-        <span className="text-black dark:text-white mr-1">
-          {showIcon && <Icon name="warning-sign" size={3} />}
+    <div className="flex justify-end items-center">
+      {showIcon && (
+        <span className="text-black dark:text-white mr-2">
+          <VegaIcon name={VegaIconNames.EXCLAIMATION_MARK} size={12} />
         </span>
-        <span className="text-ellipsis overflow-hidden">{children}</span>
-      </div>
-    </Tooltip>
+      )}
+      <span className="overflow-hidden whitespace-nowrap text-ellipsis">
+        {children}
+      </span>
+    </div>
   );
 };

libs/positions/src/lib/stacked-cell.tsx

@@ -0,0 +1,18 @@
+import type { ReactNode } from 'react';
+
+export const StackedCell = ({
+  primary,
+  secondary,
+}: {
+  primary: ReactNode;
+  secondary: ReactNode;
+}) => {
+  return (
+    <div className="leading-4 text-ellipsis whitespace-nowrap overflow-hidden">
+      <div data-testid="stack-cell-primary">{primary}</div>
+      <div data-testid="stack-cell-secondary" className="text-muted">
+        {secondary}
+      </div>
+    </div>
+  );
+};

libs/proposals/src/components/index.ts

@@ -1,6 +1,7 @@
 export * from './asset-proposal-notification';
 export * from './market-proposal-notification';
-export * from './protocol-upgrade-countdown';
-export * from './protocol-upgrade-proposal-notification';
 export * from './proposals-list';
+export * from './protocol-upgrade-countdown';
+export * from './protocol-upgrade-in-progress-notification';
+export * from './protocol-upgrade-proposal-notification';
 export * from './voting-progress';