fix(proposals): protocol upgrade notification block querying

feat(deal-ticket): update deal ticket submit buttons (#4635 )
chore(wallet): prepare wallet lib for publishing (#4638 )
2023-08-31 13:48:25 +02:00 · 2023-08-31 11:54:52 +02:00 · 2023-08-30 19:40:04 -07:00 · 2023-08-30 09:39:49 +01:00 · 2023-08-29 08:54:09 -07:00 · 2023-08-29 06:57:02 -07:00
148 changed files with 3720 additions and 2405 deletions
@@ -1,6 +1,6 @@
 # Related issues 🔗

-Closes #[Issue number here]
+Issue: #[Issue number here]

 # Description ℹ️

@@ -15,6 +15,7 @@ on:
          - types
          - utils
          - i18n
+          - wallet

 jobs:
  publish:
@@ -77,7 +77,7 @@
      "executor": "nx:run-commands",
      "options": {
        "commands": [
-          "npx openapi-typescript https://raw.githubusercontent.com/vegaprotocol/documentation/spec-update-v0.72.0-preview.2/specs/v0.72.0-preview.2/blockexplorer.openapi.json --output apps/explorer/src/types/explorer.d.ts --immutable-types"
+          "npx openapi-typescript https://raw.githubusercontent.com/vegaprotocol/documentation/main/specs/v0.72.3/blockexplorer.openapi.json --output apps/explorer/src/types/explorer.d.ts --immutable-types"
        ]
      }
    },
@@ -0,0 +1,25 @@
+fragment ExplorerStopOrderFields on StopOrder {
+  id
+  status
+  createdAt
+  trigger {
+    ... on StopOrderPrice {
+      price
+    }
+    ... on StopOrderTrailingPercentOffset {
+      trailingPercentOffset
+    }
+  }
+  createdAt
+  ocoLinkId
+  triggerDirection
+  order {
+    id
+  }
+}
+
+query ExplorerStopOrder($stopOrderId: ID!) {
+  stopOrder(id: $stopOrderId) {
+    ...ExplorerStopOrderFields
+  }
+}
@@ -0,0 +1,70 @@
+import * as Types from '@vegaprotocol/types';
+
+import { gql } from '@apollo/client';
+import * as Apollo from '@apollo/client';
+const defaultOptions = {} as const;
+export type ExplorerStopOrderFieldsFragment = { __typename?: 'StopOrder', id: string, status: Types.StopOrderStatus, createdAt: any, ocoLinkId?: string | null, triggerDirection: Types.StopOrderTriggerDirection, trigger: { __typename?: 'StopOrderPrice', price: string } | { __typename?: 'StopOrderTrailingPercentOffset', trailingPercentOffset: string }, order?: { __typename?: 'Order', id: string } | null };
+
+export type ExplorerStopOrderQueryVariables = Types.Exact<{
+  stopOrderId: Types.Scalars['ID'];
+}>;
+
+
+export type ExplorerStopOrderQuery = { __typename?: 'Query', stopOrder?: { __typename?: 'StopOrder', id: string, status: Types.StopOrderStatus, createdAt: any, ocoLinkId?: string | null, triggerDirection: Types.StopOrderTriggerDirection, trigger: { __typename?: 'StopOrderPrice', price: string } | { __typename?: 'StopOrderTrailingPercentOffset', trailingPercentOffset: string }, order?: { __typename?: 'Order', id: string } | null } | null };
+
+export const ExplorerStopOrderFieldsFragmentDoc = gql`
+    fragment ExplorerStopOrderFields on StopOrder {
+  id
+  status
+  createdAt
+  trigger {
+    ... on StopOrderPrice {
+      price
+    }
+    ... on StopOrderTrailingPercentOffset {
+      trailingPercentOffset
+    }
+  }
+  createdAt
+  ocoLinkId
+  triggerDirection
+  order {
+    id
+  }
+}
+    `;
+export const ExplorerStopOrderDocument = gql`
+    query ExplorerStopOrder($stopOrderId: ID!) {
+  stopOrder(id: $stopOrderId) {
+    ...ExplorerStopOrderFields
+  }
+}
+    ${ExplorerStopOrderFieldsFragmentDoc}`;
+
+/**
+ * __useExplorerStopOrderQuery__
+ *
+ * To run a query within a React component, call `useExplorerStopOrderQuery` and pass it any options that fit your needs.
+ * When your component renders, `useExplorerStopOrderQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useExplorerStopOrderQuery({
+ *   variables: {
+ *      stopOrderId: // value for 'stopOrderId'
+ *   },
+ * });
+ */
+export function useExplorerStopOrderQuery(baseOptions: Apollo.QueryHookOptions<ExplorerStopOrderQuery, ExplorerStopOrderQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<ExplorerStopOrderQuery, ExplorerStopOrderQueryVariables>(ExplorerStopOrderDocument, options);
+      }
+export function useExplorerStopOrderLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<ExplorerStopOrderQuery, ExplorerStopOrderQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<ExplorerStopOrderQuery, ExplorerStopOrderQueryVariables>(ExplorerStopOrderDocument, options);
+        }
+export type ExplorerStopOrderQueryHookResult = ReturnType<typeof useExplorerStopOrderQuery>;
+export type ExplorerStopOrderLazyQueryHookResult = ReturnType<typeof useExplorerStopOrderLazyQuery>;
+export type ExplorerStopOrderQueryResult = Apollo.QueryResult<ExplorerStopOrderQuery, ExplorerStopOrderQueryVariables>;
@@ -33,7 +33,7 @@ describe('Order TX Summary component', () => {
    expect(res.queryByTestId('order-summary')).not.toBeInTheDocument();
  });

-  it('Renders nothing if the order passed lacks a price', () => {
+  it('Renders "Market Price" if the order passed lacks a price', () => {
    const o: Order = {
      marketId: '123',
      side: 'SIDE_BUY',
@@ -41,7 +41,7 @@ describe('Order TX Summary component', () => {
      size: '10',
    };
    const res = renderComponent(o);
-    expect(res.queryByTestId('order-summary')).not.toBeInTheDocument();
+    expect(res.queryByText('Market Price')).toBeInTheDocument();
  });

  it('Renders nothing if the order has an unspecified side', () => {
@@ -3,6 +3,7 @@ import type { components } from '../../../types/explorer';
 import PriceInMarket from '../price-in-market/price-in-market';
 import { sideText } from '../order-details/lib/order-labels';
 import SizeInMarket from '../size-in-market/size-in-market';
+import { t } from '@vegaprotocol/i18n';

 export type OrderSummaryProps = {
  order: components['schemas']['v1OrderSubmission'];
@@ -20,7 +21,6 @@ const OrderTxSummary = ({ order }: OrderSummaryProps) => {
  if (
    !order ||
    !order.marketId ||
-    !order.price ||
    !order.side ||
    order.side === 'SIDE_UNSPECIFIED'
  ) {
@@ -36,10 +36,14 @@ const OrderTxSummary = ({ order }: OrderSummaryProps) => {
        '-'
      )}
      &nbsp;<i className="text-xs">@</i>&nbsp;
-      <PriceInMarket
-        marketId={order.marketId}
-        price={order.price}
-      ></PriceInMarket>
+      {order.price ? (
+        <PriceInMarket
+          marketId={order.marketId}
+          price={order.price}
+        ></PriceInMarket>
+      ) : (
+        t('Market Price')
+      )}
    </div>
  );
 };
@@ -0,0 +1,139 @@
+import { t } from '@vegaprotocol/i18n';
+import type { components } from '../../../../../types/explorer';
+import { formatNumberPercentage } from '@vegaprotocol/utils';
+import BigNumber from 'bignumber.js';
+import PriceInMarket from '../../../price-in-market/price-in-market';
+import StopOrderTriggerSummary from './stop-order-trigger';
+import { Tooltip } from '@vegaprotocol/ui-toolkit';
+import fromUnixTime from 'date-fns/fromUnixTime';
+
+const wrapperClasses =
+  'flex-1 max-w-xs items-center border border-vega-light-200 dark:border-vega-dark-150 rounded-md pv-2 ph-5 mb-5';
+
+export type StopOrderType = 'RisesAbove' | 'FallsBelow' | 'OCO';
+type V1OrderSetup = components['schemas']['v1StopOrderSetup'];
+
+interface StopOrderSetupProps extends V1OrderSetup {
+  type: StopOrderType;
+  deterministicId: string;
+}
+
+export function getExpiryTypeLabel(
+  expiryStrategy: V1OrderSetup['expiryStrategy']
+): string {
+  switch (expiryStrategy) {
+    case 'EXPIRY_STRATEGY_CANCELS':
+      return t('Cancels');
+    case 'EXPIRY_STRATEGY_SUBMIT':
+      return t('Submit');
+  }
+
+  return expiryStrategy || t('Unknown');
+}
+
+export interface ExpiryTriggerProps {
+  trailingPercentOffset?: string;
+  price?: string;
+  marketId?: string;
+}
+
+export function ExpiryTrigger({
+  trailingPercentOffset,
+  price,
+  marketId,
+}: ExpiryTriggerProps) {
+  if (price && marketId) {
+    return <PriceInMarket price={price} marketId={marketId} />;
+  }
+  if (trailingPercentOffset) {
+    return (
+      <span>
+        {formatNumberPercentage(new BigNumber(trailingPercentOffset))}{' '}
+        (trailing)
+      </span>
+    );
+  }
+
+  return null;
+}
+
+export function getMovePrefix(
+  type: StopOrderType,
+  trailingPercentOffset?: string
+): string {
+  if (type === 'RisesAbove') {
+    if (trailingPercentOffset) {
+      return '+';
+    } else {
+      return '>';
+    }
+  } else {
+    if (trailingPercentOffset) {
+      return '-';
+    } else {
+      return '<';
+    }
+  }
+}
+
+export const TypeLabel = {
+  RisesAbove: t('Rises above ↗'),
+  FallsBelow: t('Falls below ↘'),
+  OCO: '',
+};
+
+/**
+ */
+export const StopOrderSetup = ({
+  type,
+  price,
+  orderSubmission,
+  expiresAt,
+  expiryStrategy,
+  trailingPercentOffset,
+  deterministicId,
+}: StopOrderSetupProps) => {
+  let d = 'Unknown';
+  try {
+    d = expiresAt
+      ? fromUnixTime(parseInt(expiresAt) / 1000000000).toLocaleString()
+      : t('Unknown');
+  } catch (e) {
+    d = t('Unknown');
+  }
+
+  return (
+    <div className={wrapperClasses}>
+      <div className="mb-12 lg:mb-0">
+        <div className="bg-slate-100 text-slate-900 px-6 py-2 md:px-6 flex">
+          <div className="flex-1">
+            <strong className="font-bold mb-1">{TypeLabel[type]} </strong>
+            <p className=" font-xs mb-0">
+              {getMovePrefix(type, trailingPercentOffset)}
+              <ExpiryTrigger
+                trailingPercentOffset={trailingPercentOffset}
+                price={price}
+                marketId={orderSubmission?.marketId}
+              />
+            </p>
+          </div>
+
+          {expiresAt && expiryStrategy ? (
+            <div className="flex-1">
+              <strong className="font-bold mb-1">{t('Expiry Type')}</strong>
+              <p className=" font-xs mb-0">
+                <Tooltip description={<span>{d}</span>}>
+                  <span>{getExpiryTypeLabel(expiryStrategy)}</span>
+                </Tooltip>
+              </p>
+            </div>
+          ) : null}
+        </div>
+        <StopOrderTriggerSummary
+          id={deterministicId}
+          orderSubmission={orderSubmission}
+        />
+      </div>
+    </div>
+  );
+};
@@ -0,0 +1,108 @@
+import { StopOrderStatus } from '@vegaprotocol/types';
+import { useExplorerStopOrderQuery } from '../../../order-details/__generated__/StopOrder';
+import type { ExplorerStopOrderQuery } from '../../../order-details/__generated__/StopOrder';
+import { t } from '@vegaprotocol/i18n';
+import { Icon } from '@vegaprotocol/ui-toolkit';
+import type { IconName } from '@vegaprotocol/ui-toolkit';
+import OrderTxSummary from '../../../order-summary/order-tx-summary';
+import type { components } from '../../../../../types/explorer';
+import type { ApolloError } from '@apollo/client';
+
+export const StatusLabel: Record<StopOrderStatus, string> = {
+  [StopOrderStatus.STATUS_CANCELLED]: t('Cancelled'),
+  [StopOrderStatus.STATUS_EXPIRED]: t('Expired'),
+  [StopOrderStatus.STATUS_PENDING]: t('Pending'),
+  [StopOrderStatus.STATUS_REJECTED]: t('Rejected'),
+  [StopOrderStatus.STATUS_STOPPED]: t('Stopped'),
+  [StopOrderStatus.STATUS_TRIGGERED]: t('Triggered'),
+  [StopOrderStatus.STATUS_UNSPECIFIED]: t('Status unknown'),
+};
+
+export const StatusIcon: Record<StopOrderStatus, IconName> = {
+  [StopOrderStatus.STATUS_CANCELLED]: 'disable',
+  [StopOrderStatus.STATUS_EXPIRED]: 'outdated',
+  [StopOrderStatus.STATUS_PENDING]: 'circle',
+  [StopOrderStatus.STATUS_REJECTED]: 'cross',
+  [StopOrderStatus.STATUS_STOPPED]: 'stop',
+  [StopOrderStatus.STATUS_TRIGGERED]: 'tick',
+  [StopOrderStatus.STATUS_UNSPECIFIED]: 'help',
+};
+
+export const StatusMidColor: Record<StopOrderStatus, string> = {
+  [StopOrderStatus.STATUS_CANCELLED]: 'bg-red-100 text-red-900',
+  [StopOrderStatus.STATUS_EXPIRED]: 'bg-red-100 text-red-900',
+  [StopOrderStatus.STATUS_PENDING]: 'bg-yellow-100 text-yellow-900',
+  [StopOrderStatus.STATUS_REJECTED]: 'bg-red-100 text-red-900',
+  [StopOrderStatus.STATUS_STOPPED]: 'bg-red-100 text-red-900',
+  [StopOrderStatus.STATUS_TRIGGERED]: 'bg-green-100 text-green-900',
+  [StopOrderStatus.STATUS_UNSPECIFIED]: 'bg-yellow-100 text-yellow-900',
+};
+
+export const StatusBottomColor: Record<StopOrderStatus, string> = {
+  [StopOrderStatus.STATUS_CANCELLED]: 'bg-red-50 text-red-900 line-through',
+  [StopOrderStatus.STATUS_EXPIRED]: 'bg-red-50 text-red-900 line-through',
+  [StopOrderStatus.STATUS_PENDING]: 'bg-yellow-50 text-yellow-900',
+  [StopOrderStatus.STATUS_REJECTED]: 'bg-red-50 text-red-900 line-through',
+  [StopOrderStatus.STATUS_STOPPED]: 'bg-red-50 text-red-900 line-through',
+  [StopOrderStatus.STATUS_TRIGGERED]: 'bg-green-50 text-green-900',
+  [StopOrderStatus.STATUS_UNSPECIFIED]:
+    'bg-yellow-50 text-yellow-900 line-through',
+};
+
+export function getStopOrderTriggerStatus(
+  data?: ExplorerStopOrderQuery,
+  error?: ApolloError
+) {
+  if (data && data.stopOrder) {
+    return data.stopOrder.status;
+  }
+
+  return StopOrderStatus.STATUS_UNSPECIFIED;
+}
+
+export interface StopOrderTriggerSummaryProps {
+  id: string;
+  orderSubmission?: components['schemas']['v1OrderSubmission'];
+}
+
+/**
+ */
+const StopOrderTriggerSummary = ({
+  id,
+  orderSubmission,
+}: StopOrderTriggerSummaryProps) => {
+  const { data, error } = useExplorerStopOrderQuery({
+    variables: { stopOrderId: id },
+  });
+
+  const status = getStopOrderTriggerStatus(data, error);
+
+  return (
+    <>
+      <div
+        className={`${StatusMidColor[status]} px-3 py-2 md:px-6 flex space-x-4`}
+      >
+        <p className="m-0 p-0 align-top">
+          <Icon
+            size={6}
+            name={StatusIcon[status]}
+            className="inline-block mr-2"
+          />
+          <span className="align-top">{StatusLabel[status]}</span>
+        </p>
+      </div>
+
+      <div
+        className={`${StatusBottomColor[status]} px-3 py-2 md:px-6 flex space-x-4`}
+      >
+        {orderSubmission && (
+          <p className="text-vega-grey-400 strike">
+            <OrderTxSummary order={orderSubmission} />
+          </p>
+        )}
+      </div>
+    </>
+  );
+};
+
+export default StopOrderTriggerSummary;
@@ -1,10 +1,12 @@
 import { t } from '@vegaprotocol/i18n';
 import type { components } from '../../../../../types/explorer';
 import { Tooltip } from '@vegaprotocol/ui-toolkit';
+import SizeInMarket from '../../../size-in-market/size-in-market';

 export interface TxDetailsOrderIcebergDetailsProps {
  iceberg: components['schemas']['v1IcebergOpts'];
  size: components['schemas']['v1OrderSubmission']['size'];
+  marketId?: string;
 }

 /**
@@ -28,6 +30,7 @@ export interface TxDetailsOrderIcebergDetailsProps {
 export const TxOrderIcebergDetails = ({
  iceberg,
  size,
+  marketId,
 }: TxDetailsOrderIcebergDetailsProps) => {
  return (
    <div
@@ -36,15 +39,28 @@ export const TxOrderIcebergDetails = ({
    >
      <Tooltip description={t('Iceberg: Minimum visible size')}>
        <span className="align-bottom text-vega-orange-650">
-          {iceberg.minimumVisibleSize || '-'}
+          {marketId ? (
+            <SizeInMarket
+              size={iceberg.minimumVisibleSize}
+              marketId={marketId}
+            />
+          ) : (
+            iceberg.minimumVisibleSize
+          )}
        </span>
      </Tooltip>
      <Tooltip description={t('Iceberg: Total size')}>
-        <span className="text-sm text-vega-blue-600 mx-3">{size}</span>
+        <span className="text-sm text-vega-blue-600 mx-3">
+          {marketId ? <SizeInMarket size={size} marketId={marketId} /> : size}
+        </span>
      </Tooltip>
      <Tooltip description={t('Iceberg: Visible peak')}>
        <span className="align-top text-vega-yellow-600">
-          {iceberg.peakSize || '-'}
+          {marketId ? (
+            <SizeInMarket size={iceberg.peakSize} marketId={marketId} />
+          ) : (
+            iceberg.peakSize
+          )}
        </span>
      </Tooltip>
    </div>
@@ -26,6 +26,11 @@ export const sharedHeaderProps = {
  className: 'align-top',
 };

+const Labels: Record<BlockExplorerTransactionResult['type'], string> = {
+  'Stop Orders Submission': 'Stop Order',
+  'Stop Orders Cancellation': 'Cancel Stop Order',
+};
+
 /**
 * These rows are shown for every transaction type, providing a consistent set of rows for the top
 * of a transaction details row. The order is relatively arbitrary but felt right - it might need to
@@ -44,12 +49,14 @@ export const TxDetailsShared = ({
  const time: string = blockData?.result.block.header.time || '';
  const height: string = blockData?.result.block.header.height || txData.block;

+  const type = Labels[txData.type] || txData.type;
+
  return (
    <>
      {hideTypeRow === false ? (
        <TableRow modifier="bordered">
          <TableCell {...sharedHeaderProps}>{t('Type')}</TableCell>
-          <TableCell>{txData.type}</TableCell>
+          <TableCell>{type}</TableCell>
        </TableRow>
      ) : null}
      <TableRow modifier="bordered">
@@ -31,6 +31,8 @@ const AccountType: Record<AccountTypes, string> = {
  ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES: 'LP Received Fees',
  ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS: 'Market Proposers',
  ACCOUNT_TYPE_HOLDING: 'Holding',
+  ACCOUNT_TYPE_LIQUIDITY_FEES_BONUS_DISTRIBUTION: 'Bonus Distribution',
+  ACCOUNT_TYPE_LP_LIQUIDITY_FEES: 'LP Liquidity Fees',
 };

 interface TransferParticipantsProps {
@@ -27,6 +27,7 @@ import { TxDetailsNodeAnnounce } from './tx-node-announce';
 import { TxDetailsStateVariable } from './tx-state-variable-proposal';
 import { TxProposal } from './tx-proposal';
 import { TxDetailsTransfer } from './tx-transfer';
+import { TxDetailsStopOrderSubmission } from './tx-stop-order-submission';

 interface TxDetailsWrapperProps {
  txData: BlockExplorerTransactionResult | undefined;
@@ -116,6 +117,8 @@ function getTransactionComponent(txData?: BlockExplorerTransactionResult) {
      return TxDetailsUndelegate;
    case 'State Variable Proposal':
      return TxDetailsStateVariable;
+    case 'Stop Orders Submission':
+      return TxDetailsStopOrderSubmission;
    case 'Transfer Funds':
      return TxDetailsTransfer;
    default:
@@ -81,7 +81,11 @@ export const TxDetailsOrder = ({
          <TableRow modifier="bordered">
            <TableCell>{t('Iceberg details')}</TableCell>
            <TableCell>
-              <TxOrderIcebergDetails iceberg={iceberg} size={size} />
+              <TxOrderIcebergDetails
+                iceberg={iceberg}
+                size={size}
+                marketId={marketId}
+              />
            </TableCell>
          </TableRow>
        ) : null}
@@ -0,0 +1,148 @@
+import { t } from '@vegaprotocol/i18n';
+import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response';
+import { MarketLink } from '../../links/';
+import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response';
+import { TxDetailsShared } from './shared/tx-details-shared';
+import { TableCell, TableRow, TableWithTbody } from '../../table';
+import {
+  getStopOrderIds,
+  stopOrdersSignatureToDeterministicId,
+} from '../lib/deterministic-ids';
+import type { components } from '../../../../types/explorer';
+import { StopOrderSetup } from './order/stop-order-setup';
+
+type StopOrderSetup = components['schemas']['v1StopOrderSetup'];
+
+interface TxDetailsOrderProps {
+  txData: BlockExplorerTransactionResult | undefined;
+  pubKey: string | undefined;
+  blockData: TendermintBlocksResponse | undefined;
+}
+
+export function getStopTypeLabel(
+  risesAbove: StopOrderSetup | undefined,
+  fallsBelow: StopOrderSetup | undefined
+): string {
+  if (risesAbove && fallsBelow) {
+    return t('OCO (One Cancels Other)');
+  } else if (fallsBelow) {
+    return t('Falls Below ↘');
+  } else if (risesAbove) {
+    return t('Rises Above ↗');
+  } else {
+    return t('Stop Order');
+  }
+}
+
+export interface StopMarketIdProps {
+  risesAbove: StopOrderSetup | undefined;
+  fallsBelow: StopOrderSetup | undefined;
+  showMarketName?: boolean;
+}
+
+export function StopMarketId({
+  risesAbove,
+  fallsBelow,
+  showMarketName = false,
+}: StopMarketIdProps) {
+  const raMarketId = risesAbove?.orderSubmission?.marketId;
+  const fbMarketId = fallsBelow?.orderSubmission?.marketId;
+
+  if (raMarketId && fbMarketId) {
+    if (raMarketId === fbMarketId) {
+      return <MarketLink id={raMarketId} showMarketName={showMarketName} />;
+    } else {
+      return (
+        <>
+          <MarketLink id={raMarketId} showMarketName={showMarketName} />,
+          <MarketLink id={fbMarketId} showMarketName={showMarketName} />
+        </>
+      );
+    }
+  } else if (raMarketId) {
+    return <MarketLink id={raMarketId} showMarketName={showMarketName} />;
+  } else if (fbMarketId) {
+    return <MarketLink id={fbMarketId} showMarketName={showMarketName} />;
+  } else {
+    return '-';
+  }
+}
+
+/**
+ */
+export const TxDetailsStopOrderSubmission = ({
+  txData,
+  pubKey,
+  blockData,
+}: TxDetailsOrderProps) => {
+  if (!txData || !txData.command.stopOrdersSubmission) {
+    return <>{t('Awaiting Block Explorer transaction details')}</>;
+  }
+
+  const tx: components['schemas']['v1StopOrdersSubmission'] =
+    txData.command.stopOrdersSubmission;
+
+  const orderIds = stopOrdersSignatureToDeterministicId(
+    txData?.signature?.value
+  );
+
+  const { risesAboveId, fallsBelowId } = getStopOrderIds(
+    orderIds,
+    tx.risesAbove,
+    tx.fallsBelow
+  );
+
+  return (
+    <>
+      <TableWithTbody className="mb-8" allowWrap={true}>
+        <TxDetailsShared
+          txData={txData}
+          pubKey={pubKey}
+          blockData={blockData}
+        />
+        <TableRow modifier="bordered">
+          <TableCell>{t('Market ID')}</TableCell>
+          <TableCell>
+            <StopMarketId
+              risesAbove={tx.risesAbove}
+              fallsBelow={tx.fallsBelow}
+            />
+          </TableCell>
+        </TableRow>
+        <TableRow modifier="bordered">
+          <TableCell>{t('Market')}</TableCell>
+          <TableCell>
+            <StopMarketId
+              risesAbove={tx.risesAbove}
+              fallsBelow={tx.fallsBelow}
+              showMarketName={true}
+            />
+          </TableCell>
+        </TableRow>
+        <TableRow modifier="bordered">
+          <TableCell>{t('Trigger')}</TableCell>
+          <TableCell>
+            {getStopTypeLabel(tx.risesAbove, tx.fallsBelow)}
+          </TableCell>
+        </TableRow>
+      </TableWithTbody>
+      <div className="flex gap-2">
+        {tx.fallsBelow && fallsBelowId && (
+          <StopOrderSetup
+            type={'FallsBelow'}
+            {...tx.fallsBelow}
+            deterministicId={fallsBelowId}
+          />
+        )}
+
+        {tx.risesAbove && risesAboveId && (
+          <StopOrderSetup
+            type={'RisesAbove'}
+            {...tx.risesAbove}
+            deterministicId={risesAboveId}
+          />
+        )}
+      </div>
+    </>
+  );
+};
@@ -1,4 +1,8 @@
-import { hexToString, txSignatureToDeterministicId } from './deterministic-ids';
+import {
+  hexToString,
+  txSignatureToDeterministicId,
+  stopOrdersSignatureToDeterministicId,
+} from './deterministic-ids';

 it('txSignatureToDeterministicId Turns a known signature in to a known deterministic ID', () => {
  const signature =
@@ -20,3 +24,24 @@ it('hexToString encodes a known good value as bytes', () => {
  const res = hexToString(hex);
  expect(res).toEqual([14, 221]);
 });
+
+describe('stopOrdersSignatureToDeterministicId', () => {
+  it('should return empty object if no signature is provided', () => {
+    const result = stopOrdersSignatureToDeterministicId();
+    expect(result.length).toEqual(0);
+  });
+
+  it('should return valid deterministic ids if a signature is provided', () => {
+    const signature = 'deadb33f';
+    const result = stopOrdersSignatureToDeterministicId(signature);
+
+    expect(result.length).toEqual(2);
+
+    expect(result[0]).toBe(
+      '4c45b67a8c08cbf1982883a75beaf309bf172461d04bd427623d6cd3d9ab0e91'
+    );
+    expect(result[1]).toBe(
+      'afe7509ff90d8f26339a0ab81e4d3e1fb6c4d44e94419aa5e13ae7659d894da1'
+    );
+  });
+});
@@ -1,4 +1,6 @@
+import type { components } from '../../../../types/explorer';
 import { sha3_256 } from 'js-sha3';
+type StopOrderSetup = components['schemas']['v1StopOrderSetup'];

 /**
 * Encodes a string as bytes
@@ -37,3 +39,58 @@ export function txSignatureToDeterministicId(signature: string): string {

  return hash.hex();
 }
+
+/**
+ * Given a stop order signature string, returns the deterministic IDs of both potential
+ * Stop Orders. A stop order is not an order per se, but a trigger for an order. The order
+ * created by the stop order will have another ID based on the market event that hit the
+ * trigger, and as such is not deterministic.
+ *
+ * @param signature
+ * @returns string[]
+ */
+export function stopOrdersSignatureToDeterministicId(
+  signature?: string
+): string[] {
+  if (!signature) {
+    return [];
+  }
+
+  const firstId = txSignatureToDeterministicId(signature);
+  return [firstId, txSignatureToDeterministicId(firstId)];
+}
+
+export type stopSignatures = {
+  risesAboveId: string | undefined;
+  fallsBelowId: string | undefined;
+};
+
+/**
+ * In 0.72.10 the way stop order IDs are determined is a little tricky. It will be stabilised
+ * in a future release.
+ * @param deterministicIds Output of stopORdersSignatureToDeterministicId
+ * @param risesAbove Stop order setup
+ * @param fallsBelow Stop order setup
+ * @returns Object containing the deterministic IDs of the stop orders
+ */
+export function getStopOrderIds(
+  deterministicIds: string[],
+  risesAbove: StopOrderSetup | undefined,
+  fallsBelow: StopOrderSetup | undefined
+) {
+  if (risesAbove && fallsBelow) {
+    return {
+      risesAboveId: deterministicIds[0],
+      fallsBelowId: deterministicIds[1],
+    };
+  } else if (!fallsBelow && risesAbove) {
+    return {
+      risesAboveId: deterministicIds[0],
+    };
+  } else {
+    return {
+      fallsBelowId: deterministicIds[0] || undefined,
+      risesAboveId: deterministicIds[1] || undefined,
+    };
+  }
+}
@@ -34,6 +34,7 @@ export type FilterOption =
  | 'Protocol Upgrade'
  | 'Register new Node'
  | 'State Variable Proposal'
+  | 'Stop Orders Submission'
  | 'Stop Orders Cancellation'
  | 'Submit Oracle Data'
  | 'Submit Order'
@@ -54,6 +55,7 @@ export const PrimaryFilterOptions: FilterOption[] = [
  'Delegate',
  'Liquidity Provision Order',
  'Proposal',
+  'Stop Orders Submission',
  'Stop Orders Cancellation',
  'Submit Oracle Data',
  'Submit Order',
@@ -50,6 +50,25 @@ const displayString: StringMap = {
  'Stop Orders Cancellation': 'Cancel stop',
 };

+export function getLabelForStopOrderType(
+  orderType: string,
+  command: components['schemas']['v1InputData']
+): string {
+  if (command.stopOrdersSubmission) {
+    if (
+      command.stopOrdersSubmission.risesAbove &&
+      command.stopOrdersSubmission.fallsBelow
+    ) {
+      return 'Stop ⇅';
+    } else if (command.stopOrdersSubmission.risesAbove) {
+      return 'Stop ↗';
+    } else if (command.stopOrdersSubmission.fallsBelow) {
+      return 'Stop ↘';
+    }
+  }
+  return 'Stop';
+}
+
 export function getLabelForOrderType(
  orderType: string,
  command: components['schemas']['v1InputData']
@@ -185,6 +204,9 @@ export const TxOrderType = ({ orderType, command }: TxOrderTypeProps) => {
  } else if (type === 'Order' && command) {
    type = getLabelForOrderType(orderType, command);
    colours = 'text-white dark-text-white bg-vega-blue dark:bg-vega-blue';
+  } else if (type === 'Stop' && command) {
+    type = getLabelForStopOrderType(orderType, command);
+    colours = 'text-white dark-text-white bg-vega-blue dark:bg-vega-blue';
  }

  if (type === 'Vote on Proposal') {
@@ -55,7 +55,7 @@ export const TxsInfiniteList = ({
  }

  return (
-    <div className="overflow-scroll">
+    <div>
      <table className={className} data-testid="transactions-list">
        <thead>
          <tr className="w-full mb-3 text-vega-dark-300 uppercase text-left">
@@ -1,4 +1,34 @@
+fragment ExplorerOracleDataConnection on OracleSpec {
+  dataConnection {
+    edges {
+      node {
+        externalData {
+          data {
+            signers {
+              signer {
+                ... on ETHAddress {
+                  address
+                }
+                ... on PubKey {
+                  key
+                }
+              }
+            }
+            data {
+              name
+              value
+            }
+            matchedSpecIds
+            broadcastAt
+          }
+        }
+      }
+    }
+  }
+}
+
 fragment ExplorerOracleDataSource on OracleSpec {
+  ...ExplorerOracleDataConnection
  dataSourceSpec {
    spec {
      id
@@ -34,6 +64,7 @@ fragment ExplorerOracleDataSource on OracleSpec {
                  key {
                    name
                    type
+                    numberDecimalPlaces
                  }
                  conditions {
                    value
@@ -49,38 +80,6 @@ fragment ExplorerOracleDataSource on OracleSpec {
  }
 }

-fragment ExplorerOracleDataConnection on OracleSpec {
-  dataConnection {
-    pageInfo {
-      hasNextPage
-    }
-    edges {
-      node {
-        externalData {
-          data {
-            signers {
-              signer {
-                ... on ETHAddress {
-                  address
-                }
-                ... on PubKey {
-                  key
-                }
-              }
-            }
-            data {
-              name
-              value
-            }
-            matchedSpecIds
-            broadcastAt
-          }
-        }
-      }
-    }
-  }
-}
-
 query ExplorerOracleSpecs {
  oracleSpecsConnection(pagination: { first: 50 }) {
    pageInfo {
@@ -97,6 +96,5 @@ query ExplorerOracleSpecs {
 query ExplorerOracleSpecById($id: ID!) {
  oracleSpec(oracleSpecId: $id) {
    ...ExplorerOracleDataSource
-    ...ExplorerOracleDataConnection
  }
 }
@@ -3,24 +3,55 @@ import * as Types from '@vegaprotocol/types';
 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
-export type ExplorerOracleDataSourceFragment = { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, 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, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } } } } } };
+export type ExplorerOracleDataConnectionFragment = { __typename?: 'OracleSpec', dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } };

-export type ExplorerOracleDataConnectionFragment = { __typename?: 'OracleSpec', dataConnection: { __typename?: 'OracleDataConnection', pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean }, edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } };
+export type ExplorerOracleDataSourceFragment = { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, 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, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } } } } }, dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } };

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


-export type ExplorerOracleSpecsQuery = { __typename?: 'Query', oracleSpecsConnection?: { __typename?: 'OracleSpecsConnection', pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean }, edges?: Array<{ __typename?: 'OracleSpecEdge', node: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, 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, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } } } } } } } | null> | null } | null };
+export type ExplorerOracleSpecsQuery = { __typename?: 'Query', oracleSpecsConnection?: { __typename?: 'OracleSpecsConnection', pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean }, edges?: Array<{ __typename?: 'OracleSpecEdge', node: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, 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, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } } } } }, dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } } } | null> | null } | null };

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


