fix(positions): fix valueGetter for realisedPNL in positions table

chore(trading): cherry pick position pnl formatting fix (#4347 )
chore(trading): remove user pnl from closed market list (#4312 )
2023-07-20 17:55:21 +01:00 · 2023-07-20 12:52:33 +01:00 · 2023-07-20 12:52:13 +01:00 · 2023-07-20 10:52:49 +02:00 · 2023-07-20 10:27:43 +02:00 · 2023-07-19 16:42:47 +02:00
101 changed files with 1749 additions and 538 deletions
@@ -6,7 +6,7 @@ name: 'Add Issues To Project Board'
    types:
      - opened
 env:
-  GH_TOKEN: ${{ secrets.GH_NEW_CARD_TO_PROJECT }}
+  GH_TOKEN: ${{ secrets.PROJECT_MANAGE_ACTION }}
  PROJECT_ID: ${{ secrets.FRONT_END_PROJECT_ID }}
  ISSUE_ID: ${{ github.event.issue.node_id }}
  USER: ${{ github.actor }}
@@ -28,7 +28,7 @@ jobs:
          echo IS_MAINNET_RELEASE=false >> $GITHUB_ENV
          echo IS_TESTNET_RELEASE=false >> $GITHUB_ENV
          echo IS_IPFS_RELEASE=false >> $GITHUB_ENV
-          echo IS_S3_RELASE=false >> $GITHUB_ENV
+          echo IS_S3_RELEASE=false >> $GITHUB_ENV

      - name: Is PR
        if: ${{ github.event_name == 'pull_request' }}
@@ -51,9 +51,9 @@ jobs:
          echo IS_IPFS_RELEASE=true >> $GITHUB_ENV

      - name: Is S3 Release
-        if: ${{ env.IS_IPFS_RELASE == 'false' && github.event_name == 'push' }}
+        if: ${{ env.IS_IPFS_RELEASE == 'false' && github.event_name == 'push' }}
        run: |
-          echo IS_S3_RELASE=true >> $GITHUB_ENV
+          echo IS_S3_RELEASE=true >> $GITHUB_ENV

      - name: Set up QEMU
        id: quemu
@@ -251,7 +251,7 @@ jobs:
      - name: Publish dist to s3
        uses: jakejarvis/s3-sync-action@master
        # s3 releases are not happening for trading on mainnet - it's IPFS
-        if: ${{ env.IS_S3_RELASE == 'true' }}
+        if: ${{ env.IS_S3_RELEASE == 'true' }}
        with:
          args: --acl private --follow-symlinks --delete
        env:
@@ -262,11 +262,11 @@ jobs:
          SOURCE_DIR: 'dist-result'

      - name: Install aws CLI
-        if: ${{ env.IS_S3_RELASE == 'true' }}
+        if: ${{ env.IS_S3_RELEASE == 'true' }}
        uses: unfor19/install-aws-cli-action@master

      - name: Perform cache invalidation
-        if: ${{ env.IS_S3_RELASE == 'true' }}
+        if: ${{ env.IS_S3_RELEASE == 'true' }}
        env:
          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -40,7 +40,7 @@ context.skip('Transactions page', function () {
            .first()
            .click({ force: true });
        } else {
-          cy.slack('Unable to find any transactions on page');
+          cy.log('Unable to find any transactions on page');
          cy.screenshot();
        }
      });
@@ -78,7 +78,7 @@ context.skip('Transactions page', function () {
              }
            });
        } else {
-          cy.slack('Unable to find any transactions on page');
+          cy.log('Unable to find any transactions on page');
          cy.screenshot();
        }
      });
