chore: update tests for icons

Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/use-action-icon-buttons
2023-08-16 12:01:09 +03:00 · 2023-08-16 12:00:45 +03:00 · 2023-08-15 15:26:30 +03:00 · 2023-08-15 12:17:05 +03:00 · 2023-08-14 18:05:03 +03:00 · 2023-08-14 12:27:47 +03:00
174 changed files with 1886 additions and 3584 deletions
@@ -125,7 +125,7 @@ jobs:
      #----------------------------------------------
      - name: Run tests
        working-directory: ./console-test
-        run: poetry run pytest -s --numprocesses auto --dist loadfile
+        run: poetry run pytest -s --numprocesses auto
      - name: Check files
        run: |
          ls -al .
@@ -20,7 +20,7 @@ jobs:
        project: ${{ fromJSON(inputs.projects) }}
    name: ${{ matrix.project }}
    runs-on: self-hosted-runner
-    timeout-minutes: 120
+    timeout-minutes: 100
    steps:
      # Checks if skip cache was requested
      - name: Set skip-nx-cache flag
@@ -1,4 +1,6 @@
 # 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
@@ -6,6 +8,3 @@ 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
@@ -1,4 +1,6 @@
 # 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
@@ -8,6 +10,3 @@ 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
@@ -1,4 +1,6 @@
 # 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
@@ -9,6 +11,3 @@ 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
@@ -1,4 +1,6 @@
 # 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
@@ -8,7 +10,4 @@ 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_TENDERMINT_URL=https://be.mainnet-mirror.vega.rocks
-NX_TENDERMINT_WEBSOCKET_URL=wss://be.mainnet-mirror.vega.rocks/websocket
+NX_VEGA_CONSOLE_URL=https://console.mainnet-mirror.vega.rocks
@@ -1,5 +1,7 @@
 # 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
@@ -9,6 +11,3 @@ 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
@@ -7,10 +7,9 @@ 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
@@ -11,7 +11,6 @@ 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';
@@ -86,8 +85,6 @@ 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':
@@ -41,7 +41,7 @@ export const TxDetailsIssueSignatures = ({
    return <>{t('Awaiting Block Explorer transaction details')}</>;
  }

-  const cmd: Command = txData.command.issueSignatures;
+  const cmd: Command = txData.command;
  const k = cmd.kind ? kind[cmd.kind] : null;

  return (
@@ -1,60 +0,0 @@
-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>
-  );
-};
@@ -34,7 +34,6 @@ export type FilterOption =
  | 'Protocol Upgrade'
  | 'Register new Node'
  | 'State Variable Proposal'
-  | 'Stop Orders Cancellation'
  | 'Submit Oracle Data'
  | 'Submit Order'
  | 'Transfer Funds'
@@ -54,7 +53,6 @@ export const PrimaryFilterOptions: FilterOption[] = [
  'Delegate',
  'Liquidity Provision Order',
  'Proposal',
-  'Stop Orders Cancellation',
  'Submit Oracle Data',
  'Submit Order',
  'Transfer Funds',
@@ -22,11 +22,6 @@ 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();
@@ -67,10 +62,6 @@ export const Layout = () => {
            />
          )}
          <Header />
-          <ProtocolUpgradeProposalNotification
-            mode={ProtocolUpgradeCountdownMode.IN_ESTIMATED_TIME_REMAINING}
-          />
-          <ProtocolUpgradeInProgressNotification />
        </div>
        <div className={fixedWidthClasses}>
          <main className="p-4">