-export type ExplorerOracleSpecByIdQuery = { __typename?: 'Query', oracleSpec?: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, 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, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } } } } }, dataConnection: { __typename?: 'OracleDataConnection', pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean }, edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } } | null };
+export type ExplorerOracleSpecByIdQuery = { __typename?: 'Query', oracleSpec?: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, 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, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } } } } }, dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } } | null };

+export const ExplorerOracleDataConnectionFragmentDoc = gql`
+    fragment ExplorerOracleDataConnection on OracleSpec {
+  dataConnection {
+    edges {
+      node {
+        externalData {
+          data {
+            signers {
+              signer {
+                ... on ETHAddress {
+                  address
+                }
+                ... on PubKey {
+                  key
+                }
+              }
+            }
+            data {
+              name
+              value
+            }
+            matchedSpecIds
+            broadcastAt
+          }
+        }
+      }
+    }
+  }
+}
+    `;
 export const ExplorerOracleDataSourceFragmentDoc = gql`
    fragment ExplorerOracleDataSource on OracleSpec {
+  ...ExplorerOracleDataConnection
  dataSourceSpec {
    spec {
      id
@@ -56,6 +87,7 @@ export const ExplorerOracleDataSourceFragmentDoc = gql`
                  key {
                    name
                    type
+                    numberDecimalPlaces
                  }
                  conditions {
                    value
@@ -70,40 +102,7 @@ export const ExplorerOracleDataSourceFragmentDoc = gql`
    }
  }
 }
-    `;
-export const ExplorerOracleDataConnectionFragmentDoc = gql`
-    fragment ExplorerOracleDataConnection on OracleSpec {
-  dataConnection {
-    pageInfo {
-      hasNextPage
-    }
-    edges {
-      node {
-        externalData {
-          data {
-            signers {
-              signer {
-                ... on ETHAddress {
-                  address
-                }
-                ... on PubKey {
-                  key
-                }
-              }
-            }
-            data {
-              name
-              value
-            }
-            matchedSpecIds
-            broadcastAt
-          }
-        }
-      }
-    }
-  }
-}
-    `;
+    ${ExplorerOracleDataConnectionFragmentDoc}`;
 export const ExplorerOracleSpecsDocument = gql`
    query ExplorerOracleSpecs {
  oracleSpecsConnection(pagination: {first: 50}) {
@@ -149,11 +148,9 @@ export const ExplorerOracleSpecByIdDocument = gql`
    query ExplorerOracleSpecById($id: ID!) {
  oracleSpec(oracleSpecId: $id) {
    ...ExplorerOracleDataSource
-    ...ExplorerOracleDataConnection
  }
 }
-    ${ExplorerOracleDataSourceFragmentDoc}
-${ExplorerOracleDataConnectionFragmentDoc}`;
+    ${ExplorerOracleDataSourceFragmentDoc}`;

 /**
 * __useExplorerOracleSpecByIdQuery__
@@ -1,23 +1,23 @@
 import { render } from '@testing-library/react';
 import { OracleData } from './oracle-data';
-import type { ExplorerOracleDataConnectionFragment } from '../__generated__/Oracles';
+import { type ExplorerOracleDataConnectionFragment } from '../__generated__/Oracles';

-function renderComponent(data: ExplorerOracleDataConnectionFragment) {
+type DataConnection = ExplorerOracleDataConnectionFragment['dataConnection'];
+
+function renderComponent(
+  data: ExplorerOracleDataConnectionFragment['dataConnection']
+) {
  return <OracleData data={data} />;
 }

 describe('Oracle Data view', () => {
  it('Renders nothing when data is null', () => {
-    const res = render(
-      renderComponent(null as unknown as ExplorerOracleDataConnectionFragment)
-    );
+    const res = render(renderComponent(null as unknown as DataConnection));
    expect(res.container).toBeEmptyDOMElement();
  });

  it('Renders nothing when dataConnection is empty', () => {
-    const res = render(
-      renderComponent({} as ExplorerOracleDataConnectionFragment)
-    );
+    const res = render(renderComponent({} as DataConnection));
    expect(res.container).toBeEmptyDOMElement();
  });
  it('Renders nothing when dataConnection has no edges', () => {
@@ -26,7 +26,7 @@ describe('Oracle Data view', () => {
        dataConnection: {
          edges: null,
        },
-      } as ExplorerOracleDataConnectionFragment)
+      } as DataConnection)
    );
    expect(res.container).toBeEmptyDOMElement();
  });
@@ -37,7 +37,7 @@ describe('Oracle Data view', () => {
        dataConnection: {
          edges: [],
        },
-      } as unknown as ExplorerOracleDataConnectionFragment)
+      } as unknown as DataConnection)
    );
    expect(res.container).toBeEmptyDOMElement();
  });
@@ -47,20 +47,18 @@ describe('Oracle Data view', () => {
  it('Renders details component when there is data', () => {
    const res = render(
      renderComponent({
-        dataConnection: {
-          edges: [
-            {
-              node: {
-                externalData: {
-                  data: {
-                    broadcastAt: '2022-01-01',
-                  },
+        edges: [
+          {
+            node: {
+              externalData: {
+                data: {
+                  broadcastAt: '2022-01-01',
                },
              },
            },
-          ],
-        },
-      } as ExplorerOracleDataConnectionFragment)
+          },
+        ],
+      } as DataConnection)
    );
    expect(res.getByText('Broadcast data')).toBeInTheDocument();
  });
@@ -4,7 +4,7 @@ import filter from 'recursive-key-filter';
 import type { ExplorerOracleDataConnectionFragment } from '../__generated__/Oracles';

 interface OracleDataTypeProps {
-  data: ExplorerOracleDataConnectionFragment;
+  data: ExplorerOracleDataConnectionFragment['dataConnection'];
 }

 /**
@@ -14,12 +14,7 @@ interface OracleDataTypeProps {
 * that Does The Job, rather than because it's good.
 */
 export function OracleData({ data }: OracleDataTypeProps) {
-  if (
-    !data ||
-    !data.dataConnection ||
-    !data.dataConnection.edges?.length ||
-    data.dataConnection.edges.length > 1
-  ) {
+  if (!data || !data.edges?.length || data.edges.length > 1) {
    return null;
  }

@@ -27,7 +22,7 @@ export function OracleData({ data }: OracleDataTypeProps) {
    <details data-testid="oracle-data">
      <summary>{t('Broadcast data')}</summary>
      <ul>
-        {data.dataConnection.edges.map((d) => {
+        {data.edges.map((d) => {
          if (!d) {
            return null;
          }
@@ -27,8 +27,8 @@ export function OracleMarkets({ id }: OracleMarketsProps) {
    const m = markets.find((m) => {
      const p = m.tradableInstrument.instrument.product;
      if (
-        p.dataSourceSpecForSettlementData.id === id ||
-        p.dataSourceSpecForTradingTermination.id === id
+        p?.dataSourceSpecForSettlementData?.id === id ||
+        p?.dataSourceSpecForTradingTermination?.id === id
      ) {
        return true;
      }
@@ -36,15 +36,9 @@ export function OracleMarkets({ id }: OracleMarketsProps) {
    });

    if (m && m.id) {
-      const type =
-        id ===
-        m.tradableInstrument.instrument.product.dataSourceSpecForSettlementData
-          .id
-          ? 'Settlement for'
-          : 'Termination for';
      return (
        <TableRow modifier="bordered">
-          <TableHeader scope="row">{type}</TableHeader>
+          <TableHeader scope="row">{getLabel(id, m)}</TableHeader>
          <TableCell modifier="bordered" data-testid={`m-${m.id}`}>
            <MarketLink id={m.id} />
          </TableCell>
@@ -61,3 +55,14 @@ export function OracleMarkets({ id }: OracleMarketsProps) {
    </TableRow>
  );
 }
+
+export function getLabel(
+  id: string,
+  m: ExplorerOracleForMarketsMarketFragment | null
+): string {
+  const settlementId =
+    m?.tradableInstrument?.instrument?.product?.dataSourceSpecForSettlementData
+      ?.id || null;
+
+  return id === settlementId ? 'Settlement for' : 'Termination for';
+}
@@ -22,7 +22,7 @@ export type SourceType =
 interface OracleDetailsProps {
  id: string;
  dataSource: ExplorerOracleDataSourceFragment;
-  dataConnection?: ExplorerOracleDataConnectionFragment;
+  dataConnection: ExplorerOracleDataConnectionFragment['dataConnection'];
  // Defaults to false. Hides the count of 'broadcasts' this oracle has seen
  showBroadcasts?: boolean;
 }
@@ -41,8 +41,7 @@ export const OracleDetails = ({
  showBroadcasts = false,
 }: OracleDetailsProps) => {
  const sourceType = dataSource.dataSourceSpec.spec.data.sourceType;
-  const reportsCount: number =
-    dataConnection?.dataConnection.edges?.length || 0;
+  const reportsCount: number = dataConnection.edges?.length || 0;

  return (
    <div>
@@ -34,11 +34,15 @@ const Oracles = () => {
              if (!id) {
                return null;
              }
+
+              const dataConnection = o?.node.dataConnection;
+
              return (
                <div id={id} key={id} className="mb-10">
                  <OracleDetails
                    id={id}
                    dataSource={o?.node}
+                    dataConnection={dataConnection}
                    showBroadcasts={false}
                  />
                  <details>
@@ -39,7 +39,7 @@ export const Oracle = () => {
            <OracleDetails
              id={id || ''}
              dataSource={data?.oracleSpec}
-              dataConnection={data?.oracleSpec}
+              dataConnection={data?.oracleSpec.dataConnection}
              showBroadcasts={true}
            />
            <details>
@@ -920,6 +920,8 @@ export interface components {
     *  - ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES: Per asset reward account for fees received by liquidity providers
     *  - ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS: Per asset reward account for market proposers when the market goes above some trading threshold
     *  - ACCOUNT_TYPE_HOLDING: Per asset account for holding in-flight unfilled orders' funds
+     *  - ACCOUNT_TYPE_LP_LIQUIDITY_FEES: Network controlled liquidity provider's account, per market, to hold accrued liquidity fees.
+     *  - ACCOUNT_TYPE_LIQUIDITY_FEES_BONUS_DISTRIBUTION: Network controlled liquidity fees bonus distribution account, per market.
     * @default ACCOUNT_TYPE_UNSPECIFIED
     * @enum {string}
     */
@@ -941,7 +943,9 @@ export interface components {
      | 'ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES'
      | 'ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES'
      | 'ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS'
-      | 'ACCOUNT_TYPE_HOLDING';
+      | 'ACCOUNT_TYPE_HOLDING'
+      | 'ACCOUNT_TYPE_LP_LIQUIDITY_FEES'
+      | 'ACCOUNT_TYPE_LIQUIDITY_FEES_BONUS_DISTRIBUTION';
    /** Vega representation of an external asset */
    readonly vegaAssetDetails: {
      /** @description Vega built-in asset. */
@@ -20,6 +20,10 @@ NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 NX_VEGA_REST_URL=http://localhost:3008/api/v2/
 NX_SUCCESSOR_MARKETS=true

+NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
+NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
+NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/pl/firefox/addon/vega-wallet
+
 #Test configuration variables
 CYPRESS_FAIRGROUND=false
 CYPRESS_VEGA_URL=http://localhost:3008/graphql
@@ -11,6 +11,9 @@ import {
  getDateFormatForSpecifiedDays,
  getProposalFromTitle,
  getProposalInformationFromTable,
+  goToMakeNewProposal,
+  governanceProposalType,
+  longProposalDescription,
  proposalChangeType,
  submitUniqueRawProposal,
  validateProposalDetailsDiff,
@@ -43,7 +46,6 @@ const proposalDetailsTitle = 'proposal-title';
 const proposalDetailsDescription = 'proposal-description';
 const openProposals = 'open-proposals';
 const viewProposalButton = 'view-proposal-btn';
-const proposalDescriptionToggle = 'proposal-description-toggle';
 const voteBreakdownToggle = 'vote-breakdown-toggle';
 const proposalTermsToggle = 'proposal-json-toggle';
 const marketDataToggle = 'proposal-market-data-toggle';
@@ -71,10 +73,13 @@ describe(

    // 3001-VOTE-050 3001-VOTE-054 3001-VOTE-055 3002-PROP-019
    it('Newly created raw proposal details - shows proposal title and full description', function () {
-      const proposalDescription =
-        'I propose that everyone evaluate the following IPFS document and vote Yes if they agree. bafybeigwwctpv37xdcwacqxvekr6e4kaemqsrv34em6glkbiceo3fcy4si';
+      const proposalDetails = longProposalDescription;

-      createRawProposal();
+      goToMakeNewProposal(governanceProposalType.RAW);
+      submitUniqueRawProposal({
+        proposalTitle: 'raw proposal with long description',
+        proposalDescription: proposalDetails,
+      });
      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
        cy.getByTestId(openProposals).within(() => {
          getProposalFromTitle(rawProposal.rationale.title).within(() => {
@@ -85,12 +90,17 @@ describe(
          'contain.text',
          rawProposal.rationale.title
        );
-        cy.getByTestId(proposalDescriptionToggle).click();
-        cy.getByTestId('proposal-description-toggle');
-        cy.getByTestId(proposalDetailsDescription)
-          .find('p')
-          .should('have.text', proposalDescription);
      });
+      cy.getByTestId(proposalDetailsDescription).within(() => {
+        cy.get('p').should('not.have.text', 'Hyperlink text');
+        cy.getByTestId('show-more-btn').click();
+        cy.get('p')
+          .invoke('text')
+          .should('have.have.length', 2194) // Full description is displayed
+          .and('contain', 'Hyperlink text');
+        cy.get('a').should('have.attr', 'href');
+      });
+
      // 3001-VOTE-008
      getProposalInformationFromTable('ID')
        .invoke('text')
@@ -361,34 +371,6 @@ describe(
      stakingPageDisassociateAllTokens();
    });

-    it('Error message should be displayed if error returned from wallet when voting', function () {
-      const errorMsg =
-        'Application error: party has already submitted the maximum number of transactions of this type per epoch (3)';
-
-      createRawProposal();
-      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-        getProposalFromTitle(rawProposal.rationale.title).within(() =>
-          cy.getByTestId(viewProposalButton).click()
-        );
-        cy.intercept('POST', '/api/v2/requests', {
-          jsonrpc: '2.0',
-          error: {
-            code: 2001,
-            message: 'Application error',
-            data: 'party has already submitted the maximum number of transactions of this type per epoch (3)',
-          },
-          id: '-PK5EGmErnjLhAmzMeclC',
-        });
-        cy.contains('Vote breakdown').should('be.visible', { timeout: 10000 });
-        cy.getByTestId('vote-buttons').contains('for').click();
-        cy.getByTestId('dialog-title').should(
-          'have.text',
-          'Transaction failed'
-        );
-        cy.getByTestId('Error').should('have.text', errorMsg);
-      });
-    });
-
    it('Able to see successor market details with new and updated values', function () {
      cy.createMarket();
      cy.reload();
@@ -425,7 +407,8 @@ describe(
      // 3003-PMAN-011 3003-PMAN-012
      cy.getByTestId(marketDataToggle).click();
      cy.getByTestId('proposal-market-data').within(() => {
-        cy.contains('Key details').click();
+        // Assert that all toggles are removed
+        cy.getByTestId('accordion-toggle').should('not.exist');
        validateProposalDetailsDiff(
          'Name',
          proposalChangeType.UPDATED,
@@ -449,7 +432,6 @@ describe(
          'Opening auction'
        );

-        cy.contains('Instrument').click();
        validateProposalDetailsDiff(
          'Market Name',
          proposalChangeType.UPDATED,
@@ -457,7 +439,6 @@ describe(
          'Test market 1'
        );

-        cy.contains('Metadata').click();
        validateProposalDetailsDiff(
          'Sector',
          proposalChangeType.UPDATED,
@@ -274,3 +274,6 @@ export enum proposalChangeType {
  UPDATED = 'Updated',
  ADDED = 'Added',
 }
+
+export const longProposalDescription =
+  'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam bibendum orci augue, vel imperdiet augue ultrices sed. In hac habitasse platea dictumst. Sed eget elit vitae nisl tincidunt faucibus. Donec pellentesque mauris nec viverra blandit. Aenean eros diam, tempor eu luctus nec, rhoncus non massa. Mauris libero diam, mattis et enim ut, lobortis pharetra elit. Phasellus vel metus accumsan, rhoncus tellus finibus, blandit mi. In sollicitudin ex ac tortor ornare interdum. Sed est ipsum, vestibulum eget dolor vel, porta luctus elit. Fusce justo nibh, placerat eget sollicitudin eleifend, rhoncus id lorem. Fusce vitae magna vel urna faucibus accumsan quis id purus.\nPraesent convallis dolor sed ante ultricies tempor. Proin sed risus ut libero euismod semper. Duis quis quam sed lacus viverra blandit vel scelerisque diam. Donec interdum, ipsum eget imperdiet ornare, risus augue faucibus lectus, ullamcorper scelerisque erat sapien in purus. Nunc molestie tincidunt felis dignissim vestibulum. Quisque quis ornare enim, non dignissim lectus. Mauris mollis, massa ut maximus consectetur, sem mi lobortis quam, vel malesuada eros tortor nec ex. Cras ac nunc sed erat malesuada varius a quis nulla. Curabitur cursus nec sem sit amet aliquet. Ut tristique tortor neque, a dignissim lectus dictum vel. Praesent sollicitudin bibendum vulputate.\nAenean bibendum tristique diam laoreet posuere. Curabitur ornare lectus ut diam ultricies, ut sodales eros lacinia. Maecenas mauris turpis, gravida non arcu ac, interdum auctor sapien. Vestibulum sed tortor quam. Interdum et malesuada fames ac ante ipsum primis in faucibus. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec finibus pulvinar magna, non laoreet lectus molestie nec. Vestibulum tempus mattis vehicula. Praesent in orci lectus. In commodo sollicitudin lacus, et lobortis eros placerat vitae. Proin mi libero, feugiat id pretium posuere, rhoncus ut augue. Cras massa tortor, rutrum sed ex vitae, posuere pretium augue. Donec pellentesque suscipit dignissim. Vivamus convallis a odio vitae sodales. Nullam non eleifend mauris, sed iaculis lectus. Cras facilisis justo at ante.\n[Hyperlink text](https://dweb.link/ipfs/bafybeigwwctpv37xdcwacqxvekr6e4kaemqsrv34em6glkbiceo3fcy4si)';
@@ -22,6 +22,8 @@ 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

+NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
+NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/pl/firefox/addon/vega-wallet

 #Test configuration variables
 CYPRESS_FAIRGROUND=false
@@ -29,3 +31,4 @@ LC_ALL="en_US.UTF-8"

 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
+NX_METAMASK_SNAPS=true
@@ -30,3 +30,4 @@ CYPRESS_FAIRGROUND=false

 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=false
+NX_METAMASK_SNAPS=false
@@ -22,3 +22,4 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://be.devnet1.vega.xyz/websocket

 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
+NX_METAMASK_SNAPS=true
@@ -22,3 +22,4 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket

 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=false
+NX_METAMASK_SNAPS=false
@@ -21,3 +21,4 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://be.mainnet-mirror.vega.rocks/websocket

 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=false
+NX_METAMASK_SNAPS=false
@@ -18,3 +18,4 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket

 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
+NX_METAMASK_SNAPS=true
@@ -23,3 +23,4 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://be.testnet.vega.xyz/websocket

 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
+NX_METAMASK_SNAPS=true
@@ -20,3 +20,4 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.

 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=false
+NX_METAMASK_SNAPS=false
@@ -41,6 +41,7 @@ import {
  AppFailure,
  NodeSwitcherDialog,
  useNodeSwitcherStore,
+  DocsLinks,
 } from '@vegaprotocol/environment';
 import { ENV } from './config';
 import type { InMemoryCacheConfig } from '@apollo/client';
@@ -109,8 +110,17 @@ const Web3Container = ({
    store.connectors,
    store.initialize,
  ]);
-  const { ETHEREUM_PROVIDER_URL, ETH_LOCAL_PROVIDER_URL, ETH_WALLET_MNEMONIC } =
-    useEnvironment();
+  const {
+    ETHEREUM_PROVIDER_URL,
+    ETH_LOCAL_PROVIDER_URL,
+    ETH_WALLET_MNEMONIC,
+    VEGA_ENV,
+    VEGA_URL,
+    VEGA_EXPLORER_URL,
+    CHROME_EXTENSION_URL,
+    MOZILLA_EXTENSION_URL,
+    VEGA_WALLET_URL,
+  } = useEnvironment();
  useEffect(() => {
    if (chainId) {
      return initializeConnectors(
@@ -139,10 +149,33 @@ const Web3Container = ({
    return <SplashLoader />;
  }

+  if (
+    !VEGA_URL ||
+    !VEGA_WALLET_URL ||
+    !VEGA_EXPLORER_URL ||
+    !DocsLinks ||
+    !CHROME_EXTENSION_URL ||
+    !MOZILLA_EXTENSION_URL
+  ) {
+    return null;
+  }
+
  return (
    <Web3Provider connectors={connectors}>
      <Web3Connector connectors={connectors} chainId={Number(chainId)}>
-        <VegaWalletProvider>
+        <VegaWalletProvider
+          config={{
+            network: VEGA_ENV,
+            vegaUrl: VEGA_URL,
+            vegaWalletServiceUrl: VEGA_WALLET_URL,
+            links: {
+              explorer: VEGA_EXPLORER_URL,
+              concepts: DocsLinks?.VEGA_WALLET_CONCEPTS_URL,
+              chromeExtensionUrl: CHROME_EXTENSION_URL,
+              mozillaExtensionUrl: MOZILLA_EXTENSION_URL,
+            },
+          }}
+        >
          <ContractsProvider>
            <AppLoader>
              <BalanceManager>
@@ -275,7 +308,7 @@ const AppContainer = () => {
    <Router>
      <ScrollToTop />
      <AppStateProvider>
-        <div className="grid min-h-full text-white">
+        <div className="min-h-full text-white grid">
          <NodeGuard
            skeleton={<div>{t('Loading')}</div>}
            failure={
@@ -1,17 +1,25 @@
+import { FLAGS } from '@vegaprotocol/environment';
 import {
  JsonRpcConnector,
  ViewConnector,
  InjectedConnector,
+  SnapConnector,
+  DEFAULT_SNAP_ID,
 } from '@vegaprotocol/wallet';

 const urlParams = new URLSearchParams(window.location.search);

-export const injected = new InjectedConnector();
 export const jsonRpc = new JsonRpcConnector();
+export const injected = new InjectedConnector();
 export const view = new ViewConnector(urlParams.get('address'));

+export const snap = FLAGS.METAMASK_SNAPS
+  ? new SnapConnector(DEFAULT_SNAP_ID)
+  : undefined;
+
 export const Connectors = {
  injected,
  jsonRpc,
  view,
+  snap,
 };
@@ -1,6 +1,7 @@
 import { MemoryRouter } from 'react-router-dom';
 import { MockedProvider } from '@apollo/client/testing';
 import { VegaWalletProvider } from '@vegaprotocol/wallet';
+import type { VegaWalletConfig } from '@vegaprotocol/wallet';
 import { render, screen } from '@testing-library/react';
 import { generateProposal } from '../../test-helpers/generate-proposals';
 import { Proposal } from './proposal';
@@ -43,11 +44,23 @@ jest.mock('../list-asset', () => ({
  ListAsset: () => <div data-testid="proposal-list-asset"></div>,
 }));

+const vegaWalletConfig: VegaWalletConfig = {
+  network: 'TESTNET',
+  vegaUrl: 'https://vega.xyz',
+  vegaWalletServiceUrl: 'https://wallet.vega.xyz',
+  links: {
+    explorer: 'explorer',
+    concepts: 'concepts',
+    chromeExtensionUrl: 'chrome',
+    mozillaExtensionUrl: 'mozilla',
+  },
+};
+
 const renderComponent = (proposal: ProposalQuery['proposal']) => {
  render(
    <MemoryRouter>
      <MockedProvider>
-        <VegaWalletProvider>
+        <VegaWalletProvider config={vegaWalletConfig}>
          <Proposal
            restData={{}}
            proposal={proposal as ProposalQuery['proposal']}
@@ -4,6 +4,7 @@ import { VoteButtons } from './vote-buttons';
 import { VoteState } from './use-user-vote';
 import { ProposalState } from '@vegaprotocol/types';
 import { VegaWalletContext } from '@vegaprotocol/wallet';
+import type { VegaWalletContextShape } from '@vegaprotocol/wallet';
 import { mockWalletContext } from '../../test-helpers/mocks';
 import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider';
 import { MockedProvider } from '@apollo/react-testing';
@@ -67,7 +68,7 @@ describe('Vote buttons', () => {
      disconnect: jest.fn(),
      selectPubKey: jest.fn(),
      connector: null,
-    };
+    } as unknown as VegaWalletContextShape;

    render(
      <AppStateProvider>
@@ -114,6 +114,7 @@ describe('Raw proposal form', () => {
              {
                pubKey,
                sendTx: mockSendTx,
+                links: { explorer: 'explorer' },
              } as unknown as VegaWalletContextShape
            }
          >
@@ -1,7 +1,7 @@
 import { NetworkParamsDocument } from '@vegaprotocol/network-parameters';
 import type { MockedResponse } from '@apollo/client/testing';
 import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
-import type { PubKey } from '@vegaprotocol/wallet';
+import type { PubKey, VegaWalletContextShape } from '@vegaprotocol/wallet';
 import type { VoteValue } from '@vegaprotocol/types';
 import type { UserVoteQuery } from '../components/vote-details/__generated__/Vote';
 import { UserVoteDocument } from '../components/vote-details/__generated__/Vote';
@@ -21,7 +21,7 @@ export const mockWalletContext = {
  disconnect: jest.fn(),
  selectPubKey: jest.fn(),
  connector: null,
-};
+} as unknown as VegaWalletContextShape;

 const mockEthereumConfig = {
  network_id: '3',
@@ -133,7 +133,11 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
    validateMarketDataRow(4, 'Decimals', '5');
    validateMarketDataRow(5, 'Quantum', '1');
    validateMarketDataRow(6, 'Status', 'Enabled');
-    validateMarketDataRow(7, 'Contract address', '0x0158…78a4');
+    validateMarketDataRow(
+      7,
+      'Contract address',
+      '0x0158031158Bb4dF2AD02eAA31e8963E84EA978a4'
+    );
    validateMarketDataRow(8, 'Withdrawal threshold', '0.0005');
    validateMarketDataRow(9, 'Lifetime limit', '1,230');
    validateMarketDataRow(10, 'Infrastructure fee account balance', '0.00001');
@@ -33,9 +33,7 @@ describe('deal ticker order validation', { tags: '@smoke' }, () => {

    it('must see the price unit', function () {
      // 7002-SORD-018
-      cy.getByTestId(orderPriceField)
-        .siblings('label')
-        .should('have.text', 'Price (DAI)');
+      cy.getByTestId(orderPriceField).next().should('have.text', 'DAI');
    });

    it('must see warning when placing an order with expiry date in past', () => {
@@ -1,59 +1,25 @@
 import { aliasGQLQuery } from '@vegaprotocol/cypress';
-import { ledgerEntriesQuery } from '@vegaprotocol/mock';
+import { partyAssetsQuery } from '@vegaprotocol/mock';

 describe('Portfolio page', { tags: '@smoke' }, () => {
  beforeEach(() => {
-    cy.mockTradingPage();
    cy.mockGQL((req) => {
-      aliasGQLQuery(req, 'LedgerEntries', ledgerEntriesQuery());
+      aliasGQLQuery(req, 'PartyAssets', partyAssetsQuery());
    });
+    cy.mockTradingPage();
    cy.mockSubscription();
    cy.setVegaWallet();
  });
  describe('Ledger entries', () => {
-    it('List should be properly rendered', () => {
+    it('Download form should be properly rendered', () => {
+      // 7007-LEEN-001
      cy.visit('/#/portfolio');
      cy.getByTestId('"Ledger entries"').click();
-      const headers = [
-        'Sender',
-        'Account type',
-        'Market',
-        'Receiver',
-        'Account type',
-        'Market',
-        'Transfer type',
-        'Quantity',
-        'Asset',
-        'Sender account balance',
-        'Receiver account balance',
-        'Vega time',
-      ];
      cy.getByTestId('tab-ledger-entries').within(($headers) => {
        cy.wrap($headers)
-          .get('.ag-header-cell-text')
-          .each(($header, i) => {
-            cy.wrap($header).should('have.text', headers[i]);
-          });
+          .getByTestId('ledger-download-button')
+          .should('be.visible');
      });
-      cy.get(
-        '[data-testid="tab-ledger-entries"] .ag-center-cols-container .ag-row'
-      ).should('have.length', ledgerEntriesQuery().ledgerEntries.edges.length);
-    });
-
-    it('account filters should be callable', () => {
-      cy.visit('/#/portfolio');
-      cy.getByTestId('"Ledger entries"').click();
-      cy.get('[role="columnheader"][col-id="fromAccountType"]').realHover();
-      cy.get(
-        '[role="columnheader"][col-id="fromAccountType"] .ag-header-cell-menu-button'
-      ).click();
-      cy.get('fieldset.ag-simple-filter-body-wrapper')
-        .should('be.visible')
-        .within((fields) => {
-          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');
    });
  });
 });
@@ -43,10 +43,11 @@ describe('ethereum wallet', { tags: '@smoke', testIsolation: true }, () => {
    // 0004-EWAL-005
    // 0004-EWAL-006

+    const ethWalletAddress = Cypress.env('ETHEREUM_WALLET_ADDRESS');
    cy.getByTestId('Deposits').click();
    cy.getByTestId('deposit-button').click();
    connectEthereumWallet('MetaMask');
-    cy.getByTestId('ethereum-address').should('have.text', '0xEe7D…d94F');
+    cy.getByTestId('ethereum-address').should('have.text', ethWalletAddress);
    cy.getByTestId('disconnect-ethereum-wallet')
      .should('have.text', 'Disconnect')
      .click();
@@ -12,6 +12,8 @@ NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/main/announcements.json
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
+NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
+NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/pl/firefox/addon/vega-wallet


 # Cosmic elevator flags
@@ -19,6 +21,7 @@ NX_SUCCESSOR_MARKETS=true
 NX_STOP_ORDERS=true
 # NX_ICEBERG_ORDERS
 # NX_PRODUCT_PERPETUALS
+NX_METAMASK_SNAPS=true

 NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket
@@ -23,6 +23,7 @@ NX_SUCCESSOR_MARKETS=false
 NX_STOP_ORDERS=false
 # NX_ICEBERG_ORDERS
 # NX_PRODUCT_PERPETUALS
+NX_METAMASK_SNAPS=false

 NX_TENDERMINT_URL=http://localhost:26617
 NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket
@@ -21,6 +21,7 @@ NX_SUCCESSOR_MARKETS=true
 NX_STOP_ORDERS=true
 # NX_ICEBERG_ORDERS
 # NX_PRODUCT_PERPETUALS
+NX_METAMASK_SNAPS=true

 NX_TENDERMINT_URL=https://tm.be.devnet1.vega.xyz/
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.devnet1.vega.xyz/websocket
@@ -23,6 +23,7 @@ NX_SUCCESSOR_MARKETS=false
 NX_STOP_ORDERS=false
 # NX_ICEBERG_ORDERS
 # NX_PRODUCT_PERPETUALS
+NX_METAMASK_SNAPS=false

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

 NX_TENDERMINT_URL=https://be.mainnet-mirror.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.mainnet-mirror.vega.rocks/websocket
@@ -21,3 +21,4 @@ NX_SUCCESSOR_MARKETS=true
 NX_STOP_ORDERS=true
 # NX_ICEBERG_ORDERS
 # NX_PRODUCT_PERPETUALS
+NX_METAMASK_SNAPS=true
@@ -22,6 +22,7 @@ NX_SUCCESSOR_MARKETS=true
 NX_STOP_ORDERS=true
 NX_ICEBERG_ORDERS=true
 # NX_PRODUCT_PERPETUALS
+NX_METAMASK_SNAPS=false

 NX_TENDERMINT_URL=https://tm.be.testnet.vega.xyz
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.testnet.vega.xyz/websocket
@@ -23,6 +23,7 @@ NX_SUCCESSOR_MARKETS=false
 NX_STOP_ORDERS=false
 # NX_ICEBERG_ORDERS
 # NX_PRODUCT_PERPETUALS
+NX_METAMASK_SNAPS=false

 NX_TENDERMINT_URL=https://tm.be.validators-testnet.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.xyz/websocket
@@ -1,6 +1,7 @@
 import type { InMemoryCacheConfig } from '@apollo/client';
 import {
  AppFailure,
+  DocsLinks,
  NetworkLoader,
  NodeGuard,
  useEnvironment,
@@ -17,16 +18,32 @@ export const DynamicLoader = dynamic(() => import('../preloader/preloader'), {
 });

 export const AppLoader = ({ children }: { children: ReactNode }) => {
-  const { error, VEGA_URL, MAINTENANCE_PAGE } = useEnvironment((store) => ({
-    error: store.error,
-    VEGA_URL: store.VEGA_URL,
-    MAINTENANCE_PAGE: store.MAINTENANCE_PAGE,
-  }));
+  const {
+    error,
+    VEGA_URL,
+    VEGA_ENV,
+    VEGA_WALLET_URL,
+    VEGA_EXPLORER_URL,
+    MAINTENANCE_PAGE,
+    MOZILLA_EXTENSION_URL,
+    CHROME_EXTENSION_URL,
+  } = useEnvironment();

  if (MAINTENANCE_PAGE) {
    return <MaintenancePage />;
  }

+  if (
+    !VEGA_URL ||
+    !VEGA_WALLET_URL ||
+    !VEGA_EXPLORER_URL ||
+    !CHROME_EXTENSION_URL ||
+    !MOZILLA_EXTENSION_URL ||
+    !DocsLinks
+  ) {
+    return null;
+  }
+
  return (
    <NetworkLoader
      cache={cacheConfig}
@@ -40,7 +57,21 @@ export const AppLoader = ({ children }: { children: ReactNode }) => {
        failure={<AppFailure title={t(`Node: ${VEGA_URL} is unsuitable`)} />}
      >
        <Web3Provider>
-          <VegaWalletProvider>{children}</VegaWalletProvider>
+          <VegaWalletProvider
+            config={{
+              network: VEGA_ENV,
+              vegaUrl: VEGA_URL,
+              vegaWalletServiceUrl: VEGA_WALLET_URL,
+              links: {
+                explorer: VEGA_EXPLORER_URL,
+                concepts: DocsLinks.VEGA_WALLET_CONCEPTS_URL,
+                chromeExtensionUrl: CHROME_EXTENSION_URL,
+                mozillaExtensionUrl: MOZILLA_EXTENSION_URL,
+              },
+            }}
+          >
+            {children}
+          </VegaWalletProvider>
        </Web3Provider>
      </NodeGuard>
    </NetworkLoader>
@@ -1,23 +1,30 @@
-import { useDataGridEvents } from '@vegaprotocol/datagrid';
 import { t } from '@vegaprotocol/i18n';
-import { LedgerManager } from '@vegaprotocol/ledger';
-import { Splash } from '@vegaprotocol/ui-toolkit';
+import { LedgerExportForm } from '@vegaprotocol/ledger';
+import { Loader, Splash } from '@vegaprotocol/ui-toolkit';
 import { useVegaWallet } from '@vegaprotocol/wallet';
-import type { DataGridSlice } from '../../stores/datagrid-store-slice';
-import { createDataGridSlice } from '../../stores/datagrid-store-slice';
-import { create } from 'zustand';
-import { persist } from 'zustand/middleware';
+import { useEnvironment } from '@vegaprotocol/environment';
+import type { PartyAssetFieldsFragment } from '@vegaprotocol/assets';
+import { usePartyAssetsQuery } from '@vegaprotocol/assets';

 export const LedgerContainer = () => {
+  const VEGA_URL = useEnvironment((store) => store.VEGA_URL);
  const { pubKey } = useVegaWallet();
-
-  const gridStore = useLedgerStore((store) => store.gridStore);
-  const updateGridStore = useLedgerStore((store) => store.updateGridStore);
-
-  const gridStoreCallbacks = useDataGridEvents(gridStore, (colState) => {
-    updateGridStore(colState);
+  const { data, loading } = usePartyAssetsQuery({
+    variables: { partyId: pubKey || '' },
+    skip: !pubKey,
  });

+  const assets = (data?.party?.accountsConnection?.edges ?? [])
+    .map<PartyAssetFieldsFragment>(
+      (item) => item?.node?.asset ?? ({} as PartyAssetFieldsFragment)
+    )
+    .reduce((aggr, item) => {
+      if ('id' in item && 'symbol' in item) {
+        aggr[item.id as string] = item.symbol as string;
+      }
+      return aggr;
+    }, {} as Record<string, string>);
+
  if (!pubKey) {
    return (
      <Splash>
@@ -26,11 +33,31 @@ export const LedgerContainer = () => {
    );
  }

-  return <LedgerManager partyId={pubKey} gridProps={gridStoreCallbacks} />;
-};
+  if (!VEGA_URL) {
+    return (
+      <Splash>
+        <p>{t('Environment not configured')}</p>
+      </Splash>
+    );
+  }

-const useLedgerStore = create<DataGridSlice>()(
-  persist(createDataGridSlice, {
-    name: 'vega_ledger_store',
-  })
-);
+  if (loading) {
+    return (
+      <div className="relative flex items-center justify-center w-full h-full">
+        <Loader />
+      </div>
+    );
+  }
+
+  if (!Object.keys(assets).length) {
+    return (
+      <Splash>
+        <p>{t('No ledger entries to export')}</p>
+      </Splash>
+    );
+  }
+
+  return (
+    <LedgerExportForm partyId={pubKey} vegaUrl={VEGA_URL} assets={assets} />
+  );
+};
@@ -9,7 +9,8 @@ import {
 } from './sidebar';
 import { MemoryRouter, Route, Routes } from 'react-router-dom';
 import { VegaIconNames } from '@vegaprotocol/ui-toolkit';
-import { VegaWalletProvider } from '@vegaprotocol/wallet';
+import type { VegaWalletContextShape } from '@vegaprotocol/wallet';
+import { VegaWalletContext } from '@vegaprotocol/wallet';

 jest.mock('../node-health', () => ({
  NodeHealthContainer: () => <span data-testid="node-health" />,
@@ -31,16 +32,20 @@ jest.mock('../welcome-dialog', () => ({
  GetStarted: () => <div data-testid="get-started" />,
 }));

+const walletContext = {
+  pubKeys: [{ publicKey: 'pubkey' }],
+} as VegaWalletContextShape;
+
 describe('Sidebar', () => {
  it.each(['/markets/all', '/portfolio'])(
    'does not render ticket and info',
    (path) => {
      render(
-        <VegaWalletProvider>
+        <VegaWalletContext.Provider value={walletContext}>
          <MemoryRouter initialEntries={[path]}>
            <Sidebar />
          </MemoryRouter>
-        </VegaWalletProvider>
+        </VegaWalletContext.Provider>
      );

      expect(screen.getByTestId(ViewType.ViewAs)).toBeInTheDocument();
@@ -58,11 +63,11 @@ describe('Sidebar', () => {

  it('renders ticket and info on market pages', () => {
    render(
-      <VegaWalletProvider>
+      <VegaWalletContext.Provider value={walletContext}>
        <MemoryRouter initialEntries={['/markets/ABC']}>
          <Sidebar />
        </MemoryRouter>
-      </VegaWalletProvider>
+      </VegaWalletContext.Provider>
    );

    expect(screen.getByTestId(ViewType.ViewAs)).toBeInTheDocument();
@@ -79,11 +84,11 @@ describe('Sidebar', () => {

  it('renders selected state', async () => {
    render(
-      <VegaWalletProvider>
+      <VegaWalletContext.Provider value={walletContext}>
        <MemoryRouter initialEntries={['/markets/ABC']}>
          <Sidebar />
        </MemoryRouter>
-      </VegaWalletProvider>
+      </VegaWalletContext.Provider>
    );

    const settingsButton = screen.getByTestId(ViewType.Settings);
@@ -107,13 +112,13 @@ describe('Sidebar', () => {
 describe('SidebarContent', () => {
  it('renders the correct content', () => {
    const { container } = render(
-      <VegaWalletProvider>
+      <VegaWalletContext.Provider value={walletContext}>
        <MemoryRouter initialEntries={['/markets/ABC']}>
          <Routes>
            <Route path="/markets/:marketId" element={<SidebarContent />} />
          </Routes>
        </MemoryRouter>
-      </VegaWalletProvider>
+      </VegaWalletContext.Provider>
    );

    expect(container).toBeEmptyDOMElement();
@@ -133,13 +138,13 @@ describe('SidebarContent', () => {

  it('closes sidebar if market id is required but not present', () => {
    const { container } = render(
-      <VegaWalletProvider>
+      <VegaWalletContext.Provider value={walletContext}>
        <MemoryRouter initialEntries={['/portfolio']}>
          <Routes>
            <Route path="/portfolio" element={<SidebarContent />} />
          </Routes>
        </MemoryRouter>
-      </VegaWalletProvider>
+      </VegaWalletContext.Provider>
    );

    act(() => {
@@ -29,6 +29,7 @@ interface Props {
 }

 const GetStartedButton = ({ step }: { step: OnboardingStep }) => {
+  const { CHROME_EXTENSION_URL, MOZILLA_EXTENSION_URL } = useEnvironment();
  const navigate = useNavigate();
  const [, setOnboardingViewed] = useLocalStorage(
    constants.ONBOARDING_VIEWED_KEY
@@ -46,7 +47,13 @@ const GetStartedButton = ({ step }: { step: OnboardingStep }) => {
    openVegaWalletDialog();
  };
  if (step === OnboardingStep.ONBOARDING_WALLET_STEP) {
-    return <GetWalletButton className="justify-between" />;
+    return (
+      <GetWalletButton
+        className="justify-between"
+        chromeExtensionUrl={CHROME_EXTENSION_URL}
+        mozillaExtensionUrl={MOZILLA_EXTENSION_URL}
+      />
+    );
  } else if (step === OnboardingStep.ONBOARDING_CONNECT_STEP) {
    buttonText = t('Connect');
  } else if (step === OnboardingStep.ONBOARDING_DEPOSIT_STEP) {
@@ -1,7 +1,10 @@
+import { FLAGS } from '@vegaprotocol/environment';
 import {
  JsonRpcConnector,
  ViewConnector,
  InjectedConnector,
+  SnapConnector,
+  DEFAULT_SNAP_ID,
 } from '@vegaprotocol/wallet';

 export const jsonRpc = new JsonRpcConnector();
@@ -15,8 +18,13 @@ if (typeof window !== 'undefined') {
  view = new ViewConnector();
 }

+export const snap = FLAGS.METAMASK_SNAPS
+  ? new SnapConnector(DEFAULT_SNAP_ID)
+  : undefined;
+
 export const Connectors = {
  injected,
  jsonRpc,
  view,
+  snap,
 };
@@ -64,6 +64,10 @@ html.dark {

 html [data-theme='dark'],
 html [data-theme='light'] {
+  /* fonts */
+  --pennant-font-family-base: theme(fontFamily.alpha);
+  --pennant-font-family-monospace: theme(fontFamily.mono);
+
  /* sell candles only use stroke as the candle is solid (without border) */
  --pennant-color-sell-stroke: theme(colors.market.red.DEFAULT);

@@ -24,3 +24,26 @@ query Assets {
    }
  }
 }
+
+fragment PartyAssetFields on Asset {
+  id
+  name
+  symbol
+  status
+}
+
+query PartyAssets($partyId: ID!) {
+  party(id: $partyId) {
+    id
+    accountsConnection {
+      edges {
+        node {
+          type
+          asset {
+            ...PartyAssetFields
+          }
+        }
+      }
+    }
+  }
+}
@@ -10,6 +10,15 @@ export type AssetsQueryVariables = Types.Exact<{ [key: string]: never; }>;

 export type AssetsQuery = { __typename?: 'Query', assetsConnection?: { __typename?: 'AssetsConnection', edges?: Array<{ __typename?: 'AssetEdge', node: { __typename?: 'Asset', id: string, name: string, symbol: string, decimals: number, quantum: string, status: Types.AssetStatus, source: { __typename: 'BuiltinAsset' } | { __typename: 'ERC20', contractAddress: string, lifetimeLimit: string, withdrawThreshold: string } } } | null> | null } | null };

+export type PartyAssetFieldsFragment = { __typename?: 'Asset', id: string, name: string, symbol: string, status: Types.AssetStatus };
+
+export type PartyAssetsQueryVariables = Types.Exact<{
+  partyId: Types.Scalars['ID'];
+}>;
+
+
+export type PartyAssetsQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, accountsConnection?: { __typename?: 'AccountsConnection', edges?: Array<{ __typename?: 'AccountEdge', node: { __typename?: 'AccountBalance', type: Types.AccountType, asset: { __typename?: 'Asset', id: string, name: string, symbol: string, status: Types.AssetStatus } } } | null> | null } | null } | null };
+
 export const AssetListFieldsFragmentDoc = gql`
    fragment AssetListFields on Asset {
  id
@@ -28,6 +37,14 @@ export const AssetListFieldsFragmentDoc = gql`
  status
 }
    `;
+export const PartyAssetFieldsFragmentDoc = gql`
+    fragment PartyAssetFields on Asset {
+  id
+  name
+  symbol
+  status
+}
+    `;
 export const AssetsDocument = gql`
    query Assets {
  assetsConnection {
@@ -65,4 +82,49 @@ export function useAssetsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<Ass
        }
 export type AssetsQueryHookResult = ReturnType<typeof useAssetsQuery>;
 export type AssetsLazyQueryHookResult = ReturnType<typeof useAssetsLazyQuery>;
-export type AssetsQueryResult = Apollo.QueryResult<AssetsQuery, AssetsQueryVariables>;
+export type AssetsQueryResult = Apollo.QueryResult<AssetsQuery, AssetsQueryVariables>;
+export const PartyAssetsDocument = gql`
+    query PartyAssets($partyId: ID!) {
+  party(id: $partyId) {
+    id
+    accountsConnection {
+      edges {
+        node {
+          type
+          asset {
+            ...PartyAssetFields
+          }
+        }
+      }
+    }
+  }
+}
+    ${PartyAssetFieldsFragmentDoc}`;
+
+/**
+ * __usePartyAssetsQuery__
+ *
+ * To run a query within a React component, call `usePartyAssetsQuery` and pass it any options that fit your needs.
+ * When your component renders, `usePartyAssetsQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = usePartyAssetsQuery({
+ *   variables: {
+ *      partyId: // value for 'partyId'
+ *   },
+ * });
+ */
+export function usePartyAssetsQuery(baseOptions: Apollo.QueryHookOptions<PartyAssetsQuery, PartyAssetsQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<PartyAssetsQuery, PartyAssetsQueryVariables>(PartyAssetsDocument, options);
+      }
+export function usePartyAssetsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<PartyAssetsQuery, PartyAssetsQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<PartyAssetsQuery, PartyAssetsQueryVariables>(PartyAssetsDocument, options);
+        }
+export type PartyAssetsQueryHookResult = ReturnType<typeof usePartyAssetsQuery>;
+export type PartyAssetsLazyQueryHookResult = ReturnType<typeof usePartyAssetsLazyQuery>;
+export type PartyAssetsQueryResult = Apollo.QueryResult<PartyAssetsQuery, PartyAssetsQueryVariables>;
@@ -97,7 +97,7 @@ export const AssetDetailsDialog = ({
      }}
    >
      {content}
-      <p className="text-xs my-4">
+      <p className="text-sm my-4">
        {t(
          'There is 1 unit of the settlement asset (%s) to every 1 quote unit.',
          [assetSymbol]
@@ -3,11 +3,7 @@ import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import type * as Schema from '@vegaprotocol/types';
 import type { KeyValueTableRowProps } from '@vegaprotocol/ui-toolkit';
-import {
-  CopyWithTooltip,
-  Icon,
-  truncateMiddle,
-} from '@vegaprotocol/ui-toolkit';
+import { CopyWithTooltip, Icon } from '@vegaprotocol/ui-toolkit';
 import {
  KeyValueTable,
  KeyValueTableRow,
@@ -60,7 +56,7 @@ export const rows: Rows = [
    key: AssetDetail.ID,
    label: t('ID'),
    tooltip: '',
-    value: (asset) => truncateMiddle(asset.id),
+    value: (asset) => asset.id,
  },
  {
    key: AssetDetail.TYPE,
@@ -113,9 +109,7 @@ export const rows: Rows = [

      return (
        <>
-          <EtherscanLink address={asset.source.contractAddress}>
-            {truncateMiddle(asset.source.contractAddress)}
-          </EtherscanLink>{' '}
+          <EtherscanLink address={asset.source.contractAddress} />{' '}
          <CopyWithTooltip text={asset.source.contractAddress}>
            <button title={t('Copy address to clipboard')}>
              <Icon size={3} name="duplicate" />
@@ -1,4 +1,4 @@
-import { TradingOption, truncateMiddle } from '@vegaprotocol/ui-toolkit';
+import { TradingOption } from '@vegaprotocol/ui-toolkit';
 import type { AssetFieldsFragment } from './__generated__/Asset';
 import classNames from 'classnames';
 import { t } from '@vegaprotocol/i18n';
@@ -45,7 +45,7 @@ export const AssetOption = ({ asset, balance }: AssetOptionProps) => {
        {balance}
        <div className="text-[12px] font-mono w-full text-left break-all">
          <span className="text-vega-light-300 dark:text-vega-dark-300">
-            {truncateMiddle(asset.id)}
+            {asset.id}
          </span>
        </div>
      </div>
@@ -0,0 +1,47 @@
+import merge from 'lodash/merge';
+import type { PartyAssetsQuery } from './__generated__/Assets';
+import * as Types from '@vegaprotocol/types';
+import type { PartialDeep } from 'type-fest';
+
+export const partyAssetsQuery = (
+  override?: PartialDeep<PartyAssetsQuery>
+): PartyAssetsQuery => {
+  const defaultAssets: PartyAssetsQuery = {
+    party: {
+      __typename: 'Party',
+      id: 'partyId',
+      accountsConnection: {
+        edges: partyAccountFields.map((node) => ({
+          __typename: 'AccountEdge',
+          node,
+        })),
+      },
+    },
+  };
+  return merge(defaultAssets, override);
+};
+
+const partyAccountFields = [
+  {
+    __typename: 'AccountBalance',
+    type: Types.AccountType.ACCOUNT_TYPE_MARGIN,
+    asset: {
+      __typename: 'Asset',
+      id: 'asset-id',
+      symbol: 'tEURO',
+      name: 'Euro',
+      status: Types.AssetStatus.STATUS_ENABLED,
+    },
+  },
+  {
+    __typename: 'AccountBalance',
+    type: Types.AccountType.ACCOUNT_TYPE_MARGIN,
+    asset: {
+      __typename: 'Asset',
+      id: 'asset-id-2',
+      symbol: 'tDAI',
+      name: 'DAI',
+      status: Types.AssetStatus.STATUS_ENABLED,
+    },
+  },
+] as const;
@@ -2,6 +2,7 @@
 export * from '../accounts/src/lib/accounts.mock';
 export * from '../assets/src/lib/asset.mock';
 export * from '../assets/src/lib/assets.mock';
+export * from '../assets/src/lib/party-assets.mock';
 export * from '../candles-chart/src/lib/candles.mock';
 export * from '../candles-chart/src/lib/chart.mock';
 export * from '../deal-ticket/src/hooks/estimate-order.mock';
@@ -10,7 +11,6 @@ export * from '../environment/src/utils/node.mock';
 export * from '../environment/src/components/node-guard/node-guard.mock';
 export * from '../fills/src/lib/fills.mock';
 export * from '../proposals/src/lib/proposals-data-provider/proposals.mock';
-export * from '../ledger/src/lib/ledger-entries.mock';
 export * from '../market-depth/src/lib/market-depth.mock';
 export * from '../markets/src/lib/components/market-info/market-info.mock';
 export * from '../markets/src/lib/market-candles.mock';
@@ -1,25 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import { Side } from '@vegaprotocol/types';
-import classNames from 'classnames';
-
-interface Props {
-  side: Side;
-  label?: string;
-}
-
-export const DealTicketButton = ({ side, label }: Props) => {
-  const buttonClasses = classNames(
-    'px-10 py-2 uppercase rounded-md text-white w-full',
-    {
-      'bg-market-red': side === Side.SIDE_SELL,
-      'bg-market-green-550': side === Side.SIDE_BUY,
-    }
-  );
-  return (
-    <div className="mb-2">
-      <button type="submit" data-testid="place-order" className={buttonClasses}>
-        {label || t('Place order')}
-      </button>
-    </div>
-  );
-};
@@ -1,7 +1,4 @@
 import { useCallback, useState } from 'react';
-import { Tooltip } from '@vegaprotocol/ui-toolkit';
-import classnames from 'classnames';
-import type { ReactNode } from 'react';
 import { t } from '@vegaprotocol/i18n';
 import { FeesBreakdown } from '@vegaprotocol/markets';
 import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
@@ -16,7 +13,6 @@ import { marketMarginDataProvider } from '@vegaprotocol/accounts';
 import { useDataProvider } from '@vegaprotocol/data-provider';

 import {
-  NOTIONAL_SIZE_TOOLTIP_TEXT,
  MARGIN_DIFF_TOOLTIP_TEXT,
  DEDUCTION_FROM_COLLATERAL_TOOLTIP_TEXT,
  TOTAL_MARGIN_AVAILABLE,
@@ -25,114 +21,54 @@ import {
  MARGIN_ACCOUNT_TOOLTIP_TEXT,
 } from '../../constants';
 import { useEstimateFees } from '../../hooks';
+import { KeyValue } from './key-value';

 const emptyValue = '-';

-export interface DealTicketFeeDetailPros {
-  label: string;
-  value?: string | null | undefined;
-  symbol: string;
-  indent?: boolean | undefined;
-  labelDescription?: ReactNode;
-  formattedValue?: string;
-  onClick?: () => void;
-}
-
-export const DealTicketFeeDetail = ({
-  label,
-  value,
-  labelDescription,
-  symbol,
-  indent,
-  onClick,
-  formattedValue,
-}: DealTicketFeeDetailPros) => {
-  const displayValue = `${formattedValue ?? '-'} ${symbol || ''}`;
-  const valueElement = onClick ? (
-    <button onClick={onClick} className="text-muted">
-      {displayValue}
-    </button>
-  ) : (
-    <div className="text-muted">{displayValue}</div>
-  );
-  return (
-    <div
-      data-testid={
-        'deal-ticket-fee-' + label.toLocaleLowerCase().replace(/\s/g, '-')
-      }
-      key={typeof label === 'string' ? label : 'value-dropdown'}
-      className={classnames(
-        'text-xs mt-2 flex justify-between items-center gap-4 flex-wrap',
-        { 'ml-2': indent }
-      )}
-    >
-      <Tooltip description={labelDescription}>
-        <div>{label}</div>
-      </Tooltip>
-      <Tooltip description={`${value ?? '-'} ${symbol || ''}`}>
-        {valueElement}
-      </Tooltip>
-    </div>
-  );
-};
-
 export interface DealTicketFeeDetailsProps {
  assetSymbol: string;
  order: OrderSubmissionBody['orderSubmission'];
  market: Market;
-  notionalSize: string | null;
 }

 export const DealTicketFeeDetails = ({
  assetSymbol,
  order,
  market,
-  notionalSize,
 }: DealTicketFeeDetailsProps) => {
  const feeEstimate = useEstimateFees(order);
  const { settlementAsset: asset } =
    market.tradableInstrument.instrument.product;
  const { decimals: assetDecimals, quantum } = asset;
-  const marketDecimals = market.decimalPlaces;
-  const quoteName = market.tradableInstrument.instrument.product.quoteName;

  return (
-    <>
-      <DealTicketFeeDetail
-        label={t('Notional')}
-        value={formatValue(notionalSize, marketDecimals)}
-        formattedValue={formatValue(notionalSize, marketDecimals)}
-        symbol={quoteName}
-        labelDescription={NOTIONAL_SIZE_TOOLTIP_TEXT(quoteName)}
-      />
-      <DealTicketFeeDetail
-        label={t('Fees')}
-        value={
-          feeEstimate?.totalFeeAmount &&
-          `~${formatValue(feeEstimate?.totalFeeAmount, assetDecimals)}`
-        }
-        formattedValue={
-          feeEstimate?.totalFeeAmount &&
-          `~${formatValue(feeEstimate?.totalFeeAmount, assetDecimals, quantum)}`
-        }
-        labelDescription={
-          <>
-            <span>
-              {t(
-                `An estimate of the most you would be expected to pay in fees, in the market's settlement asset ${assetSymbol}.`
-              )}
-            </span>
-            <FeesBreakdown
-              fees={feeEstimate?.fees}
-              feeFactors={market.fees.factors}
-              symbol={assetSymbol}
-              decimals={assetDecimals}
-            />
-          </>
-        }
-        symbol={assetSymbol}
-      />
-    </>
+    <KeyValue
+      label={t('Fees')}
+      value={
+        feeEstimate?.totalFeeAmount &&
+        `~${formatValue(feeEstimate?.totalFeeAmount, assetDecimals)}`
+      }
+      formattedValue={
+        feeEstimate?.totalFeeAmount &&
+        `~${formatValue(feeEstimate?.totalFeeAmount, assetDecimals, quantum)}`
+      }
+      labelDescription={
+        <>
+          <span>
+            {t(
+              `An estimate of the most you would be expected to pay in fees, in the market's settlement asset ${assetSymbol}.`
+            )}
+          </span>
+          <FeesBreakdown
+            fees={feeEstimate?.fees}
+            feeFactors={market.fees.factors}
+            symbol={assetSymbol}
+            decimals={assetDecimals}
+          />
+        </>
+      }
+      symbol={assetSymbol}
+    />
  );
 };

@@ -209,7 +145,7 @@ export const DealTicketMarginDetails = ({
      BigInt(marginAccountBalance);

    deductionFromCollateral = (
-      <DealTicketFeeDetail
+      <KeyValue
        indent
        label={t('Deduction from collateral')}
        value={formatRange(
@@ -236,7 +172,7 @@ export const DealTicketMarginDetails = ({
      />
    );
    projectedMargin = (
-      <DealTicketFeeDetail
+      <KeyValue
        label={t('Projected margin')}
        value={formatRange(
          marginEstimate?.bestCase.initialLevel,
@@ -308,7 +244,7 @@ export const DealTicketMarginDetails = ({

  return (
    <>
-      <DealTicketFeeDetail
+      <KeyValue
        label={t('Margin required')}
        value={formatRange(
          marginRequiredBestCase,
@@ -324,7 +260,7 @@ export const DealTicketMarginDetails = ({
        labelDescription={MARGIN_DIFF_TOOLTIP_TEXT(assetSymbol)}
        symbol={assetSymbol}
      />
-      <DealTicketFeeDetail
+      <KeyValue
        label={t('Total margin available')}
        indent
        value={formatValue(totalMarginAvailable, assetDecimals)}
@@ -342,7 +278,7 @@ export const DealTicketMarginDetails = ({
        )}
      />
      {deductionFromCollateral}
-      <DealTicketFeeDetail
+      <KeyValue
        label={t('Current margin allocation')}
        indent
        onClick={
@@ -358,7 +294,7 @@ export const DealTicketMarginDetails = ({
        )}
      />
      {projectedMargin}
-      <DealTicketFeeDetail
+      <KeyValue
        label={t('Liquidation price estimate')}
        value={liquidationPriceEstimate}
        formattedValue={liquidationPriceEstimate}
@@ -32,7 +32,7 @@ export const DealTicketSizeIceberg = ({
  const renderPeakSizeError = () => {
    if (peakSizeError) {
      return (
-        <TradingInputError testId="deal-ticket-peak-error-message-size-limit">
+        <TradingInputError testId="deal-ticket-peak-error-message">
          {peakSizeError}
        </TradingInputError>
      );
@@ -44,7 +44,7 @@ export const DealTicketSizeIceberg = ({
  const renderMinimumSizeError = () => {
    if (minimumVisibleSizeError) {
      return (
-        <TradingInputError testId="deal-ticket-minimum-error-message-size-limit">
+        <TradingInputError testId="deal-ticket-minimum-error-message">
          {minimumVisibleSizeError}
        </TradingInputError>
      );
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { VegaWalletContext } from '@vegaprotocol/wallet';
-import { render, screen, waitFor } from '@testing-library/react';
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { generateMarket } from '../../test-helpers';
 import { StopOrder } from './deal-ticket-stop-order';
@@ -12,6 +12,7 @@ import {
  useDealTicketFormValues,
 } from '../../hooks/use-form-values';
 import type { FeatureFlags } from '@vegaprotocol/environment';
+import { formatForInput } from '@vegaprotocol/utils';

 jest.mock('zustand');
 jest.mock('./deal-ticket-fee-details', () => ({
@@ -57,7 +58,7 @@ const orderSideBuy = 'order-side-SIDE_BUY';
 const orderSideSell = 'order-side-SIDE_SELL';

 const triggerDirectionRisesAbove = 'triggerDirection-risesAbove';
-// const triggerDirectionFallsBelow = 'triggerDirection-fallsBelow';
+const triggerDirectionFallsBelow = 'triggerDirection-fallsBelow';

 const expiryStrategySubmit = 'expiryStrategy-submit';
 const expiryStrategyCancel = 'expiryStrategy-cancel';
@@ -65,6 +66,7 @@ const expiryStrategyCancel = 'expiryStrategy-cancel';
 const triggerTypePrice = 'triggerType-price';
 const triggerTypeTrailingPercentOffset = 'triggerType-trailingPercentOffset';

+const oco = 'oco';
 const expire = 'expire';
 const datePicker = 'date-picker-field';
 const timeInForce = 'order-tif';
@@ -76,6 +78,8 @@ const triggerPriceWarningMessage = 'stop-order-warning-message-trigger-price';
 const triggerTrailingPercentOffsetErrorMessage =
  'stop-order-error-message-trigger-trailing-percent-offset';

+const ocoPostfix = (id: string, postfix = true) => (postfix ? `${id}-oco` : id);
+
 describe('StopOrder', () => {
  beforeEach(() => {
    localStorage.clear();
@@ -107,6 +111,7 @@ describe('StopOrder', () => {
      'checked'
    );
    expect(screen.getByTestId(expire).dataset.state).toEqual('unchecked');
+    expect(screen.getByTestId(oco).dataset.state).toEqual('unchecked');
    await userEvent.click(screen.getByTestId(expire));
    await waitFor(() => {
      expect(screen.getByTestId(expiryStrategySubmit).dataset.state).toEqual(
@@ -115,6 +120,32 @@ describe('StopOrder', () => {
    });
  });

+  it('calculate notional for market limit', async () => {
+    render(generateJsx());
+    await userEvent.type(screen.getByTestId(sizeInput), '10');
+    await userEvent.type(screen.getByTestId(priceInput), '10');
+    expect(screen.getByTestId('deal-ticket-fee-notional')).toHaveTextContent(
+      'Notional100.00 BTC'
+    );
+  });
+
+  it('calculates notional for limit order', async () => {
+    render(generateJsx());
+    await userEvent.click(screen.getByTestId(orderTypeTrigger));
+    await userEvent.click(screen.getByTestId(orderTypeMarket));
+    await userEvent.type(screen.getByTestId(sizeInput), '10');
+    // price trigger is selected but it's empty, calculate base on size and marketPrice prop
+    expect(screen.getByTestId('deal-ticket-fee-notional')).toHaveTextContent(
+      'Notional20.00 BTC'
+    );
+
+    await userEvent.type(screen.getByTestId(triggerPriceInput), '3');
+    // calculate base on size and price trigger
+    expect(screen.getByTestId('deal-ticket-fee-notional')).toHaveTextContent(
+      'Notional30.00 BTC'
+    );
+  });
+
  it('should use local storage state for initial values', async () => {
    const values: Partial<StopOrderFormValues> = {
      type: Schema.OrderType.TYPE_LIMIT,
@@ -125,6 +156,11 @@ describe('StopOrder', () => {
      expire: true,
      expiryStrategy: Schema.StopOrderExpiryStrategy.EXPIRY_STRATEGY_CANCELS,
      expiresAt: '2023-07-27T16:43:27.000',
+      oco: true,
+      ocoType: Schema.OrderType.TYPE_LIMIT,
+      ocoSize: '0.2',
+      ocoPrice: '300.23',
+      ocoTimeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
    };

    useDealTicketFormValues.setState({
@@ -143,10 +179,22 @@ describe('StopOrder', () => {
    expect(screen.getByTestId(sizeInput)).toHaveDisplayValue(
      values.size as string
    );
-    expect(screen.getByTestId('order-tif')).toHaveValue(values.timeInForce);
+    expect(screen.getByTestId(timeInForce)).toHaveValue(values.timeInForce);
    expect(screen.getByTestId(priceInput)).toHaveDisplayValue(
      values.price as string
    );
+
+    expect(screen.getByTestId(ocoPostfix(sizeInput))).toHaveDisplayValue(
+      values.ocoSize as string
+    );
+    expect(screen.getByTestId(ocoPostfix(timeInForce))).toHaveValue(
+      values.ocoTimeInForce
+    );
+    expect(screen.getByTestId(ocoPostfix(priceInput))).toHaveDisplayValue(
+      values.ocoPrice as string
+    );
+    expect(screen.getByTestId('ocoTypeLimit').dataset.state).toEqual('checked');
+
    expect(screen.getByTestId(expire).dataset.state).toEqual('checked');
    expect(screen.getByTestId(expiryStrategyCancel).dataset.state).toEqual(
      'checked'
@@ -154,6 +202,9 @@ describe('StopOrder', () => {
    expect(screen.getByTestId(datePicker)).toHaveDisplayValue(
      values.expiresAt as string
    );
+
+    await userEvent.click(screen.getByTestId(orderTypeMarket));
+    expect(screen.getByTestId(oco).dataset.state).toEqual('unchecked');
  });

  it('does not submit if no wallet connected', async () => {
@@ -174,145 +225,239 @@ describe('StopOrder', () => {
    expect(submit).toBeCalled();
  });

-  it('validates size field', async () => {
+  it.each([
+    { fieldName: 'size', ocoValue: false },
+    { fieldName: 'ocoSize', ocoValue: true },
+  ])('validates $fieldName field', async ({ ocoValue }) => {
    render(generateJsx());
-
+    if (ocoValue) {
+      await userEvent.click(screen.getByTestId(oco));
+    }
    await userEvent.click(screen.getByTestId(submitButton));
-
+    const getByTestId = (id: string) =>
+      screen.getByTestId(ocoPostfix(id, ocoValue));
+    const queryByTestId = (id: string) =>
+      screen.queryByTestId(ocoPostfix(id, ocoValue));
    // default value should be invalid
-    expect(screen.getByTestId(sizeErrorMessage)).toBeInTheDocument();
+    expect(getByTestId(sizeErrorMessage)).toBeInTheDocument();
    // to small value should be invalid
-    await userEvent.type(screen.getByTestId(sizeInput), '0.01');
-    expect(screen.getByTestId(sizeErrorMessage)).toBeInTheDocument();
+    await userEvent.type(getByTestId(sizeInput), '0.01');
+    expect(getByTestId(sizeErrorMessage)).toBeInTheDocument();

    // clear and fill using valid value
-    await userEvent.clear(screen.getByTestId(sizeInput));
-    await userEvent.type(screen.getByTestId(sizeInput), '0.1');
-    expect(screen.queryByTestId(sizeErrorMessage)).toBeNull();
+    await userEvent.clear(getByTestId(sizeInput));
+    await userEvent.type(getByTestId(sizeInput), '0.1');
+    expect(queryByTestId(sizeErrorMessage)).toBeNull();
  });

-  it('validates price field', async () => {
+  it.each([
+    { fieldName: 'price', ocoValue: false },
+    { fieldName: 'ocoPrice', ocoValue: true },
+  ])('validates $fieldName field', async ({ ocoValue }) => {
    render(generateJsx());
-
+    if (ocoValue) {
+      await userEvent.click(screen.getByTestId(oco));
+    }
    await userEvent.click(screen.getByTestId(submitButton));
-    // price error message should not show if size has error
-    // expect(screen.queryByTestId(priceErrorMessage)).toBeNull();
-    // await userEvent.type(screen.getByTestId(sizeInput), '0.1');
-    expect(screen.getByTestId(priceErrorMessage)).toBeInTheDocument();
-    await userEvent.type(screen.getByTestId(priceInput), '0.001');
-    expect(screen.getByTestId(priceErrorMessage)).toBeInTheDocument();
+
+    const getByTestId = (id: string) =>
+      screen.getByTestId(ocoPostfix(id, ocoValue));
+    const queryByTestId = (id: string) =>
+      screen.queryByTestId(ocoPostfix(id, ocoValue));
+
+    expect(getByTestId(priceErrorMessage)).toBeInTheDocument();
+    await userEvent.type(getByTestId(priceInput), '0.001');
+    expect(getByTestId(priceErrorMessage)).toBeInTheDocument();

    // switch to market order type error should disappear
    await userEvent.click(screen.getByTestId(orderTypeTrigger));
    await userEvent.click(screen.getByTestId(orderTypeMarket));
    await userEvent.click(screen.getByTestId(submitButton));
-    expect(screen.queryByTestId(priceErrorMessage)).toBeNull();
+    expect(queryByTestId(priceErrorMessage)).toBeNull();

    // switch back to limit type
    await userEvent.click(screen.getByTestId(orderTypeTrigger));
    await userEvent.click(screen.getByTestId(orderTypeLimit));
    await userEvent.click(screen.getByTestId(submitButton));
-    expect(screen.getByTestId(priceErrorMessage)).toBeInTheDocument();
+    expect(getByTestId(priceErrorMessage)).toBeInTheDocument();

    // to small value should be invalid
-    await userEvent.type(screen.getByTestId(priceInput), '0.001');
-    expect(screen.getByTestId(priceErrorMessage)).toBeInTheDocument();
+    await userEvent.type(getByTestId(priceInput), '0.001');
+    expect(getByTestId(priceErrorMessage)).toBeInTheDocument();

    // clear and fill using valid value
-    await userEvent.clear(screen.getByTestId(priceInput));
-    await userEvent.type(screen.getByTestId(priceInput), '0.01');
-    expect(screen.queryByTestId(priceErrorMessage)).toBeNull();
+    await userEvent.clear(getByTestId(priceInput));
+    await userEvent.type(getByTestId(priceInput), '0.01');
+    expect(queryByTestId(priceErrorMessage)).toBeNull();
  });

-  it('validates trigger price field', async () => {
+  it.each([
+    { fieldName: 'triggerPrice', ocoValue: false },
+    { fieldName: 'ocoTriggerPrice', ocoValue: true },
+  ])('validates $fieldName field', async ({ ocoValue }) => {
    render(generateJsx());

+    if (ocoValue) {
+      await userEvent.click(screen.getByTestId(oco));
+      await userEvent.click(screen.getByTestId(triggerDirectionFallsBelow));
+    }
    await userEvent.click(screen.getByTestId(submitButton));
-    expect(screen.getByTestId(triggerPriceErrorMessage)).toBeInTheDocument();
+    const getByTestId = (id: string) =>
+      screen.getByTestId(ocoPostfix(id, ocoValue));
+    const queryByTestId = (id: string) =>
+      screen.queryByTestId(ocoPostfix(id, ocoValue));
+    expect(getByTestId(triggerPriceErrorMessage)).toBeInTheDocument();

    // switch to trailing percentage offset trigger type
-    await userEvent.click(screen.getByTestId(triggerTypeTrailingPercentOffset));
-    expect(screen.queryByTestId(triggerPriceErrorMessage)).toBeNull();
+    await userEvent.click(getByTestId(triggerTypeTrailingPercentOffset));
+    expect(queryByTestId(triggerPriceErrorMessage)).toBeNull();

    // switch back to price trigger type
-    await userEvent.click(screen.getByTestId(triggerTypePrice));
-    expect(screen.getByTestId(triggerPriceErrorMessage)).toBeInTheDocument();
+    await userEvent.click(getByTestId(triggerTypePrice));
+    expect(getByTestId(triggerPriceErrorMessage)).toBeInTheDocument();

    // to small value should be invalid
-    await userEvent.type(screen.getByTestId(triggerPriceInput), '0.001');
-    expect(screen.getByTestId(triggerPriceErrorMessage)).toBeInTheDocument();
+    await userEvent.type(getByTestId(triggerPriceInput), '0.001');
+    expect(getByTestId(triggerPriceErrorMessage)).toBeInTheDocument();

    // clear and fill using value causing immediate trigger
-    await userEvent.clear(screen.getByTestId(triggerPriceInput));
-    await userEvent.type(screen.getByTestId(triggerPriceInput), '0.01');
-    expect(screen.queryByTestId(triggerPriceErrorMessage)).toBeNull();
-    expect(
-      screen.queryByTestId(triggerPriceWarningMessage)
-    ).toBeInTheDocument();
+    await userEvent.clear(getByTestId(triggerPriceInput));
+    await userEvent.type(getByTestId(triggerPriceInput), '0.01');
+    expect(queryByTestId(triggerPriceErrorMessage)).toBeNull();
+    expect(queryByTestId(triggerPriceWarningMessage)).toBeInTheDocument();

    // change to correct value
-    await userEvent.type(screen.getByTestId(triggerPriceInput), '2');
-    expect(screen.queryByTestId(triggerPriceWarningMessage)).toBeNull();
+    await userEvent.type(getByTestId(triggerPriceInput), '2');
+    expect(queryByTestId(triggerPriceWarningMessage)).toBeNull();
  });

-  it('validates trigger trailing percentage offset field', async () => {
+  it.each([
+    { fieldName: 'trailingPercentageOffset', ocoValue: false },
+    { fieldName: 'ocoTrailingPercentageOffset', ocoValue: true },
+  ])('validates $fieldName field', async ({ ocoValue }) => {
    render(generateJsx());
+    if (ocoValue) {
+      await userEvent.click(screen.getByTestId(oco));
+    }
+    await userEvent.click(screen.getByTestId(submitButton));
+    const getByTestId = (id: string) =>
+      screen.getByTestId(ocoPostfix(id, ocoValue));
+    const queryByTestId = (id: string) =>
+      screen.queryByTestId(ocoPostfix(id, ocoValue));

    // should not show error with default form values
-    await userEvent.click(screen.getByTestId(submitButton));
-    expect(
-      screen.queryByTestId(triggerTrailingPercentOffsetErrorMessage)
-    ).toBeNull();
+    expect(queryByTestId(triggerTrailingPercentOffsetErrorMessage)).toBeNull();

    // switch to trailing percentage offset trigger type
-    await userEvent.click(screen.getByTestId(triggerTypeTrailingPercentOffset));
+    await userEvent.click(getByTestId(triggerTypeTrailingPercentOffset));
    expect(
-      screen.getByTestId(triggerTrailingPercentOffsetErrorMessage)
+      getByTestId(triggerTrailingPercentOffsetErrorMessage)
    ).toBeInTheDocument();

    // to small value should be invalid
    await userEvent.type(
-      screen.getByTestId(triggerTrailingPercentOffsetInput),
+      getByTestId(triggerTrailingPercentOffsetInput),
      '0.09'
    );
    expect(
-      screen.getByTestId(triggerTrailingPercentOffsetErrorMessage)
+      getByTestId(triggerTrailingPercentOffsetErrorMessage)
    ).toBeInTheDocument();

    // clear and fill using valid value
-    await userEvent.clear(
-      screen.getByTestId(triggerTrailingPercentOffsetInput)
-    );
-    await userEvent.type(
-      screen.getByTestId(triggerTrailingPercentOffsetInput),
-      '0.1'
-    );
-    expect(
-      screen.queryByTestId(triggerTrailingPercentOffsetErrorMessage)
-    ).toBeNull();
+    await userEvent.clear(getByTestId(triggerTrailingPercentOffsetInput));
+    await userEvent.type(getByTestId(triggerTrailingPercentOffsetInput), '0.1');
+    expect(queryByTestId(triggerTrailingPercentOffsetErrorMessage)).toBeNull();

    // to big value should be invalid
-    await userEvent.clear(
-      screen.getByTestId(triggerTrailingPercentOffsetInput)
-    );
+    await userEvent.clear(getByTestId(triggerTrailingPercentOffsetInput));
    await userEvent.type(
-      screen.getByTestId(triggerTrailingPercentOffsetInput),
+      getByTestId(triggerTrailingPercentOffsetInput),
      '99.91'
    );
    expect(
-      screen.getByTestId(triggerTrailingPercentOffsetErrorMessage)
+      getByTestId(triggerTrailingPercentOffsetErrorMessage)
    ).toBeInTheDocument();

    // clear and fill using valid value
-    await userEvent.clear(
-      screen.getByTestId(triggerTrailingPercentOffsetInput)
-    );
+    await userEvent.clear(getByTestId(triggerTrailingPercentOffsetInput));
    await userEvent.type(
-      screen.getByTestId(triggerTrailingPercentOffsetInput),
+      getByTestId(triggerTrailingPercentOffsetInput),
      '99.9'
    );
+    expect(queryByTestId(triggerTrailingPercentOffsetErrorMessage)).toBeNull();
+  });
+
+  it('sync oco trigger', async () => {
+    render(generateJsx());
+    await userEvent.click(screen.getByTestId(oco));
    expect(
-      screen.queryByTestId(triggerTrailingPercentOffsetErrorMessage)
-    ).toBeNull();
+      screen.getByTestId(triggerDirectionRisesAbove).dataset.state
+    ).toEqual('checked');
+    expect(
+      screen.getByTestId(ocoPostfix(triggerDirectionFallsBelow)).dataset.state
+    ).toEqual('checked');
+    await userEvent.click(screen.getByTestId(triggerDirectionFallsBelow));
+    expect(
+      screen.getByTestId(triggerDirectionRisesAbove).dataset.state
+    ).toEqual('unchecked');
+    expect(
+      screen.getByTestId(ocoPostfix(triggerDirectionFallsBelow)).dataset.state
+    ).toEqual('unchecked');
+    await userEvent.click(
+      screen.getByTestId(ocoPostfix(triggerDirectionFallsBelow))
+    );
+    expect(
+      screen.getByTestId(triggerDirectionRisesAbove).dataset.state
+    ).toEqual('checked');
+    expect(
+      screen.getByTestId(ocoPostfix(triggerDirectionFallsBelow)).dataset.state
+    ).toEqual('checked');
+  });
+
+  it('disables submit expiry strategy when OCO selected', async () => {
+    render(generateJsx());
+    await userEvent.click(screen.getByTestId(expire));
+    await userEvent.click(screen.getByTestId(expiryStrategySubmit));
+    await userEvent.click(screen.getByTestId(oco));
+    expect(screen.getByTestId(expiryStrategySubmit).dataset.state).toEqual(
+      'unchecked'
+    );
+    expect(screen.getByTestId(expiryStrategySubmit)).toBeDisabled();
+    await userEvent.click(screen.getByTestId(oco));
+    await userEvent.click(screen.getByTestId(expiryStrategySubmit));
+    expect(screen.getByTestId(expiryStrategySubmit).dataset.state).toEqual(
+      'checked'
+    );
+    expect(screen.getByTestId(expiryStrategySubmit)).not.toBeDisabled();
+  });
+
+  it('sets expiry time/date to now if expiry is changed to checked', async () => {
+    const now = Math.round(Date.now() / 1000) * 1000;
+    render(generateJsx());
+    jest.spyOn(global.Date, 'now').mockImplementationOnce(() => now);
+    await userEvent.click(screen.getByTestId(expire));
+
+    // expiry time/date was empty it should be set to now
+    expect(
+      new Date(screen.getByTestId<HTMLInputElement>(datePicker).value).getTime()
+    ).toEqual(now);
+
+    // set to the value in the past (now - 1s)
+    fireEvent.change(screen.getByTestId<HTMLInputElement>(datePicker), {
+      target: { value: formatForInput(new Date(now - 1000)) },
+    });
+    expect(
+      new Date(
+        screen.getByTestId<HTMLInputElement>(datePicker).value
+      ).getTime() + 1000
+    ).toEqual(now);
+
+    // switch expiry off and on
+    await userEvent.click(screen.getByTestId(expire));
+    await userEvent.click(screen.getByTestId(expire));
+    // expiry time/date was in the past it should be set to now
+    expect(
+      new Date(screen.getByTestId<HTMLInputElement>(datePicker).value).getTime()
+    ).toEqual(now);
  });
 });
@@ -1,8 +1,12 @@
 import { useRef, useCallback, useEffect } from 'react';
 import { useVegaWallet } from '@vegaprotocol/wallet';
-import type { StopOrdersSubmission } from '@vegaprotocol/wallet';
+import type {
+  OrderSubmissionBody,
+  StopOrdersSubmission,
+} from '@vegaprotocol/wallet';
 import {
  formatForInput,
+  formatValue,
  removeDecimal,
  toDecimal,
  validateAmount,
@@ -19,6 +23,9 @@ import {
  TradingInputError as InputError,
  TradingSelect as Select,
  Tooltip,
+  TradingButton as Button,
+  Pill,
+  Intent,
 } from '@vegaprotocol/ui-toolkit';
 import { getDerivedPrice } from '@vegaprotocol/markets';
 import type { Market } from '@vegaprotocol/markets';
@@ -31,6 +38,7 @@ import {
  REDUCE_ONLY_TOOLTIP,
  stopSubmit,
  getNotionalSize,
+  getAssetUnit,
 } from './deal-ticket';
 import { TypeToggle } from './type-selector';
 import {
@@ -41,9 +49,10 @@ import {
 } from '../../hooks/use-form-values';
 import type { StopOrderFormValues } from '../../hooks/use-form-values';
 import { mapFormValuesToStopOrdersSubmission } from '../../utils/map-form-values-to-submission';
-import { DealTicketButton } from './deal-ticket-button';
 import { DealTicketFeeDetails } from './deal-ticket-fee-details';
 import { validateExpiration } from '../../utils';
+import { NOTIONAL_SIZE_TOOLTIP_TEXT } from '../../constants';
+import { KeyValue } from './key-value';

 export interface StopOrderProps {
  market: Market;
@@ -78,7 +87,7 @@ const Trigger = ({
  control,
  watch,
  priceStep,
-  assetSymbol,
+  quoteName,
  oco,
  marketPrice,
  decimalPlaces,
@@ -86,7 +95,7 @@ const Trigger = ({
  control: Control<StopOrderFormValues>;
  watch: UseFormWatch<StopOrderFormValues>;
  priceStep: string;
-  assetSymbol: string;
+  quoteName: string;
  oco?: boolean;
  marketPrice?: string | null;
  decimalPlaces: number;
@@ -181,7 +190,7 @@ const Trigger = ({
                      data-testid={`triggerPrice${oco ? '-oco' : ''}`}
                      type="number"
                      step={priceStep}
-                      appendElement={assetSymbol}
+                      appendElement={<Pill size="xs">{quoteName}</Pill>}
                      value={value || ''}
                      hasError={!!fieldState.error}
                      {...props}
@@ -249,7 +258,7 @@ const Trigger = ({
                    <Input
                      type="number"
                      step={trailingPercentOffsetStep}
-                      appendElement="%"
+                      appendElement={<Pill size="xs">%</Pill>}
                      data-testid={`triggerTrailingPercentOffset${
                        oco ? '-oco' : ''
                      }`}
@@ -311,10 +320,14 @@ const Size = ({
  control,
  sizeStep,
  oco,
+  isLimitType,
+  assetUnit,
 }: {
  control: Control<StopOrderFormValues>;
  sizeStep: string;
  oco?: boolean;
+  isLimitType: boolean;
+  assetUnit?: string;
 }) => {
  return (
    <Controller
@@ -332,7 +345,7 @@ const Size = ({
        const { value, ...props } = field;
        const id = `order-size${oco ? '-oco' : ''}`;
        return (
-          <div className="mb-4">
+          <div className={isLimitType ? 'mb-4' : 'mb-2'}>
            <FormGroup labelFor={id} label={t(`Size`)} compact>
              <Input
                id={id}
@@ -341,6 +354,7 @@ const Size = ({
                step={sizeStep}
                min={sizeStep}
                onWheel={(e) => e.currentTarget.blur()}
+                appendElement={assetUnit && <Pill size="xs">{assetUnit}</Pill>}
                data-testid={id}
                value={value || ''}
                hasError={!!fieldState.error}
@@ -394,12 +408,8 @@ const Price = ({
        const { value, ...props } = field;
        const id = `order-price${oco ? '-oco' : ''}`;
        return (
-          <div className="mb-4">
-            <FormGroup
-              labelFor={id}
-              label={t(`Price (${quoteName})`)}
-              compact={true}
-            >
+          <div className="mb-2">
+            <FormGroup labelFor={id} label={t('Price')} compact={true}>
              <Input
                id={id}
                className="w-full"
@@ -409,6 +419,7 @@ const Price = ({
                onWheel={(e) => e.currentTarget.blur()}
                value={value || ''}
                hasError={!!fieldState.error}
+                appendElement={<Pill size="xs">{quoteName}</Pill>}
                {...props}
              />
            </FormGroup>
@@ -434,17 +445,17 @@ const TimeInForce = ({
  oco?: boolean;
 }) => (
  <Controller
-    name="timeInForce"
+    name={oco ? 'ocoTimeInForce' : 'timeInForce'}
    control={control}
    render={({ field, fieldState }) => {
-      const id = `select-time-in-force${oco ? '-oco' : ''}`;
+      const id = `order-tif${oco ? '-oco' : ''}`;
      return (
        <div className="mb-2">
          <FormGroup label={t('Time in force')} labelFor={id} compact={true}>
            <Select
              id={id}
              className="w-full"
-              data-testid="order-tif"
+              data-testid={id}
              hasError={!!fieldState.error}
              {...field}
            >
@@ -486,6 +497,255 @@ const ReduceOnly = () => (
  />
 );

+const NotionalAndFees = ({
+  market,
+  marketPrice,
+  side,
+  size,
+  price,
+  timeInForce,
+  triggerPrice,
+  triggerType,
+  type,
+}: Pick<
+  OrderSubmissionBody['orderSubmission'],
+  'side' | 'size' | 'timeInForce' | 'type' | 'price'
+> &
+  Pick<StopOrderProps, 'market' | 'marketPrice'> &
+  Pick<StopOrderFormValues, 'triggerType' | 'triggerPrice'>) => {
+  const { quoteName, settlementAsset: asset } =
+    market.tradableInstrument.instrument.product;
+  const isPriceTrigger = triggerType === 'price';
+  const derivedPrice = getDerivedPrice(
+    {
+      type,
+      price,
+    },
+    type === Schema.OrderType.TYPE_MARKET && isPriceTrigger && triggerPrice
+      ? removeDecimal(triggerPrice, market.decimalPlaces)
+      : marketPrice || '0'
+  );
+
+  const notionalSize = getNotionalSize(
+    derivedPrice,
+    size,
+    market.decimalPlaces,
+    market.positionDecimalPlaces
+  );
+  return (
+    <div className="mb-4">
+      <KeyValue
+        label={t('Notional')}
+        value={formatValue(notionalSize, market.decimalPlaces)}
+        formattedValue={formatValue(notionalSize, market.decimalPlaces)}
+        symbol={quoteName}
+        labelDescription={NOTIONAL_SIZE_TOOLTIP_TEXT(quoteName)}
+      />
+      <DealTicketFeeDetails
+        order={{
+          marketId: market.id,
+          price: derivedPrice,
+          side,
+          size,
+          timeInForce,
+          type,
+        }}
+        assetSymbol={asset.symbol}
+        market={market}
+      />
+    </div>
+  );
+};
+
+const formatSizeAtPrice = ({
+  assetUnit,
+  decimalPlaces,
+  positionDecimalPlaces,
+  price,
+  quoteName,
+  side,
+  size,
+  type,
+}: Pick<StopOrderFormValues, 'price' | 'side' | 'size' | 'type'> & {
+  assetUnit?: string;
+  decimalPlaces: number;
+  positionDecimalPlaces: number;
+  quoteName: string;
+}) =>
+  `${formatValue(
+    removeDecimal(size, positionDecimalPlaces),
+    positionDecimalPlaces
+  )} ${assetUnit} @ ${
+    type === Schema.OrderType.TYPE_MARKET
+      ? 'market'
+      : `${formatValue(
+          removeDecimal(price || '0', decimalPlaces),
+          decimalPlaces
+        )} ${quoteName}`
+  }`;
+const formatTrigger = ({
+  decimalPlaces,
+  triggerDirection,
+  triggerPrice,
+  triggerTrailingPercentOffset,
+  triggerType,
+  quoteName,
+}: Pick<
+  StopOrderFormValues,
+  | 'triggerDirection'
+  | 'triggerType'
+  | 'triggerPrice'
+  | 'triggerTrailingPercentOffset'
+> & {
+  decimalPlaces: number;
+  quoteName: string;
+}) =>
+  `${
+    triggerDirection ===
+    Schema.StopOrderTriggerDirection.TRIGGER_DIRECTION_RISES_ABOVE
+      ? t('above')
+      : t('below')
+  } ${
+    triggerType === 'price'
+      ? `${formatValue(
+          removeDecimal(triggerPrice || '', decimalPlaces),
+          decimalPlaces
+        )} ${quoteName}`
+      : `${(Number(triggerTrailingPercentOffset) || 0).toFixed(1)}% ${t(
+          'trailing'
+        )}`
+  }`;
+
+const SubmitButton = ({
+  assetUnit,
+  market,
+  oco,
+  ocoPrice,
+  ocoSize,
+  ocoTriggerPrice,
+  ocoTriggerTrailingPercentOffset,
+  ocoTriggerType,
+  ocoType,
+  price,
+  side,
+  size,
+  triggerDirection,
+  triggerPrice,
+  triggerTrailingPercentOffset,
+  triggerType,
+  type,
+}: Pick<
+  StopOrderFormValues,
+  | 'oco'
+  | 'ocoPrice'
+  | 'ocoSize'
+  | 'ocoTriggerPrice'
+  | 'ocoTriggerTrailingPercentOffset'
+  | 'ocoTriggerType'
+  | 'ocoType'
+  | 'price'
+  | 'side'
+  | 'size'
+  | 'triggerDirection'
+  | 'triggerPrice'
+  | 'triggerTrailingPercentOffset'
+  | 'triggerType'
+  | 'type'
+> &
+  Pick<StopOrderProps, 'market'> & { assetUnit?: string }) => {
+  const { quoteName } = market.tradableInstrument.instrument.product;
+  const risesAbove =
+    triggerDirection ===
+    Schema.StopOrderTriggerDirection.TRIGGER_DIRECTION_RISES_ABOVE;
+  const subLabel = oco ? (
+    <>
+      {formatSizeAtPrice({
+        assetUnit,
+        decimalPlaces: market.decimalPlaces,
+        positionDecimalPlaces: market.positionDecimalPlaces,
+        price: risesAbove ? price : ocoPrice,
+        quoteName,
+        side,
+        size: risesAbove ? size : ocoSize,
+        type,
+      })}{' '}
+      {formatTrigger({
+        decimalPlaces: market.decimalPlaces,
+        quoteName,
+        triggerDirection:
+          Schema.StopOrderTriggerDirection.TRIGGER_DIRECTION_RISES_ABOVE,
+        triggerPrice: risesAbove ? triggerPrice : ocoTriggerPrice,
+        triggerTrailingPercentOffset: risesAbove
+          ? triggerTrailingPercentOffset
+          : ocoTriggerTrailingPercentOffset,
+        triggerType: risesAbove ? triggerType : ocoTriggerType,
+      })}
+      <br />
+      {formatSizeAtPrice({
+        assetUnit,
+        decimalPlaces: market.decimalPlaces,
+        positionDecimalPlaces: market.positionDecimalPlaces,
+        price: !risesAbove ? price : ocoPrice,
+        quoteName,
+        side,
+        size: !risesAbove ? size : ocoSize,
+        type: ocoType,
+      })}{' '}
+      {formatTrigger({
+        decimalPlaces: market.decimalPlaces,
+        quoteName,
+        triggerDirection:
+          Schema.StopOrderTriggerDirection.TRIGGER_DIRECTION_FALLS_BELOW,
+        triggerPrice: !risesAbove ? triggerPrice : ocoTriggerPrice,
+        triggerTrailingPercentOffset: !risesAbove
+          ? triggerTrailingPercentOffset
+          : ocoTriggerTrailingPercentOffset,
+        triggerType: !risesAbove ? triggerType : ocoTriggerType,
+      })}
+    </>
+  ) : (
+    <>
+      {formatSizeAtPrice({
+        assetUnit,
+        decimalPlaces: market.decimalPlaces,
+        positionDecimalPlaces: market.positionDecimalPlaces,
+        price,
+        quoteName,
+        side,
+        size,
+        type,
+      })}
+      <br />
+      {t('Trigger')}{' '}
+      {formatTrigger({
+        decimalPlaces: market.decimalPlaces,
+        quoteName,
+        triggerDirection,
+        triggerPrice,
+        triggerTrailingPercentOffset,
+        triggerType,
+      })}
+    </>
+  );
+  return (
+    <Button
+      intent={side === Schema.Side.SIDE_BUY ? Intent.Success : Intent.Danger}
+      data-testid="place-order"
+      type="submit"
+      className="w-full"
+      subLabel={subLabel}
+    >
+      {t(
+        oco
+          ? 'Place OCO stop order'
+          : type === Schema.OrderType.TYPE_MARKET
+          ? 'Place market stop order'
+          : 'Place limit stop order'
+      )}
+    </Button>
+  );
+};
+
 export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
  const { pubKey, isReadOnly } = useVegaWallet();
  const setType = useDealTicketFormValues((state) => state.setType);
@@ -521,50 +781,40 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
    },
    [market.id, market.decimalPlaces, market.positionDecimalPlaces, submit]
  );
-  const side = watch('side');
  const expire = watch('expire');
-  const triggerType = watch('triggerType');
-  const triggerPrice = watch('triggerPrice');
-  const timeInForce = watch('timeInForce');
-  const rawPrice = watch('price');
-  const rawSize = watch('size');
-  const oco = watch('oco');
  const expiresAt = watch('expiresAt');
-
-  useEffect(() => {
-    const size = storedFormValues?.[dealTicketType]?.size;
-    if (size && rawSize !== size) {
-      setValue('size', size);
-    }
-  }, [storedFormValues, dealTicketType, rawSize, setValue]);
-
-  useEffect(() => {
-    const price = storedFormValues?.[dealTicketType]?.price;
-    if (price && rawPrice !== price) {
-      setValue('price', price);
-    }
-  }, [storedFormValues, dealTicketType, rawPrice, setValue]);
-
-  const isPriceTrigger = triggerType === 'price';
-  const size = removeDecimal(rawSize, market.positionDecimalPlaces);
-  const price =
-    marketPrice &&
-    getDerivedPrice(
-      {
-        type,
-        price: rawPrice && removeDecimal(rawPrice, market.decimalPlaces),
-      },
-      type === Schema.OrderType.TYPE_MARKET && isPriceTrigger && triggerPrice
-        ? removeDecimal(triggerPrice, market.decimalPlaces)
-        : marketPrice
-    );
-
-  const notionalSize = getNotionalSize(
-    price,
-    size,
-    market.decimalPlaces,
-    market.positionDecimalPlaces
+  const oco = watch('oco');
+  const ocoPrice = watch('ocoPrice');
+  const ocoSize = watch('ocoSize');
+  const ocoTimeInForce = watch('ocoTimeInForce');
+  const ocoTriggerPrice = watch('ocoTriggerPrice');
+  const ocoTriggerTrailingPercentOffset = watch(
+    'ocoTriggerTrailingPercentOffset'
  );
+  const ocoTriggerType = watch('ocoTriggerType');
+  const ocoType = watch('ocoType');
+  const price = watch('price');
+  const side = watch('side');
+  const size = watch('size');
+  const timeInForce = watch('timeInForce');
+  const triggerDirection = watch('triggerDirection');
+  const triggerPrice = watch('triggerPrice');
+  const triggerTrailingPercentOffset = watch('triggerTrailingPercentOffset');
+  const triggerType = watch('triggerType');
+
+  useEffect(() => {
+    const storedSize = storedFormValues?.[dealTicketType]?.size;
+    if (storedSize && size !== storedSize) {
+      setValue('size', storedSize);
+    }
+  }, [storedFormValues, dealTicketType, size, setValue]);
+
+  useEffect(() => {
+    const storedPrice = storedFormValues?.[dealTicketType]?.price;
+    if (storedPrice && price !== storedPrice) {
+      setValue('price', storedPrice);
+    }
+  }, [storedFormValues, dealTicketType, price, setValue]);

  useEffect(() => {
    const subscription = watch((value, { name, type }) => {
@@ -573,8 +823,10 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
    return () => subscription.unsubscribe();
  }, [watch, market.id, updateStoredFormValues]);

-  const { quoteName, settlementAsset: asset } =
-    market.tradableInstrument.instrument.product;
+  const { quoteName } = market.tradableInstrument.instrument.product;
+  const assetUnit = getAssetUnit(
+    market.tradableInstrument.instrument.metadata.tags
+  );

  const sizeStep = toDecimal(market?.positionDecimalPlaces);
  const priceStep = toDecimal(market?.decimalPlaces);
@@ -584,6 +836,10 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
    control,
  });

+  const normalizedPrice = price && removeDecimal(price, market.decimalPlaces);
+  const normalizedSize =
+    size && removeDecimal(size, market.positionDecimalPlaces);
+
  return (
    <form
      onSubmit={isReadOnly || !pubKey ? stopSubmit : handleSubmit(onSubmit)}
@@ -620,18 +876,34 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
        control={control}
        watch={watch}
        priceStep={priceStep}
-        assetSymbol={asset.symbol}
+        quoteName={quoteName}
        marketPrice={marketPrice}
        decimalPlaces={market.decimalPlaces}
      />
      <hr className="mb-4 border-vega-clight-500 dark:border-vega-cdark-500" />
+      <Size
+        control={control}
+        sizeStep={sizeStep}
+        isLimitType={type === Schema.OrderType.TYPE_LIMIT}
+        assetUnit={assetUnit}
+      />
      <Price
        control={control}
        watch={watch}
        priceStep={priceStep}
        quoteName={quoteName}
      />
-      <Size control={control} sizeStep={sizeStep} />
+      <NotionalAndFees
+        market={market}
+        marketPrice={marketPrice}
+        price={normalizedPrice}
+        side={side}
+        size={normalizedSize}
+        timeInForce={timeInForce}
+        triggerPrice={triggerPrice}
+        triggerType={triggerType}
+        type={type}
+      />
      <TimeInForce control={control} />
      <div className="flex justify-end pb-3 gap-2">
        <ReduceOnly />
@@ -682,12 +954,12 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
                  >
                    <Radio
                      value={Schema.OrderType.TYPE_MARKET}
-                      id={`ocoTypeMarket`}
+                      id="ocoTypeMarket"
                      label={'Market'}
                    />
                    <Radio
                      value={Schema.OrderType.TYPE_LIMIT}
-                      id={`ocoTypeLimit`}
+                      id="ocoTypeLimit"
                      label={'Limit'}
                    />
                  </RadioGroup>
@@ -699,12 +971,19 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
            control={control}
            watch={watch}
            priceStep={priceStep}
-            assetSymbol={asset.symbol}
+            quoteName={quoteName}
            marketPrice={marketPrice}
            decimalPlaces={market.decimalPlaces}
            oco
          />
          <hr className="mb-2 border-vega-clight-500 dark:border-vega-cdark-500" />
+          <Size
+            control={control}
+            sizeStep={sizeStep}
+            assetUnit={assetUnit}
+            oco
+            isLimitType={ocoType === Schema.OrderType.TYPE_LIMIT}
+          />
          <Price
            control={control}
            watch={watch}
@@ -712,7 +991,19 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
            quoteName={quoteName}
            oco
          />
-          <Size control={control} sizeStep={sizeStep} oco />
+          <NotionalAndFees
+            market={market}
+            marketPrice={marketPrice}
+            price={ocoPrice && removeDecimal(ocoPrice, market.decimalPlaces)}
+            side={side}
+            size={
+              ocoSize && removeDecimal(ocoSize, market.positionDecimalPlaces)
+            }
+            timeInForce={ocoTimeInForce}
+            triggerPrice={ocoTriggerPrice}
+            triggerType={ocoTriggerType}
+            type={ocoType}
+          />
          <TimeInForce control={control} oco />
          <div className="flex justify-end mb-2 gap-2">
            <ReduceOnly />
@@ -728,11 +1019,12 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
            return (
              <Checkbox
                onCheckedChange={(value) => {
+                  const now = Date.now();
                  if (
                    value &&
-                    (!expiresAt || new Date(expiresAt).getTime() < Date.now())
+                    (!expiresAt || new Date(expiresAt).getTime() < now)
                  ) {
-                    setValue('expiresAt', formatForInput(new Date()), {
+                    setValue('expiresAt', formatForInput(new Date(now)), {
                      shouldValidate: true,
                    });
                  }
@@ -803,19 +1095,24 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
        </>
      )}
      <NoWalletWarning isReadOnly={isReadOnly} />
-      <DealTicketButton side={side} label={t('Submit Stop Order')} />
-      <DealTicketFeeDetails
-        order={{
-          marketId: market.id,
-          price: price || undefined,
-          side,
-          size,
-          timeInForce,
-          type,
-        }}
-        notionalSize={notionalSize}
-        assetSymbol={asset.symbol}
+      <SubmitButton
+        assetUnit={assetUnit}
        market={market}
+        oco={oco}
+        ocoPrice={ocoPrice}
+        ocoSize={ocoSize}
+        ocoTriggerPrice={ocoTriggerPrice}
+        ocoTriggerTrailingPercentOffset={ocoTriggerTrailingPercentOffset}
+        ocoTriggerType={ocoTriggerType}
+        ocoType={ocoType}
+        price={price}
+        side={side}
+        size={size}
+        triggerDirection={triggerDirection}
+        triggerPrice={triggerPrice}
+        triggerTrailingPercentOffset={triggerTrailingPercentOffset}
+        triggerType={triggerType}
+        type={type}
      />
    </form>
  );
@@ -1,6 +1,12 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { VegaWalletContext } from '@vegaprotocol/wallet';
-import { act, render, screen, waitFor } from '@testing-library/react';
+import {
+  act,
+  fireEvent,
+  render,
+  screen,
+  waitFor,
+} from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { generateMarket, generateMarketData } from '../../test-helpers';
 import { DealTicket } from './deal-ticket';
@@ -14,6 +20,7 @@ import {
 } from '../../hooks/use-form-values';
 import * as positionsTools from '@vegaprotocol/positions';
 import { OrdersDocument } from '@vegaprotocol/orders';
+import { formatForInput } from '@vegaprotocol/utils';

 jest.mock('zustand');
 jest.mock('./deal-ticket-fee-details', () => ({
@@ -314,7 +321,7 @@ describe('DealTicket', () => {
    expect(screen.getByTestId('iceberg')).toBeChecked();
  });

-  it('should set values for a non-persistent iceberg order and disable post only checkbox', () => {
+  it('should set values for a non-persistent order and disable post only checkbox', () => {
    const expectedOrder = {
      marketId: market.id,
      type: Schema.OrderType.TYPE_LIMIT,
@@ -357,6 +364,7 @@ describe('DealTicket', () => {
    expect(screen.getByTestId('reduce-only')).not.toBeChecked();
    expect(screen.getByTestId('post-only')).not.toBeChecked();
    expect(screen.getByTestId('iceberg')).not.toBeChecked();
+    expect(screen.getByTestId('iceberg')).toBeDisabled();
  });

  // eslint-disable-next-line jest/no-disabled-tests
@@ -473,4 +481,150 @@ describe('DealTicket', () => {
      Object.keys(Schema.OrderTimeInForce).length
    );
  });
+
+  it('validates size field', async () => {
+    render(generateJsx());
+    const sizeErrorMessage = 'deal-ticket-error-message-size';
+    const sizeInput = 'order-size';
+    await userEvent.click(screen.getByTestId('place-order'));
+    // default value should be invalid
+    expect(screen.getByTestId(sizeErrorMessage)).toBeInTheDocument();
+    // to small value should be invalid
+    await userEvent.type(screen.getByTestId(sizeInput), '0.01');
+    expect(screen.getByTestId(sizeErrorMessage)).toBeInTheDocument();
+
+    // clear and fill using valid value
+    await userEvent.clear(screen.getByTestId(sizeInput));
+    await userEvent.type(screen.getByTestId(sizeInput), '0.1');
+    expect(screen.queryByTestId(sizeErrorMessage)).toBeNull();
+  });
+
+  it('validates price field', async () => {
+    const priceErrorMessage = 'deal-ticket-error-message-price';
+    const priceInput = 'order-price';
+    const submitButton = 'place-order';
+    const orderTypeMarket = 'order-type-Market';
+    const orderTypeLimit = 'order-type-Limit';
+    render(generateJsx());
+
+    await userEvent.click(screen.getByTestId(submitButton));
+
+    expect(screen.getByTestId(priceErrorMessage)).toBeInTheDocument();
+    await userEvent.type(screen.getByTestId(priceInput), '0.001');
+    expect(screen.getByTestId(priceErrorMessage)).toBeInTheDocument();
+
+    // switch to market order type error should disappear
+    await userEvent.click(screen.getByTestId(orderTypeMarket));
+    await userEvent.click(screen.getByTestId(submitButton));
+    expect(screen.queryByTestId(priceErrorMessage)).toBeNull();
+
+    // switch back to limit type
+    await userEvent.click(screen.getByTestId(orderTypeLimit));
+    await userEvent.click(screen.getByTestId(submitButton));
+    expect(screen.getByTestId(priceErrorMessage)).toBeInTheDocument();
+
+    // to small value should be invalid
+    await userEvent.type(screen.getByTestId(priceInput), '0.001');
+    expect(screen.getByTestId(priceErrorMessage)).toBeInTheDocument();
+
+    // clear and fill using valid value
+    await userEvent.clear(screen.getByTestId(priceInput));
+    await userEvent.type(screen.getByTestId(priceInput), '0.01');
+    expect(screen.queryByTestId(priceErrorMessage)).toBeNull();
+  });
+
+  it('validates iceberg field', async () => {
+    const peakSizeErrorMessage = 'deal-ticket-peak-error-message';
+    const minimumSizeErrorMessage = 'deal-ticket-minimum-error-message';
+    const sizeInput = 'order-size';
+    const peakSizeInput = 'order-peak-size';
+    const minimumSizeInput = 'order-minimum-size';
+    const submitButton = 'place-order';
+
+    render(generateJsx());
+    await userEvent.selectOptions(
+      screen.getByTestId('order-tif'),
+      Schema.OrderTimeInForce.TIME_IN_FORCE_GFA
+    );
+    await userEvent.click(screen.getByTestId('iceberg'));
+    await userEvent.click(screen.getByTestId(submitButton));
+
+    // validate empty fields
+    expect(screen.getByTestId(peakSizeErrorMessage)).toBeInTheDocument();
+    expect(screen.getByTestId(minimumSizeErrorMessage)).toBeInTheDocument();
+
+    await userEvent.type(screen.getByTestId(peakSizeInput), '0.01');
+    await userEvent.type(screen.getByTestId(minimumSizeInput), '0.01');
+
+    // validate value smaller than step
+    expect(screen.getByTestId(peakSizeErrorMessage)).toBeInTheDocument();
+    expect(screen.getByTestId(minimumSizeErrorMessage)).toBeInTheDocument();
+
+    await userEvent.clear(screen.getByTestId(peakSizeInput));
+    await userEvent.type(screen.getByTestId(peakSizeInput), '0.5');
+    await userEvent.clear(screen.getByTestId(minimumSizeInput));
+    await userEvent.type(screen.getByTestId(minimumSizeInput), '0.7');
+
+    await userEvent.clear(screen.getByTestId(sizeInput));
+    await userEvent.type(screen.getByTestId(sizeInput), '0.1');
+
+    // validate value higher than size
+    expect(screen.getByTestId(peakSizeErrorMessage)).toBeInTheDocument();
+    expect(screen.getByTestId(minimumSizeErrorMessage)).toBeInTheDocument();
+
+    await userEvent.clear(screen.getByTestId(sizeInput));
+    await userEvent.type(screen.getByTestId(sizeInput), '1');
+    // validate peak higher than minimum
+    expect(screen.queryByTestId(peakSizeErrorMessage)).toBeNull();
+    expect(screen.getByTestId(minimumSizeErrorMessage)).toBeInTheDocument();
+
+    await userEvent.clear(screen.getByTestId(peakSizeInput));
+    await userEvent.type(screen.getByTestId(peakSizeInput), '1');
+    await userEvent.clear(screen.getByTestId(minimumSizeInput));
+    await userEvent.type(screen.getByTestId(minimumSizeInput), '1');
+
+    // validate correct values
+    expect(screen.queryByTestId(peakSizeErrorMessage)).toBeNull();
+    expect(screen.queryByTestId(minimumSizeErrorMessage)).toBeNull();
+  });
+
+  it('sets expiry time/date to now if expiry is changed to checked', async () => {
+    const datePicker = 'date-picker-field';
+    const now = Math.round(Date.now() / 1000) * 1000;
+    render(generateJsx());
+    jest.spyOn(global.Date, 'now').mockImplementationOnce(() => now);
+    await userEvent.selectOptions(
+      screen.getByTestId('order-tif'),
+      Schema.OrderTimeInForce.TIME_IN_FORCE_GTT
+    );
+
+    // expiry time/date was empty it should be set to now
+    expect(
+      new Date(screen.getByTestId<HTMLInputElement>(datePicker).value).getTime()
+    ).toEqual(now);
+
+    // set to the value in the past (now - 1s)
+    fireEvent.change(screen.getByTestId<HTMLInputElement>(datePicker), {
+      target: { value: formatForInput(new Date(now - 1000)) },
+    });
+    expect(
+      new Date(
+        screen.getByTestId<HTMLInputElement>(datePicker).value
+      ).getTime() + 1000
+    ).toEqual(now);
+
+    // switch expiry off and on
+    await userEvent.selectOptions(
+      screen.getByTestId('order-tif'),
+      Schema.OrderTimeInForce.TIME_IN_FORCE_GFA
+    );
+    await userEvent.selectOptions(
+      screen.getByTestId('order-tif'),
+      Schema.OrderTimeInForce.TIME_IN_FORCE_GTT
+    );
+    // expiry time/date was in the past it should be set to now
+    expect(
+      new Date(screen.getByTestId<HTMLInputElement>(datePicker).value).getTime()
+    ).toEqual(now);
+  });
 });
@@ -3,7 +3,6 @@ import * as Schema from '@vegaprotocol/types';
 import type { FormEventHandler } from 'react';
 import { memo, useCallback, useEffect, useRef, useMemo } from 'react';
 import { Controller, useController, useForm } from 'react-hook-form';
-import { DealTicketButton } from './deal-ticket-button';
 import {
  DealTicketFeeDetails,
  DealTicketMarginDetails,
@@ -23,6 +22,8 @@ import {
  Intent,
  Notification,
  Tooltip,
+  TradingButton as Button,
+  Pill,
 } from '@vegaprotocol/ui-toolkit';

 import {
@@ -35,6 +36,7 @@ import {
  validateAmount,
  toDecimal,
  formatForInput,
+  formatValue,
 } from '@vegaprotocol/utils';
 import { activeOrdersProvider } from '@vegaprotocol/orders';
 import { getDerivedPrice } from '@vegaprotocol/markets';
@@ -46,7 +48,10 @@ import {
  validateType,
 } from '../../utils';
 import { ZeroBalanceError } from '../deal-ticket-validation/zero-balance-error';
-import { SummaryValidationType } from '../../constants';
+import {
+  NOTIONAL_SIZE_TOOLTIP_TEXT,
+  SummaryValidationType,
+} from '../../constants';
 import type {
  Market,
  MarketData,
@@ -68,6 +73,7 @@ import { useDealTicketFormValues } from '../../hooks/use-form-values';
 import { DealTicketSizeIceberg } from './deal-ticket-size-iceberg';
 import noop from 'lodash/noop';
 import { isNonPersistentOrder } from '../../utils/time-in-force-persistance';
+import { KeyValue } from './key-value';

 export const REDUCE_ONLY_TOOLTIP =
  '"Reduce only" will ensure that this order will not increase the size of an open position. When the order is matched, it will only trade enough volume to bring your open volume towards 0 but never change the direction of your position. If applied to a limit order that is not instantly filled, the order will be stopped.';
@@ -118,6 +124,11 @@ const getDefaultValues = (
  ...storedValues,
 });

+export const getAssetUnit = (tags?: string[] | null) =>
+  tags
+    ?.find((tag) => tag.startsWith('base:') || tag.startsWith('ticker:'))
+    ?.replace(/^[^:]*:/, '');
+
 export const DealTicket = ({
  market,
  onMarketClick,
@@ -257,6 +268,10 @@ export const DealTicket = ({
  const assetSymbol =
    market.tradableInstrument.instrument.product.settlementAsset.symbol;

+  const assetUnit = getAssetUnit(
+    market.tradableInstrument.instrument.metadata.tags
+  );
+
  const summaryError = useMemo(() => {
    if (!pubKey) {
      return {
@@ -338,6 +353,7 @@ export const DealTicket = ({
  const priceStep = toDecimal(market?.decimalPlaces);
  const sizeStep = toDecimal(market?.positionDecimalPlaces);
  const quoteName = market.tradableInstrument.instrument.product.quoteName;
+  const isLimitType = type === Schema.OrderType.TYPE_LIMIT;

  return (
    <form
@@ -384,18 +400,16 @@ export const DealTicket = ({
            message: t('Size cannot be lower than ' + sizeStep),
          },
          validate: validateAmount(sizeStep, 'Size'),
+          deps: ['peakSize', 'minimumVisibleSize'],
        }}
        render={({ field, fieldState }) => (
-          <div className="mb-4">
-            <FormGroup
-              label={t('Size')}
-              labelFor="input-order-size-limit"
-              compact
-            >
+          <div className={isLimitType ? 'mb-4' : 'mb-2'}>
+            <FormGroup label={t('Size')} labelFor="order-size" compact>
              <Input
-                id="input-order-size-limit"
+                id="order-size"
                className="w-full"
                type="number"
+                appendElement={assetUnit && <Pill size="xs">{assetUnit}</Pill>}
                step={sizeStep}
                min={sizeStep}
                data-testid="order-size"
@@ -411,7 +425,7 @@ export const DealTicket = ({
          </div>
        )}
      />
-      {type === Schema.OrderType.TYPE_LIMIT && (
+      {isLimitType && (
        <Controller
          name="price"
          control={control}
@@ -424,14 +438,15 @@ export const DealTicket = ({
            validate: validateAmount(priceStep, 'Price'),
          }}
          render={({ field, fieldState }) => (
-            <div className="mb-4">
+            <div className="mb-2">
              <FormGroup
                labelFor="input-price-quote"
-                label={t(`Price (${quoteName})`)}
+                label={t('Price')}
                compact
              >
                <Input
                  id="input-price-quote"
+                  appendElement={<Pill size="xs">{quoteName}</Pill>}
                  className="w-full"
                  type="number"
                  step={priceStep}
@@ -449,6 +464,22 @@ export const DealTicket = ({
          )}
        />
      )}
+      <div className="mb-4">
+        <KeyValue
+          label={t('Notional')}
+          value={formatValue(notionalSize, market.decimalPlaces)}
+          formattedValue={formatValue(notionalSize, market.decimalPlaces)}
+          symbol={quoteName}
+          labelDescription={NOTIONAL_SIZE_TOOLTIP_TEXT(quoteName)}
+        />
+        <DealTicketFeeDetails
+          order={
+            normalizedOrder && { ...normalizedOrder, price: price || undefined }
+          }
+          assetSymbol={assetSymbol}
+          market={market}
+        />
+      </div>
      <Controller
        name="timeInForce"
        control={control}
@@ -475,7 +506,7 @@ export const DealTicket = ({
              }

              // iceberg orders must be persistent orders, so if user
-              // switches to to a non persisten tif value, remove iceberg selection
+              // switches to a non persistent tif value, remove iceberg selection
              if (iceberg && isNonPersistentOrder(value)) {
                setValue('iceberg', false);
              }
@@ -487,7 +518,7 @@ export const DealTicket = ({
          />
        )}
      />
-      {type === Schema.OrderType.TYPE_LIMIT &&
+      {isLimitType &&
        timeInForce === Schema.OrderTimeInForce.TIME_IN_FORCE_GTT && (
          <Controller
            name="expiresAt"
@@ -569,7 +600,7 @@ export const DealTicket = ({
          )}
        />
      </div>
-      {type === Schema.OrderType.TYPE_LIMIT && (
+      {isLimitType && (
        <>
          <div className="flex justify-between pb-2 gap-2">
            <Controller
@@ -624,15 +655,29 @@ export const DealTicket = ({
        pubKey={pubKey}
        onDeposit={onDeposit}
      />
-      <DealTicketButton side={side} />
-      <DealTicketFeeDetails
-        order={
-          normalizedOrder && { ...normalizedOrder, price: price || undefined }
-        }
-        notionalSize={notionalSize}
-        assetSymbol={assetSymbol}
-        market={market}
-      />
+      <Button
+        data-testid="place-order"
+        type="submit"
+        className="w-full"
+        intent={side === Schema.Side.SIDE_BUY ? Intent.Success : Intent.Danger}
+        subLabel={`${formatValue(
+          normalizedOrder.size,
+          market.positionDecimalPlaces
+        )} ${assetUnit} @ ${
+          type === Schema.OrderType.TYPE_MARKET
+            ? 'market'
+            : `${formatValue(
+                normalizedOrder.price,
+                market.decimalPlaces
+              )} ${quoteName}`
+        }`}
+      >
+        {t(
+          type === Schema.OrderType.TYPE_MARKET
+            ? 'Place market order'
+            : 'Place limit order'
+        )}
+      </Button>
      <DealTicketMarginDetails
        onMarketClick={onMarketClick}
        assetSymbol={assetSymbol}
@@ -0,0 +1,51 @@
+import { Tooltip } from '@vegaprotocol/ui-toolkit';
+import classnames from 'classnames';
+import type { ReactNode } from 'react';
+
+export interface KeyValuePros {
+  label: string;
+  value?: string | null | undefined;
+  symbol: string;
+  indent?: boolean | undefined;
+  labelDescription?: ReactNode;
+  formattedValue?: string;
+  onClick?: () => void;
+}
+
+export const KeyValue = ({
+  label,
+  value,
+  labelDescription,
+  symbol,
+  indent,
+  onClick,
+  formattedValue,
+}: KeyValuePros) => {
+  const displayValue = `${formattedValue ?? '-'} ${symbol || ''}`;
+  const valueElement = onClick ? (
+    <button onClick={onClick} className="text-muted">
+      {displayValue}
+    </button>
+  ) : (
+    <div className="text-muted">{displayValue}</div>
+  );
+  return (
+    <div
+      data-testid={
+        'deal-ticket-fee-' + label.toLocaleLowerCase().replace(/\s/g, '-')
+      }
+      key={typeof label === 'string' ? label : 'value-dropdown'}
+      className={classnames(
+        'text-xs mt-2 flex justify-between items-center gap-4 flex-wrap',
+        { 'ml-2': indent }
+      )}
+    >
+      <Tooltip description={labelDescription}>
+        <div>{label}</div>
+      </Tooltip>
+      <Tooltip description={`${value ?? '-'} ${symbol || ''}`}>
+        {valueElement}
+      </Tooltip>
+    </div>
+  );
+};
@@ -2,11 +2,7 @@ import type { Asset } from '@vegaprotocol/assets';
 import { EtherscanLink } from '@vegaprotocol/environment';
 import { t } from '@vegaprotocol/i18n';
 import { Intent, Notification } from '@vegaprotocol/ui-toolkit';
-import {
-  formatNumber,
-  getUnlimitedThreshold,
-  quantumDecimalPlaces,
-} from '@vegaprotocol/utils';
+import { formatNumber } from '@vegaprotocol/utils';
 import type { EthStoredTxState } from '@vegaprotocol/web3';
 import { EthTxStatus, useEthTransactionStore } from '@vegaprotocol/web3';
 import BigNumber from 'bignumber.js';
@@ -192,15 +188,6 @@ const ApprovalTxFeedback = ({
  }

  if (tx.status === EthTxStatus.Confirmed) {
-    const approvedAllowanceValue = (
-      allowance || new BigNumber(0)
-    ).isGreaterThan(getUnlimitedThreshold(selectedAsset.decimals))
-      ? '∞'
-      : formatNumber(
-          allowance?.toString() || 0,
-          quantumDecimalPlaces(selectedAsset.quantum, selectedAsset.decimals)
-        );
-
    return (
      <div className="mb-4">
        <Notification
@@ -211,7 +198,7 @@ const ApprovalTxFeedback = ({
              <p>
                {t('You approved deposits of up to %s %s.', [
                  selectedAsset?.symbol,
-                  approvedAllowanceValue,
+                  formatNumber(allowance?.toString() || 0),
                ])}
              </p>
              {txLink && <p>{txLink}</p>}
@@ -15,7 +15,6 @@ import { useWeb3ConnectStore } from '@vegaprotocol/web3';
 import { useWeb3React } from '@web3-react/core';
 import type { AssetFieldsFragment } from '@vegaprotocol/assets';
 import type { DepositBalances } from './use-deposit-balances';
-import { truncateMiddle } from '@vegaprotocol/ui-toolkit';

 jest.mock('@vegaprotocol/wallet');
 jest.mock('@vegaprotocol/web3');
@@ -91,7 +90,7 @@ describe('Deposit form', () => {
    // Assert default values (including) from/to provided by useVegaWallet and useWeb3React
    expect(screen.getByText('From (Ethereum address)')).toBeInTheDocument();
    expect(screen.getByTestId('ethereum-address')).toHaveTextContent(
-      truncateMiddle(MOCK_ETH_ADDRESS)
+      MOCK_ETH_ADDRESS
    );
    expect(screen.getByLabelText('Asset')).toHaveValue('');
    expect(screen.getByLabelText('To (Vega key)')).toHaveValue('');
@@ -354,7 +353,7 @@ describe('Deposit form', () => {
    ).not.toBeInTheDocument();
    expect(screen.getByText('From (Ethereum address)')).toBeInTheDocument();
    expect(screen.getByTestId('ethereum-address')).toHaveTextContent(
-      truncateMiddle(MOCK_ETH_ADDRESS)
+      MOCK_ETH_ADDRESS
    );
  });

@@ -22,7 +22,6 @@ import {
  Intent,
  ButtonLink,
  TradingSelect,
-  truncateMiddle,
 } from '@vegaprotocol/ui-toolkit';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { useWeb3React } from '@web3-react/core';
@@ -174,7 +173,7 @@ export const DepositForm = ({
              return (
                <div className="text-sm" aria-describedby="ethereum-address">
                  <p className="mb-1 break-all" data-testid="ethereum-address">
-                    {truncateMiddle(account)}
+                    {account}
                  </p>
                  <DisconnectEthereumButton
                    onDisconnect={() => {
@@ -7,7 +7,7 @@ import {
  Tooltip,
 } from '@vegaprotocol/ui-toolkit';
 import type BigNumber from 'bignumber.js';
-import { formatNumber, quantumDecimalPlaces } from '@vegaprotocol/utils';
+import { formatNumber } from '@vegaprotocol/utils';

 // Note: all of the values here are with correct asset's decimals
 // See `libs/deposits/src/lib/use-deposit-balances.ts`
@@ -35,10 +35,7 @@ export const DepositLimits = ({
      label: t('Balance available'),
      rawValue: balance,
      value: balance ? (
-        <CompactNumber
-          number={balance}
-          decimals={quantumDecimalPlaces(asset.quantum, asset.decimals)}
-        />
+        <CompactNumber number={balance} decimals={asset.decimals} />
      ) : (
        '-'
      ),
@@ -76,7 +73,7 @@ export const DepositLimits = ({
      value: !exempt ? (
        <CompactNumber
          number={max.minus(deposited)}
-          decimals={quantumDecimalPlaces(asset.quantum, asset.decimals)}
+          decimals={asset.decimals}
        />
      ) : (
        <div data-testid="exempt">{t('Exempt')}</div>
@@ -100,10 +97,7 @@ export const DepositLimits = ({
      ),
      rawValue: allowance,
      value: allowance ? (
-        <CompactNumber
-          number={allowance}
-          decimals={quantumDecimalPlaces(asset.quantum, asset.decimals)}
-        />
+        <CompactNumber number={allowance} decimals={asset.decimals} />
      ) : (
        '-'
      ),
@@ -408,6 +408,12 @@ function compileFeatureFlags(): FeatureFlags {
        process.env['NX_PRODUCT_PERPETUALS']
      ) as string
    ),
+    METAMASK_SNAPS: TRUTHY.includes(
+      windowOrDefault(
+        'NX_METAMASK_SNAPS',
+        process.env['NX_METAMASK_SNAPS']
+      ) as string
+    ),
  };
  const EXPLORER_FLAGS = {
    EXPLORER_ASSETS: TRUTHY.includes(
@@ -18,7 +18,11 @@ export type Environment = z.infer<typeof envSchema>;
 export type FeatureFlags = z.infer<typeof featureFlagsSchema>;
 export type CosmicElevatorFlags = Pick<
  FeatureFlags,
-  'ICEBERG_ORDERS' | 'STOP_ORDERS' | 'SUCCESSOR_MARKETS' | 'PRODUCT_PERPETUALS'
+  | 'ICEBERG_ORDERS'
+  | 'STOP_ORDERS'
+  | 'SUCCESSOR_MARKETS'
+  | 'PRODUCT_PERPETUALS'
+  | 'METAMASK_SNAPS'
 >;
 export type Configuration = z.infer<typeof tomlConfigSchema>;
 export const CUSTOM_NODE_KEY = 'custom' as const;
@@ -77,6 +77,7 @@ const COSMIC_ELEVATOR_FLAGS = {
  STOP_ORDERS: z.optional(z.boolean()),
  ICEBERG_ORDERS: z.optional(z.boolean()),
  PRODUCT_PERPETUALS: z.optional(z.boolean()),
+  METAMASK_SNAPS: z.optional(z.boolean()),
 };

 const EXPLORER_FLAGS = {
@@ -1,2 +1 @@
-export * from './lib/ledger-manager';
-export * from './lib/__generated__/LedgerEntries';
+export * from './lib/ledger-export-form';
@@ -1,47 +0,0 @@
-fragment LedgerEntry on AggregatedLedgerEntry {
-  vegaTime
-  quantity
-  assetId
-  transferType
-  toAccountType
-  toAccountMarketId
-  toAccountPartyId
-  toAccountBalance
-  fromAccountType
-  fromAccountMarketId
-  fromAccountPartyId
-  fromAccountBalance
-}
-
-query LedgerEntries(
-  $partyId: ID!
-  $pagination: Pagination
-  $dateRange: DateRange
-  $fromAccountType: [AccountType!]
-  $toAccountType: [AccountType!]
-) {
-  ledgerEntries(
-    filter: {
-      FromAccountFilter: {
-        partyIds: [$partyId]
-        accountTypes: $fromAccountType
-      }
-      ToAccountFilter: { partyIds: [$partyId], accountTypes: $toAccountType }
-    }
-    pagination: $pagination
-    dateRange: $dateRange
-  ) {
-    edges {
-      node {
-        ...LedgerEntry
-      }
-      cursor
-    }
-    pageInfo {
-      startCursor
-      endCursor
-      hasNextPage
-      hasPreviousPage
-    }
-  }
-}
@@ -1,88 +0,0 @@
-import * as Types from '@vegaprotocol/types';
-
-import { gql } from '@apollo/client';
-import * as Apollo from '@apollo/client';
-const defaultOptions = {} as const;
-export type LedgerEntryFragment = { __typename?: 'AggregatedLedgerEntry', vegaTime: any, quantity: string, assetId?: string | null, transferType?: Types.TransferType | null, toAccountType?: Types.AccountType | null, toAccountMarketId?: string | null, toAccountPartyId?: string | null, toAccountBalance: string, fromAccountType?: Types.AccountType | null, fromAccountMarketId?: string | null, fromAccountPartyId?: string | null, fromAccountBalance: string };
-
-export type LedgerEntriesQueryVariables = Types.Exact<{
-  partyId: Types.Scalars['ID'];
-  pagination?: Types.InputMaybe<Types.Pagination>;
-  dateRange?: Types.InputMaybe<Types.DateRange>;
-  fromAccountType?: Types.InputMaybe<Array<Types.AccountType> | Types.AccountType>;
-  toAccountType?: Types.InputMaybe<Array<Types.AccountType> | Types.AccountType>;
-}>;
-
-
-export type LedgerEntriesQuery = { __typename?: 'Query', ledgerEntries: { __typename?: 'AggregatedLedgerEntriesConnection', edges: Array<{ __typename?: 'AggregatedLedgerEntriesEdge', cursor: string, node: { __typename?: 'AggregatedLedgerEntry', vegaTime: any, quantity: string, assetId?: string | null, transferType?: Types.TransferType | null, toAccountType?: Types.AccountType | null, toAccountMarketId?: string | null, toAccountPartyId?: string | null, toAccountBalance: string, fromAccountType?: Types.AccountType | null, fromAccountMarketId?: string | null, fromAccountPartyId?: string | null, fromAccountBalance: string } } | null>, pageInfo: { __typename?: 'PageInfo', startCursor: string, endCursor: string, hasNextPage: boolean, hasPreviousPage: boolean } } };
-
-export const LedgerEntryFragmentDoc = gql`
-    fragment LedgerEntry on AggregatedLedgerEntry {
-  vegaTime
-  quantity
-  assetId
-  transferType
-  toAccountType
-  toAccountMarketId
-  toAccountPartyId
-  toAccountBalance
-  fromAccountType
-  fromAccountMarketId
-  fromAccountPartyId
-  fromAccountBalance
-}
-    `;
-export const LedgerEntriesDocument = gql`
-    query LedgerEntries($partyId: ID!, $pagination: Pagination, $dateRange: DateRange, $fromAccountType: [AccountType!], $toAccountType: [AccountType!]) {
-  ledgerEntries(
-    filter: {FromAccountFilter: {partyIds: [$partyId], accountTypes: $fromAccountType}, ToAccountFilter: {partyIds: [$partyId], accountTypes: $toAccountType}}
-    pagination: $pagination
-    dateRange: $dateRange
-  ) {
-    edges {
-      node {
-        ...LedgerEntry
-      }
-      cursor
-    }
-    pageInfo {
-      startCursor
-      endCursor
-      hasNextPage
-      hasPreviousPage
-    }
-  }
-}
-    ${LedgerEntryFragmentDoc}`;
-
-/**
- * __useLedgerEntriesQuery__
- *
- * To run a query within a React component, call `useLedgerEntriesQuery` and pass it any options that fit your needs.
- * When your component renders, `useLedgerEntriesQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useLedgerEntriesQuery({
- *   variables: {
- *      partyId: // value for 'partyId'
- *      pagination: // value for 'pagination'
- *      dateRange: // value for 'dateRange'
- *      fromAccountType: // value for 'fromAccountType'
- *      toAccountType: // value for 'toAccountType'
- *   },
- * });
- */
-export function useLedgerEntriesQuery(baseOptions: Apollo.QueryHookOptions<LedgerEntriesQuery, LedgerEntriesQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<LedgerEntriesQuery, LedgerEntriesQueryVariables>(LedgerEntriesDocument, options);
-      }
-export function useLedgerEntriesLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<LedgerEntriesQuery, LedgerEntriesQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<LedgerEntriesQuery, LedgerEntriesQueryVariables>(LedgerEntriesDocument, options);
-        }
-export type LedgerEntriesQueryHookResult = ReturnType<typeof useLedgerEntriesQuery>;
-export type LedgerEntriesLazyQueryHookResult = ReturnType<typeof useLedgerEntriesLazyQuery>;
-export type LedgerEntriesQueryResult = Apollo.QueryResult<LedgerEntriesQuery, LedgerEntriesQueryVariables>;
@@ -1,77 +0,0 @@
-import type { Asset } from '@vegaprotocol/assets';
-import { assetsMapProvider } from '@vegaprotocol/assets';
-import type { Market } from '@vegaprotocol/markets';
-import { marketsMapProvider } from '@vegaprotocol/markets';
-import {
-  makeDataProvider,
-  makeDerivedDataProvider,
-} from '@vegaprotocol/data-provider';
-
-import type {
-  LedgerEntriesQuery,
-  LedgerEntriesQueryVariables,
-  LedgerEntryFragment,
-} from './__generated__/LedgerEntries';
-import { LedgerEntriesDocument } from './__generated__/LedgerEntries';
-
-export type LedgerEntry = LedgerEntryFragment & {
-  asset: Asset | null | undefined;
-  marketSender: Market | null | undefined;
-  marketReceiver: Market | null | undefined;
-};
-
-type Edge = LedgerEntriesQuery['ledgerEntries']['edges'][number];
-
-const isLedgerEntryEdge = (entry: Edge): entry is NonNullable<Edge> =>
-  entry !== null;
-
-const getData = (responseData: LedgerEntriesQuery | null) => {
-  return (
-    responseData?.ledgerEntries?.edges
-      .filter(isLedgerEntryEdge)
-      .map((edge) => edge.node) || []
-  );
-};
-
-const ledgerEntriesOnlyProvider = makeDataProvider<
-  LedgerEntriesQuery,
-  ReturnType<typeof getData>,
-  never,
-  never,
-  LedgerEntriesQueryVariables
->({
-  query: LedgerEntriesDocument,
-  getData,
-  additionalContext: {
-    isEnlargedTimeout: true,
-  },
-});
-
-export const ledgerEntriesProvider = makeDerivedDataProvider<
-  LedgerEntry[],
-  never,
-  LedgerEntriesQueryVariables
->(
-  [
-    ledgerEntriesOnlyProvider,
-    (callback, client) => assetsMapProvider(callback, client, undefined),
-    (callback, client) => marketsMapProvider(callback, client, undefined),
-  ],
-  (partsData) => {
-    const entries = partsData[0] as ReturnType<typeof getData>;
-    const assets = partsData[1] as Record<string, Asset>;
-    const markets = partsData[2] as Record<string, Market>;
-    return entries.map((entry) => {
-      const asset = entry.assetId
-        ? (assets as Record<string, Asset>)[entry.assetId]
-        : null;
-      const marketSender = entry.fromAccountMarketId
-        ? markets[entry.fromAccountMarketId]
-        : null;
-      const marketReceiver = entry.toAccountMarketId
-        ? markets[entry.toAccountMarketId]
-        : null;
-      return { ...entry, asset, marketSender, marketReceiver };
-    });
-  }
-);
@@ -1,247 +0,0 @@
-import type {
-  LedgerEntriesQuery,
-  LedgerEntryFragment,
-} from './__generated__/LedgerEntries';
-import * as Schema from '@vegaprotocol/types';
-import type { PartialDeep } from 'type-fest';
-import merge from 'lodash/merge';
-
-export const ledgerEntriesQuery = (
-  override?: PartialDeep<LedgerEntriesQuery>
-): LedgerEntriesQuery => {
-  const defaultResult: LedgerEntriesQuery = {
-    __typename: 'Query',
-    ledgerEntries: {
-      __typename: 'AggregatedLedgerEntriesConnection',
-      edges: ledgerEntries.map((node) => ({
-        __typename: 'AggregatedLedgerEntriesEdge',
-        node,
-        cursor: 'cursor-1',
-      })),
-      pageInfo: {
-        startCursor:
-          'eyJ2ZWdhX3RpbWUiOiIyMDIyLTExLTIzVDE3OjI3OjU2LjczNDM2NFoifQ==',
-        endCursor:
-          'eyJ2ZWdhX3RpbWUiOiIyMDIyLTExLTIzVDEzOjExOjE2LjU0NjM2M1oifQ==',
-        hasNextPage: false,
-        hasPreviousPage: false,
-        __typename: 'PageInfo',
-      },
-    },
-  };
-  return merge(defaultResult, override);
-};
-
-export const ledgerEntries: LedgerEntryFragment[] = [
-  {
-    vegaTime: '1669224476734364000',
-    quantity: '0',
-    assetId: 'asset-id',
-    transferType: Schema.TransferType.TRANSFER_TYPE_MARGIN_HIGH,
-    toAccountType: Schema.AccountType.ACCOUNT_TYPE_EXTERNAL,
-    toAccountMarketId: 'market-1',
-    toAccountPartyId: 'network',
-    fromAccountType: Schema.AccountType.ACCOUNT_TYPE_GENERAL,
-    fromAccountMarketId: 'market-0',
-    fromAccountPartyId:
-      '2e1ef32e5804e14232406aebaad719087d326afa5c648b7824d0823d8a46c8d1',
-    __typename: 'AggregatedLedgerEntry',
-    toAccountBalance: '0',
-    fromAccountBalance: '0',
-  },
-  {
-    vegaTime: '1669221452175594000',
-    quantity: '0',
-    assetId: 'asset-id-2',
-    transferType: Schema.TransferType.TRANSFER_TYPE_MARGIN_HIGH,
-    toAccountType: Schema.AccountType.ACCOUNT_TYPE_EXTERNAL,
-    toAccountMarketId: 'market-0',
-    toAccountPartyId: 'network',
-    fromAccountType: Schema.AccountType.ACCOUNT_TYPE_GENERAL,
-    fromAccountMarketId: 'market-2',
-    fromAccountPartyId:
-      '2e1ef32e5804e14232406aebaad719087d326afa5c648b7824d0823d8a46c8d1',
-    __typename: 'AggregatedLedgerEntry',
-    toAccountBalance: '0',
-    fromAccountBalance: '0',
-  },
-  {
-    vegaTime: '1669209347054198000',
-    quantity: '0',
-    assetId: 'asset-id',
-    transferType: Schema.TransferType.TRANSFER_TYPE_MARGIN_HIGH,
-    toAccountType: Schema.AccountType.ACCOUNT_TYPE_EXTERNAL,
-    toAccountMarketId: 'market-3',
-    toAccountPartyId: 'network',
-    fromAccountType: Schema.AccountType.ACCOUNT_TYPE_GENERAL,
-    fromAccountMarketId: 'market-2',
-    fromAccountPartyId: 'sender party id',
-    __typename: 'AggregatedLedgerEntry',
-    toAccountBalance: '0',
-    fromAccountBalance: '0',
-  },
-  {
-    vegaTime: '1669209345512806000',
-    quantity: '0',
-    assetId: 'asset-id',
-    transferType: Schema.TransferType.TRANSFER_TYPE_MARGIN_HIGH,
-    __typename: 'AggregatedLedgerEntry',
-    toAccountBalance: '0',
-    fromAccountBalance: '0',
-  },
-  {
-    vegaTime: '1669209316163397000',
-    quantity: '0',
-    assetId: 'asset-id-2',
-    transferType: Schema.TransferType.TRANSFER_TYPE_MARGIN_HIGH,
-    __typename: 'AggregatedLedgerEntry',
-    toAccountBalance: '0',
-    fromAccountBalance: '0',
-  },
-  {
-    vegaTime: '1669209299051286000',
-    quantity: '1326783',
-    assetId: 'asset-id-2',
-    transferType: Schema.TransferType.TRANSFER_TYPE_MTM_WIN,
-    __typename: 'AggregatedLedgerEntry',
-    toAccountBalance: '0',
-    fromAccountBalance: '0',
-  },
-  {
-    vegaTime: '1669209151328614000',
-    quantity: '0',
-    assetId: '5cfa87844724df6069b94e4c8a6f03af21907d7bc251593d08e4251043ee9f7c',
-    transferType: Schema.TransferType.TRANSFER_TYPE_MARGIN_HIGH,
-    __typename: 'AggregatedLedgerEntry',
-    toAccountBalance: '0',
-    fromAccountBalance: '0',
-  },
-  {
-    vegaTime: '1669209117655380000',
-    quantity: '0',
-    assetId: '5cfa87844724df6069b94e4c8a6f03af21907d7bc251593d08e4251043ee9f7c',
-    transferType: Schema.TransferType.TRANSFER_TYPE_MARGIN_HIGH,
-    __typename: 'AggregatedLedgerEntry',
-    toAccountBalance: '0',
-    fromAccountBalance: '0',
-  },
-  {
-    vegaTime: '1669209082788024000',
-    quantity: '1326783',
-    assetId: '5cfa87844724df6069b94e4c8a6f03af21907d7bc251593d08e4251043ee9f7c',
-    transferType: Schema.TransferType.TRANSFER_TYPE_MTM_WIN,
-    __typename: 'AggregatedLedgerEntry',
-    toAccountBalance: '0',
-    fromAccountBalance: '0',
-  },
-  {
-    vegaTime: '1669209076546363000',
-    quantity: '0',
-    assetId: 'cee709223217281d7893b650850ae8ee8a18b7539b5658f9b4cc24de95dd18ad',
-    transferType: Schema.TransferType.TRANSFER_TYPE_MARGIN_HIGH,
-    __typename: 'AggregatedLedgerEntry',
-    toAccountBalance: '0',
-    fromAccountBalance: '0',
-  },
-  {
-    vegaTime: '2022-11-24T13:36:42.13989Z',
-    quantity: '9078407730948615',
-    assetId: 'cee709223217281d7893b650850ae8ee8a18b7539b5658f9b4cc24de95dd18ad',
-    transferType: Schema.TransferType.TRANSFER_TYPE_MARGIN_LOW,
-    toAccountType: Schema.AccountType.ACCOUNT_TYPE_GENERAL,
-    toAccountMarketId: null,
-    toAccountPartyId:
-      '2e1ef32e5804e14232406aebaad719087d326afa5c648b7824d0823d8a46c8d1',
-    fromAccountType: Schema.AccountType.ACCOUNT_TYPE_MARGIN,
-    fromAccountMarketId:
-      '0942d767cb2cb5a795e14216e8e53c2b6f75e46dc1732c5aeda8a5aba4ad193d',
-    fromAccountPartyId:
-      '2e1ef32e5804e14232406aebaad719087d326afa5c648b7824d0823d8a46c8d1',
-    __typename: 'AggregatedLedgerEntry',
-    toAccountBalance: '0',
-    fromAccountBalance: '0',
-  },
-
-  {
-    vegaTime: '2022-11-24T13:35:49.257039Z',
-    quantity: '263142253070974',
-    assetId: 'cee709223217281d7893b650850ae8ee8a18b7539b5658f9b4cc24de95dd18ad',
-    transferType: Schema.TransferType.TRANSFER_TYPE_MARGIN_LOW,
-    toAccountType: Schema.AccountType.ACCOUNT_TYPE_GENERAL,
-    toAccountMarketId: null,
-    toAccountPartyId:
-      '2e1ef32e5804e14232406aebaad719087d326afa5c648b7824d0823d8a46c8d1',
-    fromAccountType: Schema.AccountType.ACCOUNT_TYPE_MARGIN,
-    fromAccountMarketId:
-      '0942d767cb2cb5a795e14216e8e53c2b6f75e46dc1732c5aeda8a5aba4ad193d',
-    fromAccountPartyId:
-      '2e1ef32e5804e14232406aebaad719087d326afa5c648b7824d0823d8a46c8d1',
-    __typename: 'AggregatedLedgerEntry',
-    toAccountBalance: '0',
-    fromAccountBalance: '0',
-  },
-  {
-    vegaTime: '2022-11-24T12:41:22.054428Z',
-    quantity: '1000000000',
-    assetId: '4e4e80abff30cab933b8c4ac6befc618372eb76b2cbddc337eff0b4a3a4d25b8',
-    transferType: Schema.TransferType.TRANSFER_TYPE_DEPOSIT,
-    toAccountType: Schema.AccountType.ACCOUNT_TYPE_EXTERNAL,
-    toAccountMarketId: null,
-    toAccountPartyId: 'network',
-    fromAccountType: Schema.AccountType.ACCOUNT_TYPE_GENERAL,
-    fromAccountMarketId: null,
-    fromAccountPartyId:
-      '2e1ef32e5804e14232406aebaad719087d326afa5c648b7824d0823d8a46c8d1',
-    __typename: 'AggregatedLedgerEntry',
-    toAccountBalance: '0',
-    fromAccountBalance: '0',
-  },
-  {
-    vegaTime: '2022-11-24T12:39:11.516154Z',
-    quantity: '1000000000000',
-    assetId: 'c9fe6fc24fce121b2cc72680543a886055abb560043fda394ba5376203b7527d',
-    transferType: Schema.TransferType.TRANSFER_TYPE_DEPOSIT,
-    toAccountType: Schema.AccountType.ACCOUNT_TYPE_EXTERNAL,
-    toAccountMarketId: null,
-    toAccountPartyId: 'network',
-    fromAccountType: Schema.AccountType.ACCOUNT_TYPE_GENERAL,
-    fromAccountMarketId: null,
-    fromAccountPartyId:
-      '2e1ef32e5804e14232406aebaad719087d326afa5c648b7824d0823d8a46c8d1',
-    __typename: 'AggregatedLedgerEntry',
-    toAccountBalance: '0',
-    fromAccountBalance: '0',
-  },
-  {
-    vegaTime: '2022-11-24T12:37:26.832226Z',
-    quantity: '10000000000000000000000',
-    assetId: 'c9fe6fc24fce121b2cc72680543a886055abb560043fda394ba5376203b7527d',
-    transferType: Schema.TransferType.TRANSFER_TYPE_DEPOSIT,
-    toAccountType: Schema.AccountType.ACCOUNT_TYPE_EXTERNAL,
-    toAccountMarketId: null,
-    toAccountPartyId: 'network',
-    fromAccountType: Schema.AccountType.ACCOUNT_TYPE_GENERAL,
-    fromAccountMarketId: null,
-    fromAccountPartyId:
-      '2e1ef32e5804e14232406aebaad719087d326afa5c648b7824d0823d8a46c8d1',
-    __typename: 'AggregatedLedgerEntry',
-    toAccountBalance: '0',
-    fromAccountBalance: '0',
-  },
-  {
-    vegaTime: '2022-11-24T12:24:52.844901Z',
-    quantity: '49390000000000000000000',
-    assetId: 'c9fe6fc24fce121b2cc72680543a886055abb560043fda394ba5376203b7527d',
-    transferType: Schema.TransferType.TRANSFER_TYPE_DEPOSIT,
-    toAccountType: Schema.AccountType.ACCOUNT_TYPE_EXTERNAL,
-    toAccountMarketId: null,
-    toAccountPartyId: 'network',
-    fromAccountType: Schema.AccountType.ACCOUNT_TYPE_GENERAL,
-    fromAccountMarketId: null,
-    fromAccountPartyId:
-      '2e1ef32e5804e14232406aebaad719087d326afa5c648b7824d0823d8a46c8d1',
-    __typename: 'AggregatedLedgerEntry',
-    toAccountBalance: '0',
-    fromAccountBalance: '0',
-  },
-];
@@ -0,0 +1,215 @@
+import { render, screen, waitFor, fireEvent } from '@testing-library/react';
+import { createDownloadUrl, LedgerExportForm } from './ledger-export-form';
+import { formatForInput, toNanoSeconds } from '@vegaprotocol/utils';
+
+const vegaUrl = 'https://vega-url.co.uk/querystuff';
+
+const mockResponse = {
+  headers: { get: jest.fn() },
+  blob: () => '',
+};
+global.fetch = jest.fn().mockResolvedValue(mockResponse);
+
+const assetsMock = {
+  ['a'.repeat(64)]: 'symbol asset-id',
+  ['b'.repeat(64)]: 'symbol asset-id-2',
+};
+
+describe('LedgerExportForm', () => {
+  const partyId = 'c'.repeat(64);
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  beforeAll(() => {
+    jest.useFakeTimers().setSystemTime(new Date('2023-08-10T10:10:10.000Z'));
+  });
+
+  afterAll(() => {
+    jest.useRealTimers();
+  });
+
+  it('should be properly rendered', async () => {
+    render(
+      <LedgerExportForm
+        partyId={partyId}
+        vegaUrl={vegaUrl}
+        assets={assetsMock}
+      />
+    );
+    expect(screen.getByText('symbol asset-id')).toBeInTheDocument();
+
+    // userEvent does not work with faked timers
+    fireEvent.click(screen.getByTestId('ledger-download-button'));
+
+    expect(screen.getByTestId('download-spinner')).toBeInTheDocument();
+
+    await waitFor(() => {
+      expect(global.fetch).toHaveBeenCalledWith(
+        `https://vega-url.co.uk/api/v2/ledgerentry/export?partyId=${partyId}&assetId=${
+          Object.keys(assetsMock)[0]
+        }&dateRange.startTimestamp=1691057410000000000`
+      );
+    });
+    await waitFor(() => {
+      expect(screen.queryByTestId('download-spinner')).not.toBeInTheDocument();
+    });
+  });
+
+  it('assetID should be properly change request url', async () => {
+    render(
+      <LedgerExportForm
+        partyId={partyId}
+        vegaUrl={vegaUrl}
+        assets={assetsMock}
+      />
+    );
+    expect(screen.getByText('symbol asset-id')).toBeInTheDocument();
+
+    fireEvent.change(screen.getByTestId('select-ledger-asset'), {
+      target: { value: Object.keys(assetsMock)[1] },
+    });
+
+    expect(screen.getByText('symbol asset-id-2')).toBeInTheDocument();
+
+    fireEvent.click(screen.getByTestId('ledger-download-button'));
+
+    expect(screen.getByTestId('download-spinner')).toBeInTheDocument();
+
+    await waitFor(() => {
+      expect(global.fetch).toHaveBeenCalledWith(
+        `https://vega-url.co.uk/api/v2/ledgerentry/export?partyId=${partyId}&assetId=${
+          Object.keys(assetsMock)[1]
+        }&dateRange.startTimestamp=1691057410000000000`
+      );
+    });
+    await waitFor(() => {
+      expect(screen.queryByTestId('download-spinner')).not.toBeInTheDocument();
+    });
+  });
+
+  it('date-from should properly change request url', async () => {
+    const newDate = new Date(1691230210000);
+    render(
+      <LedgerExportForm
+        partyId={partyId}
+        vegaUrl={vegaUrl}
+        assets={assetsMock}
+      />
+    );
+    expect(screen.getByLabelText('Date from')).toBeInTheDocument();
+
+    fireEvent.change(screen.getByLabelText('Date from'), {
+      target: { value: formatForInput(newDate) },
+    });
+
+    expect(screen.getByTestId('date-from')).toHaveValue(
+      `${formatForInput(newDate)}.000`
+    );
+
+    fireEvent.click(screen.getByTestId('ledger-download-button'));
+
+    expect(screen.getByTestId('download-spinner')).toBeInTheDocument();
+
+    await waitFor(() => {
+      expect(global.fetch).toHaveBeenCalledWith(
+        `https://vega-url.co.uk/api/v2/ledgerentry/export?partyId=${partyId}&assetId=${
+          Object.keys(assetsMock)[0]
+        }&dateRange.startTimestamp=${toNanoSeconds(newDate)}`
+      );
+    });
+
+    await waitFor(() => {
+      expect(screen.queryByTestId('download-spinner')).not.toBeInTheDocument();
+    });
+  });
+
+  it('date-to should properly change request url', async () => {
+    const newDate = new Date(1691230210000);
+    render(
+      <LedgerExportForm
+        partyId={partyId}
+        vegaUrl={vegaUrl}
+        assets={assetsMock}
+      />
+    );
+
+    expect(screen.getByLabelText('Date to')).toBeInTheDocument();
+
+    fireEvent.change(screen.getByLabelText('Date to'), {
+      target: { value: formatForInput(newDate) },
+    });
+
+    expect(screen.getByTestId('date-to')).toHaveValue(
+      `${formatForInput(newDate)}.000`
+    );
+
+    fireEvent.click(screen.getByTestId('ledger-download-button'));
+
+    await waitFor(() => {
+      expect(global.fetch).toHaveBeenCalledWith(
+        `https://vega-url.co.uk/api/v2/ledgerentry/export?partyId=${partyId}&assetId=${
+          Object.keys(assetsMock)[0]
+        }&dateRange.startTimestamp=1691057410000000000&dateRange.endTimestamp=${toNanoSeconds(
+          newDate
+        )}`
+      );
+    });
+
+    await waitFor(() => {
+      expect(screen.queryByTestId('download-spinner')).not.toBeInTheDocument();
+    });
+  });
+});
+
+describe('createDownloadUrl', () => {
+  const fromTimestamp = 1690848000000;
+  const toTimestamp = 1691107200000;
+  const args = {
+    protohost: 'https://vega-url.co.uk',
+    partyId: 'a'.repeat(64),
+    assetId: 'b'.repeat(64),
+    dateFrom: new Date(fromTimestamp).toISOString(),
+  };
+
+  it('formats url with without an end date', () => {
+    expect(createDownloadUrl(args)).toEqual(
+      `${args.protohost}/api/v2/ledgerentry/export?partyId=${
+        args.partyId
+      }&assetId=${args.assetId}&dateRange.startTimestamp=${toNanoSeconds(
+        args.dateFrom
+      )}`
+    );
+  });
+
+  it('formats url with with an end date', () => {
+    const dateTo = new Date(toTimestamp).toISOString();
+    expect(
+      createDownloadUrl({
+        ...args,
+        dateTo,
+      })
+    ).toEqual(
+      `${args.protohost}/api/v2/ledgerentry/export?partyId=${
+        args.partyId
+      }&assetId=${args.assetId}&dateRange.startTimestamp=${toNanoSeconds(
+        args.dateFrom
+      )}&dateRange.endTimestamp=${toNanoSeconds(dateTo)}`
+    );
+  });
+
+  it('should throw if invalid args are provided', () => {
+    // invalid url
+    expect(() => {
+      // @ts-ignore override z.infer type
+      createDownloadUrl({ ...args, protohost: 'foo' });
+    }).toThrow();
+
+    // invalid partyId
+    expect(() => {
+      // @ts-ignore override z.infer type
+      createDownloadUrl({ ...args, partyId: 'z'.repeat(64) });
+    }).toThrow();
+  });
+});
@@ -0,0 +1,172 @@
+import { useRef, useState } from 'react';
+import { z } from 'zod';
+import {
+  Button,
+  Loader,
+  TradingFormGroup,
+  TradingInput,
+  TradingSelect,
+} from '@vegaprotocol/ui-toolkit';
+import { toNanoSeconds, VEGA_ID_REGEX } from '@vegaprotocol/utils';
+import { t } from '@vegaprotocol/i18n';
+import { localLoggerFactory } from '@vegaprotocol/logger';
+import { formatForInput } from '@vegaprotocol/utils';
+import { subDays } from 'date-fns';
+
+const DEFAULT_EXPORT_FILE_NAME = 'ledger_entries.csv';
+
+const getProtoHost = (vegaurl: string) => {
+  const loc = new URL(vegaurl);
+  return `${loc.protocol}//${loc.host}`;
+};
+
+const downloadSchema = z.object({
+  protohost: z.string().url().nonempty(),
+  partyId: z.string().regex(VEGA_ID_REGEX).nonempty(),
+  assetId: z.string().regex(VEGA_ID_REGEX).nonempty(),
+  dateFrom: z.string().nonempty(),
+  dateTo: z.string().optional(),
+});
+
+export const createDownloadUrl = (args: z.infer<typeof downloadSchema>) => {
+  // check args from form inputs
+  downloadSchema.parse(args);
+
+  const params = new URLSearchParams();
+  params.append('partyId', args.partyId);
+  params.append('assetId', args.assetId);
+  params.append('dateRange.startTimestamp', toNanoSeconds(args.dateFrom));
+
+  if (args.dateTo) {
+    params.append('dateRange.endTimestamp', toNanoSeconds(args.dateTo));
+  }
+
+  const url = new URL(args.protohost);
+  url.pathname = '/api/v2/ledgerentry/export';
+  url.search = params.toString();
+
+  return url.toString();
+};
+
+interface Props {
+  partyId: string;
+  vegaUrl: string;
+  assets: Record<string, string>;
+}
+
+export const LedgerExportForm = ({ partyId, vegaUrl, assets }: Props) => {
+  const now = useRef(new Date());
+  const [dateFrom, setDateFrom] = useState(() => {
+    return formatForInput(subDays(now.current, 7));
+  });
+  const [dateTo, setDateTo] = useState('');
+  const maxFromDate = formatForInput(new Date(dateTo || now.current));
+  const maxToDate = formatForInput(now.current);
+
+  const [isDownloading, setIsDownloading] = useState(false);
+  const [assetId, setAssetId] = useState(Object.keys(assets)[0]);
+  const protohost = getProtoHost(vegaUrl);
+  const disabled = Boolean(!assetId || isDownloading);
+
+  const assetDropDown = (
+    <TradingSelect
+      id="select-ledger-asset"
+      value={assetId}
+      onChange={(e) => {
+        setAssetId(e.target.value);
+      }}
+      className="w-full"
+      data-testid="select-ledger-asset"
+      disabled={isDownloading}
+    >
+      {Object.keys(assets).map((assetKey) => (
+        <option key={assetKey} value={assetKey}>
+          {assets[assetKey]}
+        </option>
+      ))}
+    </TradingSelect>
+  );
+
+  const startDownload = async (event: React.FormEvent<HTMLFormElement>) => {
+    event.preventDefault();
+    try {
+      const link = createDownloadUrl({
+        protohost,
+        partyId,
+        assetId,
+        dateFrom,
+        dateTo,
+      });
+      setIsDownloading(true);
+      const resp = await fetch(link);
+      const { headers } = resp;
+      const nameHeader = headers.get('content-disposition');
+      const filename = nameHeader?.split('=').pop() ?? DEFAULT_EXPORT_FILE_NAME;
+      const blob = await resp.blob();
+      if (blob) {
+        const link = document.createElement('a');
+        link.href = URL.createObjectURL(blob);
+        link.download = filename;
+        link.click();
+      }
+    } catch (err) {
+      localLoggerFactory({ application: 'ledger' }).error('Download file', err);
+    } finally {
+      setIsDownloading(false);
+    }
+  };
+
+  if (!protohost || Object.keys(assets).length === 0) {
+    return null;
+  }
+
+  return (
+    <form onSubmit={startDownload} className="p-4 w-[350px]">
+      <h2 className="mb-4">{t('Export ledger entries')}</h2>
+      <TradingFormGroup label={t('Select asset')} labelFor="asset">
+        {assetDropDown}
+      </TradingFormGroup>
+      <TradingFormGroup label={t('Date from')} labelFor="date-from">
+        <TradingInput
+          type="datetime-local"
+          data-testid="date-from"
+          id="date-from"
+          value={dateFrom}
+          onChange={(e) => setDateFrom(e.target.value)}
+          disabled={disabled}
+          max={maxFromDate}
+        />
+      </TradingFormGroup>
+      <TradingFormGroup label={t('Date to')} labelFor="date-to">
+        <TradingInput
+          type="datetime-local"
+          data-testid="date-to"
+          id="date-to"
+          value={dateTo}
+          onChange={(e) => setDateTo(e.target.value)}
+          disabled={disabled}
+          max={maxToDate}
+        />
+      </TradingFormGroup>
+      <div className="relative text-sm" title={t('Download all to .csv file')}>
+        {isDownloading && (
+          <div
+            className="absolute flex items-center justify-center w-full h-full"
+            data-testid="download-spinner"
+          >
+            <Loader size="small" />
+          </div>
+        )}
+        <Button
+          variant="primary"
+          fill
+          disabled={disabled}
+          type="submit"
+          data-testid="ledger-download-button"
+        >
+          {t('Download')}
+        </Button>
+      </div>
+    </form>
+  );
+};
@@ -1,85 +0,0 @@
-import { act, render, screen, waitFor } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import { LedgerExportLink } from './ledger-export-link';
-import * as Types from '@vegaprotocol/types';
-import { ledgerEntries } from './ledger-entries.mock';
-import type { LedgerEntry } from './ledger-entries-data-provider';
-
-const VEGA_URL = 'https://vega-url.co.uk/querystuff';
-const mockEnvironment = jest.fn(() => VEGA_URL);
-jest.mock('@vegaprotocol/environment', () => ({
-  useEnvironment: jest.fn(() => mockEnvironment()),
-}));
-
-const asset = {
-  id: 'assetID',
-  name: 'assetName',
-  symbol: 'assetSymbol',
-  decimals: 1,
-  quantum: '1',
-  status: Types.AssetStatus,
-  source: {
-    __typename: 'ERC20',
-    contractAddress: 'contractAddres',
-    lifetimeLimit: 'lifetimeLimit',
-    withdrawThreshold: 'withdraw',
-  },
-};
-
-describe('LedgerExportLink', () => {
-  const partyId = 'partyId';
-  const entries = ledgerEntries.map((entry) => {
-    return {
-      ...entry,
-      asset: entry.assetId
-        ? {
-            ...asset,
-            id: entry.assetId,
-            name: `name ${entry.assetId}`,
-            symbol: `symbol ${entry.assetId}`,
-          }
-        : null,
-      marketSender: null,
-      marketReceiver: null,
-    } as LedgerEntry;
-  });
-
-  it('should be properly rendered', async () => {
-    render(<LedgerExportLink partyId={partyId} entries={entries} />);
-    await waitFor(() => {
-      expect(screen.getByRole('link')).toBeInTheDocument();
-      expect(screen.getByRole('link')).toHaveAttribute(
-        'href',
-        `https://vega-url.co.uk/api/v2/ledgerentry/export?partyId=${partyId}&assetId=asset-id`
-      );
-      expect(
-        screen.getByRole('button', { name: /^symbol asset-id/ })
-      ).toBeInTheDocument();
-    });
-  });
-  it('should be properly change link url', async () => {
-    render(<LedgerExportLink partyId={partyId} entries={entries} />);
-    await waitFor(() => {
-      expect(
-        screen.getByRole('button', { name: /^symbol asset-id/ })
-      ).toBeInTheDocument();
-    });
-    act(() => {
-      userEvent.click(screen.getByRole('button', { name: /^symbol asset-id/ }));
-    });
-    await waitFor(() => {
-      expect(screen.getByRole('menu')).toBeInTheDocument();
-    });
-    act(() => {
-      userEvent.click(
-        screen.getByRole('menuitem', { name: /^symbol asset-id-2/ })
-      );
-    });
-    await waitFor(() => {
-      expect(screen.getByRole('link')).toHaveAttribute(
-        'href',
-        `https://vega-url.co.uk/api/v2/ledgerentry/export?partyId=${partyId}&assetId=asset-id-2`
-      );
-    });
-  });
-});
@@ -1,71 +0,0 @@
-import type { LedgerEntry } from './ledger-entries-data-provider';
-import { useMemo, useState } from 'react';
-import { useEnvironment } from '@vegaprotocol/environment';
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuTrigger,
-  Link,
-  Button,
-} from '@vegaprotocol/ui-toolkit';
-import { t } from '@vegaprotocol/i18n';
-
-const getProtoHost = (vegaurl: string) => {
-  const loc = new URL(vegaurl);
-  return `${loc.protocol}//${loc.host}`;
-};
-
-export const LedgerExportLink = ({
-  partyId,
-  entries,
-}: {
-  partyId: string;
-  entries: LedgerEntry[];
-}) => {
-  const assets = entries.reduce((aggr, item) => {
-    if (item.asset && !(item.asset.id in aggr)) {
-      aggr[item.asset.id] = item.asset.symbol;
-    }
-    return aggr;
-  }, {} as Record<string, string>);
-  const [assetId, setAssetId] = useState(Object.keys(assets)[0]);
-  const VEGA_URL = useEnvironment((store) => store.VEGA_URL);
-  const protohost = VEGA_URL ? getProtoHost(VEGA_URL) : '';
-
-  const assetDropDown = useMemo(() => {
-    return (
-      <DropdownMenu
-        trigger={<DropdownMenuTrigger>{assets[assetId]}</DropdownMenuTrigger>}
-      >
-        <DropdownMenuContent>
-          {Object.keys(assets).map((assetKey) => (
-            <DropdownMenuItem
-              key={assetKey}
-              onSelect={() => setAssetId(assetKey)}
-            >
-              {assets[assetKey]}
-            </DropdownMenuItem>
-          ))}
-        </DropdownMenuContent>
-      </DropdownMenu>
-    );
-  }, [assetId, assets]);
-
-  if (!protohost || !entries || entries.length === 0) {
-    return null;
-  }
-  return (
-    <div className="flex shrink items-stretch gap-2 p-2">
-      <div className="flex items-center">Export all</div>
-      {assetDropDown}
-      <Link
-        className="text-sm"
-        title={t('Download all to .csv file')}
-        href={`${protohost}/api/v2/ledgerentry/export?partyId=${partyId}&assetId=${assetId}`}
-      >
-        <Button size="sm">{t('Download')}</Button>
-      </Link>
-    </div>
-  );
-};
@@ -1,73 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import type * as Schema from '@vegaprotocol/types';
-import type { FilterChangedEvent } from 'ag-grid-community';
-import { useCallback, useState, useMemo } from 'react';
-import { subDays, formatRFC3339 } from 'date-fns';
-import { ledgerEntriesProvider } from './ledger-entries-data-provider';
-import type { LedgerEntriesQueryVariables } from './__generated__/LedgerEntries';
-import { LedgerTable } from './ledger-table';
-import { useDataProvider } from '@vegaprotocol/data-provider';
-import type * as Types from '@vegaprotocol/types';
-import { LedgerExportLink } from './ledger-export-link';
-import type { useDataGridEvents } from '@vegaprotocol/datagrid';
-
-export interface Filter {
-  vegaTime?: {
-    value: Schema.DateRange;
-  };
-  fromAccountType?: { value: Types.AccountType[] };
-  toAccountType?: { value: Types.AccountType[] };
-}
-const defaultFilter = {
-  vegaTime: {
-    value: { start: formatRFC3339(subDays(Date.now(), 7)) },
-  },
-};
-
-export const LedgerManager = ({
-  partyId,
-  gridProps,
-}: {
-  partyId: string;
-  gridProps: ReturnType<typeof useDataGridEvents>;
-}) => {
-  const [filter, setFilter] = useState<Filter>(defaultFilter);
-
-  const variables = useMemo<LedgerEntriesQueryVariables>(
-    () => ({
-      partyId,
-      dateRange: filter?.vegaTime?.value,
-      pagination: {
-        first: 10,
-      },
-    }),
-    [partyId, filter?.vegaTime?.value]
-  );
-
-  const { data, error } = useDataProvider({
-    dataProvider: ledgerEntriesProvider,
-    variables,
-    skip: !variables.partyId,
-  });
-
-  const onFilterChanged = useCallback(
-    (event: FilterChangedEvent) => {
-      const updatedFilter = { ...defaultFilter, ...event.api.getFilterModel() };
-      setFilter(updatedFilter);
-      gridProps.onFilterChanged(event);
-    },
-    [gridProps]
-  );
-
-  return (
-    <div className="h-full relative">
-      <LedgerTable
-        rowData={data}
-        overlayNoRowsTemplate={error ? error.message : t('No entries')}
-        {...gridProps}
-        onFilterChanged={onFilterChanged}
-      />
-      {data && <LedgerExportLink entries={data} partyId={partyId} />}
-    </div>
-  );
-};
@@ -1,215 +0,0 @@
-import {
-  addDecimalsFormatNumber,
-  fromNanoSeconds,
-  getDateTimeFormat,
-  truncateByChars,
-} from '@vegaprotocol/utils';
-import { t } from '@vegaprotocol/i18n';
-import type {
-  VegaValueFormatterParams,
-  TypedDataAgGrid,
-} from '@vegaprotocol/datagrid';
-import {
-  AgGridLazy as AgGrid,
-  DateRangeFilter,
-  MarketNameCell,
-  SetFilter,
-} from '@vegaprotocol/datagrid';
-import type * as Types from '@vegaprotocol/types';
-import type { ColDef } from 'ag-grid-community';
-import type { Market } from '@vegaprotocol/markets';
-import {
-  AccountTypeMapping,
-  DescriptionTransferTypeMapping,
-  TransferTypeMapping,
-} from '@vegaprotocol/types';
-import type { LedgerEntry } from './ledger-entries-data-provider';
-import { useMemo } from 'react';
-import { formatRFC3339, subDays } from 'date-fns';
-
-export const TransferTooltipCellComponent = ({
-  value,
-}: {
-  value: Types.TransferType;
-}) => {
-  return (
-    <p className="max-w-sm px-4 py-2 z-20 rounded text-sm break-word">
-      {value ? DescriptionTransferTypeMapping[value] : ''}
-    </p>
-  );
-};
-
-const defaultValue = { start: formatRFC3339(subDays(Date.now(), 7)) };
-const dateRangeFilterParams = {
-  maxNextDays: 0,
-  defaultValue,
-};
-const defaultColDef = {
-  resizable: true,
-  sortable: true,
-  tooltipComponent: TransferTooltipCellComponent,
-  filterParams: {
-    ...dateRangeFilterParams,
-    buttons: ['reset'],
-  },
-};
-
-type LedgerEntryProps = TypedDataAgGrid<LedgerEntry>;
-
-export const LedgerTable = (props: LedgerEntryProps) => {
-  const columnDefs = useMemo<ColDef[]>(
-    () => [
-      {
-        headerName: t('Sender'),
-        field: 'fromAccountPartyId',
-        cellRenderer: ({
-          value,
-        }: VegaValueFormatterParams<LedgerEntry, 'fromAccountPartyId'>) =>
-          truncateByChars(value || ''),
-      },
-      {
-        headerName: t('Account type'),
-        filter: SetFilter,
-        filterParams: {
-          set: AccountTypeMapping,
-        },
-        field: 'fromAccountType',
-        cellRenderer: ({
-          value,
-        }: VegaValueFormatterParams<LedgerEntry, 'fromAccountType'>) =>
-          value ? AccountTypeMapping[value] : '-',
-      },
-      {
-        headerName: t('Market'),
-        field: 'marketSender.tradableInstrument.instrument.code',
-        cellRenderer: ({
-          value,
-          data,
-        }: VegaValueFormatterParams<
-          LedgerEntry,
-          'marketSender.tradableInstrument.instrument.code'
-        >) =>
-          value && (
-            <MarketNameCell value={value} data={data?.marketSender as Market} />
-          ),
-      },
-      {
-        headerName: t('Receiver'),
-        field: 'toAccountPartyId',
-        cellRenderer: ({
-          value,
-        }: VegaValueFormatterParams<LedgerEntry, 'toAccountPartyId'>) =>
-          truncateByChars(value || ''),
-      },
-      {
-        headerName: t('Account type'),
-        filter: SetFilter,
-        filterParams: {
-          set: AccountTypeMapping,
-        },
-        field: 'toAccountType',
-        cellRenderer: ({
-          value,
-        }: VegaValueFormatterParams<LedgerEntry, 'toAccountType'>) =>
-          value ? AccountTypeMapping[value] : '-',
-      },
-      {
-        headerName: t('Market'),
-        field: 'marketReceiver.tradableInstrument.instrument.code',
-        cellRenderer: ({
-          value,
-          data,
-        }: VegaValueFormatterParams<
-          LedgerEntry,
-          'marketReceiver.tradableInstrument.instrument.code'
-        >) =>
-          value && (
-            <MarketNameCell
-              value={value}
-              data={data?.marketReceiver as Market}
-            />
-          ),
-      },
-      {
-        headerName: t('Transfer type'),
-        field: 'transferType',
-        tooltipField: 'transferType',
-        filter: SetFilter,
-        filterParams: {
-          set: TransferTypeMapping,
-        },
-        valueFormatter: ({
-          value,
-        }: VegaValueFormatterParams<LedgerEntry, 'transferType'>) =>
-          value ? TransferTypeMapping[value] : '',
-      },
-      {
-        headerName: t('Quantity'),
-        field: 'quantity',
-        valueFormatter: ({
-          value,
-          data,
-        }: VegaValueFormatterParams<LedgerEntry, 'quantity'>) => {
-          const assetDecimalPlaces = data?.asset?.decimals || 0;
-          return value
-            ? addDecimalsFormatNumber(value, assetDecimalPlaces)
-            : '';
-        },
-      },
-      {
-        headerName: t('Asset'),
-        field: 'assetId',
-        valueFormatter: ({
-          value,
-          data,
-        }: VegaValueFormatterParams<LedgerEntry, 'asset'>) =>
-          data?.asset?.symbol || '',
-      },
-      {
-        headerName: t('Sender account balance'),
-        field: 'fromAccountBalance',
-        valueFormatter: ({
-          value,
-          data,
-        }: VegaValueFormatterParams<LedgerEntry, 'fromAccountBalance'>) => {
-          const assetDecimalPlaces = data?.asset?.decimals || 0;
-          return value
-            ? addDecimalsFormatNumber(value, assetDecimalPlaces)
-            : '';
-        },
-      },
-      {
-        headerName: t('Receiver account balance'),
-        field: 'toAccountBalance',
-        valueFormatter: ({
-          value,
-          data,
-        }: VegaValueFormatterParams<LedgerEntry, 'toAccountBalance'>) => {
-          const assetDecimalPlaces = data?.asset?.decimals || 0;
-          return value
-            ? addDecimalsFormatNumber(value, assetDecimalPlaces)
-            : '';
-        },
-      },
-      {
-        headerName: t('Vega time'),
-        field: 'vegaTime',
-        valueFormatter: ({
-          value,
-        }: VegaValueFormatterParams<LedgerEntry, 'vegaTime'>) =>
-          value ? getDateTimeFormat().format(fromNanoSeconds(value)) : '-',
-        filterParams: dateRangeFilterParams,
-        filter: DateRangeFilter,
-      },
-    ],
-    []
-  );
-  return (
-    <AgGrid
-      tooltipShowDelay={500}
-      defaultColDef={defaultColDef}
-      columnDefs={columnDefs}
-      {...props}
-    />
-  );
-};
@@ -26,22 +26,36 @@ export const ProtocolUpgradeInProgressNotification = () => {
  const [nextUpgrade] = useLocalStorageSnapshot(
    NEXT_PROTOCOL_UPGRADE_PROPOSAL_SNAPSHOT
  );
-  const { blocksRising, block } = useBlockRising();
  const detailsLink = useProtocolUpgradeProposalLink();

  let vegaReleaseTag: string | undefined;
  let upgradeBlockHeight: string | undefined;

-  if (error && !data && nextUpgrade && ALLOW_STORED_PROPOSAL_DATA) {
+  const hasData = data && !error;
+  const hasStoredData = nextUpgrade && ALLOW_STORED_PROPOSAL_DATA;
+
+  if (hasData) {
+    // gets tag and height from the data api
+    vegaReleaseTag = data.vegaReleaseTag;
+    upgradeBlockHeight = data.upgradeBlockHeight;
+  } else if (hasStoredData) {
+    // gets tag and height from stored value if data api is unavailable
    try {
      const stored = JSON.parse(nextUpgrade) as StoredNextProtocolUpgradeData;
      vegaReleaseTag = stored.vegaReleaseTag;
      upgradeBlockHeight = stored.upgradeBlockHeight;
    } catch {
-      // no op
+      // NOOP - could not parse stored data
    }
  }

+  const hasUpgradeInfo = vegaReleaseTag && upgradeBlockHeight;
+
+  const { blocksRising, block } = useBlockRising(
+    // skips querying blocks if there's no upgrade information available
+    !hasUpgradeInfo
+  );
+
  /**
   * If upgrade is in progress then none of the nodes should produce blocks,
   * same should be with the tendermint block info otherwise it's a network
@@ -50,10 +64,7 @@ export const ProtocolUpgradeInProgressNotification = () => {
   * Once the networks is back then the notification disappears.
   */
  const upgradeInProgress =
-    vegaReleaseTag &&
-    upgradeBlockHeight &&
-    !blocksRising &&
-    block <= Number(upgradeBlockHeight);
+    hasUpgradeInfo && !blocksRising && block <= Number(upgradeBlockHeight);

  if (!upgradeInProgress) return null;

@@ -15,31 +15,33 @@ const CHECK_INTERVAL = 5000; // ms
 */
 const ALLOW_STALE = 2; // times -> MAX(this, 1) * CHECK_INTERVAL ~> min check time

-export const useBlockRising = () => {
+export const useBlockRising = (skip = false) => {
  const [blocksRising, setBlocksRising] = useState(true);
  const [block, setBlock] = useState(0);
  const nodes = useEnvironment((state) => state.nodes);
  const clients = useMemo(() => {
-    return nodes.map(
-      (n) =>
-        n &&
-        n.length > 0 &&
-        createClient({
+    return nodes.map((n) => {
+      if (n && n.length > 0) {
+        const client = createClient({
          url: n,
          cacheConfig: undefined,
          retry: false,
          connectToDevTools: false,
          connectToHeaderStore: true,
-        })
-    );
+        });
+        return client;
+      }
+      return undefined;
+    });
  }, [nodes]);

  const { refetch: fetchBlockInfo } = useBlockInfo();
  useEffect(() => {
+    if (skip) return;
    let stale = 0;
    let prev = 0;
    const check = async () => {
-      const queries = clients.map((client, index) =>
+      const queries = clients.map((client) =>
        client
          ? client
              .query<BlockStatisticsQuery>({
@@ -47,18 +49,16 @@ export const useBlockRising = () => {
                fetchPolicy: 'network-only',
                errorPolicy: 'ignore',
              })
-              .catch((err) =>
-                Promise.reject(
-                  `could not retrieve statistics from ${nodes[index]}`
-                )
-              )
+              .catch(() => {
+                // NOOP - could not retrieve statistics for that node (network error)
+              })
          : undefined
      );

      const blockInfo = await fetchBlockInfo();
      const results = (await Promise.allSettled(compact(queries))).map(
        (res) => {
-          if (res && res.status === 'fulfilled') {
+          if (res && res.status === 'fulfilled' && res.value) {
            return res.value.data.statistics;
          } else {
            return undefined;
@@ -86,7 +86,7 @@ export const useBlockRising = () => {
    return () => {
      clearInterval(interval);
    };
-  }, [clients, fetchBlockInfo, blocksRising, nodes]);
+  }, [clients, fetchBlockInfo, blocksRising, nodes, skip]);

  return { blocksRising, block };
 };
@@ -1,14 +1,9 @@
 import { BigNumber } from 'bignumber.js';
-import {
-  getUserLocale,
-  formatNumber,
-  getUnlimitedThreshold,
-} from '@vegaprotocol/utils';
+import { getUserLocale, formatNumber } from '@vegaprotocol/utils';

 const INFINITY = '∞';
 const DEFAULT_COMPACT_ABOVE = 1_000_000;
 const DEFAULT_COMPACT_CAP = new BigNumber(1e24);
-
 /**
 * Compacts given number to human readable format.
 * @param number
@@ -40,10 +35,6 @@ export const CompactNumber = ({
  const decimalPlaces =
    (decimals === 'infer' ? number.decimalPlaces() : decimals) || 0;

-  if (number.isGreaterThan(getUnlimitedThreshold(decimalPlaces))) {
-    return <span data-testid={testId}>{INFINITY}</span>;
-  }
-
  if (number.isLessThan(DEFAULT_COMPACT_ABOVE)) {
    return (
      <span data-testid={testId}>{formatNumber(number, decimalPlaces)}</span>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
asiaznik	d3f5c2fc32	fix(proposals): protocol upgrade notification block querying	2023-08-31 13:48:25 +02:00
Bartłomiej Głownia	a8c2f4e025	feat(deal-ticket): update deal ticket submit buttons (#4635 )	2023-08-31 11:54:52 +02:00
Matthew Russell	2cea73c567	chore(wallet): prepare wallet lib for publishing (#4638 )	2023-08-30 19:40:04 -07:00
Edd	b0a54be408	fix(explorer): format iceberg size according to market (#4612 )	2023-08-30 09:39:49 +01:00
Matthew Russell	d1a036e53c	chore(trading,governance,explorer): update pr template to not close issues (#4645 )	2023-08-29 08:54:09 -07:00
MaciekandMatthew Russell	9ac199f59a	chore(ledger): remove ledger entries table, adjust download form (#4611 ) Co-authored-by: Matthew Russell <mattrussell36@gmail.com>	2023-08-29 06:57:02 -07:00
Edd	332cc302c3	feat(explorer): add stop order view (#4418 )	2023-08-29 12:24:22 +02:00
Edd	4da0e9c368	fix(explorer): correctly display data source matches (#4631 )	2023-08-29 12:23:55 +02:00
Joe Tsang	13e1f99767	test(governance): successor market proposal changes (#4632 )	2023-08-29 09:47:59 +01:00
ArtandMatthew Russell	5c18c898b0	feat(wallet): metamask snaps (#4621 ) Co-authored-by: Matthew Russell <mattrussell36@gmail.com>	2023-08-28 18:51:58 -07:00
Matthew Russell	4fe81cc4aa	fix(trading): update fonts for pennant (#4636 )	2023-08-28 10:02:32 -07:00