@@ -4,7 +4,7 @@ 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
-NX_VEGA_ENV=MAINNET-MIRROR
+NX_VEGA_ENV=MAINNET_MIRROR
 NX_BLOCK_EXPLORER=https://be.mainnet-mirror.vega.rocks/rest
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_VEGA_GOVERNANCE_URL=https://governance.mainnet-mirror.vega.rocks
@@ -137,7 +137,7 @@ export const ProposalsTable = ({ data }: ProposalsTableProps) => {
        hide: window.innerWidth <= BREAKPOINT_MD,
        headerName: t('Enactment date'),
        field: 'terms.enactmentDatetime',
-        valueFormatte: ({
+        valueFormatter: ({
          value,
        }: VegaValueFormatterParams<
          ProposalListFieldsFragment,
@@ -1,7 +1,5 @@
 import { Link, useParams } from 'react-router-dom';
-import { DATA_SOURCES } from '../../../config';
 import { getDateTimeFormat } from '@vegaprotocol/utils';
-import type { TendermintBlocksResponse } from '../tendermint-blocks-response';
 import { RouteTitle } from '../../../components/route-title';
 import { TimeAgo } from '../../../components/time-ago';
 import {
@@ -14,7 +12,7 @@ import { TxsPerBlock } from '../../../components/txs/txs-per-block';
 import { AsyncRenderer, Button } from '@vegaprotocol/ui-toolkit';
 import { Routes } from '../../route-names';
 import { t } from '@vegaprotocol/i18n';
-import { useFetch } from '@vegaprotocol/react-helpers';
+import { useBlockInfo } from '@vegaprotocol/tendermint';
 import { NodeLink } from '../../../components/links';
 import { useDocumentTitle } from '../../../hooks/use-document-title';
 import EmptyList from '../../../components/empty-list/empty-list';
@@ -24,10 +22,7 @@ const Block = () => {
  useDocumentTitle(['Blocks', `Block #${block}`]);
  const {
    state: { data: blockData, loading, error },
-  } = useFetch<TendermintBlocksResponse>(
-    `${DATA_SOURCES.tendermintUrl}/block?height=${block}`,
-    { cache: 'force-cache' }
-  );
+  } = useBlockInfo(Number(block));

  return (
    <section>
@@ -54,7 +54,7 @@ export const PartyBlockStake = ({
      {p?.stakingSummary.currentStakeAvailable ? (
        <KeyValueTable>
          <KeyValueTableRow noBorder={true}>
-            <div>{t('Available stake')}</div>
+            <div>{t('Associated to key')}</div>
            <div>
              <GovernanceAssetBalance
                price={p.stakingSummary.currentStakeAvailable}
@@ -62,7 +62,7 @@ export const PartyBlockStake = ({
            </div>
          </KeyValueTableRow>
          <KeyValueTableRow noBorder={true}>
-            <div>{t('Active stake')}</div>
+            <div>{t('Staked to validator')}</div>
            <div>
              <GovernanceAssetBalance price={linkedStake || '0'} />
            </div>
@@ -18,6 +18,10 @@ NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/annou
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 NX_VEGA_REST_URL=https://api.n00.stagnet1.vega.xyz/api/v2/

+NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.rocks
+NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket
+
 #Test configuration variables
 CYPRESS_FAIRGROUND=false
 LC_ALL="en_US.UTF-8"
+
@@ -19,6 +19,9 @@ NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
 NX_VEGA_REST_URL=http://localhost:3008/api/v2/

+NX_TENDERMINT_URL=http://localhost:26617
+NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket
+
 #Test configuration variables
 CYPRESS_FAIRGROUND=false

@@ -13,3 +13,6 @@ NX_TRANCHES_SERVICE_URL=https://tranches-devnet1-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_REST_URL=https://api.n00.devnet1.vega.xyz/api/v2/
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996
+
+NX_TENDERMINT_URL=https://tm.be.devnet1.vega.xyz/
+NX_TENDERMINT_WEBSOCKET_URL=wss://be.devnet1.vega.xyz/websocket
@@ -14,3 +14,6 @@ NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-mainnet-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
 NX_VEGA_REST_URL=https://api.vega.community/api/v2/
+
+NX_TENDERMINT_URL=https://be.vega.community
+NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket
@@ -1,8 +1,8 @@
 # App configuration variables
-NX_VEGA_ENV=MAINNET-MIRROR
+NX_VEGA_ENV=MAINNET_MIRROR
 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
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.vega.xyz","MAINNET-MIRROR":"https://governance.mainnet-mirror.vega.rocks","STAGNET1":"https://trading.stagnet1.vega.rocks"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.vega.xyz","MAINNET_MIRROR":"https://governance.mainnet-mirror.vega.rocks","STAGNET1":"https://trading.stagnet1.vega.rocks"}'
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
@@ -13,3 +13,6 @@ NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-mainnet-mirror-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
 NX_VEGA_REST_URL=https://api.mainnet-mirror.vega.rocks/api/v2/
+
+NX_TENDERMINT_URL=https://be.mainnet-mirror.vega.rocks
+NX_TENDERMINT_WEBSOCKET_URL=wss://be.mainnet-mirror.vega.rocks/websocket
@@ -9,3 +9,6 @@ NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_REST_URL=https://api.n00.stagnet1.vega.xyz/api/v2/
+
+NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.rocks
+NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket
@@ -14,3 +14,6 @@ NX_TRANCHES_SERVICE_URL=https://tranches-testnet-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_REST_URL=https://api.n07.testnet.vega.xyz/api/v2/
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996
+
+NX_TENDERMINT_URL=https://tm.be.testnet.vega.xyz
+NX_TENDERMINT_WEBSOCKET_URL=wss://be.testnet.vega.xyz/websocket
@@ -11,3 +11,6 @@ NX_VEGA_EXPLORER_URL=https://explorer.validators-testnet.vega.rocks/
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_REST_URL=https://api-validators-testnet.vega.rocks/api/v2/
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996
+
+NX_TENDERMINT_URL=https://tm.be.validators-testnet.vega.rocks
+NX_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.
@@ -18,6 +18,10 @@ import { VegaWallet } from '../vega-wallet';
 import { useLocation, useMatch } from 'react-router-dom';
 import { useEffect } from 'react';
 import { useTelemetryDialog } from '../telemetry-dialog/telemetry-dialog';
+import {
+  ProtocolUpgradeCountdown,
+  ProtocolUpgradeCountdownMode,
+} from '@vegaprotocol/proposals';

 export const SettingsLink = () => {
  const { open, isOpen, close } = useTelemetryDialog();
@@ -61,7 +65,14 @@ export const Nav = ({ theme }: Pick<NavigationProps, 'theme'>) => {
      appName="Governance"
      theme={theme}
      breakpoints={[458, 959]}
-      actions={<SettingsLink />}
+      actions={
+        <>
+          <SettingsLink />
+          <ProtocolUpgradeCountdown
+            mode={ProtocolUpgradeCountdownMode.IN_ESTIMATED_TIME_REMAINING}
+          />
+        </>
+      }
    >
      <NavigationList
        className="[.drawer-content_&]:border-b [.drawer-content_&]:border-b-vega-light-200 dark:[.drawer-content_&]:border-b-vega-dark-200 [.drawer-content_&]:pb-8 [.drawer-content_&]:mb-2"
@@ -4,7 +4,11 @@ import type { ReactNode } from 'react';
 import { AnnouncementBanner } from '@vegaprotocol/announcements';
 import { Nav } from '../nav';
 import { Networks, useEnvironment } from '@vegaprotocol/environment';
-import React from 'react';
+import {
+  ProtocolUpgradeCountdownMode,
+  ProtocolUpgradeProposalNotification,
+} from '@vegaprotocol/proposals';
+import { ViewingAsBanner } from '@vegaprotocol/ui-toolkit';

 interface AppLayoutProps {
  children: ReactNode;
@@ -31,8 +35,23 @@ export const AppLayout = ({ children }: AppLayoutProps) => {
          />
        )}
        <Nav theme={VEGA_ENV === Networks.TESTNET ? 'yellow' : 'dark'} />
+        <NotificationsContainer />
      </div>
      <div className={AppLayoutClasses}>{children}</div>
    </div>
  );
 };
+
+const NotificationsContainer = () => {
+  const { isReadOnly, pubKey, disconnect } = useVegaWallet();
+  return (
+    <div data-testid="banners">
+      <ProtocolUpgradeProposalNotification
+        mode={ProtocolUpgradeCountdownMode.IN_ESTIMATED_TIME_REMAINING}
+      />
+      {isReadOnly ? (
+        <ViewingAsBanner pubKey={pubKey} disconnect={disconnect} />
+      ) : null}
+    </div>
+  );
+};
@@ -1,5 +1,3 @@
-import { ViewingAsBanner } from '@vegaprotocol/ui-toolkit';
-import { useVegaWallet } from '@vegaprotocol/wallet';
 import React from 'react';

 export interface TemplateSidebarProps {
@@ -8,24 +6,18 @@ export interface TemplateSidebarProps {
 }

 export function TemplateSidebar({ children, sidebar }: TemplateSidebarProps) {
-  const { isReadOnly, pubKey, disconnect } = useVegaWallet();
  return (
-    <>
-      {isReadOnly ? (
-        <ViewingAsBanner pubKey={pubKey} disconnect={disconnect} />
-      ) : null}
-      <div className="w-full border-b border-neutral-700 lg:grid lg:grid-rows-[1fr] lg:grid-cols-[1fr_450px]">
-        <main className="max-w-[100vw] col-start-1 p-4 overflow-auto">
-          {children}
-        </main>
-        <aside className="col-start-2 row-start-1 row-span-2 hidden lg:block p-4 bg-banner bg-contain border-l border-neutral-700">
-          {sidebar.map((Component, i) => (
-            <section className="mb-4 last:mb-0" key={i}>
-              {Component}
-            </section>
-          ))}
-        </aside>
-      </div>
-    </>
+    <div className="w-full border-b border-neutral-700 lg:grid lg:grid-rows-[1fr] lg:grid-cols-[1fr_450px]">
+      <main className="max-w-[100vw] col-start-1 p-4 overflow-auto">
+        {children}
+      </main>
+      <aside className="col-start-2 row-start-1 row-span-2 hidden lg:block p-4 bg-banner bg-contain border-l border-neutral-700">
+        {sidebar.map((Component, i) => (
+          <section className="mb-4 last:mb-0" key={i}>
+            {Component}
+          </section>
+        ))}
+      </aside>
+    </div>
  );
 }
@@ -25,6 +25,10 @@ export const ContractAddresses: {
    claimAddress: customClaimAddress ?? '0x0',
    lockedAddress: customLockedAddress ?? '0x0',
  },
+  MAINNET_MIRROR: {
+    claimAddress: '0x8Cef746ab7C83B61F6461cC92882bD61AB65a994', // TODO not deployed to this env, but random address so app doesn't error
+    lockedAddress: '0x0', // TODO not deployed to this env
+  },
  DEVNET: {
    claimAddress: '0x8Cef746ab7C83B61F6461cC92882bD61AB65a994', // TODO not deployed to this env, but random address so app doesn't error
    lockedAddress: '0x0', // TODO not deployed to this env
@@ -837,5 +837,7 @@
  "RejectedProposals": "Rejected proposals",
  "networkGovernance": "Network governance",
  "networkUpgrades": "Network upgrades",
-  "assetSpecification": "Asset specification"
+  "assetSpecification": "Asset specification",
+  "Estimated time to upgrade": "Estimated time to upgrade",
+  "Upgraded at": "Upgraded at"
 }
@@ -31,6 +31,7 @@ import {
  orderByDate,
  orderByUpgradeBlockHeight,
 } from '../proposals/components/proposals-list/proposals-list';
+import { BigNumber } from '../../lib/bignumber';

 const nodesToShow = 6;

@@ -248,6 +249,8 @@ const GovernanceHome = ({ name }: RouteChildProps) => {

  const activeNodes = removePaginationWrapper(
    validatorsData?.nodesConnection.edges
+  ).filter((node) =>
+    new BigNumber(node.rankingScore.performanceScore).isGreaterThan(0)
  );

  const trimmedActiveNodes = activeNodes?.slice(0, nodesToShow);
@@ -4,16 +4,20 @@ import { render } from '@testing-library/react';
 import { ProtocolUpgradeProposalStatus } from '@vegaprotocol/types';
 import { ProtocolUpgradeProposalDetailInfo } from './protocol-upgrade-proposal-detail-info';

-const renderComponent = () =>
+const PROPOSAL = {
+  vegaReleaseTag: 'v0.1.234',
+  status:
+    ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_PENDING,
+  upgradeBlockHeight: '12345',
+  approvers: [],
+};
+
+const renderComponent = (lastBlockHeight?: string, time?: string) =>
  render(
    <ProtocolUpgradeProposalDetailInfo
-      proposal={{
-        vegaReleaseTag: 'v0.1.234',
-        status:
-          ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_PENDING,
-        upgradeBlockHeight: '12345',
-        approvers: [],
-      }}
+      proposal={PROPOSAL}
+      lastBlockHeight={lastBlockHeight}
+      time={time}
    />
  );

@@ -43,4 +47,28 @@ describe('ProtocolUpgradeProposalDetailInfo', () => {
      'v0.1.234'
    );
  });
+
+  it('should display estimated time if proposal is still pending', () => {
+    const { getByTestId } = renderComponent('12', 'time');
+    expect(getByTestId('protocol-upgrade-time-label')).toHaveTextContent(
+      'Estimated time to upgrade'
+    );
+    expect(getByTestId('protocol-upgrade-time')).toHaveTextContent('time');
+  });
+
+  it('should display upgraded at if proposal is done', () => {
+    const { getByTestId } = renderComponent('123456', 'time');
+    expect(getByTestId('protocol-upgrade-time-label')).toHaveTextContent(
+      'Upgraded at'
+    );
+    expect(getByTestId('protocol-upgrade-time')).toHaveTextContent('time');
+  });
+
+  it('should not display time if none provided', () => {
+    const { queryByTestId } = renderComponent('123456', undefined);
+    expect(
+      queryByTestId('protocol-upgrade-time-label')
+    ).not.toBeInTheDocument();
+    expect(queryByTestId('protocol-upgrade-time')).not.toBeInTheDocument();
+  });
 });
@@ -5,19 +5,33 @@ import {
  RoundedWrapper,
 } from '@vegaprotocol/ui-toolkit';
 import { SubHeading } from '../../../../components/heading';
-import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
+import { type ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
+import * as Types from '@vegaprotocol/types';
+import type { ReactNode } from 'react';

 export interface ProtocolUpgradeProposalDetailInfoProps {
  proposal: ProtocolUpgradeProposalFieldsFragment;
  lastBlockHeight?: string;
+  time?: string | ReactNode;
 }

 export const ProtocolUpgradeProposalDetailInfo = ({
  proposal,
  lastBlockHeight,
+  time,
 }: ProtocolUpgradeProposalDetailInfoProps) => {
  const { t } = useTranslation();

+  const shouldShowUpgradeTime =
+    ![
+      Types.ProtocolUpgradeProposalStatus
+        .PROTOCOL_UPGRADE_PROPOSAL_STATUS_REJECTED,
+      Types.ProtocolUpgradeProposalStatus
+        .PROTOCOL_UPGRADE_PROPOSAL_STATUS_UNSPECIFIED,
+    ].includes(proposal.status) && time;
+
+  const pending = Number(proposal.upgradeBlockHeight) > Number(lastBlockHeight);
+
  return (
    <div className="mb-10">
      <SubHeading title={t('proposal')} />
@@ -29,13 +43,26 @@ export const ProtocolUpgradeProposalDetailInfo = ({
            <span data-testid="protocol-upgrade-block-height">
              {proposal.upgradeBlockHeight}{' '}
              {lastBlockHeight && (
-                <>
+                <span className="text-vega-light-300 dark:text-vega-dark-300">
                  ({t('currently')} {lastBlockHeight})
-                </>
+                </span>
              )}
            </span>
          </KeyValueTableRow>

+          {shouldShowUpgradeTime && (
+            <KeyValueTableRow>
+              <span
+                data-testid="protocol-upgrade-time-label"
+                className="uppercase"
+              >
+                {pending ? t('Estimated time to upgrade') : t('Upgraded at')}
+              </span>
+
+              <span data-testid="protocol-upgrade-time">{time}</span>
+            </KeyValueTableRow>
+          )}
+
          <KeyValueTableRow>
            <span className="uppercase">{t('state')}</span>

@@ -3,12 +3,12 @@ import * as Types from '@vegaprotocol/types';
 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
-export type ProposalFieldsFragment = { __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, datetime: any, rejectionReason?: Types.ProposalRejectionReason | null, errorDetails?: string | null, rationale: { __typename?: 'ProposalRationale', title: string, description: string }, party: { __typename?: 'Party', id: string }, terms: { __typename?: 'ProposalTerms', closingDatetime: any, enactmentDatetime?: any | null, change: { __typename: 'NewAsset', name: string, symbol: string, decimals: number, quantum: string, source: { __typename?: 'BuiltinAsset', maxFaucetAmountMint: string } | { __typename?: 'ERC20', contractAddress: string, withdrawThreshold: string, lifetimeLimit: string } } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', instrument: { __typename?: 'InstrumentConfiguration', name: string, code: string, futureProduct?: { __typename?: 'FutureProduct', settlementAsset: { __typename?: 'Asset', symbol: string } } | null } } | { __typename?: 'UpdateAsset', quantum: string, assetId: string, source: { __typename?: 'UpdateERC20', lifetimeLimit: string, withdrawThreshold: string } } | { __typename?: 'UpdateMarket', marketId: string } | { __typename?: 'UpdateNetworkParameter', networkParameter: { __typename?: 'NetworkParameter', key: string, value: string } } }, votes: { __typename?: 'ProposalVotes', yes: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string }, no: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string } } };
+export type ProposalFieldsFragment = { __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, datetime: any, rejectionReason?: Types.ProposalRejectionReason | null, errorDetails?: string | null, rationale: { __typename?: 'ProposalRationale', title: string, description: string }, party: { __typename?: 'Party', id: string }, terms: { __typename?: 'ProposalTerms', closingDatetime: any, enactmentDatetime?: any | null, change: { __typename?: 'CancelTransfer' } | { __typename: 'NewAsset', name: string, symbol: string, decimals: number, quantum: string, source: { __typename?: 'BuiltinAsset', maxFaucetAmountMint: string } | { __typename?: 'ERC20', contractAddress: string, withdrawThreshold: string, lifetimeLimit: string } } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', instrument: { __typename?: 'InstrumentConfiguration', name: string, code: string, futureProduct?: { __typename?: 'FutureProduct', settlementAsset: { __typename?: 'Asset', symbol: string } } | null } } | { __typename?: 'NewTransfer' } | { __typename?: 'UpdateAsset', quantum: string, assetId: string, source: { __typename?: 'UpdateERC20', lifetimeLimit: string, withdrawThreshold: string } } | { __typename?: 'UpdateMarket', marketId: string } | { __typename?: 'UpdateNetworkParameter', networkParameter: { __typename?: 'NetworkParameter', key: string, value: string } } }, votes: { __typename?: 'ProposalVotes', yes: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string }, no: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string } } };

 export type ProposalsQueryVariables = Types.Exact<{ [key: string]: never; }>;


-export type ProposalsQuery = { __typename?: 'Query', proposalsConnection?: { __typename?: 'ProposalsConnection', edges?: Array<{ __typename?: 'ProposalEdge', node: { __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, datetime: any, rejectionReason?: Types.ProposalRejectionReason | null, errorDetails?: string | null, rationale: { __typename?: 'ProposalRationale', title: string, description: string }, party: { __typename?: 'Party', id: string }, terms: { __typename?: 'ProposalTerms', closingDatetime: any, enactmentDatetime?: any | null, change: { __typename: 'NewAsset', name: string, symbol: string, decimals: number, quantum: string, source: { __typename?: 'BuiltinAsset', maxFaucetAmountMint: string } | { __typename?: 'ERC20', contractAddress: string, withdrawThreshold: string, lifetimeLimit: string } } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', instrument: { __typename?: 'InstrumentConfiguration', name: string, code: string, futureProduct?: { __typename?: 'FutureProduct', settlementAsset: { __typename?: 'Asset', symbol: string } } | null } } | { __typename?: 'UpdateAsset', quantum: string, assetId: string, source: { __typename?: 'UpdateERC20', lifetimeLimit: string, withdrawThreshold: string } } | { __typename?: 'UpdateMarket', marketId: string } | { __typename?: 'UpdateNetworkParameter', networkParameter: { __typename?: 'NetworkParameter', key: string, value: string } } }, votes: { __typename?: 'ProposalVotes', yes: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string }, no: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string } } } } | null> | null } | null };
+export type ProposalsQuery = { __typename?: 'Query', proposalsConnection?: { __typename?: 'ProposalsConnection', edges?: Array<{ __typename?: 'ProposalEdge', node: { __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, datetime: any, rejectionReason?: Types.ProposalRejectionReason | null, errorDetails?: string | null, rationale: { __typename?: 'ProposalRationale', title: string, description: string }, party: { __typename?: 'Party', id: string }, terms: { __typename?: 'ProposalTerms', closingDatetime: any, enactmentDatetime?: any | null, change: { __typename?: 'CancelTransfer' } | { __typename: 'NewAsset', name: string, symbol: string, decimals: number, quantum: string, source: { __typename?: 'BuiltinAsset', maxFaucetAmountMint: string } | { __typename?: 'ERC20', contractAddress: string, withdrawThreshold: string, lifetimeLimit: string } } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', instrument: { __typename?: 'InstrumentConfiguration', name: string, code: string, futureProduct?: { __typename?: 'FutureProduct', settlementAsset: { __typename?: 'Asset', symbol: string } } | null } } | { __typename?: 'NewTransfer' } | { __typename?: 'UpdateAsset', quantum: string, assetId: string, source: { __typename?: 'UpdateERC20', lifetimeLimit: string, withdrawThreshold: string } } | { __typename?: 'UpdateMarket', marketId: string } | { __typename?: 'UpdateNetworkParameter', networkParameter: { __typename?: 'NetworkParameter', key: string, value: string } } }, votes: { __typename?: 'ProposalVotes', yes: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string }, no: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string } } } } | null> | null } | null };

 export const ProposalFieldsFragmentDoc = gql`
    fragment ProposalFields on Proposal {
@@ -1,14 +1,23 @@
 import { useEffect, useMemo } from 'react';
 import { useParams } from 'react-router-dom';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
-import { removePaginationWrapper, stripFullStops } from '@vegaprotocol/utils';
+import {
+  convertToCountdownString,
+  formatDateWithLocalTimezone,
+  removePaginationWrapper,
+  stripFullStops,
+} from '@vegaprotocol/utils';
 import * as Schema from '@vegaprotocol/types';

 import { ProtocolUpgradeProposal } from './protocol-upgrade-proposal';
 import { ProposalNotFound } from '../components/proposal-not-found';
 import { useNodesQuery } from '../../staking/home/__generated__/Nodes';
 import { useRefreshAfterEpoch } from '../../../hooks/use-refresh-after-epoch';
-import { useProtocolUpgradeProposalsQuery } from '@vegaprotocol/proposals';
+import {
+  useProtocolUpgradeProposalsQuery,
+  useTimeToUpgrade,
+} from '@vegaprotocol/proposals';
+import { useBlockInfo } from '@vegaprotocol/tendermint';

 export const ProtocolUpgradeProposalContainer = () => {
  const params = useParams<{ proposalReleaseTag: string }>();
@@ -58,6 +67,20 @@ export const ProtocolUpgradeProposalContainer = () => {
    );
  }, [nodesData]);

+  const pending =
+    Number(protocolUpgradeProposal?.upgradeBlockHeight) >
+    Number(data?.lastBlockHeight);
+
+  const {
+    state: { data: blockInfo },
+  } = useBlockInfo(
+    Number(protocolUpgradeProposal?.upgradeBlockHeight),
+    !pending
+  );
+  const time = useTimeToUpgrade(
+    Number(protocolUpgradeProposal?.upgradeBlockHeight)
+  );
+
  return (
    <AsyncRenderer
      loading={loading || nodesLoading}
@@ -69,6 +92,19 @@ export const ProtocolUpgradeProposalContainer = () => {
          proposal={protocolUpgradeProposal}
          lastBlockHeight={data?.lastBlockHeight}
          consensusValidators={consensusValidators}
+          time={
+            pending && time ? (
+              convertToCountdownString(time, '0:00:00:00')
+            ) : blockInfo?.result ? (
+              <span title={blockInfo.result.block.header.time}>
+                {formatDateWithLocalTimezone(
+                  new Date(blockInfo.result.block.header.time)
+                )}
+              </span>
+            ) : (
+              '-'
+            )
+          }
        />
      ) : (
        <ProposalNotFound />
@@ -1,10 +1,11 @@
 import { useMemo } from 'react';
+import type { ReactNode } from 'react';
 import { ProtocolUpgradeProposalDetailHeader } from '../components/protocol-upgrade-proposal-detail-header';
 import { ProtocolUpdateProposalDetailApprovals } from '../components/protocol-upgrade-proposal-detail-approvals';
 import { ProtocolUpgradeProposalDetailInfo } from '../components/protocol-upgrade-proposal-detail-info';
 import { getNormalisedVotingPower } from '../../staking/shared';
 import type { NodesFragmentFragment } from '../../staking/home/__generated__/Nodes';
-import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
+import { type ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
 import { useVegaRelease } from '@vegaprotocol/environment';
 import { ExternalLink } from '@vegaprotocol/ui-toolkit';
 import { useTranslation } from 'react-i18next';
@@ -13,6 +14,7 @@ export interface ProtocolUpgradeProposalProps {
  proposal: ProtocolUpgradeProposalFieldsFragment;
  consensusValidators: NodesFragmentFragment[] | null;
  lastBlockHeight?: string;
+  time?: string | ReactNode;
 }

 export const getConsensusApprovals = (
@@ -44,6 +46,7 @@ export const ProtocolUpgradeProposal = ({
  proposal,
  lastBlockHeight,
  consensusValidators,
+  time,
 }: ProtocolUpgradeProposalProps) => {
  const { t } = useTranslation();
  const releaseInfo = useVegaRelease(proposal.vegaReleaseTag);
@@ -73,6 +76,7 @@ export const ProtocolUpgradeProposal = ({
      <ProtocolUpgradeProposalDetailInfo
        proposal={proposal}
        lastBlockHeight={lastBlockHeight}
+        time={time}
      />

      {consensusValidators && consensusApprovals && (
@@ -351,12 +351,6 @@ describe('Closed markets', { tags: '@smoke' }, () => {
        )
      );

-    // 6001-MARK-017
-    cy.get(rowSelector)
-      .first()
-      .find('[col-id="realisedPNL"]')
-      .should('have.text', '-');
-
    // 6001-MARK-018
    cy.get(rowSelector)
      .first()
@@ -369,6 +363,10 @@ describe('Closed markets', { tags: '@smoke' }, () => {
      .first()
      .find('button svg')
      .should('exist');
+    cy.get(rowSelector)
+      .find('[col-id="successorMarketID"]')
+      .first()
+      .should('have.text', ' - ');
  });

  // test market list for market in terminated state
@@ -9,6 +9,7 @@ const bidCumulative = 'cumulative-vol-9889001';
 const midPrice = 'middle-mark-price-4612690000';
 const priceResolution = 'resolution';
 const dealTicketPrice = 'order-price';
+const dealTicketSize = 'order-size';
 const resPrice = 'price-990';

 describe('order book', { tags: '@smoke' }, () => {
@@ -74,6 +75,18 @@ describe('order book', { tags: '@smoke' }, () => {
    cy.getByTestId(dealTicketPrice).should('have.value', '98.94585');
  });

+  it('copy size to deal ticket form', () => {
+    // 6003-ORDB-009
+    cy.getByTestId(bidCumulative).click();
+    cy.getByTestId(dealTicketSize).should('have.value', '7');
+  });
+
+  it('copy size to deal ticket form', () => {
+    // 6003-ORDB-009
+    cy.getByTestId(bidVolume).click();
+    cy.getByTestId(dealTicketSize).should('have.value', '1');
+  });
+
  it('change price resolution', () => {
    // 6003-ORDB-008
    const resolutions = [
@@ -88,13 +101,14 @@ describe('order book', { tags: '@smoke' }, () => {
      '1,000',
      '10,000',
    ];
-    cy.getByTestId(priceResolution)
-      .find('option')
+    cy.getByTestId(priceResolution).click();
+    cy.get('[role="menu"]')
+      .find('[role="menuitem"]')
      .each(($el, index) => {
        expect($el.text()).to.equal(resolutions[index]);
      });

-    cy.getByTestId(priceResolution).select('0.0');
+    cy.get('[role="menuitem"]').eq(4).click();
    cy.getByTestId(resPrice).should('have.text', '99.0');
    cy.getByTestId(askPrice).should('not.exist');
    cy.getByTestId(bidPrice).should('not.exist');
@@ -50,7 +50,7 @@ describe('Portfolio page', { tags: '@smoke' }, () => {
      cy.get('fieldset.ag-simple-filter-body-wrapper')
        .should('be.visible')
        .within((fields) => {
-          cy.wrap(fields).find('label').should('have.length', 16);
+          cy.wrap(fields).find('label').should('have.length', 18);
        });
      cy.getByTestId('"Ledger entries"').click();
      cy.get('fieldset.ag-simple-filter-body-wrapper').should('not.exist');
@@ -71,7 +71,7 @@ describe('trades', { tags: '@smoke' }, () => {
      });
  });

-  it('copy price to deal ticket form', () => {
+  it.skip('copy price to deal ticket form', () => {
    // 6005-THIS-007
    cy.get(colIdPrice).last().should('be.visible').click();
    cy.getByTestId('order-price').should('have.value', '171.16898');
@@ -3,9 +3,9 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_SENTRY_DSN=https://2ffce43721964aafa78277c50654ece4@o286262.ingest.sentry.io/6300613
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/mainnet-mirror/vegawallet-mainnet-mirror.toml
-NX_VEGA_ENV=MAINNET-MIRROR
+NX_VEGA_ENV=MAINNET_MIRROR
 NX_VEGA_EXPLORER_URL=https://explorer.mainnet-mirror.vega.rocks
-NX_VEGA_NETWORKS={\"MAINNET\":\"https://console.vega.xyz\",\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://trading.stagnet1.vega.rocks\",\"MAINNET-MIRROR\":\"https://trading.mainnet-mirror.vega.rocks\"}
+NX_VEGA_NETWORKS={\"MAINNET\":\"https://console.vega.xyz\",\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://trading.stagnet1.vega.rocks\",\"MAINNET_MIRROR\":\"https://trading.mainnet-mirror.vega.rocks\"}
 NX_VEGA_TOKEN_URL=https://governance.mainnet-mirror.vega.rocks
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
@@ -1,7 +1,7 @@
-import { act, render, screen, within } from '@testing-library/react';
+import { act, render, screen, within, waitFor } from '@testing-library/react';
+import { MemoryRouter } from 'react-router-dom';
 import { Closed } from './closed';
 import { MarketStateMapping, PropertyKeyType } from '@vegaprotocol/types';
-import { PositionStatus } from '@vegaprotocol/types';
 import { MarketState } from '@vegaprotocol/types';
 import { subDays } from 'date-fns';
 import type { MockedResponse } from '@apollo/client/testing';
@@ -18,11 +18,6 @@ import {
 } from '@vegaprotocol/markets';
 import type { VegaWalletContextShape } from '@vegaprotocol/wallet';
 import { VegaWalletContext } from '@vegaprotocol/wallet';
-import type {
-  PositionsQuery,
-  PositionFieldsFragment,
-} from '@vegaprotocol/positions';
-import { PositionsDocument } from '@vegaprotocol/positions';
 import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
 import {
  createMarketFragment,
@@ -160,45 +155,6 @@ describe('Closed', () => {
    },
  };

-  // Create mock position
-  const createPosition = (): PositionFieldsFragment => {
-    return {
-      __typename: 'Position' as const,
-      realisedPNL: '1000',
-      unrealisedPNL: '2000',
-      openVolume: '3000',
-      averageEntryPrice: '100',
-      updatedAt: new Date().toISOString(),
-      positionStatus: PositionStatus.POSITION_STATUS_UNSPECIFIED,
-      lossSocializationAmount: '1000',
-      market: {
-        __typename: 'Market',
-        id: marketId,
-      },
-      party: {
-        __typename: 'Party',
-        id: pubKey,
-      },
-    };
-  };
-  const position = createPosition();
-  const positionsMock: MockedResponse<PositionsQuery> = {
-    request: {
-      query: PositionsDocument,
-      variables: {
-        partyIds: [pubKey],
-      },
-    },
-    result: {
-      data: {
-        positions: {
-          __typename: 'PositionConnection',
-          edges: [{ __typename: 'PositionEdge', node: position }],
-        },
-      },
-    },
-  };
-
  beforeAll(() => {
    originalNow = Date.now;
    Date.now = jest.fn().mockReturnValue(mockNowTimestamp);
@@ -211,15 +167,17 @@ describe('Closed', () => {
  it('renders correctly formatted and filtered rows', async () => {
    await act(async () => {
      render(
-        <MockedProvider
-          mocks={[marketsMock, marketsDataMock, positionsMock, oracleDataMock]}
-        >
-          <VegaWalletContext.Provider
-            value={{ pubKey } as VegaWalletContextShape}
+        <MemoryRouter>
+          <MockedProvider
+            mocks={[marketsMock, marketsDataMock, oracleDataMock]}
          >
-            <Closed />
-          </VegaWalletContext.Provider>
-        </MockedProvider>
+            <VegaWalletContext.Provider
+              value={{ pubKey } as VegaWalletContextShape}
+            >
+              <Closed />
+            </VegaWalletContext.Provider>
+          </MockedProvider>
+        </MemoryRouter>
      );
    });
    // screen.debug(document, Infinity);
@@ -230,11 +188,11 @@ describe('Closed', () => {
      'Description',
      'Status',
      'Settlement date',
+      'Successor market',
      'Best bid',
      'Best offer',
      'Mark price',
      'Settlement price',
-      'Realised PNL',
      'Settlement asset',
      '', // actions row
    ];
@@ -247,6 +205,7 @@ describe('Closed', () => {
      market.tradableInstrument.instrument.name,
      MarketStateMapping[market.state],
      '3 days ago',
+      '-',
      /* eslint-disable @typescript-eslint/no-non-null-assertion */
      addDecimalsFormatNumber(marketsData.bestBidPrice, market.decimalPlaces),
      addDecimalsFormatNumber(
@@ -256,7 +215,6 @@ describe('Closed', () => {
      addDecimalsFormatNumber(marketsData!.markPrice, market.decimalPlaces),
      /* eslint-enable @typescript-eslint/no-non-null-assertion */
      addDecimalsFormatNumber(property.value, market.decimalPlaces),
-      addDecimalsFormatNumber(position.realisedPNL, market.decimalPlaces),
      market.tradableInstrument.instrument.product.settlementAsset.symbol,
      '', // actions row
    ];
@@ -315,20 +273,17 @@ describe('Closed', () => {
    };
    await act(async () => {
      render(
-        <MockedProvider
-          mocks={[
-            mixedMarketsMock,
-            marketsDataMock,
-            positionsMock,
-            oracleDataMock,
-          ]}
-        >
-          <VegaWalletContext.Provider
-            value={{ pubKey } as VegaWalletContextShape}
+        <MemoryRouter>
+          <MockedProvider
+            mocks={[mixedMarketsMock, marketsDataMock, oracleDataMock]}
          >
-            <Closed />
-          </VegaWalletContext.Provider>
-        </MockedProvider>
+            <VegaWalletContext.Provider
+              value={{ pubKey } as VegaWalletContextShape}
+            >
+              <Closed />
+            </VegaWalletContext.Provider>
+          </MockedProvider>
+        </MemoryRouter>
      );
    });

@@ -359,4 +314,69 @@ describe('Closed', () => {
      });
    expect(cells).toEqual(expectedRows.map((m) => m.node.id));
  });
+
+  it('successor marked should be visible', async () => {
+    const mixedMarkets = [
+      {
+        __typename: 'MarketEdge' as const,
+        node: createMarketFragment({
+          id: 'include-0',
+          state: MarketState.STATE_SETTLED,
+          successorMarketID: 'successorMarketID',
+        }),
+      },
+      {
+        __typename: 'MarketEdge' as const,
+        node: {
+          ...createMarketFragment({
+            id: 'successorMarketID',
+            state: MarketState.STATE_ACTIVE,
+          }),
+          tradableInstrument: {
+            ...createMarketFragment().tradableInstrument,
+            instrument: {
+              ...createMarketFragment().tradableInstrument.instrument,
+              id: 'successorAssset',
+              name: 'Successor Market Name',
+              code: 'SuccessorCode',
+            },
+          },
+        },
+      },
+    ];
+
+    const mixedMarketsMock: MockedResponse<MarketsQuery> = {
+      request: {
+        query: MarketsDocument,
+      },
+      result: {
+        data: {
+          marketsConnection: {
+            __typename: 'MarketConnection',
+            edges: mixedMarkets,
+          },
+        },
+      },
+    };
+
+    render(
+      <MemoryRouter>
+        <MockedProvider
+          mocks={[mixedMarketsMock, marketsDataMock, oracleDataMock]}
+        >
+          <VegaWalletContext.Provider
+            value={{ pubKey } as VegaWalletContextShape}
+          >
+            <Closed />
+          </VegaWalletContext.Provider>
+        </MockedProvider>
+      </MemoryRouter>
+    );
+
+    await waitFor(() => {
+      expect(
+        screen.getByRole('button', { name: 'SuccessorCode' })
+      ).toBeInTheDocument();
+    });
+  });
 });
@@ -4,7 +4,11 @@ import type {
  VegaICellRendererParams,
  VegaValueFormatterParams,
 } from '@vegaprotocol/datagrid';
-import { AgGridLazy as AgGrid, COL_DEFS } from '@vegaprotocol/datagrid';
+import {
+  AgGridLazy as AgGrid,
+  COL_DEFS,
+  MarketNameCell,
+} from '@vegaprotocol/datagrid';
 import { useMemo } from 'react';
 import { t } from '@vegaprotocol/i18n';
 import { MarketState, MarketStateMapping } from '@vegaprotocol/types';
@@ -12,7 +16,6 @@ import {
  addDecimalsFormatNumber,
  getMarketExpiryDate,
 } from '@vegaprotocol/utils';
-import { usePositionsQuery } from '@vegaprotocol/positions';
 import type {
  DataSourceFilterFragment,
  MarketMaybeWithData,
@@ -20,13 +23,14 @@ import type {
 import {
  MarketActionsDropdown,
  closedMarketsWithDataProvider,
+  marketProvider,
 } from '@vegaprotocol/markets';
-import { useVegaWallet } from '@vegaprotocol/wallet';
 import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
 import type { ColDef } from 'ag-grid-community';
 import { SettlementDateCell } from './settlement-date-cell';
 import { SettlementPriceCell } from './settlement-price-cell';
 import { useDataProvider } from '@vegaprotocol/data-provider';
+import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';

 type SettlementAsset =
  MarketMaybeWithData['tradableInstrument']['instrument']['product']['settlementAsset'];
@@ -47,33 +51,18 @@ interface Row {
  setlementDataSourceFilter: DataSourceFilterFragment | undefined;
  tradingTerminationOracleId: string;
  settlementAsset: SettlementAsset;
-  realisedPNL: string | undefined;
+  successorMarketID: string | undefined | null;
 }

 export const Closed = () => {
-  const { pubKey } = useVegaWallet();
-  const {
-    data: marketData,
-    error,
-    reload,
-  } = useDataProvider({
+  const { data: marketData, error } = useDataProvider({
    dataProvider: closedMarketsWithDataProvider,
    variables: undefined,
  });
-  const { data: positionData } = usePositionsQuery({
-    variables: {
-      partyIds: pubKey ? [pubKey] : [],
-    },
-    skip: !pubKey,
-  });

  // find a position for each market and add the realised pnl to
  // a normalized object
  const rowData = compact(marketData).map((market) => {
-    const position = positionData?.positions?.edges?.find((edge) => {
-      return edge.node.market.id === market.id;
-    });
-
    const instrument = market.tradableInstrument.instrument;

    const spec =
@@ -108,26 +97,46 @@ export const Closed = () => {
      tradingTerminationOracleId:
        instrument.product.dataSourceSpecForTradingTermination.id,
      settlementAsset: instrument.product.settlementAsset,
-      realisedPNL: position?.node.realisedPNL,
+      successorMarketID: market.successorMarketID,
    };

    return row;
  });
  return (
    <div className="h-full relative">
-      <ClosedMarketsDataGrid rowData={rowData} error={error} reload={reload} />
+      <ClosedMarketsDataGrid rowData={rowData} error={error} />
    </div>
  );
 };

+export const SuccessorMarketRenderer = ({
+  value,
+}: VegaICellRendererParams<Row, 'successorMarketID'>) => {
+  const { data } = useDataProvider({
+    dataProvider: marketProvider,
+    variables: {
+      marketId: value || '',
+    },
+    skip: !value,
+  });
+  const onMarketClick = useMarketClickHandler();
+  return data ? (
+    <MarketNameCell
+      value={data.tradableInstrument.instrument.code}
+      data={data}
+      onMarketClick={onMarketClick}
+    />
+  ) : (
+    ' - '
+  );
+};
+
 const ClosedMarketsDataGrid = ({
  rowData,
  error,
-  reload,
 }: {
  rowData: Row[];
  error: Error | undefined;
-  reload: () => void;
 }) => {
  const openAssetDialog = useAssetDetailsDialogStore((store) => store.open);
  const colDefs = useMemo(() => {
@@ -199,6 +208,11 @@ const ClosedMarketsDataGrid = ({
          },
        },
      },
+      {
+        headerName: t('Successor market'),
+        field: 'successorMarketID',
+        cellRenderer: 'SuccessorMarketRenderer',
+      },
      {
        headerName: t('Best bid'),
        field: 'bestBidPrice',
@@ -254,25 +268,11 @@ const ClosedMarketsDataGrid = ({
          />
        ),
      },
-      {
-        headerName: t('Realised PNL'),
-        field: 'realisedPNL',
-        cellClass: 'font-mono ag-right-aligned-cell',
-        type: 'numericColumn',
-        valueFormatter: ({
-          value,
-          data,
-        }: VegaValueFormatterParams<Row, 'realisedPNL'>) => {
-          if (!value || !data) return '-';
-          return addDecimalsFormatNumber(value, data.decimalPlaces);
-        },
-      },
      {
        headerName: t('Settlement asset'),
        field: 'settlementAsset',
        cellRenderer: ({
          value,
-          data,
        }: VegaValueFormatterParams<Row, 'settlementAsset'>) => (
          <button
            className="underline"
@@ -311,7 +311,9 @@ const ClosedMarketsDataGrid = ({
      defaultColDef={{
        resizable: true,
        minWidth: 100,
+        flex: 1,
      }}
+      components={{ SuccessorMarketRenderer }}
      overlayNoRowsTemplate={error ? error.message : t('No markets')}
    />
  );
@@ -3,7 +3,6 @@ import { addMockGQLCommand } from './lib/mock-gql';
 import { addMockSubscription } from './lib/mock-ws';
 import { addMockWalletCommand } from './lib/mock-rest';
 import { addMockWeb3ProviderCommand } from './lib/commands/mock-web3-provider';
-import { addSlackCommand } from './lib/commands/slack';
 import { addHighlightLog } from './lib/commands/highlight-log';
 import { addGetAssets } from './lib/commands/get-assets';
 import { addVegaWalletReceiveFaucetedAsset } from './lib/commands/vega-wallet-receive-fauceted-asset';
@@ -26,7 +25,6 @@ import { addVegaWalletTopUpRewardsPool } from './lib/commands/vega-wallet-top-up
 import { addAssociateTokensToVegaWallet } from './lib/commands/associate-tokens-to-vega-wallet';

 addGetTestIdcommand();
-addSlackCommand();
 addMockGQLCommand();
 addMockSubscription();
 addMockWalletCommand();
@@ -1,28 +0,0 @@
-declare global {
-  // eslint-disable-next-line @typescript-eslint/no-namespace
-  namespace Cypress {
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    interface Chainable<Subject> {
-      slack(message: string): void;
-    }
-  }
-}
-
-export function addSlackCommand() {
-  // @ts-ignore - ignoring Cypress type error which gets resolved when Cypress uses the command
-  Cypress.Commands.add('slack', (message) => {
-    const text = `${message}: ${JSON.stringify(Cypress.spec)}`;
-
-    cy.log('NOTIFYING SLACK');
-
-    const webhook = Cypress.env('SLACK_WEBHOOK');
-
-    if (!webhook) {
-      return;
-    }
-
-    cy.request('POST', webhook, {
-      text,
-    });
-  });
-}
@@ -23,6 +23,11 @@ export const OrderTypeCell = ({
      return undefined;
    }
    if (!value) return '-';
+
+    if (order?.icebergOrder) {
+      return t('%s (Iceberg)', [Schema.OrderTypeMapping[value]]);
+    }
+
    if (order?.peggedOrder) {
      const reference =
        Schema.PeggedReferenceMapping[order.peggedOrder?.reference];
@@ -34,6 +39,7 @@ export const OrderTypeCell = ({
      );
      return t('%s %s %s Peg limit', [reference, side, offset]);
    }
+
    if (order?.liquidityProvision) {
      return t('Liquidity provision');
    }
@@ -0,0 +1,195 @@
+import { Controller, type Control } from 'react-hook-form';
+import type { Market } from '@vegaprotocol/markets';
+import type { OrderObj } from '@vegaprotocol/orders';
+import type { OrderFormFields } from '../../hooks/use-order-form';
+import { toDecimal, validateAmount } from '@vegaprotocol/utils';
+import { t } from '@vegaprotocol/i18n';
+import {
+  FormGroup,
+  Input,
+  InputError,
+  Tooltip,
+} from '@vegaprotocol/ui-toolkit';
+
+export interface DealTicketSizeIcebergProps {
+  control: Control<OrderFormFields>;
+  market: Market;
+  peakSizeError?: string;
+  minimumVisibleSizeError?: string;
+  update: (obj: Partial<OrderObj>) => void;
+  peakSize: string;
+  minimumVisibleSize: string;
+  size: string;
+}
+
+export const DealTicketSizeIceberg = ({
+  control,
+  market,
+  update,
+  peakSizeError,
+  minimumVisibleSizeError,
+  peakSize,
+  minimumVisibleSize,
+  size,
+}: DealTicketSizeIcebergProps) => {
+  const sizeStep = toDecimal(market?.positionDecimalPlaces);
+
+  const renderPeakSizeError = () => {
+    if (peakSizeError) {
+      return (
+        <InputError testId="deal-ticket-peak-error-message-size-limit">
+          {peakSizeError}
+        </InputError>
+      );
+    }
+
+    return null;
+  };
+
+  const renderMinimumSizeError = () => {
+    if (minimumVisibleSizeError) {
+      return (
+        <InputError testId="deal-ticket-minimum-error-message-size-limit">
+          {minimumVisibleSizeError}
+        </InputError>
+      );
+    }
+
+    return null;
+  };
+
+  return (
+    <div className="mb-2">
+      <div className="flex items-center gap-4">
+        <div className="flex-1">
+          <FormGroup
+            label={
+              <Tooltip
+                description={
+                  <div>
+                    {t(
+                      'The maximum volume that can be traded at once. Must be less than the total size of the order.'
+                    )}
+                  </div>
+                }
+              >
+                <span className="text-xs">{t('Peak size')}</span>
+              </Tooltip>
+            }
+            labelFor="input-order-peak-size"
+            className="!mb-1"
+          >
+            <Controller
+              name="icebergOpts.peakSize"
+              control={control}
+              rules={{
+                required: t('You need to provide a peak size'),
+                min: {
+                  value: sizeStep,
+                  message: t('Peak size cannot be lower than ' + sizeStep),
+                },
+                max: {
+                  value: size,
+                  message: t(
+                    'Peak size cannot be greater than the size (%s) ',
+                    [size]
+                  ),
+                },
+                validate: validateAmount(sizeStep, 'peakSize'),
+              }}
+              render={() => (
+                <Input
+                  id="input-order-peak-size"
+                  className="w-full"
+                  type="number"
+                  value={peakSize}
+                  onChange={(e) =>
+                    update({
+                      icebergOpts: {
+                        peakSize: e.target.value,
+                        minimumVisibleSize,
+                      },
+                    })
+                  }
+                  step={sizeStep}
+                  min={sizeStep}
+                  max={size}
+                  data-testid="order-peak-size"
+                  onWheel={(e) => e.currentTarget.blur()}
+                />
+              )}
+            />
+          </FormGroup>
+        </div>
+        <div className="flex-0 items-center">
+          <div className="flex"></div>
+          <div className="flex"></div>
+        </div>
+        <div className="flex-1">
+          <FormGroup
+            label={
+              <Tooltip
+                description={
+                  <div>
+                    {t(
+                      'When the order trades and its size falls below this threshold, it will be reset to the peak size and moved to the back of the priority order. Must be less than or equal to peak size, and greater than 0.'
+                    )}
+                  </div>
+                }
+              >
+                <span className="text-xs">{t('Minimum size')}</span>
+              </Tooltip>
+            }
+            labelFor="input-order-minimum-size"
+            className="!mb-1"
+          >
+            <Controller
+              name="icebergOpts.minimumVisibleSize"
+              control={control}
+              rules={{
+                required: t('You need to provide a minimum visible size'),
+                min: {
+                  value: sizeStep,
+                  message: t(
+                    'Minimum visible size cannot be lower than ' + sizeStep
+                  ),
+                },
+                max: {
+                  value: peakSize,
+                  message: t(
+                    'Minimum visible size cannot be greater than the peak size (%s)',
+                    [peakSize]
+                  ),
+                },
+                validate: validateAmount(sizeStep, 'minimumVisibleSize'),
+              }}
+              render={() => (
+                <Input
+                  id="input-order-minimum-size"
+                  className="w-full"
+                  type="number"
+                  value={minimumVisibleSize}
+                  onChange={(e) =>
+                    update({
+                      icebergOpts: {
+                        peakSize,
+                        minimumVisibleSize: e.target.value,
+                      },
+                    })
+                  }
+                  step={sizeStep}
+                  min={sizeStep}
+                  max={peakSize}
+                  data-testid="order-minimum-size"
+                  onWheel={(e) => e.currentTarget.blur()}
+                />
+              )}
+            />
+          </FormGroup>
+        </div>
+      </div>
+      {renderPeakSizeError()}
+      {renderMinimumSizeError()}
+    </div>
+  );
+};
@@ -224,6 +224,109 @@ describe('DealTicket', () => {
    expect(screen.getByTestId('reduce-only')).not.toBeChecked();
  });

+  it('should set values for a persistent post only iceberg order and disable reduce only checkbox', () => {
+    const expectedOrder = {
+      marketId: market.id,
+      type: Schema.OrderType.TYPE_LIMIT,
+      side: Schema.Side.SIDE_SELL,
+      size: '10',
+      price: '300.22',
+      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
+      persist: true,
+      reduceOnly: false,
+      postOnly: true,
+      iceberg: true,
+      icebergOpts: {
+        peakSize: '5',
+        minimumVisibleSize: '7',
+      },
+    };
+
+    useOrderStore.setState({
+      orders: {
+        [expectedOrder.marketId]: expectedOrder,
+      },
+    });
+
+    render(generateJsx());
+
+    // Assert correct defaults are used from store
+    expect(
+      screen
+        .getByTestId(`order-type-${Schema.OrderType.TYPE_LIMIT}`)
+        .querySelector('input')
+    ).toBeChecked();
+    expect(
+      screen.queryByTestId('order-side-SIDE_SELL')?.querySelector('input')
+    ).toBeChecked();
+    expect(
+      screen.queryByTestId('order-side-SIDE_BUY')?.querySelector('input')
+    ).not.toBeChecked();
+    expect(screen.getByTestId('order-size')).toHaveDisplayValue(
+      expectedOrder.size
+    );
+    expect(screen.getByTestId('order-tif')).toHaveValue(
+      expectedOrder.timeInForce
+    );
+    expect(screen.getByTestId('order-price')).toHaveDisplayValue(
+      expectedOrder.price
+    );
+    expect(screen.getByTestId('post-only')).toBeEnabled();
+    expect(screen.getByTestId('reduce-only')).toBeDisabled();
+    expect(screen.getByTestId('post-only')).toBeChecked();
+    expect(screen.getByTestId('reduce-only')).not.toBeChecked();
+    expect(screen.getByTestId('iceberg')).toBeEnabled();
+    expect(screen.getByTestId('iceberg')).toBeChecked();
+  });
+
+  it('should set values for a non-persistent iceberg order and disable post only checkbox', () => {
+    const expectedOrder = {
+      marketId: market.id,
+      type: Schema.OrderType.TYPE_LIMIT,
+      side: Schema.Side.SIDE_SELL,
+      size: '0.1',
+      price: '300.22',
+      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_IOC,
+      persist: false,
+      reduceOnly: false,
+      postOnly: false,
+    };
+    useOrderStore.setState({
+      orders: {
+        [expectedOrder.marketId]: expectedOrder,
+      },
+    });
+
+    render(generateJsx());
+
+    // Assert correct defaults are used from store
+    expect(
+      screen
+        .getByTestId(`order-type-${Schema.OrderType.TYPE_LIMIT}`)
+        .querySelector('input')
+    ).toBeChecked();
+    expect(
+      screen.queryByTestId('order-side-SIDE_SELL')?.querySelector('input')
+    ).toBeChecked();
+    expect(
+      screen.queryByTestId('order-side-SIDE_BUY')?.querySelector('input')
+    ).not.toBeChecked();
+    expect(screen.getByTestId('order-size')).toHaveDisplayValue(
+      expectedOrder.size
+    );
+    expect(screen.getByTestId('order-tif')).toHaveValue(
+      expectedOrder.timeInForce
+    );
+    expect(screen.getByTestId('order-price')).toHaveDisplayValue(
+      expectedOrder.price
+    );
+    expect(screen.getByTestId('post-only')).toBeDisabled();
+    expect(screen.getByTestId('reduce-only')).toBeEnabled();
+    expect(screen.getByTestId('reduce-only')).not.toBeChecked();
+    expect(screen.getByTestId('post-only')).not.toBeChecked();
+    expect(screen.getByTestId('iceberg')).not.toBeChecked();
+  });
+
  it('handles TIF select box dependent on order type', async () => {
    render(generateJsx());

@@ -54,6 +54,7 @@ import {
 import { OrderTimeInForce, OrderType } from '@vegaprotocol/types';
 import { useOrderForm } from '../../hooks/use-order-form';
 import { useDataProvider } from '@vegaprotocol/data-provider';
+import { DealTicketSizeIceberg } from './deal-ticket-size-iceberg';

 export interface DealTicketProps {
  market: Market;
@@ -292,6 +293,22 @@ export const DealTicket = ({
                  timeInForce: lastTIF[type] || order.timeInForce,
                  postOnly:
                    type === OrderType.TYPE_MARKET ? false : order.postOnly,
+                  iceberg:
+                    type === OrderType.TYPE_MARKET ||
+                    [
+                      OrderTimeInForce.TIME_IN_FORCE_FOK,
+                      OrderTimeInForce.TIME_IN_FORCE_IOC,
+                    ].includes(lastTIF[type] || order.timeInForce)
+                      ? false
+                      : order.iceberg,
+                  icebergOpts:
+                    type === OrderType.TYPE_MARKET ||
+                    [
+                      OrderTimeInForce.TIME_IN_FORCE_FOK,
+                      OrderTimeInForce.TIME_IN_FORCE_IOC,
+                    ].includes(lastTIF[type] || order.timeInForce)
+                      ? undefined
+                      : order.icebergOpts,
                  reduceOnly:
                    type === OrderType.TYPE_LIMIT &&
                    ![
@@ -463,6 +480,51 @@ export const DealTicket = ({
            )}
          />
        </div>
+        <div className="flex gap-2 pb-2 justify-between">
+          {order.type === Schema.OrderType.TYPE_LIMIT && (
+            <Controller
+              name="iceberg"
+              control={control}
+              render={() => (
+                <Checkbox
+                  name="iceberg"
+                  checked={order.iceberg}
+                  onCheckedChange={() => {
+                    update({ iceberg: !order.iceberg, icebergOpts: undefined });
+                  }}
+                  label={
+                    <Tooltip
+                      description={
+                        <p>
+                          {t(`Trade only a fraction of the order size at once.
+                            After the peak size of the order has traded, the size is reset. This is repeated until the order is cancelled, expires, or its full volume trades away.
+                            For example, an iceberg order with a size of 1000 and a peak size of 100 will effectively be split into 10 orders with a size of 100 each.
+                            Note that the full volume of the order is not hidden and is still reflected in the order book.`)}
+                        </p>
+                      }
+                    >
+                      <span className="text-xs">{t('Iceberg')}</span>
+                    </Tooltip>
+                  }
+                />
+              )}
+            />
+          )}
+        </div>
+        {order.iceberg && (
+          <DealTicketSizeIceberg
+            update={update}
+            market={market}
+            peakSizeError={errors.icebergOpts?.peakSize?.message}
+            minimumVisibleSizeError={
+              errors.icebergOpts?.minimumVisibleSize?.message
+            }
+            control={control}
+            size={order.size}
+            peakSize={order.icebergOpts?.peakSize || ''}
+            minimumVisibleSize={order.icebergOpts?.minimumVisibleSize || ''}
+          />
+        )}
        <SummaryMessage
          errorMessage={errors.summary?.message}
          asset={asset}
@@ -4,7 +4,6 @@ import { getDefaultOrder, useOrder } from '@vegaprotocol/orders';
 import { useEffect } from 'react';
 import { useForm } from 'react-hook-form';
 import type { OrderSubmission } from '@vegaprotocol/wallet';
-import type { Exact } from 'type-fest';

 export type OrderFormFields = OrderObj & {
  summary: string;
@@ -51,13 +50,11 @@ export const useOrderForm = (marketId: string) => {
    }
  }, [order, isSubmitted, getValues, setValue]);

-  const handleSubmitWrapper = (
-    cb: <T>(o: Exact<OrderSubmission, T>) => void
-  ) => {
+  const handleSubmitWrapper = (cb: (o: OrderSubmission) => void) => {
    return handleSubmit(() => {
-      // remove the persist key from the order in the store, the wallet will reject
+      // remove the persist and iceberg key from the order in the store, the wallet will reject
      // an order that contains unrecognized additional keys
-      cb(omit(order, 'persist'));
+      cb(omit(order, 'persist', 'iceberg'));
    });
  };

@@ -163,6 +163,7 @@ describe('Network switcher', () => {
        [Networks.MAINNET]: 'https://main.net',
        [Networks.TESTNET]: 'https://test.net',
        [Networks.VALIDATOR_TESTNET]: 'https://validator-test.net',
+        [Networks.MAINNET_MIRROR]: 'https://mainnet-mirror.net',
        [Networks.DEVNET]: 'https://dev.net',
        [Networks.STAGNET1]: 'https://stag1.net',
      };
@@ -209,6 +210,7 @@ describe('Network switcher', () => {
      [Networks.CUSTOM]: undefined,
      [Networks.MAINNET]: 'https://main.net',
      [Networks.VALIDATOR_TESTNET]: 'https://validator-test.net',
+      [Networks.MAINNET_MIRROR]: 'https://mainnet-mirror.net',
      [Networks.TESTNET]: 'https://test.net',
      [Networks.DEVNET]: 'https://dev.net',
      [Networks.STAGNET1]: 'https://stag1.net',
@@ -240,6 +242,7 @@ describe('Network switcher', () => {
      [Networks.CUSTOM]: undefined,
      [Networks.MAINNET]: undefined,
      [Networks.VALIDATOR_TESTNET]: 'https://validator-test.net',
+      [Networks.MAINNET_MIRROR]: 'https://mainnet-mirror.net',
      [Networks.TESTNET]: 'https://test.net',
      [Networks.DEVNET]: 'https://dev.net',
      [Networks.STAGNET1]: 'https://stag1.net',
@@ -16,6 +16,7 @@ import classNames from 'classnames';

 export const envNameMapping: Record<Networks, string> = {
  [Networks.VALIDATOR_TESTNET]: t('VALIDATOR_TESTNET'),
+  [Networks.MAINNET_MIRROR]: t('Mainnet-mirror'),
  [Networks.CUSTOM]: t('Custom'),
  [Networks.DEVNET]: t('Devnet'),
  [Networks.STAGNET1]: t('Stagnet'),
@@ -31,6 +32,7 @@ export const envTriggerMapping: Record<Networks, string> = {
 export const envDescriptionMapping: Record<Networks, string> = {
  [Networks.CUSTOM]: '',
  [Networks.VALIDATOR_TESTNET]: t('The validator deployed testnet'),
+  [Networks.MAINNET_MIRROR]: t('The mainnet-mirror network'),
  [Networks.DEVNET]: t('The latest Vega code auto-deployed'),
  [Networks.STAGNET1]: t('A release candidate for the staging environment'),
  [Networks.TESTNET]: t(
@@ -359,6 +359,14 @@ function compileEnvVars() {
    ),
    APP_VERSION: windowOrDefault('APP_VERSION', process.env['NX_APP_VERSION']),
    SENTRY_DSN: windowOrDefault('SENTRY_DSN', process.env['NX_SENTRY_DSN']),
+    TENDERMINT_URL: windowOrDefault(
+      'NX_TENDERMINT_URL',
+      process.env['NX_TENDERMINT_URL']
+    ),
+    TENDERMINT_WEBSOCKET_URL: windowOrDefault(
+      'NX_TENDERMINT_WEBSOCKET_URL',
+      process.env['NX_TENDERMINT_WEBSOCKET_URL']
+    ),
  };

  return env;
@@ -20,6 +20,7 @@ type DAppLinks = {

 const EmptyLinks: DAppLinks = {
  [Networks.VALIDATOR_TESTNET]: '',
+  [Networks.MAINNET_MIRROR]: '',
  [Networks.DEVNET]: '',
  [Networks.STAGNET1]: '',
  [Networks.TESTNET]: '',
@@ -31,6 +32,7 @@ const ExplorerLinks = {
  [Networks.TESTNET]: 'https://explorer.fairground.wtf',
  [Networks.VALIDATOR_TESTNET]:
    'https://explorer.validators-testnet.vega.rocks',
+  [Networks.MAINNET_MIRROR]: 'https://explorer.mainnet-mirror.vega.rocks/',
  [Networks.MAINNET]: 'https://explorer.vega.xyz',
 };

@@ -39,6 +41,7 @@ const ConsoleLinks = {
  [Networks.STAGNET1]: 'https://trading.stagnet1.vega.rocks',
  [Networks.TESTNET]: 'https://console.fairground.wtf',
  [Networks.MAINNET]: 'https://console.vega.xyz',
+  [Networks.MAINNET_MIRROR]: 'https://console.mainnet-mirror.vega.rocks/',
 };

 const TokenLinks = {
@@ -47,6 +50,7 @@ const TokenLinks = {
  [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]: 'https://governance.vega.xyz',
 };

@@ -4,6 +4,7 @@ import type { envSchema } from './utils/validate-environment';

 export enum Networks {
  VALIDATOR_TESTNET = 'VALIDATOR_TESTNET',
+  MAINNET_MIRROR = 'MAINNET_MIRROR',
  CUSTOM = 'CUSTOM',
  TESTNET = 'TESTNET',
  STAGNET1 = 'STAGNET1',
@@ -2,6 +2,7 @@ import z from 'zod';

 export enum Networks {
  VALIDATOR_TESTNET = 'VALIDATOR_TESTNET',
+  MAINNET_MIRROR = 'MAINNET_MIRROR',
  CUSTOM = 'CUSTOM',
  TESTNET = 'TESTNET',
  STAGNET1 = 'STAGNET1',
@@ -53,6 +54,8 @@ const schemaObject = {
  VEGA_INCIDENT_URL: z.optional(z.string()),
  APP_VERSION: z.optional(z.string()),
  SENTRY_DSN: z.optional(z.string()),
+  TENDERMINT_URL: z.optional(z.string()),
+  TENDERMINT_WEBSOCKET_URL: z.optional(z.string()),
 };

 // combine schema above with custom rule to ensure either
@@ -3,14 +3,14 @@ import * as Types from '@vegaprotocol/types';
 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
-export type LiquidityProvisionFieldsFragment = { __typename?: 'LiquidityProvision', id?: string | null, createdAt: any, updatedAt?: any | null, commitmentAmount: string, fee: string, status: Types.LiquidityProvisionStatus, party: { __typename?: 'Party', id: string, accountsConnection?: { __typename?: 'AccountsConnection', edges?: Array<{ __typename?: 'AccountEdge', node: { __typename?: 'AccountBalance', type: Types.AccountType, balance: string } } | null> | null } | null } };
+export type LiquidityProvisionFieldsFragment = { __typename?: 'LiquidityProvision', id: string, createdAt: any, updatedAt?: any | null, commitmentAmount: string, fee: string, status: Types.LiquidityProvisionStatus, party: { __typename?: 'Party', id: string, accountsConnection?: { __typename?: 'AccountsConnection', edges?: Array<{ __typename?: 'AccountEdge', node: { __typename?: 'AccountBalance', type: Types.AccountType, balance: string } } | null> | null } | null } };

 export type LiquidityProvisionsQueryVariables = Types.Exact<{
  marketId: Types.Scalars['ID'];
 }>;


-export type LiquidityProvisionsQuery = { __typename?: 'Query', market?: { __typename?: 'Market', liquidityProvisionsConnection?: { __typename?: 'LiquidityProvisionsConnection', edges?: Array<{ __typename?: 'LiquidityProvisionsEdge', node: { __typename?: 'LiquidityProvision', id?: string | null, createdAt: any, updatedAt?: any | null, commitmentAmount: string, fee: string, status: Types.LiquidityProvisionStatus, party: { __typename?: 'Party', id: string, accountsConnection?: { __typename?: 'AccountsConnection', edges?: Array<{ __typename?: 'AccountEdge', node: { __typename?: 'AccountBalance', type: Types.AccountType, balance: string } } | null> | null } | null } } } | null> | null } | null } | null };
+export type LiquidityProvisionsQuery = { __typename?: 'Query', market?: { __typename?: 'Market', liquidityProvisionsConnection?: { __typename?: 'LiquidityProvisionsConnection', edges?: Array<{ __typename?: 'LiquidityProvisionsEdge', node: { __typename?: 'LiquidityProvision', id: string, createdAt: any, updatedAt?: any | null, commitmentAmount: string, fee: string, status: Types.LiquidityProvisionStatus, party: { __typename?: 'Party', id: string, accountsConnection?: { __typename?: 'AccountsConnection', edges?: Array<{ __typename?: 'AccountEdge', node: { __typename?: 'AccountBalance', type: Types.AccountType, balance: string } } | null> | null } | null } } } | null> | null } | null } | null };

 export type LiquidityProvisionsUpdateSubscriptionVariables = Types.Exact<{
  partyId?: Types.InputMaybe<Types.Scalars['ID']>;
@@ -18,7 +18,7 @@ export type LiquidityProvisionsUpdateSubscriptionVariables = Types.Exact<{
 }>;


-export type LiquidityProvisionsUpdateSubscription = { __typename?: 'Subscription', liquidityProvisions?: Array<{ __typename?: 'LiquidityProvisionUpdate', id?: string | null, partyID: string, createdAt: any, updatedAt?: any | null, marketID: string, commitmentAmount: string, fee: string, status: Types.LiquidityProvisionStatus }> | null };
+export type LiquidityProvisionsUpdateSubscription = { __typename?: 'Subscription', liquidityProvisions?: Array<{ __typename?: 'LiquidityProvisionUpdate', id: string, partyID: string, createdAt: any, updatedAt?: any | null, marketID: string, commitmentAmount: string, fee: string, status: Types.LiquidityProvisionStatus }> | null };

 export type LiquidityProviderFeeShareFieldsFragment = { __typename?: 'LiquidityProviderFeeShare', equityLikeShare: string, averageEntryValuation: string, party: { __typename?: 'Party', id: string } };

@@ -180,4 +180,4 @@ export function useLiquidityProviderFeeShareLazyQuery(baseOptions?: Apollo.LazyQ
        }
 export type LiquidityProviderFeeShareQueryHookResult = ReturnType<typeof useLiquidityProviderFeeShareQuery>;
 export type LiquidityProviderFeeShareLazyQueryHookResult = ReturnType<typeof useLiquidityProviderFeeShareLazyQuery>;
-export type LiquidityProviderFeeShareQueryResult = Apollo.QueryResult<LiquidityProviderFeeShareQuery, LiquidityProviderFeeShareQueryVariables>;
+export type LiquidityProviderFeeShareQueryResult = Apollo.QueryResult<LiquidityProviderFeeShareQuery, LiquidityProviderFeeShareQueryVariables>;
@@ -66,10 +66,13 @@ export const OrderbookManager = ({ marketId }: OrderbookManagerProps) => {
        decimalPlaces={market?.decimalPlaces ?? 0}
        positionDecimalPlaces={market?.positionDecimalPlaces ?? 0}
        assetSymbol={market?.tradableInstrument.instrument.product.quoteName}
-        onClick={(price: string) => {
+        onClick={({ price, size }) => {
          if (price) {
            updateOrder(marketId, { price });
          }
+          if (size) {
+            updateOrder(marketId, { size });
+          }
        }}
        midPrice={marketData?.midPrice}
      />
@@ -11,10 +11,14 @@ interface OrderbookRowProps {
  decimalPlaces: number;
  positionDecimalPlaces: number;
  price: string;
-  onClick?: (price: string) => void;
+  onClick?: (args: { price?: string; size?: string }) => void;
  type: VolumeType;
+  width: number;
 }

+const HIDE_VOL_WIDTH = 150;
+const HIDE_CUMULATIVE_VOL_WIDTH = 220;
+
 const CumulationBar = ({
  cumulativeValue = 0,
  type,
@@ -26,7 +30,7 @@ const CumulationBar = ({
    <div
      data-testid={`${VolumeType.bid === type ? 'bid' : 'ask'}-bar`}
      className={classNames(
-        'absolute top-0 left-0 h-full transition-all',
+        'absolute top-0 left-0 h-full',
        type === VolumeType.bid
          ? 'bg-market-green-300 dark:bg-market-green/50'
          : 'bg-market-red-300 dark:bg-market-red/30'
@@ -43,6 +47,7 @@ const CumulativeVol = memo(
    testId,
    positionDecimalPlaces,
    cumulativeValue,
+    onClick,
  }: {
    ask?: number;
    bid?: number;
@@ -50,6 +55,7 @@ const CumulativeVol = memo(
    testId?: string;
    className?: string;
    positionDecimalPlaces: number;
+    onClick?: (size?: string | number) => void;
  }) => {
    const volume = cumulativeValue ? (
      <NumericCell
@@ -61,7 +67,15 @@ const CumulativeVol = memo(
      />
    ) : null;

-    return (
+    return onClick && volume ? (
+      <button
+        data-testid={testId}
+        onClick={() => onClick(cumulativeValue)}
+        className="hover:dark:bg-neutral-800 hover:bg-neutral-200 text-right pr-1"
+      >
+        {volume}
+      </button>
+    ) : (
      <div className="pr-1" data-testid={testId}>
        {volume}
      </div>
@@ -80,16 +94,24 @@ export const OrderbookRow = React.memo(
    price,
    onClick,
    type,
+    width,
  }: OrderbookRowProps) => {
    const txtId = type === VolumeType.bid ? 'bid' : 'ask';
+    const cols =
+      width >= HIDE_CUMULATIVE_VOL_WIDTH ? 3 : width >= HIDE_VOL_WIDTH ? 2 : 1;
    return (
-      <div className="relative">
+      <div className="relative pr-1">
        <CumulationBar cumulativeValue={cumulativeRelativeValue} type={type} />
-        <div className="grid gap-1 text-right grid-cols-3">
+        <div
+          data-testid={`${txtId}-rows-container`}
+          className={classNames('grid gap-1 text-right', `grid-cols-${cols}`)}
+        >
          <PriceCell
            testId={`price-${price}`}
            value={BigInt(price)}
-            onClick={() => onClick && onClick(addDecimal(price, decimalPlaces))}
+            onClick={() =>
+              onClick && onClick({ price: addDecimal(price, decimalPlaces) })
+            }
            valueFormatted={addDecimalsFixedFormatNumber(price, decimalPlaces)}
            className={
              type === VolumeType.ask
@@ -97,19 +119,37 @@ export const OrderbookRow = React.memo(
                : 'text-market-green-600 dark:text-market-green'
            }
          />
-          <NumericCell
-            testId={`${txtId}-vol-${price}`}
-            value={value}
-            valueFormatted={addDecimalsFixedFormatNumber(
-              value,
-              positionDecimalPlaces
-            )}
-          />
-          <CumulativeVol
-            testId={`cumulative-vol-${price}`}
-            positionDecimalPlaces={positionDecimalPlaces}
-            cumulativeValue={cumulativeValue}
-          />
+          {width >= HIDE_VOL_WIDTH && (
+            <PriceCell
+              testId={`${txtId}-vol-${price}`}
+              onClick={(value) =>
+                onClick &&
+                value &&
+                onClick({
+                  size: addDecimal(value, positionDecimalPlaces),
+                })
+              }
+              value={value}
+              valueFormatted={addDecimalsFixedFormatNumber(
+                value,
+                positionDecimalPlaces
+              )}
+            />
+          )}
+          {width >= HIDE_CUMULATIVE_VOL_WIDTH && (
+            <CumulativeVol
+              testId={`cumulative-vol-${price}`}
+              onClick={() =>
+                onClick &&
+                cumulativeValue &&
+                onClick({
+                  size: addDecimal(cumulativeValue, positionDecimalPlaces),
+                })
+              }
+              positionDecimalPlaces={positionDecimalPlaces}
+              cumulativeValue={cumulativeValue}
+            />
+          )}
        </div>
      </div>
    );
@@ -1,4 +1,5 @@
-import { render, fireEvent, waitFor, screen } from '@testing-library/react';
+import { render, waitFor, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import { generateMockData, VolumeType } from './orderbook-data';
 import { Orderbook } from './orderbook';
 import * as orderbookData from './orderbook-data';
@@ -33,6 +34,7 @@ describe('Orderbook', () => {
  const decimalPlaces = 3;

  beforeEach(() => {
+    jest.clearAllMocks();
    mockOffsetSize(800, 768);
  });
  it('markPrice should be in the middle', async () => {
@@ -69,12 +71,17 @@ describe('Orderbook', () => {
      await screen.findByTestId(`middle-mark-price-${params.midPrice}`)
    ).toBeInTheDocument();
    // Before resolution change the price is 122.934
-    await fireEvent.click(await screen.getByTestId('price-122901'));
-    expect(onClickSpy).toBeCalledWith('122.901');
-    const resolutionSelect = screen.getByTestId(
-      'resolution'
-    ) as HTMLSelectElement;
-    await fireEvent.change(resolutionSelect, { target: { value: '10' } });
+    await userEvent.click(await screen.getByTestId('price-122901'));
+    expect(onClickSpy).toBeCalledWith({ price: '122.901' });
+
+    await userEvent.click(screen.getByTestId('resolution'));
+
+    await waitFor(() => {
+      expect(screen.getByRole('menu')).toBeInTheDocument();
+    });
+
+    await userEvent.click(screen.getAllByRole('menuitem')[1]);
+
    expect(orderbookData.compactRows).toHaveBeenCalledWith(
      mockedData.bids,
      VolumeType.bid,
@@ -85,7 +92,88 @@ describe('Orderbook', () => {
      VolumeType.ask,
      10
    );
-    await fireEvent.click(await screen.getByTestId('price-12294'));
-    expect(onClickSpy).toBeCalledWith('122.94');
+    await userEvent.click(await screen.getByTestId('price-12294'));
+    expect(onClickSpy).toBeCalledWith({ price: '122.94' });
+  });
+
+  it('plus - minus buttons should change resolution', async () => {
+    const onClickSpy = jest.fn();
+    jest.spyOn(orderbookData, 'compactRows');
+    const mockedData = generateMockData(params);
+    render(
+      <Orderbook
+        decimalPlaces={decimalPlaces}
+        positionDecimalPlaces={0}
+        onClick={onClickSpy}
+        {...mockedData}
+        assetSymbol="USD"
+      />
+    );
+    expect((orderbookData.compactRows as jest.Mock).mock.lastCall[2]).toEqual(
+      1
+    );
+    expect(screen.getByTestId('minus-button')).toBeDisabled();
+    userEvent.click(screen.getByTestId('plus-button'));
+    await waitFor(() => {
+      expect((orderbookData.compactRows as jest.Mock).mock.lastCall[2]).toEqual(
+        10
+      );
+    });
+    expect(screen.getByTestId('minus-button')).not.toBeDisabled();
+    userEvent.click(screen.getByTestId('minus-button'));
+    await waitFor(() => {
+      expect((orderbookData.compactRows as jest.Mock).mock.lastCall[2]).toEqual(
+        1
+      );
+    });
+    expect(screen.getByTestId('minus-button')).toBeDisabled();
+    await userEvent.click(screen.getByTestId('resolution'));
+
+    await waitFor(() => {
+      expect(screen.getByRole('menu')).toBeInTheDocument();
+    });
+    await userEvent.click(screen.getAllByRole('menuitem')[5]);
+    await waitFor(() => {
+      expect((orderbookData.compactRows as jest.Mock).mock.lastCall[2]).toEqual(
+        100000
+      );
+    });
+    expect(screen.getByTestId('plus-button')).toBeDisabled();
+  });
+
+  it('two columns', () => {
+    mockOffsetSize(200, 768);
+    const onClickSpy = jest.fn();
+    const mockedData = generateMockData(params);
+    render(
+      <Orderbook
+        decimalPlaces={decimalPlaces}
+        positionDecimalPlaces={0}
+        onClick={onClickSpy}
+        {...mockedData}
+        assetSymbol="USD"
+      />
+    );
+    screen.getAllByTestId('bid-rows-container').forEach((item) => {
+      expect(item).toHaveClass('grid-cols-2');
+    });
+  });
+
+  it('one column', () => {
+    mockOffsetSize(140, 768);
+    const onClickSpy = jest.fn();
+    const mockedData = generateMockData(params);
+    render(
+      <Orderbook
+        decimalPlaces={decimalPlaces}
+        positionDecimalPlaces={0}
+        onClick={onClickSpy}
+        {...mockedData}
+        assetSymbol="USD"
+      />
+    );
+    screen.getAllByTestId('ask-rows-container').forEach((item) => {
+      expect(item).toHaveClass('grid-cols-1');
+    });
  });
 });
@@ -1,16 +1,25 @@
-import { useMemo } from 'react';
+import { useMemo, useRef, useState } from 'react';
 import ReactVirtualizedAutoSizer from 'react-virtualized-auto-sizer';
 import {
  addDecimalsFormatNumber,
  formatNumberFixed,
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
+import { usePrevious } from '@vegaprotocol/react-helpers';
 import { OrderbookRow } from './orderbook-row';
 import type { OrderbookRowData } from './orderbook-data';
 import { compactRows, VolumeType } from './orderbook-data';
-import { Splash } from '@vegaprotocol/ui-toolkit';
+import {
+  Button,
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+  Splash,
+  VegaIcon,
+  VegaIconNames,
+} from '@vegaprotocol/ui-toolkit';
 import classNames from 'classnames';
-import { useState } from 'react';
 import type { PriceLevelFieldsFragment } from './__generated__/MarketDepth';

 // Sets row height, will be used to calculate number of rows that can be
@@ -19,6 +28,19 @@ export const rowHeight = 17;
 const rowGap = 1;
 const midHeight = 30;

+type PriceChange = 'up' | 'down' | 'none';
+
+const PRICE_CHANGE_ICON_MAP: Readonly<Record<PriceChange, VegaIconNames>> = {
+  up: VegaIconNames.ARROW_UP,
+  down: VegaIconNames.ARROW_DOWN,
+  none: VegaIconNames.BULLET,
+};
+const PRICE_CHANGE_CLASS_MAP: Readonly<Record<PriceChange, string>> = {
+  up: 'text-market-green-600 dark:text-market-green',
+  down: 'text-market-red dark:text-market-red',
+  none: 'text-vega-blue-500',
+};
+
 const OrderbookTable = ({
  rows,
  resolution,
@@ -26,13 +48,15 @@ const OrderbookTable = ({
  decimalPlaces,
  positionDecimalPlaces,
  onClick,
+  width,
 }: {
  rows: OrderbookRowData[];
  resolution: number;
  decimalPlaces: number;
  positionDecimalPlaces: number;
  type: VolumeType;
-  onClick?: (price: string) => void;
+  onClick?: (args: { price?: string; size?: string }) => void;
+  width: number;
 }) => {
  return (
    <div
@@ -59,6 +83,7 @@ const OrderbookTable = ({
            cumulativeValue={data.cumulativeVol.value}
            cumulativeRelativeValue={data.cumulativeVol.relativeValue}
            type={type}
+            width={width}
          />
        ))}
      </div>
@@ -69,7 +94,7 @@ const OrderbookTable = ({
 interface OrderbookProps {
  decimalPlaces: number;
  positionDecimalPlaces: number;
-  onClick?: (price: string) => void;
+  onClick?: (args: { price?: string; size?: string }) => void;
  midPrice?: string;
  bids: PriceLevelFieldsFragment[];
  asks: PriceLevelFieldsFragment[];
@@ -99,12 +124,50 @@ export const Orderbook = ({
  const groupedBids = useMemo(() => {
    return compactRows(bids, VolumeType.bid, resolution);
  }, [bids, resolution]);
+  const [isOpen, setOpen] = useState(false);
+  const previousMidPrice = usePrevious(midPrice);
+  const priceChangeRef = useRef<'up' | 'down' | 'none'>('none');
+  if (midPrice && previousMidPrice !== midPrice) {
+    priceChangeRef.current =
+      (previousMidPrice || '') > midPrice ? 'down' : 'up';
+  }
+
+  const priceChangeIcon = (
+    <span
+      className={classNames(PRICE_CHANGE_CLASS_MAP[priceChangeRef.current])}
+    >
+      <VegaIcon name={PRICE_CHANGE_ICON_MAP[priceChangeRef.current]} />
+    </span>
+  );
+
+  const formatResolution = (r: number) => {
+    return formatNumberFixed(
+      Math.log10(r) - decimalPlaces > 0
+        ? Math.pow(10, Math.log10(r) - decimalPlaces)
+        : 0,
+      decimalPlaces - Math.log10(r)
+    );
+  };
+
+  const increaseResolution = () => {
+    const index = resolutions.indexOf(resolution);
+    if (index < resolutions.length - 1) {
+      setResolution(resolutions[index + 1]);
+    }
+  };
+
+  const decreaseResolution = () => {
+    const index = resolutions.indexOf(resolution);
+    if (index > 0) {
+      setResolution(resolutions[index - 1]);
+    }
+  };

  return (
    <div className="h-full pl-1 text-xs grid grid-rows-[1fr_min-content]">
      <div>
-        <ReactVirtualizedAutoSizer disableWidth>
-          {({ height }) => {
+        <ReactVirtualizedAutoSizer>
+          {({ width, height }) => {
            const limit = Math.max(
              1,
              Math.floor((height - midHeight) / 2 / (rowHeight + rowGap))
@@ -116,6 +179,7 @@ export const Orderbook = ({
                className="overflow-hidden grid"
                data-testid="orderbook-grid-element"
                style={{
+                  width: width + 'px',
                  height: height + 'px',
                  gridTemplateRows: `1fr ${midHeight}px 1fr`, // cannot use tailwind here as tailwind will not parse a class string with interpolation
                }}
@@ -129,6 +193,7 @@ export const Orderbook = ({
                      decimalPlaces={decimalPlaces}
                      positionDecimalPlaces={positionDecimalPlaces}
                      onClick={onClick}
+                      width={width}
                    />
                    <div className="flex items-center justify-center gap-2">
                      {midPrice && (
@@ -140,6 +205,7 @@ export const Orderbook = ({
                            {addDecimalsFormatNumber(midPrice, decimalPlaces)}
                          </span>
                          <span className="text-base">{assetSymbol}</span>
+                          {priceChangeIcon}
                        </>
                      )}
                    </div>
@@ -150,6 +216,7 @@ export const Orderbook = ({
                      decimalPlaces={decimalPlaces}
                      positionDecimalPlaces={positionDecimalPlaces}
                      onClick={onClick}
+                      width={width}
                    />
                  </>
                ) : (
@@ -162,26 +229,61 @@ export const Orderbook = ({
          }}
        </ReactVirtualizedAutoSizer>
      </div>
-      <div className="border-t border-default">
-        <select
-          onChange={(e) => {
-            setResolution(Number(e.currentTarget.value));
-          }}
-          value={resolution}
-          className="block bg-neutral-100 dark:bg-neutral-700 font-mono text-right"
-          data-testid="resolution"
+      <div className="border-t border-default flex">
+        <Button
+          onClick={increaseResolution}
+          size="xs"
+          disabled={resolutions.indexOf(resolution) >= resolutions.length - 1}
+          className="text-black dark:text-white rounded-none border-y-0 border-l-0 flex items-center border-r-1"
+          data-testid="plus-button"
        >
-          {resolutions.map((r) => (
-            <option key={r} value={r}>
-              {formatNumberFixed(
-                Math.log10(r) - decimalPlaces > 0
-                  ? Math.pow(10, Math.log10(r) - decimalPlaces)
-                  : 0,
-                decimalPlaces - Math.log10(r)
-              )}
-            </option>
-          ))}
-        </select>
+          <VegaIcon size={12} name={VegaIconNames.PLUS} />
+        </Button>
+        <DropdownMenu
+          open={isOpen}
+          onOpenChange={(open) => setOpen(open)}
+          trigger={
+            <DropdownMenuTrigger
+              data-testid="resolution"
+              className="flex justify-between px-1 items-center"
+              style={{
+                width: `${
+                  Math.max.apply(
+                    null,
+                    resolutions.map((item) => formatResolution(item).length)
+                  ) + 3
+                }ch`,
+              }}
+            >
+              <VegaIcon
+                size={12}
+                name={
+                  isOpen ? VegaIconNames.CHEVRON_UP : VegaIconNames.CHEVRON_DOWN
+                }
+              />
+              <div className="text-xs text-left">
+                {formatResolution(resolution)}
+              </div>
+            </DropdownMenuTrigger>
+          }
+        >
+          <DropdownMenuContent align="start">
+            {resolutions.map((r) => (
+              <DropdownMenuItem key={r} onClick={() => setResolution(r)}>
+                {formatResolution(r)}
+              </DropdownMenuItem>
+            ))}
+          </DropdownMenuContent>
+        </DropdownMenu>
+        <Button
+          onClick={decreaseResolution}
+          size="xs"
+          disabled={resolutions.indexOf(resolution) <= 0}
+          className="text-black dark:text-white rounded-none border-y-0 border-l-1 flex items-center"
+          data-testid="minus-button"
+        >
+          <VegaIcon size={12} name={VegaIconNames.MINUS} />
+        </Button>
      </div>
    </div>
  );
@@ -16,6 +16,16 @@ fragment DataSource on DataSourceDefinition {
        }
      }
    }
+    ... on DataSourceDefinitionInternal {
+      sourceType {
+        ... on DataSourceSpecConfigurationTime {
+          conditions {
+            operator
+            value
+          }
+        }
+      }
+    }
  }
 }

@@ -3,14 +3,14 @@ import * as Types from '@vegaprotocol/types';
 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
-export type DataSourceFragment = { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } };
+export type DataSourceFragment = { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', operator: Types.ConditionOperator, value?: string | null } | null> } } };

 export type MarketInfoQueryVariables = Types.Exact<{
  marketId: Types.Scalars['ID'];
 }>;


-export type MarketInfoQuery = { __typename?: 'Query', market?: { __typename?: 'Market', id: string, decimalPlaces: number, positionDecimalPlaces: number, state: Types.MarketState, tradingMode: Types.MarketTradingMode, lpPriceRange: string, parentMarketID?: string | null, proposal?: { __typename?: 'Proposal', id?: string | null, rationale: { __typename?: 'ProposalRationale', title: string, description: string } } | null, marketTimestamps: { __typename?: 'MarketTimestamps', open: any, close: any }, openingAuction: { __typename?: 'AuctionDuration', durationSecs: number, volume: number }, accountsConnection?: { __typename?: 'AccountsConnection', edges?: Array<{ __typename?: 'AccountEdge', node: { __typename?: 'AccountBalance', type: Types.AccountType, balance: string, asset: { __typename?: 'Asset', id: string } } } | null> | null } | null, fees: { __typename?: 'Fees', factors: { __typename?: 'FeeFactors', makerFee: string, infrastructureFee: string, liquidityFee: string } }, priceMonitoringSettings: { __typename?: 'PriceMonitoringSettings', parameters?: { __typename?: 'PriceMonitoringParameters', triggers?: Array<{ __typename?: 'PriceMonitoringTrigger', horizonSecs: number, probability: number, auctionExtensionSecs: number }> | null } | null }, riskFactors?: { __typename?: 'RiskFactor', market: string, short: string, long: string } | null, liquidityMonitoringParameters: { __typename?: 'LiquidityMonitoringParameters', triggeringRatio: string, targetStakeParameters: { __typename?: 'TargetStakeParameters', timeWindow: number, scalingFactor: number } }, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', id: string, name: string, code: string, metadata: { __typename?: 'InstrumentMetadata', tags?: Array<string> | null }, product: { __typename?: 'Future', quoteName: string, settlementAsset: { __typename?: 'Asset', id: string, symbol: string, name: string, decimals: number }, dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecBinding: { __typename?: 'DataSourceSpecToFutureBinding', settlementDataProperty: string, tradingTerminationProperty: string } } }, riskModel: { __typename?: 'LogNormalRiskModel', tau: number, riskAversionParameter: number, params: { __typename?: 'LogNormalModelParams', r: number, sigma: number, mu: number } } | { __typename?: 'SimpleRiskModel', params: { __typename?: 'SimpleRiskModelParams', factorLong: number, factorShort: number } }, marginCalculator?: { __typename?: 'MarginCalculator', scalingFactors: { __typename?: 'ScalingFactors', searchLevel: number, initialMargin: number, collateralRelease: number } } | null } } | null };
+export type MarketInfoQuery = { __typename?: 'Query', market?: { __typename?: 'Market', id: string, decimalPlaces: number, positionDecimalPlaces: number, state: Types.MarketState, tradingMode: Types.MarketTradingMode, lpPriceRange: string, parentMarketID?: string | null, proposal?: { __typename?: 'Proposal', id?: string | null, rationale: { __typename?: 'ProposalRationale', title: string, description: string } } | null, marketTimestamps: { __typename?: 'MarketTimestamps', open: any, close: any }, openingAuction: { __typename?: 'AuctionDuration', durationSecs: number, volume: number }, accountsConnection?: { __typename?: 'AccountsConnection', edges?: Array<{ __typename?: 'AccountEdge', node: { __typename?: 'AccountBalance', type: Types.AccountType, balance: string, asset: { __typename?: 'Asset', id: string } } } | null> | null } | null, fees: { __typename?: 'Fees', factors: { __typename?: 'FeeFactors', makerFee: string, infrastructureFee: string, liquidityFee: string } }, priceMonitoringSettings: { __typename?: 'PriceMonitoringSettings', parameters?: { __typename?: 'PriceMonitoringParameters', triggers?: Array<{ __typename?: 'PriceMonitoringTrigger', horizonSecs: number, probability: number, auctionExtensionSecs: number }> | null } | null }, riskFactors?: { __typename?: 'RiskFactor', market: string, short: string, long: string } | null, liquidityMonitoringParameters: { __typename?: 'LiquidityMonitoringParameters', triggeringRatio: string, targetStakeParameters: { __typename?: 'TargetStakeParameters', timeWindow: number, scalingFactor: number } }, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', id: string, name: string, code: string, metadata: { __typename?: 'InstrumentMetadata', tags?: Array<string> | null }, product: { __typename?: 'Future', quoteName: string, settlementAsset: { __typename?: 'Asset', id: string, symbol: string, name: string, decimals: number }, dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', operator: Types.ConditionOperator, value?: string | null } | null> } } } }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', operator: Types.ConditionOperator, value?: string | null } | null> } } } }, dataSourceSpecBinding: { __typename?: 'DataSourceSpecToFutureBinding', settlementDataProperty: string, tradingTerminationProperty: string } } }, riskModel: { __typename?: 'LogNormalRiskModel', tau: number, riskAversionParameter: number, params: { __typename?: 'LogNormalModelParams', r: number, sigma: number, mu: number } } | { __typename?: 'SimpleRiskModel', params: { __typename?: 'SimpleRiskModelParams', factorLong: number, factorShort: number } }, marginCalculator?: { __typename?: 'MarginCalculator', scalingFactors: { __typename?: 'ScalingFactors', searchLevel: number, initialMargin: number, collateralRelease: number } } | null } } | null };

 export const DataSourceFragmentDoc = gql`
    fragment DataSource on DataSourceDefinition {
@@ -31,6 +31,16 @@ export const DataSourceFragmentDoc = gql`
        }
      }
    }
+    ... on DataSourceDefinitionInternal {
+      sourceType {
+        ... on DataSourceSpecConfigurationTime {
+          conditions {
+            operator
+            value
+          }
+        }
+      }
+    }
  }
 }
    `;
@@ -129,6 +129,7 @@ export const MarketInfoAccordion = ({
            .filter((a) => a.type === Schema.AccountType.ACCOUNT_TYPE_INSURANCE)
            .map((a) => (
              <AccordionItem
+                key={`${a.type}:${a.asset.id}`}
                itemId={`${a.type}:${a.asset.id}`}
                title={t('Insurance pool')}
                content={<InsurancePoolInfoPanel market={market} account={a} />}
@@ -203,6 +204,7 @@ export const MarketInfoAccordion = ({
          {(market.priceMonitoringSettings?.parameters?.triggers || []).map(
            (_, triggerIndex) => (
              <AccordionItem
+                key={`trigger-${triggerIndex}`}
                itemId={`trigger-${triggerIndex}`}
                title={t(`Price monitoring bounds ${triggerIndex + 1}`)}
                content={
@@ -141,6 +141,7 @@ export const createMarketFragment = (
      },
      __typename: 'TradableInstrument',
    },
+    successorMarketID: null,
    __typename: 'Market',
  };

@@ -24,6 +24,12 @@ fragment OrderFields on Order {
    reference
    offset
  }
+  icebergOrder {
+    __typename
+    peakSize
+    minimumVisibleSize
+    reservedRemaining
+  }
 }

 query OrderById($orderId: ID!) {
@@ -66,7 +72,6 @@ fragment OrderUpdateFields on OrderUpdate {
  type
  side
  size
-  remaining
  status
  rejectionReason
  price
@@ -81,6 +86,12 @@ fragment OrderUpdateFields on OrderUpdate {
    reference
    offset
  }
+  icebergOrder {
+    __typename
+    peakSize
+    minimumVisibleSize
+    reservedRemaining
+  }
 }

 subscription OrdersUpdate($partyId: ID!, $marketIds: [ID!]) {
@@ -3,14 +3,14 @@ import * as Types from '@vegaprotocol/types';
 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
-export type OrderFieldsFragment = { __typename?: 'Order', id: string, type?: Types.OrderType | null, side: Types.Side, size: string, status: Types.OrderStatus, rejectionReason?: Types.OrderRejectionReason | null, price: string, timeInForce: Types.OrderTimeInForce, remaining: string, expiresAt?: any | null, createdAt: any, updatedAt?: any | null, postOnly?: boolean | null, reduceOnly?: boolean | null, market: { __typename?: 'Market', id: string }, liquidityProvision?: { __typename: 'LiquidityProvision' } | null, peggedOrder?: { __typename: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | null };
+export type OrderFieldsFragment = { __typename?: 'Order', id: string, type?: Types.OrderType | null, side: Types.Side, size: string, status: Types.OrderStatus, rejectionReason?: Types.OrderRejectionReason | null, price: string, timeInForce: Types.OrderTimeInForce, remaining: string, expiresAt?: any | null, createdAt: any, updatedAt?: any | null, postOnly?: boolean | null, reduceOnly?: boolean | null, market: { __typename?: 'Market', id: string }, liquidityProvision?: { __typename: 'LiquidityProvision' } | null, peggedOrder?: { __typename: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | null, icebergOrder?: { __typename: 'IcebergOrder', peakSize: string, minimumVisibleSize: string, reservedRemaining: string } | null };

 export type OrderByIdQueryVariables = Types.Exact<{
  orderId: Types.Scalars['ID'];
 }>;


-export type OrderByIdQuery = { __typename?: 'Query', orderByID: { __typename?: 'Order', id: string, type?: Types.OrderType | null, side: Types.Side, size: string, status: Types.OrderStatus, rejectionReason?: Types.OrderRejectionReason | null, price: string, timeInForce: Types.OrderTimeInForce, remaining: string, expiresAt?: any | null, createdAt: any, updatedAt?: any | null, postOnly?: boolean | null, reduceOnly?: boolean | null, market: { __typename?: 'Market', id: string }, liquidityProvision?: { __typename: 'LiquidityProvision' } | null, peggedOrder?: { __typename: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | null } };
+export type OrderByIdQuery = { __typename?: 'Query', orderByID: { __typename?: 'Order', id: string, type?: Types.OrderType | null, side: Types.Side, size: string, status: Types.OrderStatus, rejectionReason?: Types.OrderRejectionReason | null, price: string, timeInForce: Types.OrderTimeInForce, remaining: string, expiresAt?: any | null, createdAt: any, updatedAt?: any | null, postOnly?: boolean | null, reduceOnly?: boolean | null, market: { __typename?: 'Market', id: string }, liquidityProvision?: { __typename: 'LiquidityProvision' } | null, peggedOrder?: { __typename: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | null, icebergOrder?: { __typename: 'IcebergOrder', peakSize: string, minimumVisibleSize: string, reservedRemaining: string } | null } };

 export type OrdersQueryVariables = Types.Exact<{
  partyId: Types.Scalars['ID'];
@@ -20,9 +20,9 @@ export type OrdersQueryVariables = Types.Exact<{
 }>;


-export type OrdersQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, ordersConnection?: { __typename?: 'OrderConnection', edges?: Array<{ __typename?: 'OrderEdge', cursor?: string | null, node: { __typename?: 'Order', id: string, type?: Types.OrderType | null, side: Types.Side, size: string, status: Types.OrderStatus, rejectionReason?: Types.OrderRejectionReason | null, price: string, timeInForce: Types.OrderTimeInForce, remaining: string, expiresAt?: any | null, createdAt: any, updatedAt?: any | null, postOnly?: boolean | null, reduceOnly?: boolean | null, market: { __typename?: 'Market', id: string }, liquidityProvision?: { __typename: 'LiquidityProvision' } | null, peggedOrder?: { __typename: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | null } }> | null, pageInfo?: { __typename?: 'PageInfo', startCursor: string, endCursor: string, hasNextPage: boolean, hasPreviousPage: boolean } | null } | null } | null };
+export type OrdersQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, ordersConnection?: { __typename?: 'OrderConnection', edges?: Array<{ __typename?: 'OrderEdge', cursor?: string | null, node: { __typename?: 'Order', id: string, type?: Types.OrderType | null, side: Types.Side, size: string, status: Types.OrderStatus, rejectionReason?: Types.OrderRejectionReason | null, price: string, timeInForce: Types.OrderTimeInForce, remaining: string, expiresAt?: any | null, createdAt: any, updatedAt?: any | null, postOnly?: boolean | null, reduceOnly?: boolean | null, market: { __typename?: 'Market', id: string }, liquidityProvision?: { __typename: 'LiquidityProvision' } | null, peggedOrder?: { __typename: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | null, icebergOrder?: { __typename: 'IcebergOrder', peakSize: string, minimumVisibleSize: string, reservedRemaining: string } | null } }> | null, pageInfo?: { __typename?: 'PageInfo', startCursor: string, endCursor: string, hasNextPage: boolean, hasPreviousPage: boolean } | null } | null } | null };

-export type OrderUpdateFieldsFragment = { __typename?: 'OrderUpdate', id: string, marketId: string, type?: Types.OrderType | null, side: Types.Side, size: string, remaining: string, status: Types.OrderStatus, rejectionReason?: Types.OrderRejectionReason | null, price: string, timeInForce: Types.OrderTimeInForce, expiresAt?: any | null, createdAt: any, updatedAt?: any | null, liquidityProvisionId?: string | null, peggedOrder?: { __typename: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | null };
+export type OrderUpdateFieldsFragment = { __typename?: 'OrderUpdate', id: string, marketId: string, type?: Types.OrderType | null, side: Types.Side, size: string, status: Types.OrderStatus, rejectionReason?: Types.OrderRejectionReason | null, price: string, timeInForce: Types.OrderTimeInForce, remaining: string, expiresAt?: any | null, createdAt: any, updatedAt?: any | null, liquidityProvisionId?: string | null, peggedOrder?: { __typename: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | null, icebergOrder?: { __typename: 'IcebergOrder', peakSize: string, minimumVisibleSize: string, reservedRemaining: string } | null };

 export type OrdersUpdateSubscriptionVariables = Types.Exact<{
  partyId: Types.Scalars['ID'];
@@ -30,7 +30,7 @@ export type OrdersUpdateSubscriptionVariables = Types.Exact<{
 }>;


-export type OrdersUpdateSubscription = { __typename?: 'Subscription', orders?: Array<{ __typename?: 'OrderUpdate', id: string, marketId: string, type?: Types.OrderType | null, side: Types.Side, size: string, remaining: string, status: Types.OrderStatus, rejectionReason?: Types.OrderRejectionReason | null, price: string, timeInForce: Types.OrderTimeInForce, expiresAt?: any | null, createdAt: any, updatedAt?: any | null, liquidityProvisionId?: string | null, peggedOrder?: { __typename: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | null }> | null };
+export type OrdersUpdateSubscription = { __typename?: 'Subscription', orders?: Array<{ __typename?: 'OrderUpdate', id: string, marketId: string, type?: Types.OrderType | null, side: Types.Side, size: string, status: Types.OrderStatus, rejectionReason?: Types.OrderRejectionReason | null, price: string, timeInForce: Types.OrderTimeInForce, remaining: string, expiresAt?: any | null, createdAt: any, updatedAt?: any | null, liquidityProvisionId?: string | null, peggedOrder?: { __typename: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | null, icebergOrder?: { __typename: 'IcebergOrder', peakSize: string, minimumVisibleSize: string, reservedRemaining: string } | null }> | null };

 export const OrderFieldsFragmentDoc = gql`
    fragment OrderFields on Order {
@@ -59,6 +59,12 @@ export const OrderFieldsFragmentDoc = gql`
    reference
    offset
  }
+  icebergOrder {
+    __typename
+    peakSize
+    minimumVisibleSize
+    reservedRemaining
+  }
 }
    `;
 export const OrderUpdateFieldsFragmentDoc = gql`
@@ -68,7 +74,6 @@ export const OrderUpdateFieldsFragmentDoc = gql`
  type
  side
  size
-  remaining
  status
  rejectionReason
  price
@@ -83,6 +88,12 @@ export const OrderUpdateFieldsFragmentDoc = gql`
    reference
    offset
  }
+  icebergOrder {
+    __typename
+    peakSize
+    minimumVisibleSize
+    reservedRemaining
+  }
 }
    `;
 export const OrderByIdDocument = gql`
@@ -63,6 +63,11 @@ export const mapOrderUpdateToOrder = (
  return {
    ...order,
    liquidityProvision: liquidityProvision,
+    icebergOrder: order.icebergOrder
+      ? {
+          ...order.icebergOrder,
+        }
+      : undefined,
    market: {
      __typename: 'Market',
      id: marketId,
@@ -267,12 +267,14 @@ export const OrderListTable = memo<
                <div className="flex gap-2 items-center justify-end">
                  {isOrderAmendable(data) && !props.isReadOnly && (
                    <>
-                      <ButtonLink
-                        data-testid="edit"
-                        onClick={() => onEdit(data)}
-                      >
-                        {t('Edit')}
-                      </ButtonLink>
+                      {!data.icebergOrder && (
+                        <ButtonLink
+                          data-testid="edit"
+                          onClick={() => onEdit(data)}
+                        >
+                          {t('Edit')}
+                        </ButtonLink>
+                      )}
                      <ButtonLink
                        data-testid="cancel"
                        onClick={() => onCancel(data)}
@@ -16,7 +16,13 @@ export type OrderObj = {
  persist: boolean; // key used to determine if order should be kept in localStorage
  postOnly?: boolean;
  reduceOnly?: boolean;
+  iceberg?: boolean;
+  icebergOpts?: {
+    peakSize: string;
+    minimumVisibleSize: string;
+  };
 };
+
 type OrderMap = { [marketId: string]: OrderObj | undefined };

 type UpdateOrder = (
@@ -6,6 +6,7 @@ import type { Position } from './positions-data-providers';
 import * as Schema from '@vegaprotocol/types';
 import { PositionStatus, PositionStatusMapping } from '@vegaprotocol/types';
 import type { ICellRendererParams } from 'ag-grid-community';
+import { addDecimalsFormatNumber } from '@vegaprotocol/utils';

 jest.mock('./liquidation-price', () => ({
  LiquidationPrice: () => (
@@ -19,7 +20,7 @@ const singleRow: Position = {
  assetSymbol: 'BTC',
  averageEntryPrice: '133',
  currentLeverage: 1.1,
-  decimals: 2,
+  decimals: 2, // this is settlementAsset.decimals
  quantum: '0.1',
  lossSocializationAmount: '0',
  marginAccountBalance: '12345600',
@@ -177,12 +178,23 @@ it('displays allocated margin', async () => {
 });

 it('displays realised and unrealised PNL', async () => {
+  // pnl cells should be rendered with asset dps
+  const expectedRealised = addDecimalsFormatNumber(
+    singleRow.realisedPNL,
+    singleRow.decimals
+  );
+  const expectedUnrealised = addDecimalsFormatNumber(
+    singleRow.unrealisedPNL,
+    singleRow.decimals
+  );
+
  await act(async () => {
    render(<PositionsTable rowData={singleRowData} isReadOnly={false} />);
  });
+
  const cells = screen.getAllByRole('gridcell');
-  expect(cells[9].textContent).toEqual('12.3');
-  expect(cells[10].textContent).toEqual('45.6');
+  expect(cells[9].textContent).toEqual(expectedRealised);
+  expect(cells[10].textContent).toEqual(expectedUnrealised);
 });

 it('displays close button', async () => {
@@ -365,20 +365,14 @@ export const PositionsTable = forwardRef<AgGridReact, Props>(
              valueGetter: ({ data }: VegaValueGetterParams<Position>) => {
                return !data
                  ? undefined
-                  : toBigNum(
-                      data.realisedPNL,
-                      data.marketDecimalPlaces
-                    ).toNumber();
+                  : toBigNum(data.realisedPNL, data.decimals).toNumber();
              },
              valueFormatter: ({
                data,
              }: VegaValueFormatterParams<Position, 'realisedPNL'>) => {
                return !data
                  ? ''
-                  : addDecimalsFormatNumber(
-                      data.realisedPNL,
-                      data.marketDecimalPlaces
-                    );
+                  : addDecimalsFormatNumber(data.realisedPNL, data.decimals);
              },
              headerTooltip: t(
                'Profit or loss is realised whenever your position is reduced to zero and the margin is released back to your collateral balance. P&L excludes any fees paid.'
@@ -396,20 +390,14 @@ export const PositionsTable = forwardRef<AgGridReact, Props>(
              valueGetter: ({ data }: VegaValueGetterParams<Position>) => {
                return !data
                  ? undefined
-                  : toBigNum(
-                      data.unrealisedPNL,
-                      data.marketDecimalPlaces
-                    ).toNumber();
+                  : toBigNum(data.unrealisedPNL, data.decimals).toNumber();
              },
              valueFormatter: ({
                data,
              }: VegaValueFormatterParams<Position, 'unrealisedPNL'>) =>
                !data
                  ? ''
-                  : addDecimalsFormatNumber(
-                      data.unrealisedPNL,
-                      data.marketDecimalPlaces
-                    ),
+                  : addDecimalsFormatNumber(data.unrealisedPNL, data.decimals),
              headerTooltip: t(
                'Unrealised profit is the current profit on your open position. Margin is still allocated to your position.'
              ),
@@ -44,7 +44,10 @@ export const ProtocolUpgradeProposalNotification = ({
    case ProtocolUpgradeCountdownMode.IN_ESTIMATED_TIME_REMAINING:
      countdown =
        time !== undefined ? (
-          <span className="text-vega-orange-500">
+          <span
+            title={t('estimated time to protocol upgrade')}
+            className="text-vega-orange-500"
+          >
            {convertToCountdownString(time, '0:00:00:00')}
          </span>
        ) : (
@@ -13,12 +13,12 @@ export type ProposalEventSubscriptionVariables = Types.Exact<{

 export type ProposalEventSubscription = { __typename?: 'Subscription', proposals: { __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, rejectionReason?: Types.ProposalRejectionReason | null, errorDetails?: string | null } };

-export type UpdateNetworkParameterProposalFragment = { __typename?: 'Proposal', id?: string | null, state: Types.ProposalState, datetime: any, terms: { __typename?: 'ProposalTerms', enactmentDatetime?: any | null, change: { __typename?: 'NewAsset' } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket' } | { __typename?: 'UpdateAsset' } | { __typename?: 'UpdateMarket' } | { __typename?: 'UpdateNetworkParameter', networkParameter: { __typename?: 'NetworkParameter', key: string, value: string } } } };
+export type UpdateNetworkParameterProposalFragment = { __typename?: 'Proposal', id?: string | null, state: Types.ProposalState, datetime: any, terms: { __typename?: 'ProposalTerms', enactmentDatetime?: any | null, change: { __typename?: 'CancelTransfer' } | { __typename?: 'NewAsset' } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket' } | { __typename?: 'NewTransfer' } | { __typename?: 'UpdateAsset' } | { __typename?: 'UpdateMarket' } | { __typename?: 'UpdateNetworkParameter', networkParameter: { __typename?: 'NetworkParameter', key: string, value: string } } } };

 export type OnUpdateNetworkParametersSubscriptionVariables = Types.Exact<{ [key: string]: never; }>;


-export type OnUpdateNetworkParametersSubscription = { __typename?: 'Subscription', proposals: { __typename?: 'Proposal', id?: string | null, state: Types.ProposalState, datetime: any, terms: { __typename?: 'ProposalTerms', enactmentDatetime?: any | null, change: { __typename?: 'NewAsset' } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket' } | { __typename?: 'UpdateAsset' } | { __typename?: 'UpdateMarket' } | { __typename?: 'UpdateNetworkParameter', networkParameter: { __typename?: 'NetworkParameter', key: string, value: string } } } } };
+export type OnUpdateNetworkParametersSubscription = { __typename?: 'Subscription', proposals: { __typename?: 'Proposal', id?: string | null, state: Types.ProposalState, datetime: any, terms: { __typename?: 'ProposalTerms', enactmentDatetime?: any | null, change: { __typename?: 'CancelTransfer' } | { __typename?: 'NewAsset' } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket' } | { __typename?: 'NewTransfer' } | { __typename?: 'UpdateAsset' } | { __typename?: 'UpdateMarket' } | { __typename?: 'UpdateNetworkParameter', networkParameter: { __typename?: 'NetworkParameter', key: string, value: string } } } } };

 export type ProposalOfMarketQueryVariables = Types.Exact<{
  marketId: Types.Scalars['ID'];
@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useReducer, useRef } from 'react';

-interface State<T> {
+export interface State<T> {
  data?: T;
  error?: Error;
  loading?: boolean;
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "@nx/react/babel",
+      {
+        "runtime": "automatic",
+        "useBuiltIns": "usage"
+      }
+    ]
+  ],
+  "plugins": []
+}
@@ -0,0 +1,18 @@
+{
+  "extends": ["plugin:@nx/react", "../../.eslintrc.json"],
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.ts", "*.tsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.js", "*.jsx"],
+      "rules": {}
+    }
+  ]
+}
@@ -0,0 +1,7 @@
+# tendermint
+
+This library was generated with [Nx](https://nx.dev).
+
+## Running unit tests
+
+Run `nx test tendermint` to execute the unit tests via [Jest](https://jestjs.io).
@@ -0,0 +1,11 @@
+/* eslint-disable */
+export default {
+  displayName: 'tendermint',
+  preset: '../../jest.preset.js',
+  transform: {
+    '^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nx/react/plugins/jest',
+    '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nx/react/babel'] }],
+  },
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
+  coverageDirectory: '../../coverage/libs/tendermint',
+};
@@ -0,0 +1,4 @@
+{
+  "name": "tendermint",
+  "version": "0.0.1"
+}
@@ -0,0 +1,50 @@
+{
+  "name": "tendermint",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/tendermint/src",
+  "projectType": "library",
+  "tags": [],
+  "targets": {
+    "lint": {
+      "executor": "@nx/linter:eslint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": ["libs/tendermint/**/*.{ts,tsx,js,jsx}"]
+      }
+    },
+    "build": {
+      "executor": "@nx/rollup:rollup",
+      "outputs": ["{options.outputPath}"],
+      "options": {
+        "outputPath": "dist/libs/tendermint",
+        "tsConfig": "libs/tendermint/tsconfig.lib.json",
+        "project": "libs/tendermint/package.json",
+        "entryFile": "libs/tendermint/src/index.ts",
+        "external": ["react", "react-dom", "react/jsx-runtime"],
+        "rollupConfig": "@nx/react/plugins/bundle-rollup",
+        "compiler": "babel",
+        "assets": [
+          {
+            "glob": "libs/tendermint/README.md",
+            "input": ".",
+            "output": "."
+          }
+        ]
+      }
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
+      "options": {
+        "jestConfig": "libs/tendermint/jest.config.ts",
+        "passWithNoTests": true
+      },
+      "configurations": {
+        "ci": {
+          "ci": true,
+          "codeCoverage": true
+        }
+      }
+    }
+  }
+}
@@ -0,0 +1,2 @@
+export * from './lib/use-block-info';
+export * from './types';
@@ -0,0 +1,20 @@
+import { useEnvironment } from '@vegaprotocol/environment';
+import { useFetch } from '@vegaprotocol/react-helpers';
+import type { TendermintBlockResponse } from '../types';
+
+export const useBlockInfo = (blockHeight?: number, canFetch = true) => {
+  const { TENDERMINT_URL } = useEnvironment();
+
+  const url = `${TENDERMINT_URL}/block?height=${blockHeight}`;
+  const canFetchData = Boolean(
+    TENDERMINT_URL && blockHeight && !isNaN(blockHeight) && canFetch
+  );
+
+  const { state, refetch } = useFetch<TendermintBlockResponse>(
+    url,
+    { cache: 'force-cache' },
+    canFetchData
+  );
+
+  return { state, refetch };
+};
@@ -0,0 +1,57 @@
+export type TendermintBlockResponse = {
+  jsonrpc: string;
+  id: number;
+  result: {
+    block_id: Id;
+    block: Block;
+  };
+};
+
+type Id = {
+  hash: string;
+  parts: {
+    total: number;
+    hash: string;
+  };
+};
+
+type Header = {
+  version: {
+    block: string;
+  };
+  chain_id: string;
+  height: string;
+  time: string;
+  last_block_id: Id;
+  last_commit_hash: string;
+  data_hash: string;
+  validators_hash: string;
+  next_validators_hash: string;
+  consensus_hash: string;
+  app_hash: string;
+  last_results_hash: string;
+  evidence_hash: string;
+  proposer_address: string;
+};
+
+type Block = {
+  header: Header;
+  data: {
+    txs: string[];
+  };
+  evidence: {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    evidence: any[];
+  };
+  last_commit: {
+    height: string;
+    round: number;
+    block_id: Id;
+    signatures: {
+      block_id_flag: number;
+      validator_address: string;
+      timestamp: string;
+      signature: string;
+    }[];
+  };
+};
@@ -0,0 +1,25 @@
+{
+  "compilerOptions": {
+    "jsx": "react-jsx",
+    "allowJs": true,
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "noImplicitOverride": true,
+    "noPropertyAccessFromIndexSignature": false,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true
+  },
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    }
+  ],
+  "extends": "../../tsconfig.base.json"
+}
@@ -0,0 +1,23 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "types": ["node"]
+  },
+  "files": [
+    "../../node_modules/@nx/react/typings/cssmodule.d.ts",
+    "../../node_modules/@nx/react/typings/image.d.ts"
+  ],
+  "exclude": [
+    "jest.config.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.tsx",
+    "src/**/*.test.tsx",
+    "src/**/*.spec.js",
+    "src/**/*.test.js",
+    "src/**/*.spec.jsx",
+    "src/**/*.test.jsx"
+  ],
+  "include": ["src/**/*.js", "src/**/*.jsx", "src/**/*.ts", "src/**/*.tsx"]
+}
@@ -0,0 +1,20 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "module": "commonjs",
+    "types": ["jest", "node"]
+  },
+  "include": [
+    "jest.config.ts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.test.tsx",
+    "src/**/*.spec.tsx",
+    "src/**/*.test.js",
+    "src/**/*.spec.js",
+    "src/**/*.test.jsx",
+    "src/**/*.spec.jsx",
+    "src/**/*.d.ts"
+  ]
+}
@@ -92,8 +92,12 @@ export enum AccountType {
  ACCOUNT_TYPE_GLOBAL_INSURANCE = 'ACCOUNT_TYPE_GLOBAL_INSURANCE',
  /** GlobalReward - a global account for the reward pool */
  ACCOUNT_TYPE_GLOBAL_REWARD = 'ACCOUNT_TYPE_GLOBAL_REWARD',
+  /** AccountTypeHolding - an account for holding funds covering for active unfilled orders */
+  ACCOUNT_TYPE_HOLDING = 'ACCOUNT_TYPE_HOLDING',
  /** Insurance pool account - only for 'system' party */
  ACCOUNT_TYPE_INSURANCE = 'ACCOUNT_TYPE_INSURANCE',
+  /** Per liquidity provider, per market account for holding LPs' fees before distribution */
+  ACCOUNT_TYPE_LP_LIQUIDITY_FEES = 'ACCOUNT_TYPE_LP_LIQUIDITY_FEES',
  /**
   * Margin - The leverage account for parties, contains funds set aside for the margin needed to support
   * a party's open positions. Each party will have a margin account for each market they have traded in.
@@ -3338,6 +3342,8 @@ export enum ProposalRejectionReason {
  PROPOSAL_ERROR_OPENING_AUCTION_DURATION_TOO_SMALL = 'PROPOSAL_ERROR_OPENING_AUCTION_DURATION_TOO_SMALL',
  /** Proposal declined because the participation threshold was not reached */
  PROPOSAL_ERROR_PARTICIPATION_THRESHOLD_NOT_REACHED = 'PROPOSAL_ERROR_PARTICIPATION_THRESHOLD_NOT_REACHED',
+  /** Spot trading is disabled */
+  PROPOSAL_ERROR_SPOT_PRODUCT_DISABLED = 'PROPOSAL_ERROR_SPOT_PRODUCT_DISABLED',
  /** Too many decimal places specified in market */
  PROPOSAL_ERROR_TOO_MANY_MARKET_DECIMAL_PLACES = 'PROPOSAL_ERROR_TOO_MANY_MARKET_DECIMAL_PLACES',
  /** Too many price monitoring triggers specified in market */
@@ -44,6 +44,8 @@ export const AccountTypeMapping: {
  ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS: 'Reward Market Proposers',
  ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES: 'Reward Maker paid fees',
  ACCOUNT_TYPE_SETTLEMENT: 'Settlement',
+  ACCOUNT_TYPE_HOLDING: 'Holding',
+  ACCOUNT_TYPE_LP_LIQUIDITY_FEES: 'LP Liquidity Fees',
 };

 /**
@@ -322,14 +324,14 @@ export const ProposalRejectionReasonMapping: {
  PROPOSAL_ERROR_ERC20_ADDRESS_ALREADY_IN_USE:
    'ERC20 address already in use by an existing asset',
  PROPOSAL_ERROR_GOVERNANCE_CANCEL_TRANSFER_PROPOSAL_INVALID:
-    'PROPOSAL_ERROR_GOVERNANCE_CANCEL_TRANSFER_PROPOSAL_INVALID',
+    'Governance cancel transfer proposal invalid',
  PROPOSAL_ERROR_GOVERNANCE_TRANSFER_PROPOSAL_FAILED:
-    'PROPOSAL_ERROR_GOVERNANCE_TRANSFER_PROPOSAL_FAILED',
+    'Governance transfer proposal failed',
  PROPOSAL_ERROR_GOVERNANCE_TRANSFER_PROPOSAL_INVALID:
-    'PROPOSAL_ERROR_GOVERNANCE_TRANSFER_PROPOSAL_INVALID',
-  PROPOSAL_ERROR_INVALID_SPOT: 'PROPOSAL_ERROR_INVALID_SPOT',
-  PROPOSAL_ERROR_INVALID_SUCCESSOR_MARKET:
-    'PROPOSAL_ERROR_INVALID_SUCCESSOR_MARKET',
+    'Governance transfer proposal invalid',
+  PROPOSAL_ERROR_INVALID_SPOT: 'Invalid spot',
+  PROPOSAL_ERROR_INVALID_SUCCESSOR_MARKET: 'Invalid successor market',
+  PROPOSAL_ERROR_SPOT_PRODUCT_DISABLED: 'Spot product disabled',
 };

 /**
@@ -428,9 +430,9 @@ export const TransferTypeMapping: TransferTypeMap = {
  TRANSFER_TYPE_TRANSFER_FUNDS_DISTRIBUTE: 'Transfer received',
  TRANSFER_TYPE_CLEAR_ACCOUNT: 'Market accounts cleared',
  TRANSFER_TYPE_CHECKPOINT_BALANCE_RESTORE: 'Balances restored',
-  TRANSFER_TYPE_HOLDING_LOCK: 'TRANSFER_TYPE_HOLDING_LOCK',
-  TRANSFER_TYPE_HOLDING_RELEASE: 'TRANSFER_TYPE_HOLDING_RELEASE',
-  TRANSFER_TYPE_SPOT: 'TRANSFER_TYPE_SPOT',
+  TRANSFER_TYPE_HOLDING_LOCK: 'Holding locked',
+  TRANSFER_TYPE_HOLDING_RELEASE: 'Holding released',
+  TRANSFER_TYPE_SPOT: 'Spot',
 };

 export const DescriptionTransferTypeMapping: TransferTypeMap = {
@@ -458,9 +460,9 @@ export const DescriptionTransferTypeMapping: TransferTypeMap = {
  TRANSFER_TYPE_CLEAR_ACCOUNT: `Market-related accounts emptied, and balances moved, because the market has closed`,
  TRANSFER_TYPE_UNSPECIFIED: 'Default value, always invalid',
  TRANSFER_TYPE_CHECKPOINT_BALANCE_RESTORE: `Balances are being restored to the user's account following a checkpoint restart of the network`,
-  TRANSFER_TYPE_HOLDING_LOCK: '-',
-  TRANSFER_TYPE_HOLDING_RELEASE: '-',
-  TRANSFER_TYPE_SPOT: '-',
+  TRANSFER_TYPE_HOLDING_LOCK: 'Holdings locked',
+  TRANSFER_TYPE_HOLDING_RELEASE: 'Holdings released',
+  TRANSFER_TYPE_SPOT: 'Spot',
 };

 type DispatchMetricLabel = {
@@ -30,14 +30,14 @@ const primary = [
  'enabled:active:bg-vega-yellow-550 enabled:active:border-vega-yellow-550',
 ];
 const secondary = [
-  'text-white dark:text-black',
+  'text-white',
  'border-vega-pink',
  'dark:bg-vega-pink bg-vega-pink-550',
  'enabled:hover:bg-vega-pink enabled:hover:border-vega-pink',
  'enabled:active:bg-vega-pink enabled:active:border-vega-pink',
 ];
 const ternary = [
-  'text-white dark:text-black',
+  'text-black',
  'border-vega-green',
  'dark:bg-vega-green bg-vega-green-550',
  'enabled:hover:bg-vega-green enabled:hover:border-vega-green',
@@ -15,6 +15,13 @@ Default.args = {
  label: 'Regular checkbox',
 };

+export const Overflow = Template.bind({});
+Overflow.args = {
+  name: 'overflow',
+  label:
+    'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.',
+};
+
 export const Disabled = Template.bind({});
 Disabled.args = {
  disabled: true,
@@ -20,7 +20,7 @@ export const Checkbox = ({
  disabled = false,
 }: CheckboxProps) => {
  const rootClasses = classNames(
-    'relative flex justify-center items-center w-[15px] h-[15px]',
+    'relative flex justify-center items-center w-[15px] h-[15px] mt-1',
    'border rounded-sm overflow-hidden',
    {
      'opacity-40 cursor-default': disabled,
@@ -30,7 +30,7 @@ export const Checkbox = ({
  );

  return (
-    <div className="flex gap-1 items-center">
+    <div className="flex gap-1">
      <CheckboxPrimitive.Root
        name={name}
        id={name}
@@ -4,7 +4,7 @@ import type { ReactNode } from 'react';
 export interface FormGroupProps {
  children: ReactNode;
  className?: string;
-  label: string; // For accessibility reasons this must always be set for screen readers. If you want it to not show, then use the hideLabel prop"
+  label: string | ReactNode; // For accessibility reasons this must always be set for screen readers. If you want it to not show, then use the hideLabel prop"
  labelFor: string; // Same as above
  hideLabel?: boolean;
  labelDescription?: string;
@@ -0,0 +1,18 @@
+export const IconArrowUp = ({ size = 16 }: { size: number }) => {
+  return (
+    <svg width={size} height={size} viewBox="0 0 16 16">
+      <path
+        d="M 7.47,3.63
+           C 7.47,3.63 2.37,8.72 2.37,8.72
+             2.37,8.72 1.63,7.98 1.63,7.98
+             1.63,7.98 8.00,1.60 8.00,1.60
+             8.00,1.60 14.37,7.98 14.37,7.98
+             14.37,7.98 13.63,8.72 13.63,8.72
+             13.63,8.72 8.53,3.63 8.53,3.63
+             8.53,3.63 8.53,14.35 8.53,14.35
+             8.53,14.35 7.47,14.35 7.47,14.35
+             7.47,14.35 7.47,3.63 7.47,3.63 Z"
+      />
+    </svg>
+  );
+};
@@ -0,0 +1,7 @@
+export const IconBullet = ({ size = 16 }: { size: number }) => {
+  return (
+    <svg width={size} height={size} viewBox="0 0 16 16">
+      <circle cx="8" cy="8" r="6" />
+    </svg>
+  );
+};
@@ -0,0 +1,13 @@
+export const IconMinus = ({ size = 16 }: { size: number }) => {
+  return (
+    <svg width={size} height={size} viewBox="0 0 16 16">
+      <path
+        d="M 0.92,8.58
+           C 0.92,8.58 0.92,7.48 0.92,7.48
+             0.92,7.48 15.01,7.48 15.01,7.48
+             15.01,7.48 15.01,8.58 15.01,8.58
+             15.01,8.58 0.92,8.58 0.92,8.58 Z"
+      />
+    </svg>
+  );
+};
@@ -0,0 +1,21 @@
+export const IconPlus = ({ size = 16 }: { size: number }) => {
+  return (
+    <svg width={size} height={size} viewBox="0 0 16 16">
+      <path
+        d="M 7.43,15.24
+           C 7.43,15.24 7.43,8.58 7.43,8.58
+             7.43,8.58 0.92,8.58 0.92,8.58
+             0.92,8.58 0.92,7.48 0.92,7.48
+             0.92,7.48 7.43,7.48 7.43,7.48
+             7.43,7.48 7.43,0.85 7.43,0.85
+             7.43,0.85 8.48,0.85 8.48,0.85
+             8.48,0.85 8.48,7.48 8.48,7.48
+             8.48,7.48 15.01,7.48 15.01,7.48
+             15.01,7.48 15.01,8.58 15.01,8.58
+             15.01,8.58 8.48,8.58 8.48,8.58
+             8.48,8.58 8.48,15.24 8.48,15.24
+             8.48,15.24 7.43,15.24 7.43,15.24 Z"
+      />
+    </svg>
+  );
+};
@@ -1,6 +1,8 @@
 import { IconArrowDown } from './svg-icons/icon-arrow-down';
+import { IconArrowUp } from './svg-icons/icon-arrow-up';
 import { IconArrowRight } from './svg-icons/icon-arrow-right';
 import { IconBreakdown } from './svg-icons/icon-breakdown';
+import { IconBullet } from './svg-icons/icon-bullet';
 import { IconChevronDown } from './svg-icons/icon-chevron-down';
 import { IconChevronLeft } from './svg-icons/icon-chevron-left';
 import { IconChevronUp } from './svg-icons/icon-chevron-up';
@@ -13,9 +15,11 @@ import { IconGlobe } from './svg-icons/icon-globe';
 import { IconInfo } from './svg-icons/icon-info';
 import { IconKebab } from './svg-icons/icon-kebab';
 import { IconLinkedIn } from './svg-icons/icon-linkedin';
+import { IconMinus } from './svg-icons/icon-minus';
 import { IconMoon } from './svg-icons/icon-moon';
 import { IconOpenExternal } from './svg-icons/icon-open-external';
 import { IconQuestionMark } from './svg-icons/icon-question-mark';
+import { IconPlus } from './svg-icons/icon-plus';
 import { IconTick } from './svg-icons/icon-tick';
 import { IconTransfer } from './svg-icons/icon-transfer';
 import { IconTrendUp } from './svg-icons/icon-trend-up';
@@ -24,8 +28,10 @@ import { IconWithdraw } from './svg-icons/icon-withdraw';

 export enum VegaIconNames {
  ARROW_DOWN = 'arrow-down',
+  ARROW_UP = 'arrow-up',
  ARROW_RIGHT = 'arrow-right',
  BREAKDOWN = 'breakdown',
+  BULLET = 'bullet',
  CHEVRON_DOWN = 'chevron-down',
  CHEVRON_LEFT = 'chevron-left',
  CHEVRON_UP = 'chevron-up',
@@ -38,9 +44,11 @@ export enum VegaIconNames {
  INFO = 'info',
  KEBAB = 'kebab',
  LINKEDIN = 'linkedin',
+  MINUS = 'minus',
  MOON = 'moon',
  OPEN_EXTERNAL = 'open-external',
  QUESTION_MARK = 'question-mark',
+  PLUS = 'plus',
  TICK = 'tick',
  TRANSFER = 'transfer',
  TREND_UP = 'trend-up',
@@ -53,6 +61,7 @@ export const VegaIconNameMap: Record<
  ({ size }: { size: number }) => JSX.Element
 > = {
  'arrow-down': IconArrowDown,
+  'arrow-up': IconArrowUp,
  'arrow-right': IconArrowRight,
  'chevron-down': IconChevronDown,
  'chevron-left': IconChevronLeft,
@@ -61,6 +70,7 @@ export const VegaIconNameMap: Record<
  'question-mark': IconQuestionMark,
  'trend-up': IconTrendUp,
  breakdown: IconBreakdown,
+  bullet: IconBullet,
  copy: IconCopy,
  cross: IconCross,
  deposit: IconDeposit,
@@ -70,7 +80,9 @@ export const VegaIconNameMap: Record<
  info: IconInfo,
  kebab: IconKebab,
  linkedin: IconLinkedIn,
+  minus: IconMinus,
  moon: IconMoon,
+  plus: IconPlus,
  tick: IconTick,
  transfer: IconTransfer,
  twitter: IconTwitter,
@@ -2,18 +2,22 @@ import classNames from 'classnames';
 import { toastIconMapping } from '../toast';
 import { Intent } from '../../utils/intent';
 import { Icon } from '../icon';
+import type { HTMLAttributes } from 'react';

 interface NotificationBannerProps {
  intent?: Intent;
  children?: React.ReactNode;
  onClose?: () => void;
+  className?: classNames.Argument;
 }

 export const NotificationBanner = ({
  intent = Intent.None,
  children,
  onClose,
-}: NotificationBannerProps) => {
+  className,
+  ...props
+}: NotificationBannerProps & HTMLAttributes<HTMLDivElement>) => {
  return (
    <div
      className={classNames(
@@ -42,8 +46,10 @@ export const NotificationBanner = ({

          'border-b-vega-red-500 dark:border-b-vega-red-500':
            intent === Intent.Danger,
-        }
+        },
+        className
      )}
+      {...props}
    >
      {intent === Intent.None ? null : (
        <Icon
@@ -23,6 +23,7 @@ export const Tabs = ({
    }
    return children[0].props.id;
  });
+
  return (
    <TabsPrimitive.Root
      {...props}
@@ -30,7 +31,7 @@ export const Tabs = ({
      onValueChange={onValueChange || setActiveTab}
      className="h-full grid grid-rows-[min-content_1fr]"
    >
-      <div className="border-b border-default">
+      <div className="border-b border-default min-w-0">
        <TabsPrimitive.List
          className="flex flex-nowrap overflow-visible"
          role="tablist"
@@ -1,5 +1,6 @@
-import { Button } from '../button';
 import { t } from '@vegaprotocol/i18n';
+import { NotificationBanner } from '../notification-banner';
+import { Intent } from '../../utils/intent';

 export function truncateMiddle(address: string, start = 6, end = 4) {
  if (address.length < 11) return address;
@@ -20,16 +21,23 @@ export const ViewingAsBanner = ({
  disconnect,
 }: ViewingAsBannerProps) => {
  return (
-    <div
+    <NotificationBanner
      data-testid="view-banner"
-      className="w-full p-2 bg-neutral-800 flex justify-between text-neutral-400"
+      intent={Intent.None}
+      className="py-2 min-h-fit"
    >
-      <div className="text-base flex items-center justify-center">
-        {t('Viewing as Vega user:')} {pubKey && truncateMiddle(pubKey)}
+      <div className="flex justify-between items-baseline">
+        <span>
+          {t('Viewing as Vega user:')} {pubKey && truncateMiddle(pubKey)}{' '}
+        </span>
+        <button
+          className="p-2 bg-light-dark-150 dark:bg-vega-dark-150 rounded uppercase"
+          data-testid="exit-view"
+          onClick={disconnect}
+        >
+          {t('Exit view as')}
+        </button>
      </div>
-      <Button data-testid="exit-view" onClick={disconnect}>
-        {t('Exit view as')}
-      </Button>
-    </div>
+    </NotificationBanner>
  );
 };
@@ -8,10 +8,11 @@ export const defaultFormElement = (hasError?: boolean) =>
    'flex items-center w-full text-sm',
    'p-2 border-2 rounded',
    'bg-transparent',
-    'border border-vega-light-200 dark:border-vega-dark-200',
+    'border',
    'focus:border-vega-light-300 dark:focus:border-vega-dark-300',
    'disabled:opacity-60',
    {
-      'border-vega-pink': hasError,
+      'border-vega-pink text-vega-pink': hasError,
+      'border-vega-light-200 dark:border-vega-dark-200': !hasError,
    }
  );
@@ -7,7 +7,7 @@ import {
 export const formatValue = (
  value: string | number | null | undefined,
  decimalPlaces: number,
-  quantum?: string,
+  quantum?: string | number,
  formatDecimals?: number,
  emptyValue = '-'
 ): string => {
@@ -47,6 +47,10 @@ export interface OrderSubmission {
  expiresAt?: string;
  postOnly?: boolean;
  reduceOnly?: boolean;
+  icebergOpts?: {
+    peakSize: string;
+    minimumVisibleSize: string;
+  };
 }

 export interface OrderCancellation {
@@ -50,6 +50,13 @@ export const normalizeOrderSubmission = (
      : undefined,
  postOnly: order.postOnly,
  reduceOnly: order.reduceOnly,
+  icebergOpts: order.icebergOpts && {
+    peakSize: removeDecimal(order.icebergOpts.peakSize, positionDecimalPlaces),
+    minimumVisibleSize: removeDecimal(
+      order.icebergOpts.minimumVisibleSize,
+      positionDecimalPlaces
+    ),
+  },
 });

 export const normalizeOrderAmendment = <T extends Exact<OrderAmendment, T>>(
@@ -49,7 +49,8 @@
      },
      "library": {
        "style": "scss",
-        "linter": "eslint"
+        "linter": "eslint",
+        "unitTestRunner": "jest"
      }
    },
    "@nx/next": {
@@ -88,7 +88,7 @@
    "regenerator-runtime": "0.13.7",
    "semver": "^7.5.1",
    "toml": "^3.0.0",
-    "tslib": "^2.0.0",
+    "tslib": "^2.3.0",
    "uuid": "^8.3.2",
    "web-vitals": "^2.1.4",
    "zod": "^3.20.3",
@@ -127,6 +127,7 @@
    "@nx/webpack": "16.4.0",
    "@nx/workspace": "16.4.0",
    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.7",
+    "@rollup/plugin-url": "^7.0.0",
    "@sentry/webpack-plugin": "^1.18.8",
    "@storybook/addon-a11y": "7.0.24",
    "@storybook/addon-docs": "7.0.24",
@@ -135,6 +136,7 @@
    "@storybook/core-server": "7.0.24",
    "@storybook/react": "7.0.24",
    "@storybook/react-webpack5": "7.0.24",
+    "@svgr/rollup": "^8.0.1",
    "@svgr/webpack": "^6.1.2",
    "@swc/core": "^1.2.173",
    "@swc/jest": "0.2.20",
@@ -187,7 +189,7 @@
    "inquirer": "^8.0.0",
    "jest": "29.4.3",
    "jest-canvas-mock": "^2.3.1",
-    "jest-environment-jsdom": "28.1.3",
+    "jest-environment-jsdom": "^29.4.1",
    "jest-websocket-mock": "^2.3.0",
    "lint-staged": "^12.3.3",
    "mock-apollo-client": "^1.2.0",
@@ -211,7 +213,7 @@
    "tailwindcss": "3.2.7",
    "ts-jest": "29.1.0",
    "ts-node": "10.9.1",
-    "tslib": "^2.0.0",
+    "tslib": "^2.3.0",
    "type-fest": "^3.8.0",
    "typescript": "5.1.3",
    "url-loader": "^4.1.1",
@@ -48,6 +48,7 @@
      "@vegaprotocol/tailwindcss-config": [
        "libs/tailwindcss-config/src/index.js"
      ],
+      "@vegaprotocol/tendermint": ["libs/tendermint/src/index.ts"],
      "@vegaprotocol/trades": ["libs/trades/src/index.ts"],
      "@vegaprotocol/types": ["libs/types/src/index.ts"],
      "@vegaprotocol/ui-toolkit": ["libs/ui-toolkit/src/index.ts"],
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Matthew Russell	f8c4d39b93	fix(positions): fix valueGetter for realisedPNL in positions table	2023-07-20 17:55:21 +01:00
Matthew Russell	e55cf5ecc6	chore(trading): cherry pick position pnl formatting fix (#4347 )	2023-07-20 12:52:33 +01:00
Matthew Russell	406cf22810	chore(trading): remove user pnl from closed market list (#4312 )	2023-07-20 12:52:13 +01:00
Edd	8ff46bab5b	fix(explorer): fix valueformatter in enactment date on proposal table (#4358 )	2023-07-20 10:52:49 +02:00
Art	5f177785b6	feat(governance): protocol upgrade notification, est. time (#4289 )	2023-07-20 10:27:43 +02:00
Mikołaj Młodzikowski	06779f36ca	feat(ci): fix typo	2023-07-19 16:42:47 +02:00
Sam Keen	29991015b5	fix(governance): filtered out nodes with 0 performance score from homepage list (#4267 )	2023-07-19 13:32:57 +01:00
Matthew Russell	071a6ff8bb	chore(explorer): clear out slack webhook (#4320 )	2023-07-19 11:36:34 +01:00
Maciek Ben Mikołaj Młodzikowski Joe Tsang Dexter Edwards m.ray Art Bartłomiej Głownia Gordsport	5b8df4c414	chore(trading): orderbook adjustments (#4293 ) Co-authored-by: Ben <ben@vega.xyz> Co-authored-by: Mikołaj Młodzikowski <mikolaj.mlodzikowski@gmail.com> Co-authored-by: Joe Tsang <30622993+jtsang586@users.noreply.github.com> Co-authored-by: Dexter Edwards <dexter.edwards93@gmail.com> Co-authored-by: m.ray <16125548+MadalinaRaicu@users.noreply.github.com> Co-authored-by: Art <artur@vegaprotocol.io> Co-authored-by: Bartłomiej Głownia <bglownia@gmail.com> Co-authored-by: Gordsport <83510148+gordsport@users.noreply.github.com>	2023-07-18 14:48:51 +00:00
Daniel	ce6873fe54	feat(environment): add mainnet mirror config (#4287 )	2023-07-18 12:23:58 +01:00
Gordsport	d0e64364e3	chore: update the PM action secret token (#4325 )	2023-07-18 12:16:57 +01:00
Bartłomiej Głownia	737ffb4c35	feat(trading): copy order book volume value to deal ticket (#4333 )	2023-07-18 12:16:07 +01:00
Maciek	53048ac8ef	chore(trading): 4134 see if a closed market was succeeded (#4336 )	2023-07-18 09:37:25 +00:00
Art	05ca1a09b9	chore(explorer): align staking terminology (#4290 )	2023-07-18 09:03:48 +00:00
m.ray	94e398dd1c	feat(trading): submit iceberg orders (#4230 )	2023-07-17 14:24:51 +00:00
m.ray	7c0a4f61e9	fix(trading): add internal termination oracle (#4208 )	2023-07-17 13:33:52 +00:00
m.ray	056d3215e8	feat(trading): view iceberg orders (#4207 )	2023-07-17 13:04:03 +00:00
Dexter Edwards	a68b2093e4	fix(ui-toolkit): toolkit bugs (#4329 )	2023-07-17 10:59:22 +00:00