@@ -48,11 +48,9 @@ query ExplorerPartyAssets($partyId: ID!) {
        }
        stakingSummary {
          currentStakeAvailable
-          linkings(pagination: { last: 100 }) {
+          linkings(pagination: { first: 100 }) {
            edges {
              node {
-                type
-                status
                amount
              }
            }
@@ -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', 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 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 const ExplorerPartyAssetsAccountsFragmentDoc = gql`
    fragment ExplorerPartyAssetsAccounts on AccountBalance {
@@ -64,11 +64,9 @@ export const ExplorerPartyAssetsDocument = gql`
        }
        stakingSummary {
          currentStakeAvailable
-          linkings(pagination: {last: 100}) {
+          linkings(pagination: {first: 100}) {
            edges {
              node {
-                type
-                status
                amount
              }
            }
@@ -42,15 +42,9 @@ export const PartyBlockStake = ({
    linkedLength && linkedLength > 0
      ? p?.stakingSummary?.linkings?.edges
          ?.reduce((total, e) => {
-            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;
-            }
+            return new BigNumber(total).plus(
+              new BigNumber(e?.node.amount || 0)
+            );
          }, new BigNumber(0))
          .toString()
      : '0';
@@ -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="https://static.vega.xyz/favicon.ico" />
+    <meta name="twitter:card" content="summary_large_image" />
    <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" />
@@ -220,7 +220,6 @@ 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');
@@ -361,34 +360,6 @@ describe(
      stakingPageDisassociateAllTokens();
    });

-    it('Error message should be displayed if error returned from wallet when voting', function () {
-      const errorMsg =
-        'Application error: party has already submitted the maximum number of transactions of this type per epoch (3)';
-
-      createRawProposal();
-      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-        getProposalFromTitle(rawProposal.rationale.title).within(() =>
-          cy.getByTestId(viewProposalButton).click()
-        );
-        cy.intercept('POST', '/api/v2/requests', {
-          jsonrpc: '2.0',
-          error: {
-            code: 2001,
-            message: 'Application error',
-            data: 'party has already submitted the maximum number of transactions of this type per epoch (3)',
-          },
-          id: '-PK5EGmErnjLhAmzMeclC',
-        });
-        cy.contains('Vote breakdown').should('be.visible', { timeout: 10000 });
-        cy.getByTestId('vote-buttons').contains('for').click();
-        cy.getByTestId('dialog-title').should(
-          'have.text',
-          'Transaction failed'
-        );
-        cy.getByTestId('Error').should('have.text', errorMsg);
-      });
-    });
-
    it('Able to see successor market details with new and updated values', function () {
      cy.createMarket();
      cy.reload();
@@ -29,7 +29,6 @@ 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';
@@ -200,17 +199,20 @@ context(
          );
          cy.getByTestId(toastClose).click();
        });
-      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');
-      });
+      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');
+        });
      ethereumWalletConnect();
-      cy.get(scrollBar).scrollTo('right');
      cy.getByTestId(completeWithdrawalButton).first().click();
      cy.getByTestId(toast)
        .last(txTimeout)
@@ -119,7 +119,6 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
      });
    });

-    // 0006-NETW-001 0006-NETW-002
    it('should display network data', function () {
      cy.getByTestId('git-network-data')
        .should('contain.text', 'Reading network data from')
@@ -131,37 +130,6 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
        });
    });

-    // 0006-NETW-003 0006-NETW-008 0006-NETW-009 0006-NETW-010 0006-NETW-012 0006-NETW-013 0006-NETW-017 0006-NETW-018 0006-NETW-019 0006-NETW-020
-    it('should have option to switch to different network node', function () {
-      cy.getByTestId('git-network-data').within(() => {
-        cy.getByTestId('link').click();
-      });
-      cy.getByTestId('node-row').within(() => {
-        cy.getByTestId('node-url-0')
-          .parent()
-          .should('have.text', 'http://localhost:3008/graphql');
-        cy.getByTestId('response-time-cell')
-          .invoke('text')
-          .should('not.be.empty')
-          .and('not.eq', 'Checking');
-        cy.getByTestId('block-height-cell')
-          .invoke('text')
-          .should('not.be.empty')
-          .then((currentBlockHeight) => {
-            // Check that block height updates automatically
-            cy.getByTestId('block-height-cell')
-              .invoke('text')
-              .should('not.eq', currentBlockHeight);
-          });
-        cy.getByTestId('subscription-cell').should('have.text', 'Yes');
-      });
-      cy.getByTestId('connect').should('be.disabled');
-      cy.getByTestId('node-url-custom').click();
-      cy.get('input').should('exist');
-      cy.getByTestId('connect').should('be.disabled');
-      cy.getByTestId('icon-cross').click();
-    });
-
    it('should display eth data', function () {
      cy.getByTestId('git-eth-data')
        .should('contain.text', 'Reading Ethereum data from')
@@ -170,7 +138,6 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
        });
    });

-    // 0006-NETW-011
    it('should contain link for known issues on Github', function () {
      cy.getByTestId('git-info').within(() => {
        cy.contains('Known issues and feedback on')
@@ -84,10 +84,9 @@ export function stakingPageAssociateTokens(
          .length
      ) {
        cy.get(tokenInputApprove, txTimeout).should('be.enabled').click();
-        cy.contains(
-          'Approve $VEGA Tokens for staking on Vega',
-          txTimeout
-        ).should('be.visible');
+        cy.contains('Approve $VEGA Tokens for staking on Vega').should(
+          'be.visible'
+        );
        cy.contains(
          'Approve $VEGA Tokens for staking on Vega',
          txTimeout
@@ -182,7 +181,7 @@ export function clickOnValidatorFromList(
  } else {
    cy.get(`[row-id="${validatorNumber}"]`)
      .should('be.visible')
-      .first()
+      .find(stakeValidatorListName)
      .as('validatorOnList');
    cy.get('@validatorOnList').click();
  }
@@ -6,7 +6,6 @@ import { Nav } from '../nav';
 import { Networks, useEnvironment } from '@vegaprotocol/environment';
 import {
  ProtocolUpgradeCountdownMode,
-  ProtocolUpgradeInProgressNotification,
  ProtocolUpgradeProposalNotification,
 } from '@vegaprotocol/proposals';
 import { ViewingAsBanner } from '@vegaprotocol/ui-toolkit';
@@ -50,7 +49,6 @@ const NotificationsContainer = () => {
      <ProtocolUpgradeProposalNotification
        mode={ProtocolUpgradeCountdownMode.IN_ESTIMATED_TIME_REMAINING}
      />
-      <ProtocolUpgradeInProgressNotification />
      {isReadOnly ? (
        <ViewingAsBanner pubKey={pubKey} disconnect={disconnect} />
      ) : null}
@@ -626,8 +626,7 @@
  "status-tendermint": "Consensus",
  "status-ersatz": "Standby",
  "status-pending": "Candidate",
-  "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.",
+  "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.",
  "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.",
@@ -785,7 +784,6 @@
  "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",
@@ -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="https://static.vega.xyz/favicon.ico" />
+    <meta name="twitter:card" content="summary_large_image" />
    <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" />
@@ -24,7 +24,6 @@ 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'),
@@ -37,8 +36,7 @@ jest.mock('@vegaprotocol/proposals', () => ({
 const renderComponent = (
  proposal: ProposalQuery['proposal'],
  isListItem = true,
-  mocks: MockedResponse[] = [],
-  voteState?: VoteState
+  mocks: MockedResponse[] = []
 ) =>
  render(
    <AppStateProvider>
@@ -49,7 +47,6 @@ const renderComponent = (
              proposal={proposal}
              isListItem={isListItem}
              networkParams={mockNetworkParams}
-              voteState={voteState}
            />
          </VegaWalletContext.Provider>
        </MockedProvider>
@@ -389,15 +386,10 @@ describe('Proposal header', () => {
        closingDatetime: nextWeek.toString(),
      },
    });
-    renderComponent(
-      proposal,
-      true,
-      [
-        // @ts-ignore generateProposal always creates an id
-        createUserVoteQueryMock(proposal.id, VoteValue.VALUE_NO),
-      ],
-      VoteState.No
-    );
+    renderComponent(proposal, true, [
+      // @ts-ignore generateProposal always creates an id
+      createUserVoteQueryMock(proposal.id, VoteValue.VALUE_NO),
+    ]);
    expect(await screen.findByTestId('user-voted-no')).toBeInTheDocument();
  });

@@ -408,15 +400,10 @@ describe('Proposal header', () => {
        closingDatetime: nextWeek.toString(),
      },
    });
-    renderComponent(
-      proposal,
-      true,
-      [
-        // @ts-ignore generateProposal always creates an id
-        createUserVoteQueryMock(proposal.id, VoteValue.VALUE_YES),
-      ],
-      VoteState.Yes
-    );
+    renderComponent(proposal, true, [
+      // @ts-ignore generateProposal always creates an id
+      createUserVoteQueryMock(proposal.id, VoteValue.VALUE_YES),
+    ]);
    expect(await screen.findByTestId('user-voted-yes')).toBeInTheDocument();
  });
 });
@@ -8,26 +8,25 @@ 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;
@@ -1,6 +1,4 @@
 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';
@@ -46,15 +44,11 @@ jest.mock('../list-asset', () => ({
 const renderComponent = (proposal: ProposalQuery['proposal']) => {
  render(
    <MemoryRouter>
-      <MockedProvider>
-        <VegaWalletProvider>
-          <Proposal
-            restData={{}}
-            proposal={proposal as ProposalQuery['proposal']}
-            networkParams={mockNetworkParams}
-          />
-        </VegaWalletProvider>
-      </MockedProvider>
+      <Proposal
+        restData={{}}
+        proposal={proposal as ProposalQuery['proposal']}
+        networkParams={mockNetworkParams}
+      />
    </MemoryRouter>
  );
 };
@@ -19,8 +19,6 @@ 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',
@@ -55,8 +53,6 @@ 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;
@@ -136,12 +132,10 @@ export const Proposal = ({
          </div>
        )}
      </div>
-
      <ProposalHeader
        proposal={proposal}
        isListItem={false}
        networkParams={networkParams}
-        voteState={voteState}
      />

      <div id="details">
@@ -213,11 +207,6 @@ export const Proposal = ({
              spamProtectionMinTokens={
                networkParams?.spam_protection_voting_min_tokens
              }
-              submit={submit}
-              dialog={Dialog}
-              transaction={transaction}
-              voteState={voteState}
-              voteDatetime={voteDatetime}
            />
          </RoundedWrapper>
        </div>
@@ -1,7 +1,6 @@
 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';
@@ -15,17 +14,12 @@ 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}
-          voteState={voteState}
-        />
+        <ProposalHeader proposal={proposal} networkParams={networkParams} />
        <ProposalsListItemDetails proposal={proposal} />
      </RoundedWrapper>
    </li>
@@ -1,110 +0,0 @@
-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();
-  });
-});
@@ -1,4 +1,4 @@
-import { fireEvent, render, screen } from '@testing-library/react';
+import { render, screen, fireEvent } from '@testing-library/react';
 import BigNumber from 'bignumber.js';
 import { VoteButtons } from './vote-buttons';
 import { VoteState } from './use-user-vote';
@@ -24,7 +24,6 @@ describe('Vote buttons', () => {
              currentStakeAvailable={new BigNumber(1)}
              dialog={() => <div>Blah</div>}
              submit={() => Promise.resolve()}
-              transaction={null}
            />
          </VegaWalletContext.Provider>
        </MockedProvider>
@@ -48,7 +47,6 @@ describe('Vote buttons', () => {
              currentStakeAvailable={new BigNumber(1)}
              dialog={() => <div>Blah</div>}
              submit={() => Promise.resolve()}
-              transaction={null}
            />
          </VegaWalletContext.Provider>
        </MockedProvider>
@@ -83,7 +81,6 @@ describe('Vote buttons', () => {
              currentStakeAvailable={new BigNumber(1)}
              dialog={() => <div>Blah</div>}
              submit={() => Promise.resolve()}
-              transaction={null}
            />
          </VegaWalletContext.Provider>
        </MockedProvider>
@@ -108,7 +105,6 @@ describe('Vote buttons', () => {
              currentStakeAvailable={new BigNumber(0)}
              dialog={() => <div>Blah</div>}
              submit={() => Promise.resolve()}
-              transaction={null}
            />
          </VegaWalletContext.Provider>
        </MockedProvider>
@@ -136,7 +132,6 @@ describe('Vote buttons', () => {
              currentStakeAvailable={new BigNumber(1)}
              dialog={() => <div>Blah</div>}
              submit={() => Promise.resolve()}
-              transaction={null}
            />
          </VegaWalletContext.Provider>
        </MockedProvider>
@@ -164,7 +159,6 @@ describe('Vote buttons', () => {
              currentStakeAvailable={new BigNumber(10)}
              dialog={() => <div>Blah</div>}
              submit={() => Promise.resolve()}
-              transaction={null}
            />
          </VegaWalletContext.Provider>
        </MockedProvider>
@@ -189,7 +183,6 @@ describe('Vote buttons', () => {
              currentStakeAvailable={new BigNumber(10)}
              dialog={() => <div>Blah</div>}
              submit={() => Promise.resolve()}
-              transaction={null}
            />
          </VegaWalletContext.Provider>
        </MockedProvider>
@@ -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, VegaTxState } from '@vegaprotocol/wallet';
+import type { DialogProps } from '@vegaprotocol/wallet';

 interface VoteButtonsContainerProps {
  voteState: VoteState | null;
@@ -27,7 +27,6 @@ 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;
 }
@@ -68,7 +67,6 @@ export const VoteButtons = ({
  minVoterBalance,
  spamProtectionMinTokens,
  submit,
-  transaction,
  dialog: Dialog,
 }: VoteButtonsProps) => {
  const { t } = useTranslation();
@@ -190,7 +188,11 @@ export const VoteButtons = ({
        (voteState === VoteState.Yes || voteState === VoteState.No) && (
          <p data-testid="you-voted">
            <span>{t('youVoted')}:</span>{' '}
-            <span className="text-white font-bold">
+            <span
+              className={
+                voteState === VoteState.Yes ? 'text-success' : 'text-danger'
+              }
+            >
              {t(`voteState_${voteState}`)}
            </span>{' '}
            {voteDatetime ? (
@@ -210,11 +212,7 @@ export const VoteButtons = ({
          </p>
        )
      )}
-      <VoteTransactionDialog
-        voteState={voteState}
-        transaction={transaction}
-        TransactionDialog={Dialog}
-      />
+      <VoteTransactionDialog voteState={voteState} TransactionDialog={Dialog} />
    </>
  );
 };
@@ -3,30 +3,23 @@ import { formatDistanceToNow } from 'date-fns';
 import { RoundedWrapper, Icon, ExternalLink } from '@vegaprotocol/ui-toolkit';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { ProposalState } from '@vegaprotocol/types';
-import { VoteProgress } from '@vegaprotocol/proposals';
+import { useVoteSubmit, 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 = ({
@@ -34,11 +27,6 @@ export const VoteDetails = ({
  minVoterBalance,
  spamProtectionMinTokens,
  proposalType,
-  submit,
-  transaction,
-  dialog,
-  voteState,
-  voteDatetime,
 }: VoteDetailsProps) => {
  const { pubKey } = useVegaWallet();
  const {
@@ -60,7 +48,8 @@ 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)),
@@ -230,8 +219,7 @@ export const VoteDetails = ({
                spamProtectionMinTokens={spamProtectionMinTokens}
                className="flex"
                submit={submit}
-                transaction={transaction}
-                dialog={dialog}
+                dialog={Dialog}
              />
            )
          ) : (
@@ -1,10 +1,9 @@
 import { t } from '@vegaprotocol/i18n';
 import { VoteState } from './use-user-vote';
-import type { DialogProps, VegaTxState } from '@vegaprotocol/wallet';
+import type { DialogProps } from '@vegaprotocol/wallet';

 interface VoteTransactionDialogProps {
  voteState: VoteState;
-  transaction: VegaTxState | null;
  TransactionDialog: (props: DialogProps) => JSX.Element;
 }

@@ -21,15 +20,12 @@ 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>{transaction?.error?.message || t('voteError')}</p>
-    ) : undefined;
+    voteState === VoteState.Failed ? <p>{t('voteError')}</p> : undefined;

  return (
    <div data-testid="vote-transaction-dialog">
@@ -389,10 +389,10 @@ export const ConsensusValidatorsTable = ({
        },
        {
          field: ValidatorFields.NORMALISED_VOTING_POWER,
-          headerName: t('votingPower').toString(),
+          headerName: t(ValidatorFields.NORMALISED_VOTING_POWER).toString(),
          headerTooltip: t('NormalisedVotingPowerDescription').toString(),
          cellRenderer: VotingPowerRenderer,
-          width: 120,
+          width: 200,
        },
        {
          field: ValidatorFields.TOTAL_PENALTIES,
@@ -20,7 +20,6 @@ import {
  TotalStakeRenderer,
  StakeShareRenderer,
  PendingStakeRenderer,
-  VotingPowerRenderer,
 } from './shared';
 import type { AgGridReact } from 'ag-grid-react';
 import type { ColDef } from 'ag-grid-community';
@@ -40,6 +39,7 @@ interface StandbyPendingValidatorsTableProps extends ValidatorsTableProps {
 export const StandbyPendingValidatorsTable = ({
  data,
  previousEpochData,
+  totalStake,
  stakeNeededForPromotion,
  stakeNeededForPromotionDescription,
  validatorsView,
@@ -132,8 +132,6 @@ 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]:
@@ -225,14 +223,7 @@ export const StandbyPendingValidatorsTable = ({
          headerName: t(ValidatorFields.STAKE_SHARE).toString(),
          headerTooltip: t('StakeShareDescription').toString(),
          cellRenderer: StakeShareRenderer,
-          width: 120,
-        },
-        {
-          field: ValidatorFields.NORMALISED_VOTING_POWER,
-          headerName: t('votingPower').toString(),
-          headerTooltip: t('NonConsensusVotingPowerDescription').toString(),
-          cellRenderer: VotingPowerRenderer,
-          width: 120,
+          width: 100,
        },
        // {
        //   field: ValidatorFields.STAKE_NEEDED_FOR_PROMOTION,
@@ -17,10 +17,6 @@ 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;
@@ -45,9 +41,6 @@ export const ValidatorTables = ({
  const {
    appState: { decimals },
  } = useAppState();
-  const { params } = useNetworkParams([
-    NetworkParams.network_validators_incumbentBonus,
-  ]);

  const [validatorsView, setValidatorsView] = useState<ValidatorsView>('all');
  const totalStake = useMemo(
@@ -59,10 +52,6 @@ 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;
@@ -137,23 +126,28 @@ export const ValidatorTables = ({
    consensusValidators.length &&
    (standbyValidators.length || pendingValidators.length)
  ) {
-    const lowestConsensusStake = consensusValidators.reduce(
+    const lowestRankingConsensusScore = consensusValidators.reduce(
      (lowest: ValidatorWithUserData, validator: ValidatorWithUserData) => {
-        if (Number(validator.stakedTotal) < Number(lowest.stakedTotal)) {
+        if (
+          Number(validator.rankingScore.rankingScore) <
+          Number(lowest.rankingScore.rankingScore)
+        ) {
          lowest = validator;
        }
        return lowest;
      }
-    ).stakedTotal;
+    ).rankingScore.rankingScore;

-    const lowestRankingBigNum = toBigNum(lowestConsensusStake, decimals);
+    const lowestRankingBigNum = toBigNum(lowestRankingConsensusScore, 0);
+    const consensusStakedTotal = consensusValidators.reduce((acc, cur) => {
+      return acc.plus(toBigNum(cur.stakedTotal, decimals));
+    }, new BigNumber(0));

    stakeNeededForPromotion = formatNumber(
-      lowestRankingBigNum.multipliedBy(incumbentBonus.plus(1)),
+      lowestRankingBigNum.times(consensusStakedTotal),
      2
    ).toString();
  }
-
  return (
    <section data-testid="validator-tables">
      <div className="grid w-full justify-end">
@@ -193,18 +187,12 @@ export const ValidatorTables = ({
        <div className="mb-10">
          <SubHeading title={t('status-ersatz')} />
          <p>
-            <span>
-              <Trans i18nKey="ersatzDescription1" />
-            </span>
-
-            <span className="text-white font-bold">
-              {' '}
-              {stakeNeededForPromotion}{' '}
-            </span>
-
-            <span>
-              <Trans i18nKey="ersatzDescription2" />
-            </span>
+            <Trans
+              i18nKey="ersatzDescription"
+              values={{
+                stakeNeededForPromotion,
+              }}
+            />
          </p>
          <StandbyPendingValidatorsTable
            data={standbyValidators}
@@ -68,7 +68,7 @@ export const calculateOverstakedPenalty = (nodeId: string, nodes: Node[]) => {
  }
  const penalty = new BigNumber(1)
    .minus(
-      new BigNumber(node.rewardScore?.rawValidatorScore || 1).dividedBy(tts)
+      new BigNumber(node.rewardScore?.rawValidatorScore || 0).dividedBy(tts)
    )
    .times(100);
  return penalty.isLessThan(0) ? new BigNumber(0) : penalty;
@@ -256,15 +256,8 @@ 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-071
-    cy.get(rowSelector)
-      .first()
-      .find('[title="Future"]')
-      .should('have.text', 'Futr');
-
    // 6001-MARK-002
    cy.get(rowSelector)
      .first()
@@ -4,8 +4,7 @@ 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"] [data-testid="market-code"]';
+const colInstrumentCode = '[col-id="tradableInstrument.instrument.code"]';

 describe('markets all table', { tags: '@smoke' }, () => {
  beforeEach(() => {
@@ -69,12 +68,6 @@ describe('markets all table', { tags: '@smoke' }, () => {
      .find(colInstrumentCode)
      .should('have.text', 'SOLUSD');

-    // 6001-MARK-073
-    cy.get(rowSelector)
-      .first()
-      .find('[title="Future"]')
-      .should('have.text', 'Futr');
-
    //  6001-MARK-036
    cy.get(rowSelector)
      .first()
@@ -0,0 +1,130 @@
+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');
+  });
+});
@@ -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"] [data-testid="market-code"]';
+const colMarketId = '[col-id="market"]';

 describe('markets proposed table', { tags: '@smoke' }, () => {
  before(() => {
@@ -45,12 +45,6 @@ describe('markets proposed table', { tags: '@smoke' }, () => {
      .find('[col-id="description"]')
      .should('have.text', 'ETHUSD');

-    //  6001-MARK-074
-    cy.get(rowSelector)
-      .first()
-      .find('[title="Future"]')
-      .should('have.text', 'Futr');
-
    //  6001-MARK-051
    cy.get(rowSelector)
      .first()
@@ -161,13 +155,7 @@ describe('markets proposed table', { tags: '@smoke' }, () => {
      'AAVEDAI.MF21',
      'AAPL.MF21',
    ];
-    checkSorting(
-      'market',
-      marketColDefault,
-      marketColAsc,
-      marketColDesc,
-      ' [data-testid="market-code"]'
-    );
+    checkSorting('market', marketColDefault, marketColAsc, marketColDesc);

    const stateColDefault = [
      'Open',
@@ -0,0 +1,30 @@
+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');
+  });
+});
@@ -0,0 +1,186 @@
+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);
+        });
+    });
+  }
+);
@@ -3,7 +3,7 @@ import { testOrderSubmission } from '../support/order-validation';
 import type { OrderSubmission } from '@vegaprotocol/wallet';
 import { createOrder } from '../support/create-order';

-describe.skip('must submit order', { tags: '@smoke' }, () => {
+describe('must submit order', { tags: '@smoke' }, () => {
  // 7002-SORD-039
  before(() => {
    cy.setVegaWallet();
@@ -54,15 +54,6 @@ describe('deal ticket basics', { tags: '@smoke' }, () => {
    cy.getByTestId(toggleLimit).next('input').should('be.checked');
    cy.getByTestId(orderPriceField).should('have.value', '101');
  });
-
-  it('sidebar should be open after reload', () => {
-    cy.mockTradingPage();
-    cy.getByTestId('deal-ticket-form').should('be.visible');
-    cy.getByTestId('Order').click();
-    cy.getByTestId('deal-ticket-form').should('not.exist');
-    cy.reload();
-    cy.getByTestId('deal-ticket-form').should('be.visible');
-  });
 });

 describe(
@@ -1,87 +0,0 @@
-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');
-      });
-    });
-  }
-);
@@ -8,7 +8,7 @@ import {
 import type { OrderSubmission } from '@vegaprotocol/wallet';
 import { createOrder } from '../support/create-order';

-describe.skip(
+describe(
  'account validation',
  { tags: '@regression', testIsolation: true },
  () => {
@@ -120,9 +120,7 @@ describe('orders list', { tags: '@smoke', testIsolation: true }, () => {
    cy.getByTestId('All').click();

    cy.getByTestId('tab-orders')
-      .get(
-        `.ag-center-cols-container [col-id='${orderSymbol}'] [data-testid="market-code"]`
-      )
+      .get(`.ag-center-cols-container [col-id='${orderSymbol}']`)
      .should('have.length.at.least', expectedOrderList.length)
      .then(($symbols) => {
        const symbolNames: string[] = [];
@@ -222,17 +220,12 @@ describe('subscribe orders', { tags: '@smoke' }, () => {

  it('must see a filled order', () => {
    // 7002-SORD-046
-    // 7003-MORD-020
    // NOT COVERED:  Must be able to see/link to all trades that were created from this order
    updateOrder({
      id: orderId,
      status: Schema.OrderStatus.STATUS_FILLED,
    });
    cy.getByTestId(`order-status-${orderId}`).should('have.text', 'Filled');
-    cy.get('[col-id="market.tradableInstrument.instrument.code"]').contains(
-      '[title="Future"]',
-      'Futr'
-    );
  });

  it('must see a rejected order', () => {
@@ -452,7 +445,8 @@ describe('amend and cancel order', { tags: '@smoke' }, () => {
      liquidityProvisionId: null,
    });
    cy.get(`[row-id=${orderId}]`)
-      .find('[data-testid="icon-edit"]')
+      .find('[data-testid="edit"]')
+      .should('have.text', 'Edit')
      .then(($btn) => {
        cy.wrap($btn).click();
        cy.getByTestId('dialog-title').should('have.text', 'Edit order');
@@ -480,7 +474,8 @@ describe('amend and cancel order', { tags: '@smoke' }, () => {
      liquidityProvisionId: null,
    });
    cy.get(`[row-id=${orderId}]`)
-      .find(`[data-testid="icon-cross"]`)
+      .find(`[data-testid="cancel"]`)
+      .should('have.text', 'Cancel')
      .then(($btn) => {
        cy.wrap($btn).click({ force: true });
        const order: OrderCancellation = {
@@ -517,7 +512,8 @@ describe('amend and cancel order', { tags: '@smoke' }, () => {
      liquidityProvisionId: null,
    });
    cy.get(`[row-id=${orderId}]`)
-      .find('[data-testid="icon-edit"]')
+      .find('[data-testid="edit"]')
+      .should('have.text', 'Edit')
      .then(($btn) => {
        cy.wrap($btn).click({ force: true });
        cy.getByTestId('dialog-title').should('have.text', 'Edit order');
@@ -0,0 +1,371 @@
+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();
+}
@@ -20,6 +20,3 @@ 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
@@ -20,7 +20,4 @@ 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_TENDERMINT_URL=http://localhost:26617
-NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket
+# NX_PRODUCT_PERPETUALS
@@ -18,7 +18,4 @@ 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_TENDERMINT_URL=https://tm.be.devnet1.vega.xyz/
-NX_TENDERMINT_WEBSOCKET_URL=wss://be.devnet1.vega.xyz/websocket
+# NX_PRODUCT_PERPETUALS
@@ -21,6 +21,3 @@ 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
@@ -20,7 +20,4 @@ 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_TENDERMINT_URL=https://be.mainnet-mirror.vega.rocks
-NX_TENDERMINT_WEBSOCKET_URL=wss://be.mainnet-mirror.vega.rocks/websocket
+# NX_PRODUCT_PERPETUALS
@@ -19,7 +19,4 @@ NX_VEGA_CONSOLE_URL=https://console.fairground.wtf
 NX_SUCCESSOR_MARKETS=true
 NX_STOP_ORDERS=true
 NX_ICEBERG_ORDERS=true
-# NX_PRODUCT_PERPETUALS
-
-NX_TENDERMINT_URL=https://tm.be.testnet.vega.xyz
-NX_TENDERMINT_WEBSOCKET_URL=wss://be.testnet.vega.xyz/websocket
+# NX_PRODUCT_PERPETUALS
@@ -19,7 +19,4 @@ 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_TENDERMINT_URL=https://tm.be.validators-testnet.vega.rocks
-NX_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.xyz/websocket
+# NX_PRODUCT_PERPETUALS
@@ -94,11 +94,7 @@ const MainGrid = memo(
        >
          <TradeGridChild>
            <Tabs storageKey="console-trade-grid-bottom">
-              <Tab
-                id="positions"
-                name={t('Positions')}
-                menu={<TradingViews.positions.menu />}
-              >
+              <Tab id="positions" name={t('Positions')}>
                <TradingViews.positions.component />
              </Tab>
              <Tab
@@ -17,7 +17,6 @@ import type { OrderContainerProps } from '../../components/orders-container';
 import { OrdersContainer } from '../../components/orders-container';
 import { StopOrdersContainer } from '../../components/stop-orders-container';
 import { AccountsMenu } from '../../components/accounts-menu';
-import { PositionsMenu } from '../../components/positions-menu';

 type MarketDependantView =
  | typeof CandlesChartContainer
@@ -58,11 +57,7 @@ export const TradingViews = {
    label: 'Trades',
    component: requiresMarket(TradesContainer),
  },
-  positions: {
-    label: 'Positions',
-    component: PositionsContainer,
-    menu: PositionsMenu,
-  },
+  positions: { label: 'Positions', component: PositionsContainer },
  activeOrders: {
    label: 'Active',
    component: (props: OrderContainerProps) => (
@@ -214,6 +214,7 @@ describe('Closed', () => {
        </MemoryRouter>
      );
    });
+    // screen.debug(document, Infinity);

    const headers = screen.getAllByRole('columnheader');
    const expectedHeaders = [
@@ -433,7 +434,7 @@ describe('Closed', () => {

    await waitFor(() => {
      expect(
-        screen.getByRole('button', { name: /^SuccessorCode/ })
+        screen.getByRole('button', { name: 'SuccessorCode' })
      ).toBeInTheDocument();
    });
    expect(
@@ -442,16 +443,6 @@ 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 () => {
@@ -4,11 +4,7 @@ import type {
  VegaICellRendererParams,
  VegaValueFormatterParams,
 } from '@vegaprotocol/datagrid';
-import {
-  AgGridLazy as AgGrid,
-  COL_DEFS,
-  MarketNameCell,
-} from '@vegaprotocol/datagrid';
+import { AgGridLazy as AgGrid, COL_DEFS } from '@vegaprotocol/datagrid';
 import { useMemo } from 'react';
 import { t } from '@vegaprotocol/i18n';
 import { MarketState, MarketStateMapping } from '@vegaprotocol/types';
@@ -51,7 +47,6 @@ interface Row {
  setlementDataSourceFilter: DataSourceFilterFragment | undefined;
  tradingTerminationOracleId: string;
  settlementAsset: SettlementAsset;
-  productType: string;
 }

 export const Closed = () => {
@@ -95,7 +90,6 @@ export const Closed = () => {
      tradingTerminationOracleId:
        instrument.product.dataSourceSpecForTradingTermination.id,
      settlementAsset: instrument.product.settlementAsset,
-      productType: instrument.product.__typename || '',
    };

    return row;
@@ -121,7 +115,16 @@ const ClosedMarketsDataGrid = ({
      {
        headerName: t('Market'),
        field: 'code',
-        cellRenderer: 'MarketNameCell',
+        cellRenderer: ({
+          value,
+          data,
+        }: VegaICellRendererParams<Row, 'code'>) => {
+          return (
+            <span data-testid="market-code" data-market-id={data?.id}>
+              {value}
+            </span>
+          );
+        },
      },
      {
        headerName: t('Description'),
@@ -276,7 +279,7 @@ const ClosedMarketsDataGrid = ({
      rowData={rowData}
      columnDefs={colDefs}
      getRowId={({ data }) => data.id}
-      components={{ SuccessorMarketRenderer, MarketNameCell }}
+      components={{ SuccessorMarketRenderer }}
      overlayNoRowsTemplate={error ? error.message : t('No markets')}
    />
  );
@@ -1,190 +0,0 @@
-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();
-  });
-});
@@ -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,7 +33,6 @@ export const SuccessorMarketRenderer = ({
      value={data.tradableInstrument.instrument.code}
      data={data}
      onMarketClick={onMarketClick}
-      productType={data.tradableInstrument.instrument?.product.__typename}
    />
  ) : (
    '-'
@@ -99,7 +99,6 @@ describe('MarketSelectorItem', () => {
            currentMarketId={market.id}
            style={{}}
            onSelect={jest.fn()}
-            allProducts
          />
        </MockedProvider>
      </MemoryRouter>
@@ -182,7 +181,5 @@ describe('MarketSelectorItem', () => {
        addDecimalsFormatNumber(marketData.markPrice, market.decimalPlaces)
      );
    });
-
-    expect(screen.getByText('Futr')).toBeInTheDocument();
  });
 });
@@ -12,20 +12,17 @@ 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">
@@ -39,19 +36,13 @@ export const MarketSelectorItem = ({
        })}
        onClick={() => onSelect(market.id)}
      >
-        <MarketData market={market} allProducts={allProducts} />
+        <MarketData market={market} />
      </Link>
    </div>
  );
 };

-const MarketData = ({
-  market,
-  allProducts,
-}: {
-  market: MarketMaybeWithDataAndCandles;
-  allProducts: boolean;
-}) => {
+const MarketData = ({ market }: { market: MarketMaybeWithDataAndCandles }) => {
  const { data } = useMarketDataUpdateSubscription({
    variables: {
      marketId: market.id,
@@ -89,16 +80,11 @@ const MarketData = ({
      ? 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}{' '}
-          {allProducts && productType && (
-            <MarketProductPill productType={productType} />
-          )}
+          {market.tradableInstrument.instrument.code}
        </h3>
        {mode && (
          <p className="text-xs text-vega-orange-500 dark:text-vega-orange-550 whitespace-nowrap">
@@ -2,7 +2,7 @@ import { t } from '@vegaprotocol/i18n';
 import uniqBy from 'lodash/uniqBy';
 import type { MarketMaybeWithDataAndCandles } from '@vegaprotocol/markets';
 import {
-  TradingInput,
+  Input,
  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">
-            <TradingInput
+            <Input
              onChange={(e) =>
                setFilter((curr) => ({ ...curr, searchTerm: e.target.value }))
              }
@@ -128,7 +128,6 @@ export const MarketSelector = ({
              ? t('Spot markets coming soon.')
              : t('No markets')
          }
-          allProducts={allProducts}
        />
      </div>
    </div>
@@ -142,7 +141,6 @@ const MarketList = ({
  currentMarketId,
  onSelect,
  noItems,
-  allProducts,
 }: {
  data: MarketMaybeWithDataAndCandles[];
  error: Error | undefined;
@@ -151,7 +149,6 @@ const MarketList = ({
  currentMarketId?: string;
  onSelect: (marketId: string) => void;
  noItems: string;
-  allProducts: boolean;
 }) => {
  const itemSize = 45;
  const listRef = useRef<HTMLDivElement | null>(null);
@@ -195,7 +192,6 @@ const MarketList = ({
          currentMarketId={currentMarketId}
          onSelect={onSelect}
          noItems={noItems}
-          allProducts={allProducts}
        />
      </div>
    </TinyScroll>
@@ -206,7 +202,6 @@ interface ListItemData {
  data: MarketMaybeWithDataAndCandles[];
  onSelect: (marketId: string) => void;
  currentMarketId?: string;
-  allProducts: boolean;
 }

 const ListItem = ({
@@ -223,7 +218,6 @@ const ListItem = ({
    currentMarketId={data.currentMarketId}
    style={style}
    onSelect={data.onSelect}
-    allProducts={data.allProducts}
  />
 );

@@ -235,21 +229,19 @@ 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, allProducts }),
-    [data, onSelect, currentMarketId, allProducts]
+    () => ({ data, onSelect, currentMarketId }),
+    [data, onSelect, currentMarketId]
  );
  if (!data || loading) {
    return (
@@ -5,7 +5,6 @@ import { Splash } from '@vegaprotocol/ui-toolkit';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import type { DataGridSlice } from '../../stores/datagrid-store-slice';
 import { createDataGridSlice } from '../../stores/datagrid-store-slice';
-import type { StateCreator } from 'zustand';
 import { create } from 'zustand';
 import { persist } from 'zustand/middleware';
 import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';
@@ -14,7 +13,6 @@ export const PositionsContainer = ({ allKeys }: { allKeys?: boolean }) => {
  const onMarketClick = useMarketClickHandler(true);
  const { pubKey, pubKeys, isReadOnly } = useVegaWallet();

-  const showClosed = usePositionsStore((store) => store.showClosedMarkets);
  const gridStore = usePositionsStore((store) => store.gridStore);
  const updateGridStore = usePositionsStore((store) => store.updateGridStore);
  const gridStoreCallbacks = useDataGridEvents(gridStore, updateGridStore);
@@ -42,35 +40,12 @@ export const PositionsContainer = ({ allKeys }: { allKeys?: boolean }) => {
      onMarketClick={onMarketClick}
      isReadOnly={isReadOnly}
      gridProps={gridStoreCallbacks}
-      showClosed={showClosed}
    />
  );
 };

-type PositionsStoreSlice = {
-  showClosedMarkets: boolean;
-  toggleClosedMarkets: () => void;
-};
-
-const createPositionStoreSlice: StateCreator<PositionsStoreSlice> = (set) => ({
-  showClosedMarkets: false,
-  toggleClosedMarkets: () => {
-    set((curr) => {
-      return {
-        showClosedMarkets: !curr.showClosedMarkets,
-      };
-    });
-  },
-});
-
-export const usePositionsStore = create<PositionsStoreSlice & DataGridSlice>()(
-  persist(
-    (...args) => ({
-      ...createPositionStoreSlice(...args),
-      ...createDataGridSlice(...args),
-    }),
-    {
-      name: 'vega_positions_store',
-    }
-  )
+const usePositionsStore = create<DataGridSlice>()(
+  persist(createDataGridSlice, {
+    name: 'vega_positions_store',
+  })
 );
@@ -1 +0,0 @@
-export * from './positions-menu';
@@ -1,18 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import { Intent, TradingButton } from '@vegaprotocol/ui-toolkit';
-import { usePositionsStore } from '../positions-container';
-
-export const PositionsMenu = () => {
-  const showClosed = usePositionsStore((store) => store.showClosedMarkets);
-  const toggle = usePositionsStore((store) => store.toggleClosedMarkets);
-  return (
-    <TradingButton
-      intent={Intent.Primary}
-      size="extra-small"
-      data-testid="open-transfer"
-      onClick={toggle}
-    >
-      {showClosed ? t('Hide closed markets') : t('Show closed markets')}
-    </TradingButton>
-  );
-};
@@ -14,9 +14,12 @@ import { Settings } from '../settings';
 import { Tooltip } from '../../components/tooltip';
 import { WithdrawContainer } from '../withdraw-container';
 import { Routes as AppRoutes } from '../../pages/client-router';
+import { persist } from 'zustand/middleware';
 import { GetStarted } from '../welcome-dialog';
 import { useVegaWallet, useViewAsDialog } from '@vegaprotocol/wallet';

+const STORAGE_KEY = 'vega_sidebar_store';
+
 export enum ViewType {
  Order = 'Order',
  Info = 'Info',
@@ -299,14 +302,22 @@ export const useSidebar = create<{
  init: boolean;
  view: SidebarView | null;
  setView: (view: SidebarView | null) => void;
-}>()((set) => ({
-  init: true,
-  view: null,
-  setView: (x) =>
-    set(() => {
-      if (x == null) {
-        return { view: null, init: false };
-      }
-      return { view: x, init: false };
+}>()(
+  persist(
+    (set) => ({
+      init: true,
+      view: null,
+      setView: (x) =>
+        set(() => {
+          if (x == null) {
+            return { view: null, init: false };
+          }
+
+          return { view: x, init: false };
+        }),
    }),
-}));
+    {
+      name: STORAGE_KEY,
+    }
+  )
+);
@@ -1,4 +1,4 @@
-import { TradingCheckbox } from '@vegaprotocol/ui-toolkit';
+import { Checkbox } 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">
-        <TradingCheckbox
+        <Checkbox
          label={<span className="text-lg pl-1">{t('Share usage data')}</span>}
          checked={isApproved}
          name="telemetry-approval"
@@ -43,7 +43,6 @@ import { Navbar } from '../components/navbar';
 import classNames from 'classnames';
 import {
  ProtocolUpgradeCountdownMode,
-  ProtocolUpgradeInProgressNotification,
  ProtocolUpgradeProposalNotification,
 } from '@vegaprotocol/proposals';
 import { ViewingBanner } from '../components/viewing-banner';
@@ -112,7 +111,6 @@ function AppBody({ Component }: AppProps) {
          <ProtocolUpgradeProposalNotification
            mode={ProtocolUpgradeCountdownMode.IN_ESTIMATED_TIME_REMAINING}
          />
-          <ProtocolUpgradeInProgressNotification />
          <ViewingBanner />
          <UpgradeBanner showVersionChange={true} />
        </div>
@@ -1,20 +1,19 @@
-import { Head, Html, Main, NextScript } from 'next/document';
+import { Html, Head, Main, NextScript } from 'next/document';

 export default function Document() {
  return (
-    <>
+    <Html>
      <Head>
        <link rel="stylesheet" href="https://static.vega.xyz/fonts.css" />
-        <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" />
        <link
          rel="icon"
          type="image/x-icon"
@@ -22,12 +21,10 @@ export default function Document() {
        />
        <script src="/theme-setter.js" type="text/javascript" async />
      </Head>
-      <Html>
-        <body className="bg-white dark:bg-vega-cdark-900 text-default font-alpha">
-          <Main />
-          <NextScript />
-        </body>
-      </Html>
-    </>
+      <body className="bg-white dark:bg-vega-cdark-900 text-default font-alpha">
+        <Main />
+        <NextScript />
+      </body>
+    </Html>
  );
 }
@@ -10,8 +10,6 @@ export default function Index() {
  return (
    <>
      <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"
@@ -20,45 +18,17 @@ export default function Index() {
        />
        <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="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"
        />
-        {/* eslint-disable-next-line @next/next/no-css-tags */}
-        <link rel="stylesheet" href="/preloader.css" media="all" />
-        <link
-          rel="icon"
-          type="image/x-icon"
-          href="https://static.vega.xyz/favicon.ico"
-        />
-        <script src="/theme-setter.js" type="text/javascript" async />
+        <title>VEGA Console dApp</title>
      </Head>
      <ClientRouter />
    </>
@@ -24,9 +24,6 @@ const singleRow = {
        __typename: 'Instrument',
        name: 'BTCUSD Monthly (30 Jun 2022)',
        code: 'BTCUSD.MF21',
-        product: {
-          __typename: 'Future',
-        },
      },
    },
    id: '10cd0a793ad2887b340940337fa6d97a212e0e517fe8e9eab2b5ef3a38633f35',
@@ -123,9 +120,6 @@ describe('BreakdownTable', () => {
                  __typename: 'Instrument',
                  name: 'BTCUSD Monthly (30 Jun 2022)',
                  code: 'BTCUSD.MF21',
-                  product: {
-                    __typename: 'Future',
-                  },
                },
              },
            },
@@ -36,24 +36,14 @@ const BreakdownTable = forwardRef<AgGridReact, BreakdownTableProps>(
        {
          headerName: t('Market'),
          field: 'market.tradableInstrument.instrument.code',
-          minWidth: 200,
-          cellRenderer: ({
+          valueFormatter: ({
            value,
-            data,
-          }: VegaICellRendererParams<
+          }: VegaValueFormatterParams<
            AccountFields,
            'market.tradableInstrument.instrument.code'
          >) => {
-            return value ? (
-              <MarketNameCell
-                value={value}
-                productType={
-                  data?.market?.tradableInstrument.instrument.product.__typename
-                }
-              />
-            ) : (
-              'None'
-            );
+            if (!value) return 'None';
+            return value;
          },
        },
        {
@@ -136,7 +126,7 @@ const BreakdownTable = forwardRef<AgGridReact, BreakdownTableProps>(
        }
        ref={ref}
        rowHeight={34}
-        components={{ PriceCell, ProgressBarCell }}
+        components={{ PriceCell, MarketNameCell, ProgressBarCell }}
        tooltipShowDelay={500}
        defaultColDef={defaultColDef}
        columnDefs={coldefs}
@@ -9,13 +9,13 @@ import {
 import { t } from '@vegaprotocol/i18n';
 import {
  Button,
-  TradingFormGroup,
-  TradingInput,
-  TradingInputError,
-  TradingRichSelect,
-  TradingSelect,
+  FormGroup,
+  Input,
+  InputError,
+  RichSelect,
+  Select,
  Tooltip,
-  TradingCheckbox,
+  Checkbox,
 } from '@vegaprotocol/ui-toolkit';
 import type { Transfer } from '@vegaprotocol/wallet';
 import { normalizeTransfer } from '@vegaprotocol/wallet';
@@ -130,16 +130,12 @@ export const TransferForm = ({
      className="text-sm"
      data-testid="transfer-form"
    >
-      <TradingFormGroup label="Vega key" labelFor="to-address">
+      <FormGroup label="Vega key" labelFor="to-address">
        <AddressField
          pubKeys={pubKeys}
          onChange={() => setValue('toAddress', '')}
          select={
-            <TradingSelect
-              {...register('toAddress')}
-              id="to-address"
-              defaultValue=""
-            >
+            <Select {...register('toAddress')} id="to-address" defaultValue="">
              <option value="" disabled={true}>
                {t('Please select')}
              </option>
@@ -151,10 +147,10 @@ export const TransferForm = ({
                      {pk}
                    </option>
                  ))}
-            </TradingSelect>
+            </Select>
          }
          input={
-            <TradingInput
+            <Input
              // eslint-disable-next-line jsx-a11y/no-autofocus
              autoFocus={true} // focus input immediately after is shown
              id="to-address"
@@ -175,12 +171,12 @@ export const TransferForm = ({
          }
        />
        {errors.toAddress?.message && (
-          <TradingInputError forInput="to-address">
+          <InputError forInput="to-address">
            {errors.toAddress.message}
-          </TradingInputError>
+          </InputError>
        )}
-      </TradingFormGroup>
-      <TradingFormGroup label="Asset" labelFor="asset">
+      </FormGroup>
+      <FormGroup label="Asset" labelFor="asset">
        <Controller
          control={control}
          name="asset"
@@ -190,7 +186,7 @@ export const TransferForm = ({
            },
          }}
          render={({ field }) => (
-            <TradingRichSelect
+            <RichSelect
              data-testid="select-asset"
              id={field.name}
              name={field.name}
@@ -212,17 +208,15 @@ export const TransferForm = ({
                  }
                />
              ))}
-            </TradingRichSelect>
+            </RichSelect>
          )}
        />
        {errors.asset?.message && (
-          <TradingInputError forInput="asset">
-            {errors.asset.message}
-          </TradingInputError>
+          <InputError forInput="asset">{errors.asset.message}</InputError>
        )}
-      </TradingFormGroup>
-      <TradingFormGroup label="Amount" labelFor="amount">
-        <TradingInput
+      </FormGroup>
+      <FormGroup label="Amount" labelFor="amount">
+        <Input
          id="amount"
          autoComplete="off"
          appendElement={
@@ -245,13 +239,11 @@ export const TransferForm = ({
          })}
        />
        {errors.amount?.message && (
-          <TradingInputError forInput="amount">
-            {errors.amount.message}
-          </TradingInputError>
+          <InputError forInput="amount">{errors.amount.message}</InputError>
        )}
-      </TradingFormGroup>
+      </FormGroup>
      <div className="mb-4">
-        <TradingCheckbox
+        <Checkbox
          name="include-transfer-fee"
          disabled={!transferAmount}
          label={
@@ -1,8 +1,4 @@
 {
  "name": "@vegaprotocol/announcements",
-  "version": "0.0.2",
-  "peerDependencies": {
-    "react": "18.2.0",
-    "react-dom": "18.2.0"
-  }
+  "version": "0.0.2"
 }
@@ -121,12 +121,9 @@ export function createClient({
    // called on startup, NodeCheck and NodeCheckTimeUpdate are called
    // by the NodeSwitcher component and the useNodeHealth hook
    if (
-      [
-        'NodeGuard',
-        'NodeCheck',
-        'NodeCheckTimeUpdate',
-        'BlockStatistics',
-      ].includes(operation.operationName)
+      ['NodeGuard', 'NodeCheck', 'NodeCheckTimeUpdate'].includes(
+        operation.operationName
+      )
    ) {
      return;
    }
@@ -1,4 +1,4 @@
-import { TradingOption } from '@vegaprotocol/ui-toolkit';
+import { Option } 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 (
-    <TradingOption key={asset.id} value={asset.id}>
+    <Option 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>
-    </TradingOption>
+    </Option>
  );
 };
@@ -41,22 +41,21 @@ export const checkSorting = (
  column: string,
  orderTabDefault: string[],
  orderTabAsc: string[],
-  orderTabDesc: string[],
-  additionalColumnSelector = ''
+  orderTabDesc: string[]
 ) => {
-  checkSortChange(orderTabDefault, column, additionalColumnSelector);
+  checkSortChange(orderTabDefault, column);
  cy.get('.ag-header-container')
    .last()
    .within(() => {
      cy.get(`[col-id="${column}"]`).last().click();
    });
-  checkSortChange(orderTabAsc, column, additionalColumnSelector);
+  checkSortChange(orderTabAsc, column);
  cy.get('.ag-header-container')
    .last()
    .within(() => {
      cy.get(`[col-id="${column}"]`).click();
    });
-  checkSortChange(orderTabDesc, column, additionalColumnSelector);
+  checkSortChange(orderTabDesc, column);
  cy.get('.ag-header-container')
    .last()
    .within(() => {
@@ -64,20 +63,13 @@ export const checkSorting = (
    });
 };

-const checkSortChange = (
-  tabsArr: string[],
-  column: string,
-  additionalColumnSelector = ''
-) => {
+const checkSortChange = (tabsArr: string[], column: string) => {
  cy.get('.ag-center-cols-container')
    .last()
    .within(() => {
      tabsArr.forEach((entry, i) => {
        cy.get(`[row-index="${i}"]`).within(() => {
-          cy.get(`[col-id="${column}"]${additionalColumnSelector}`).should(
-            'have.text',
-            tabsArr[i]
-          );
+          cy.get(`[col-id="${column}"]`).should('have.text', tabsArr[i]);
        });
      });
    });
@@ -9,10 +9,7 @@ export const CenteredGridCellWrapper = ({
  className?: string;
 }) => (
  <div
-    className={classNames(
-      'flex h-[20px] p-0 justify-items-center items-center',
-      className
-    )}
+    className={classNames('flex h-[20px] p-0 justify-items-center', className)}
  >
    <div className="w-full self-center">{children}</div>
  </div>
@@ -1,38 +1,13 @@
-import type { MouseEvent } from 'react';
+import type { MouseEvent, ReactNode } 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; productType?: string; market?: Market }
-    | Market;
+  data?: { id?: string; marketId?: string; market?: { id: string } };
  idPath?: string;
  onMarketClick?: (marketId: string, metaKey?: boolean) => void;
-  productType?: ProductType;
+  defaultValue?: ReactNode;
 }

 export const MarketNameCell = ({
@@ -40,43 +15,29 @@ 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();
-      id && onMarketClick?.(id, ev.metaKey || ev.ctrlKey);
+      if (onMarketClick) {
+        onMarketClick(id, ev.metaKey || ev.ctrlKey);
+      }
    },
    [id, 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 ? (
+  if (!value || !data) return null;
+  return onMarketClick ? (
    <button
      onClick={handleOnClick}
      tabIndex={0}
      className="block text-left text-ellipsis overflow-hidden whitespace-nowrap w-full"
    >
-      {content}
+      {value}
    </button>
  ) : (
-    content
+    // eslint-disable-next-line react/jsx-no-useless-fragment
+    <>{value}</>
  );
 };
@@ -15,7 +15,7 @@ import {
 } from 'date-fns';
 import { formatForInput } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
-import { TradingInputError } from '@vegaprotocol/ui-toolkit';
+import { InputError } 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 ? <TradingInputError>{error}</TradingInputError> : null;
+      const not = error ? <InputError>{error}</InputError> : null;
      return (
        <div className="ag-filter-apply-panel flex min-h-[2rem]">{not}</div>
      );
@@ -1,8 +1,4 @@
-import {
-  TradingFormGroup,
-  TradingInput,
-  TradingInputError,
-} from '@vegaprotocol/ui-toolkit';
+import { FormGroup, Input, InputError } from '@vegaprotocol/ui-toolkit';
 import { toDecimal, validateAmount } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import type { DealTicketAmountProps } from './deal-ticket-amount';
@@ -26,17 +22,17 @@ export const DealTicketLimitAmount = ({
  const renderError = () => {
    if (sizeError) {
      return (
-        <TradingInputError testId="deal-ticket-error-message-size-limit">
+        <InputError testId="deal-ticket-error-message-size-limit">
          {sizeError}
-        </TradingInputError>
+        </InputError>
      );
    }

    if (priceError) {
      return (
-        <TradingInputError testId="deal-ticket-error-message-price-limit">
+        <InputError testId="deal-ticket-error-message-price-limit">
          {priceError}
-        </TradingInputError>
+        </InputError>
      );
    }

@@ -47,7 +43,7 @@ export const DealTicketLimitAmount = ({
    <div className="mb-2">
      <div className="flex items-start gap-4">
        <div className="flex-1">
-          <TradingFormGroup
+          <FormGroup
            label={t('Size')}
            labelFor="input-order-size-limit"
            className="!mb-0"
@@ -63,8 +59,8 @@ export const DealTicketLimitAmount = ({
                },
                validate: validateAmount(sizeStep, 'Size'),
              }}
-              render={({ field, fieldState }) => (
-                <TradingInput
+              render={({ field }) => (
+                <Input
                  id="input-order-size-limit"
                  className="w-full"
                  type="number"
@@ -72,16 +68,15 @@ export const DealTicketLimitAmount = ({
                  min={sizeStep}
                  data-testid="order-size"
                  onWheel={(e) => e.currentTarget.blur()}
-                  hasError={!!fieldState.error}
                  {...field}
                />
              )}
            />
-          </TradingFormGroup>
+          </FormGroup>
        </div>
-        <div className="pt-5 leading-10">@</div>
+        <div className="pt-7 leading-10">@</div>
        <div className="flex-1">
-          <TradingFormGroup
+          <FormGroup
            labelFor="input-price-quote"
            label={t(`Price (${quoteName})`)}
            labelAlign="right"
@@ -98,20 +93,19 @@ export const DealTicketLimitAmount = ({
                },
                validate: validateAmount(priceStep, 'Price'),
              }}
-              render={({ field, fieldState }) => (
-                <TradingInput
+              render={({ field }) => (
+                <Input
                  id="input-price-quote"
                  className="w-full"
                  type="number"
                  step={priceStep}
                  data-testid="order-price"
                  onWheel={(e) => e.currentTarget.blur()}
-                  hasError={!!fieldState.error}
                  {...field}
                />
              )}
            />
-          </TradingFormGroup>
+          </FormGroup>
        </div>
      </div>
      {renderError()}
@@ -4,11 +4,7 @@ import {
  validateAmount,
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
-import {
-  TradingInput,
-  TradingInputError,
-  Tooltip,
-} from '@vegaprotocol/ui-toolkit';
+import { Input, InputError, Tooltip } from '@vegaprotocol/ui-toolkit';
 import { isMarketInAuction } from '@vegaprotocol/markets';
 import type { DealTicketAmountProps } from './deal-ticket-amount';
 import { Controller } from 'react-hook-form';
@@ -37,7 +33,7 @@ export const DealTicketMarketAmount = ({
    <div className="mb-2">
      <div className="flex items-start gap-4">
        <div className="flex-1">
-          <div className="mb-2 text-xs">{t('Size')}</div>
+          <div className="mb-2 text-sm">{t('Size')}</div>
          <Controller
            name="size"
            control={control}
@@ -49,8 +45,8 @@ export const DealTicketMarketAmount = ({
              },
              validate: validateAmount(sizeStep, 'Size'),
            }}
-            render={({ field, fieldState }) => (
-              <TradingInput
+            render={({ field }) => (
+              <Input
                id="input-order-size-market"
                className="w-full"
                type="number"
@@ -58,13 +54,12 @@ export const DealTicketMarketAmount = ({
                min={sizeStep}
                onWheel={(e) => e.currentTarget.blur()}
                data-testid="order-size"
-                hasError={!!fieldState.error}
                {...field}
              />
            )}
          />
        </div>
-        <div className="pt-5 leading-10">@</div>
+        <div className="pt-7 leading-10">@</div>
        <div className="flex-1 text-sm text-right">
          {inAuction && (
            <Tooltip
@@ -77,7 +72,7 @@ export const DealTicketMarketAmount = ({
          )}
          <div
            data-testid="last-price"
-            className={classNames('leading-10', { 'pt-5': !inAuction })}
+            className={classNames('leading-10', { 'pt-7': !inAuction })}
          >
            {priceFormatted && quoteName ? (
              <>
@@ -90,12 +85,12 @@ export const DealTicketMarketAmount = ({
        </div>
      </div>
      {sizeError && (
-        <TradingInputError
+        <InputError
          intent="danger"
          testId="deal-ticket-error-message-size-market"
        >
          {sizeError}
-        </TradingInputError>
+        </InputError>
      )}
    </div>
  );
@@ -4,9 +4,9 @@ import type { OrderFormValues } from '../../hooks/use-form-values';
 import { toDecimal, validateAmount } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import {
-  TradingFormGroup,
-  TradingInput,
-  TradingInputError,
+  FormGroup,
+  Input,
+  InputError,
  Tooltip,
 } from '@vegaprotocol/ui-toolkit';

@@ -32,9 +32,9 @@ export const DealTicketSizeIceberg = ({
  const renderPeakSizeError = () => {
    if (peakSizeError) {
      return (
-        <TradingInputError testId="deal-ticket-peak-error-message-size-limit">
+        <InputError testId="deal-ticket-peak-error-message-size-limit">
          {peakSizeError}
-        </TradingInputError>
+        </InputError>
      );
    }

@@ -44,9 +44,9 @@ export const DealTicketSizeIceberg = ({
  const renderMinimumSizeError = () => {
    if (minimumVisibleSizeError) {
      return (
-        <TradingInputError testId="deal-ticket-minimum-error-message-size-limit">
+        <InputError testId="deal-ticket-minimum-error-message-size-limit">
          {minimumVisibleSizeError}
-        </TradingInputError>
+        </InputError>
      );
    }

@@ -57,7 +57,7 @@ export const DealTicketSizeIceberg = ({
    <div className="mb-2">
      <div className="flex items-center gap-4">
        <div className="flex-1">
-          <TradingFormGroup
+          <FormGroup
            label={
              <Tooltip
                description={
@@ -93,7 +93,7 @@ export const DealTicketSizeIceberg = ({
                validate: validateAmount(sizeStep, 'peakSize'),
              }}
              render={({ field }) => (
-                <TradingInput
+                <Input
                  id="input-order-peak-size"
                  className="w-full"
                  type="number"
@@ -106,14 +106,14 @@ export const DealTicketSizeIceberg = ({
                />
              )}
            />
-          </TradingFormGroup>
+          </FormGroup>
        </div>
        <div className="flex-0 items-center">
          <div className="flex"></div>
          <div className="flex"></div>
        </div>
        <div className="flex-1">
-          <TradingFormGroup
+          <FormGroup
            label={
              <Tooltip
                description={
@@ -151,7 +151,7 @@ export const DealTicketSizeIceberg = ({
                validate: validateAmount(sizeStep, 'minimumVisibleSize'),
              }}
              render={({ field }) => (
-                <TradingInput
+                <Input
                  id="input-order-minimum-size"
                  className="w-full"
                  type="number"
@@ -164,7 +164,7 @@ export const DealTicketSizeIceberg = ({
                />
              )}
            />
-          </TradingFormGroup>
+          </FormGroup>
        </div>
      </div>
      {renderPeakSizeError()}
@@ -10,13 +10,13 @@ import {
 import { useForm, Controller, useController } from 'react-hook-form';
 import * as Schema from '@vegaprotocol/types';
 import {
-  TradingRadio,
-  TradingRadioGroup,
-  TradingInput,
-  TradingCheckbox,
-  TradingFormGroup,
-  TradingInputError,
-  TradingSelect,
+  Radio,
+  RadioGroup,
+  Input,
+  Checkbox,
+  FormGroup,
+  InputError,
+  Select,
  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 && (
-        <TradingInputError testId="stop-order-error-message-type">
+        <InputError testId="stop-order-error-message-type">
          {errors.type.message}
-        </TradingInputError>
+        </InputError>
      )}

      <Controller
@@ -199,21 +199,21 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
          <SideSelector value={field.value} onValueChange={field.onChange} />
        )}
      />
-      <TradingFormGroup label={t('Trigger')} compact={true} labelFor="">
+      <FormGroup label={t('Trigger')} compact={true} labelFor="">
        <Controller
          name="triggerDirection"
          control={control}
          render={({ field }) => {
            const { onChange, value } = field;
            return (
-              <TradingRadioGroup
+              <RadioGroup
                name="triggerDirection"
                onChange={onChange}
                value={value}
                orientation="horizontal"
                className="mb-2"
              >
-                <TradingRadio
+                <Radio
                  value={
                    Schema.StopOrderTriggerDirection
                      .TRIGGER_DIRECTION_RISES_ABOVE
@@ -221,7 +221,7 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
                  id="triggerDirection-risesAbove"
                  label={'Rises above'}
                />
-                <TradingRadio
+                <Radio
                  value={
                    Schema.StopOrderTriggerDirection
                      .TRIGGER_DIRECTION_FALLS_BELOW
@@ -229,7 +229,7 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
                  id="triggerDirection-fallsBelow"
                  label={'Falls below'}
                />
-              </TradingRadioGroup>
+              </RadioGroup>
            );
          }}
        />
@@ -246,17 +246,16 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
                validate: validateAmount(priceStep, 'Price'),
              }}
              control={control}
-              render={({ field, fieldState }) => {
+              render={({ field }) => {
                const { value, ...props } = field;
                return (
                  <div className="mb-2">
-                    <TradingInput
+                    <Input
                      data-testid="triggerPrice"
                      type="number"
                      step={priceStep}
                      appendElement={asset.symbol}
                      value={value || ''}
-                      hasError={!!fieldState.error}
                      {...props}
                    />
                  </div>
@@ -264,9 +263,9 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
              }}
            />
            {errors.triggerPrice && (
-              <TradingInputError testId="stop-order-error-message-trigger-price">
+              <InputError testId="stop-order-error-message-trigger-price">
                {errors.triggerPrice.message}
-              </TradingInputError>
+              </InputError>
            )}
          </div>
        )}
@@ -295,17 +294,16 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
                  'Trailing percentage offset'
                ),
              }}
-              render={({ field, fieldState }) => {
+              render={({ field }) => {
                const { value, ...props } = field;
                return (
                  <div className="mb-2">
-                    <TradingInput
+                    <Input
                      type="number"
                      step={trailingPercentOffsetStep}
                      appendElement="%"
                      data-testid="triggerTrailingPercentOffset"
                      value={value || ''}
-                      hasError={!!fieldState.error}
                      {...props}
                    />
                  </div>
@@ -313,9 +311,9 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
              }}
            />
            {errors.triggerTrailingPercentOffset && (
-              <TradingInputError testId="stop-order-error-message-trigger-trailing-percent-offset">
+              <InputError testId="stop-order-error-message-trigger-trailing-percent-offset">
                {errors.triggerTrailingPercentOffset.message}
-              </TradingInputError>
+              </InputError>
            )}
          </div>
        )}
@@ -326,29 +324,25 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
          render={({ field }) => {
            const { onChange, value } = field;
            return (
-              <TradingRadioGroup
+              <RadioGroup
                onChange={onChange}
                value={value}
                orientation="horizontal"
              >
-                <TradingRadio
-                  value="price"
-                  id="triggerType-price"
-                  label={'Price'}
-                />
-                <TradingRadio
+                <Radio value="price" id="triggerType-price" label={'Price'} />
+                <Radio
                  value="trailingPercentOffset"
                  id="triggerType-trailingPercentOffset"
                  label={'Trailing Percent Offset'}
                />
-              </TradingRadioGroup>
+              </RadioGroup>
            );
          }}
        />
-      </TradingFormGroup>
+      </FormGroup>
      <div className="mb-2">
        <div className="flex items-start gap-4">
-          <TradingFormGroup
+          <FormGroup
            labelFor="input-price-quote"
            label={t(`Size`)}
            className="!mb-0 flex-1"
@@ -364,10 +358,10 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
                },
                validate: validateAmount(sizeStep, 'Size'),
              }}
-              render={({ field, fieldState }) => {
+              render={({ field }) => {
                const { value, ...props } = field;
                return (
-                  <TradingInput
+                  <Input
                    id="order-size"
                    className="w-full"
                    type="number"
@@ -376,17 +370,16 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
                    onWheel={(e) => e.currentTarget.blur()}
                    data-testid="order-size"
                    value={value || ''}
-                    hasError={!!fieldState.error}
                    {...props}
                  />
                );
              }}
            />
-          </TradingFormGroup>
-          <div className="pt-5 leading-10">@</div>
+          </FormGroup>
+          <div className="pt-7 leading-10">@</div>
          <div className="flex-1">
            {type === Schema.OrderType.TYPE_LIMIT ? (
-              <TradingFormGroup
+              <FormGroup
                labelFor="input-price-quote"
                label={t(`Price (${quoteName})`)}
                labelAlign="right"
@@ -404,10 +397,10 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
                    },
                    validate: validateAmount(priceStep, 'Price'),
                  }}
-                  render={({ field, fieldState }) => {
+                  render={({ field }) => {
                    const { value, ...props } = field;
                    return (
-                      <TradingInput
+                      <Input
                        id="input-price-quote"
                        className="w-full"
                        type="number"
@@ -415,16 +408,15 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
                        data-testid="order-price"
                        onWheel={(e) => e.currentTarget.blur()}
                        value={value || ''}
-                        hasError={!!fieldState.error}
                        {...props}
                      />
                    );
                  }}
                />
-              </TradingFormGroup>
+              </FormGroup>
            ) : (
              <div
-                className="text-sm text-right pt-5 leading-10"
+                className="text-sm text-right pt-7 leading-10"
                data-testid="price"
              >
                {priceFormatted && quoteName
@@ -435,21 +427,21 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
          </div>
        </div>
        {errors.size && (
-          <TradingInputError testId="stop-order-error-message-size">
+          <InputError testId="stop-order-error-message-size">
            {errors.size.message}
-          </TradingInputError>
+          </InputError>
        )}

        {!errors.size &&
          errors.price &&
          type === Schema.OrderType.TYPE_LIMIT && (
-            <TradingInputError testId="stop-order-error-message-price">
+            <InputError testId="stop-order-error-message-price">
              {errors.price.message}
-            </TradingInputError>
+            </InputError>
          )}
      </div>
      <div className="mb-2">
-        <TradingFormGroup
+        <FormGroup
          label={t('Time in force')}
          labelFor="select-time-in-force"
          compact={true}
@@ -457,12 +449,11 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
          <Controller
            name="timeInForce"
            control={control}
-            render={({ field, fieldState }) => (
-              <TradingSelect
+            render={({ field }) => (
+              <Select
                id="select-time-in-force"
                className="w-full"
                data-testid="order-tif"
-                hasError={!!fieldState.error}
                {...field}
              >
                <option
@@ -477,14 +468,14 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
                >
                  {timeInForceLabel(Schema.OrderTimeInForce.TIME_IN_FORCE_FOK)}
                </option>
-              </TradingSelect>
+              </Select>
            )}
          />
-        </TradingFormGroup>
+        </FormGroup>
        {errors.timeInForce && (
-          <TradingInputError testId="stop-error-message-tif">
+          <InputError testId="stop-error-message-tif">
            {errors.timeInForce.message}
-          </TradingInputError>
+          </InputError>
        )}
      </div>
      <div className="flex gap-2 pb-2 justify-between">
@@ -494,29 +485,29 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
          render={({ field }) => {
            const { onChange: onCheckedChange, value } = field;
            return (
-              <TradingCheckbox
+              <Checkbox
                onCheckedChange={onCheckedChange}
                checked={value}
                name="expire"
-                label={t('Expire')}
+                label={<span className="text-xs">{t('Expire')}</span>}
              />
            );
          }}
        />
-        <TradingCheckbox
+        <Checkbox
          name="reduce-only"
          checked={true}
          disabled={true}
          label={
            <Tooltip description={<span>{t(REDUCE_ONLY_TOOLTIP)}</span>}>
-              <>{t('Reduce only')}</>
+              <span className="text-xs">{t('Reduce only')}</span>
            </Tooltip>
          }
        />
      </div>
      {expire && (
        <>
-          <TradingFormGroup
+          <FormGroup
            label={t('Strategy')}
            labelFor="expiryStrategy"
            compact={true}
@@ -526,26 +517,26 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
              control={control}
              render={({ field }) => {
                return (
-                  <TradingRadioGroup orientation="horizontal" {...field}>
-                    <TradingRadio
+                  <RadioGroup orientation="horizontal" {...field}>
+                    <Radio
                      value={
                        Schema.StopOrderExpiryStrategy.EXPIRY_STRATEGY_SUBMIT
                      }
                      id="expiryStrategy-submit"
                      label={'Submit'}
                    />
-                    <TradingRadio
+                    <Radio
                      value={
                        Schema.StopOrderExpiryStrategy.EXPIRY_STRATEGY_CANCELS
                      }
                      id="expiryStrategy-cancel"
                      label={'Cancel'}
                    />
-                  </TradingRadioGroup>
+                  </RadioGroup>
                );
              }}
            />
-          </TradingFormGroup>
+          </FormGroup>
          <div className="mb-2">
            <Controller
              name="expiresAt"
@@ -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 {
-  TradingCheckbox,
-  TradingInputError,
+  Checkbox,
+  InputError,
  Intent,
  Notification,
  Tooltip,
@@ -417,7 +417,7 @@ export const DealTicket = ({
          name="postOnly"
          control={control}
          render={({ field }) => (
-            <TradingCheckbox
+            <Checkbox
              name="post-only"
              checked={!disablePostOnlyCheckbox && field.value}
              disabled={disablePostOnlyCheckbox}
@@ -449,7 +449,7 @@ export const DealTicket = ({
          name="reduceOnly"
          control={control}
          render={({ field }) => (
-            <TradingCheckbox
+            <Checkbox
              name="reduce-only"
              checked={!disableReduceOnlyCheckbox && field.value}
              disabled={disableReduceOnlyCheckbox}
@@ -483,7 +483,7 @@ export const DealTicket = ({
              name="iceberg"
              control={control}
              render={({ field }) => (
-                <TradingCheckbox
+                <Checkbox
                  name="iceberg"
                  checked={field.value}
                  onCheckedChange={field.onChange}
@@ -572,11 +572,11 @@ export const NoWalletWarning = ({
  if (isReadOnly) {
    return (
      <div className="mb-2">
-        <TradingInputError testId="deal-ticket-error-message-summary">
+        <InputError testId="deal-ticket-error-message-summary">
          {
            'You need to connect your own wallet to start trading on this market'
          }
-        </TradingInputError>
+        </InputError>
      </div>
    );
  }
@@ -613,9 +613,9 @@ const SummaryMessage = memo(
    if (error?.message) {
      return (
        <div className="mb-2">
-          <TradingInputError testId="deal-ticket-error-message-summary">
+          <InputError testId="deal-ticket-error-message-summary">
            {error?.message}
-          </TradingInputError>
+          </InputError>
        </div>
      );
    }
@@ -1,8 +1,4 @@
-import {
-  TradingFormGroup,
-  TradingInput,
-  TradingInputError,
-} from '@vegaprotocol/ui-toolkit';
+import { FormGroup, Input, InputError } from '@vegaprotocol/ui-toolkit';
 import { formatForInput } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { useRef } from 'react';
@@ -23,25 +19,24 @@ export const ExpirySelector = ({
  const dateFormatted = formatForInput(date);
  const minDate = formatForInput(date);
  return (
-    <TradingFormGroup
+    <FormGroup
      label={t('Expiry time/date')}
      labelFor="expiration"
      compact={true}
    >
-      <TradingInput
+      <Input
        data-testid="date-picker-field"
        id="expiration"
        type="datetime-local"
        value={dateFormatted}
        onChange={(e) => onSelect(e.target.value)}
        min={minDate}
-        hasError={!!errorMessage}
      />
      {errorMessage && (
-        <TradingInputError testId="deal-ticket-error-message-expiry">
+        <InputError testId="deal-ticket-error-message-expiry">
          {errorMessage}
-        </TradingInputError>
+        </InputError>
      )}
-    </TradingFormGroup>
+    </FormGroup>
  );
 };
@@ -1,7 +1,7 @@
 import {
-  TradingFormGroup,
-  TradingInputError,
-  TradingSelect,
+  FormGroup,
+  InputError,
+  Select,
  Tooltip,
  SimpleGrid,
 } from '@vegaprotocol/ui-toolkit';
@@ -90,12 +90,12 @@ export const TimeInForceSelector = ({
  };

  return (
-    <TradingFormGroup
+    <FormGroup
      label={t('Time in force')}
      labelFor="select-time-in-force"
      compact={true}
    >
-      <TradingSelect
+      <Select
        id="select-time-in-force"
        value={value}
        onChange={(e) => {
@@ -103,19 +103,18 @@ export const TimeInForceSelector = ({
        }}
        className="w-full"
        data-testid="order-tif"
-        hasError={!!errorMessage}
      >
        {options.map(([key, value]) => (
          <option key={key} value={value}>
            {timeInForceLabel(value)}
          </option>
        ))}
-      </TradingSelect>
+      </Select>
      {errorMessage && (
-        <TradingInputError testId="deal-ticket-error-message-tif">
+        <InputError testId="deal-ticket-error-message-tif">
          {renderError(errorMessage)}
-        </TradingInputError>
+        </InputError>
      )}
-    </TradingFormGroup>
+    </FormGroup>
  );
 };
@@ -1,5 +1,5 @@
 import {
-  TradingInputError,
+  InputError,
  SimpleGrid,
  Tooltip,
  TradingDropdown,
@@ -178,9 +178,9 @@ export const TypeSelector = ({
        value={value}
      />
      {errorMessage && (
-        <TradingInputError testId="deal-ticket-error-message-type">
+        <InputError testId="deal-ticket-error-message-type">
          {renderError(errorMessage as MarketModeValidationType)}
-        </TradingInputError>
+        </InputError>
      )}
    </>
  );
@@ -14,14 +14,14 @@ import { t } from '@vegaprotocol/i18n';
 import { useLocalStorage } from '@vegaprotocol/react-helpers';
 import {
  Button,
-  TradingFormGroup,
-  TradingInput,
-  TradingInputError,
-  TradingRichSelect,
+  FormGroup,
+  Input,
+  InputError,
+  RichSelect,
  Notification,
  Intent,
  ButtonLink,
-  TradingSelect,
+  Select,
 } 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"
    >
-      <TradingFormGroup
+      <FormGroup
        label={t('From (Ethereum address)')}
        labelFor="ethereum-address"
      >
@@ -197,17 +197,15 @@ export const DepositForm = ({
          }}
        />
        {errors.from?.message && (
-          <TradingInputError intent="danger">
-            {errors.from.message}
-          </TradingInputError>
+          <InputError intent="danger">{errors.from.message}</InputError>
        )}
-      </TradingFormGroup>
-      <TradingFormGroup label={t('To (Vega key)')} labelFor="to">
+      </FormGroup>
+      <FormGroup label={t('To (Vega key)')} labelFor="to">
        <AddressField
          pubKeys={pubKeys}
          onChange={() => setValue('to', '')}
          select={
-            <TradingSelect {...register('to')} id="to" defaultValue="">
+            <Select {...register('to')} id="to" defaultValue="">
              <option value="" disabled>
                {t('Please select')}
              </option>
@@ -217,10 +215,10 @@ export const DepositForm = ({
                    {pk}
                  </option>
                ))}
-            </TradingSelect>
+            </Select>
          }
          input={
-            <TradingInput
+            <Input
              // eslint-disable-next-line jsx-a11y/no-autofocus
              autoFocus={true} // focus input immediately after is shown
              id="to"
@@ -235,12 +233,12 @@ export const DepositForm = ({
          }
        />
        {errors.to?.message && (
-          <TradingInputError intent="danger" forInput="to">
+          <InputError intent="danger" forInput="to">
            {errors.to.message}
-          </TradingInputError>
+          </InputError>
        )}
-      </TradingFormGroup>
-      <TradingFormGroup label={t('Asset')} labelFor="asset">
+      </FormGroup>
+      <FormGroup label={t('Asset')} labelFor="asset">
        <Controller
          control={control}
          name="asset"
@@ -250,7 +248,7 @@ export const DepositForm = ({
            },
          }}
          render={({ field }) => (
-            <TradingRichSelect
+            <RichSelect
              data-testid="select-asset"
              id={field.name}
              name={field.name}
@@ -273,13 +271,13 @@ export const DepositForm = ({
                    }
                  />
                ))}
-            </TradingRichSelect>
+            </RichSelect>
          )}
        />
        {errors.asset?.message && (
-          <TradingInputError intent="danger" forInput="asset">
+          <InputError intent="danger" forInput="asset">
            {errors.asset.message}
-          </TradingInputError>
+          </InputError>
        )}
        {isActive && isFaucetable && selectedAsset && (
          <UseButton onClick={submitFaucet}>
@@ -298,7 +296,7 @@ export const DepositForm = ({
            {t('View asset details')}
          </button>
        )}
-      </TradingFormGroup>
+      </FormGroup>
      <FaucetNotification
        isActive={isActive}
        selectedAsset={selectedAsset}
@@ -310,8 +308,8 @@ export const DepositForm = ({
        </div>
      )}
      {approved && (
-        <TradingFormGroup label={t('Amount')} labelFor="amount">
-          <TradingInput
+        <FormGroup label={t('Amount')} labelFor="amount">
+          <Input
            type="number"
            autoComplete="off"
            id="amount"
@@ -376,9 +374,9 @@ export const DepositForm = ({
            })}
          />
          {errors.amount?.message && (
-            <TradingInputError intent="danger" forInput="amount">
+            <InputError intent="danger" forInput="amount">
              {errors.amount.message}
-            </TradingInputError>
+            </InputError>
          )}
          {selectedAsset && balances && (
            <UseButton
@@ -392,7 +390,7 @@ export const DepositForm = ({
              {t('Use maximum')}
            </UseButton>
          )}
-        </TradingFormGroup>
+        </FormGroup>
      )}
      <ApproveNotification
        isActive={isActive}
@@ -4,10 +4,10 @@ import { t } from '@vegaprotocol/i18n';
 import {
  Button,
  ButtonLink,
-  TradingInput,
+  Input,
  Loader,
-  TradingRadio,
-  TradingRadioGroup,
+  Radio,
+  RadioGroup,
 } 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>
-          <TradingRadioGroup
+          <RadioGroup
            value={nodeRadio}
            onChange={(value) => setNodeRadio(value)}
          >
@@ -112,7 +112,7 @@ export const NodeSwitcher = ({ closeDialog }: { closeDialog: () => void }) => {
                />
              </div>
            </div>
-          </TradingRadioGroup>
+          </RadioGroup>
          <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 && (
-          <TradingRadio
+          <Radio
            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"
          >
-            <TradingInput
+            <Input
              placeholder="https://"
              value={inputText}
              hasError={Boolean(error)}
@@ -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 { TradingRadio } from '@vegaprotocol/ui-toolkit';
+import { Radio } 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">
-          <TradingRadio id={`node-url-${id}`} value={url} label={url} />
+          <Radio id={`node-url-${id}`} value={url} label={url} />
        </div>
      )}
      <LayoutCell
@@ -29,7 +29,6 @@ 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',
@@ -41,18 +40,17 @@ const ConsoleLinks = {
  ...EmptyLinks,
  [Networks.STAGNET1]: 'https://trading.stagnet1.vega.rocks',
  [Networks.TESTNET]: 'https://console.fairground.wtf',
-  [Networks.MAINNET]: 'https://vega.trading',
-  [Networks.MAINNET_MIRROR]: 'https://console.mainnet-mirror.vega.rocks',
+  [Networks.MAINNET]: 'https://console.vega.xyz',
+  [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',
 };

@@ -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[2] as Record<string, Market>;
+    const markets = partsData[1] as Record<string, Market>;
    return entries.map((entry) => {
      const asset = entry.assetId
        ? (assets as Record<string, Asset>)[entry.assetId]
@@ -12,12 +12,10 @@ 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,
@@ -84,14 +82,10 @@ export const LedgerTable = (props: LedgerEntryProps) => {
        field: 'marketSender.tradableInstrument.instrument.code',
        cellRenderer: ({
          value,
-          data,
        }: VegaValueFormatterParams<
          LedgerEntry,
          'marketSender.tradableInstrument.instrument.code'
-        >) =>
-          value && (
-            <MarketNameCell value={value} data={data?.marketSender as Market} />
-          ),
+        >) => value || '-',
      },
      {
        headerName: t('Receiver'),
@@ -118,17 +112,10 @@ export const LedgerTable = (props: LedgerEntryProps) => {
        field: 'marketReceiver.tradableInstrument.instrument.code',
        cellRenderer: ({
          value,
-          data,
        }: VegaValueFormatterParams<
          LedgerEntry,
          'marketReceiver.tradableInstrument.instrument.code'
-        >) =>
-          value && (
-            <MarketNameCell
-              value={value}
-              data={data?.marketReceiver as Market}
-            />
-          ),
+        >) => value || '-',
      },
      {
        headerName: t('Transfer type'),
@@ -107,7 +107,6 @@ 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;
@@ -128,9 +128,6 @@ fragment StopOrderFields on StopOrder {
  updatedAt
  partyId
  marketId
-  order {
-    ...OrderFields
-  }
  trigger {
    ... on StopOrderPrice {
      price
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Madalina Raicu	59ffcacb1c	chore: update tests for icons	2023-08-16 12:01:09 +03:00
Madalina Raicu	3034da385e	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/use-action-icon-buttons	2023-08-16 12:00:45 +03:00
Madalina Raicu	90a8955a5b	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/use-action-icon-buttons	2023-08-15 15:26:30 +03:00
Madalina Raicu	9722580dde	fix(trading): update min width for icons	2023-08-15 12:17:05 +03:00
Madalina Raicu	ae13c15d6e	chore(trading): use action icon buttons	2023-08-14 18:05:03 +03:00
Madalina Raicu	67ce576bc8	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into develop	2023-08-14 12:27:47 +03:00
Madalina Raicu	ab1a2cb222	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into develop	2023-08-07 16:22:11 +01:00
Madalina Raicu	e1a1ae0fa1	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into develop	2023-08-07 10:16:03 +01:00