fix: skip flaky test

.github/workflows/add_issue_new_projects.yml

@@ -6,7 +6,7 @@ name: 'Add Issues To Project Board'
     types:
       - opened
 env:
-  GH_TOKEN: ${{ secrets.PROJECT_MANAGE_ACTION }}
+  GH_TOKEN: ${{ secrets.GH_NEW_CARD_TO_PROJECT }}
   PROJECT_ID: ${{ secrets.FRONT_END_PROJECT_ID }}
   ISSUE_ID: ${{ github.event.issue.node_id }}
   USER: ${{ github.actor }}

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

@@ -40,7 +40,7 @@ context.skip('Transactions page', function () {
             .first()
             .click({ force: true });
         } else {
-          cy.log('Unable to find any transactions on page');
+          cy.slack('Unable to find any transactions on page');
           cy.screenshot();
         }
       });
@@ -78,7 +78,7 @@ context.skip('Transactions page', function () {
               }
             });
         } else {
-          cy.log('Unable to find any transactions on page');
+          cy.slack('Unable to find any transactions on page');
           cy.screenshot();
         }
       });

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

@@ -54,7 +54,7 @@ export const PartyBlockStake = ({
       {p?.stakingSummary.currentStakeAvailable ? (
         <KeyValueTable>
           <KeyValueTableRow noBorder={true}>
-            <div>{t('Associated to key')}</div>
+            <div>{t('Available stake')}</div>
             <div>
               <GovernanceAssetBalance
                 price={p.stakingSummary.currentStakeAvailable}
@@ -62,7 +62,7 @@ export const PartyBlockStake = ({
             </div>
           </KeyValueTableRow>
           <KeyValueTableRow noBorder={true}>
-            <div>{t('Staked to validator')}</div>
+            <div>{t('Active stake')}</div>
             <div>
               <GovernanceAssetBalance price={linkedStake || '0'} />
             </div>

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

@@ -369,10 +369,6 @@ describe('Closed markets', { tags: '@smoke' }, () => {
       .first()
       .find('button svg')
       .should('exist');
-    cy.get(rowSelector)
-      .find('[col-id="successorMarketID"]')
-      .first()
-      .should('have.text', ' - ');
   });
 
   // test market list for market in terminated state

apps/trading-e2e/src/integration/order-book.cy.ts

@@ -9,7 +9,6 @@ const bidCumulative = 'cumulative-vol-9889001';
 const midPrice = 'middle-mark-price-4612690000';
 const priceResolution = 'resolution';
 const dealTicketPrice = 'order-price';
-const dealTicketSize = 'order-size';
 const resPrice = 'price-990';
 
 describe('order book', { tags: '@smoke' }, () => {
@@ -75,18 +74,6 @@ describe('order book', { tags: '@smoke' }, () => {
     cy.getByTestId(dealTicketPrice).should('have.value', '98.94585');
   });
 
-  it('copy size to deal ticket form', () => {
-    // 6003-ORDB-009
-    cy.getByTestId(bidCumulative).click();
-    cy.getByTestId(dealTicketSize).should('have.value', '7');
-  });
-
-  it('copy size to deal ticket form', () => {
-    // 6003-ORDB-009
-    cy.getByTestId(bidVolume).click();
-    cy.getByTestId(dealTicketSize).should('have.value', '1');
-  });
-
   it('change price resolution', () => {
     // 6003-ORDB-008
     const resolutions = [

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

@@ -50,7 +50,7 @@ describe('Portfolio page', { tags: '@smoke' }, () => {
       cy.get('fieldset.ag-simple-filter-body-wrapper')
         .should('be.visible')
         .within((fields) => {
-          cy.wrap(fields).find('label').should('have.length', 18);
+          cy.wrap(fields).find('label').should('have.length', 17);
         });
       cy.getByTestId('"Ledger entries"').click();
       cy.get('fieldset.ag-simple-filter-body-wrapper').should('not.exist');

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

@@ -1,5 +1,4 @@
-import { act, render, screen, within, waitFor } from '@testing-library/react';
-import { MemoryRouter } from 'react-router-dom';
+import { act, render, screen, within } from '@testing-library/react';
 import { Closed } from './closed';
 import { MarketStateMapping, PropertyKeyType } from '@vegaprotocol/types';
 import { PositionStatus } from '@vegaprotocol/types';
@@ -212,22 +211,15 @@ describe('Closed', () => {
   it('renders correctly formatted and filtered rows', async () => {
     await act(async () => {
       render(
-        <MemoryRouter>
-          <MockedProvider
-            mocks={[
-              marketsMock,
-              marketsDataMock,
-              positionsMock,
-              oracleDataMock,
-            ]}
+        <MockedProvider
+          mocks={[marketsMock, marketsDataMock, positionsMock, oracleDataMock]}
+        >
+          <VegaWalletContext.Provider
+            value={{ pubKey } as VegaWalletContextShape}
           >
-            <VegaWalletContext.Provider
-              value={{ pubKey } as VegaWalletContextShape}
-            >
-              <Closed />
-            </VegaWalletContext.Provider>
-          </MockedProvider>
-        </MemoryRouter>
+            <Closed />
+          </VegaWalletContext.Provider>
+        </MockedProvider>
       );
     });
     // screen.debug(document, Infinity);
@@ -238,7 +230,6 @@ describe('Closed', () => {
       'Description',
       'Status',
       'Settlement date',
-      'Successor market',
       'Best bid',
       'Best offer',
       'Mark price',
@@ -256,7 +247,6 @@ describe('Closed', () => {
       market.tradableInstrument.instrument.name,
       MarketStateMapping[market.state],
       '3 days ago',
-      '-',
       /* eslint-disable @typescript-eslint/no-non-null-assertion */
       addDecimalsFormatNumber(marketsData.bestBidPrice, market.decimalPlaces),
       addDecimalsFormatNumber(
@@ -325,22 +315,20 @@ describe('Closed', () => {
     };
     await act(async () => {
       render(
-        <MemoryRouter>
-          <MockedProvider
-            mocks={[
-              mixedMarketsMock,
-              marketsDataMock,
-              positionsMock,
-              oracleDataMock,
-            ]}
+        <MockedProvider
+          mocks={[
+            mixedMarketsMock,
+            marketsDataMock,
+            positionsMock,
+            oracleDataMock,
+          ]}
+        >
+          <VegaWalletContext.Provider
+            value={{ pubKey } as VegaWalletContextShape}
           >
-            <VegaWalletContext.Provider
-              value={{ pubKey } as VegaWalletContextShape}
-            >
-              <Closed />
-            </VegaWalletContext.Provider>
-          </MockedProvider>
-        </MemoryRouter>
+            <Closed />
+          </VegaWalletContext.Provider>
+        </MockedProvider>
       );
     });
 
@@ -371,74 +359,4 @@ describe('Closed', () => {
       });
     expect(cells).toEqual(expectedRows.map((m) => m.node.id));
   });
-
-  it('successor marked should be visible', async () => {
-    const mixedMarkets = [
-      {
-        __typename: 'MarketEdge' as const,
-        node: createMarketFragment({
-          id: 'include-0',
-          state: MarketState.STATE_SETTLED,
-          successorMarketID: 'successorMarketID',
-        }),
-      },
-      {
-        __typename: 'MarketEdge' as const,
-        node: {
-          ...createMarketFragment({
-            id: 'successorMarketID',
-            state: MarketState.STATE_ACTIVE,
-          }),
-          tradableInstrument: {
-            ...createMarketFragment().tradableInstrument,
-            instrument: {
-              ...createMarketFragment().tradableInstrument.instrument,
-              id: 'successorAssset',
-              name: 'Successor Market Name',
-              code: 'SuccessorCode',
-            },
-          },
-        },
-      },
-    ];
-
-    const mixedMarketsMock: MockedResponse<MarketsQuery> = {
-      request: {
-        query: MarketsDocument,
-      },
-      result: {
-        data: {
-          marketsConnection: {
-            __typename: 'MarketConnection',
-            edges: mixedMarkets,
-          },
-        },
-      },
-    };
-
-    render(
-      <MemoryRouter>
-        <MockedProvider
-          mocks={[
-            mixedMarketsMock,
-            marketsDataMock,
-            positionsMock,
-            oracleDataMock,
-          ]}
-        >
-          <VegaWalletContext.Provider
-            value={{ pubKey } as VegaWalletContextShape}
-          >
-            <Closed />
-          </VegaWalletContext.Provider>
-        </MockedProvider>
-      </MemoryRouter>
-    );
-
-    await waitFor(() => {
-      expect(
-        screen.getByRole('button', { name: 'SuccessorCode' })
-      ).toBeInTheDocument();
-    });
-  });
 });

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

@@ -4,11 +4,7 @@ import type {
   VegaICellRendererParams,
   VegaValueFormatterParams,
 } from '@vegaprotocol/datagrid';
-import {
-  AgGridLazy as AgGrid,
-  COL_DEFS,
-  MarketNameCell,
-} from '@vegaprotocol/datagrid';
+import { AgGridLazy as AgGrid, COL_DEFS } from '@vegaprotocol/datagrid';
 import { useMemo } from 'react';
 import { t } from '@vegaprotocol/i18n';
 import { MarketState, MarketStateMapping } from '@vegaprotocol/types';
@@ -24,7 +20,6 @@ import type {
 import {
   MarketActionsDropdown,
   closedMarketsWithDataProvider,
-  marketProvider,
 } from '@vegaprotocol/markets';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
@@ -32,7 +27,6 @@ import type { ColDef } from 'ag-grid-community';
 import { SettlementDateCell } from './settlement-date-cell';
 import { SettlementPriceCell } from './settlement-price-cell';
 import { useDataProvider } from '@vegaprotocol/data-provider';
-import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';
 
 type SettlementAsset =
   MarketMaybeWithData['tradableInstrument']['instrument']['product']['settlementAsset'];
@@ -54,7 +48,6 @@ interface Row {
   tradingTerminationOracleId: string;
   settlementAsset: SettlementAsset;
   realisedPNL: string | undefined;
-  successorMarketID: string | undefined | null;
 }
 
 export const Closed = () => {
@@ -116,7 +109,6 @@ export const Closed = () => {
         instrument.product.dataSourceSpecForTradingTermination.id,
       settlementAsset: instrument.product.settlementAsset,
       realisedPNL: position?.node.realisedPNL,
-      successorMarketID: market.successorMarketID,
     };
 
     return row;
@@ -128,28 +120,6 @@ export const Closed = () => {
   );
 };
 
-export const SuccessorMarketRenderer = ({
-  value,
-}: VegaICellRendererParams<Row, 'successorMarketID'>) => {
-  const { data } = useDataProvider({
-    dataProvider: marketProvider,
-    variables: {
-      marketId: value || '',
-    },
-    skip: !value,
-  });
-  const onMarketClick = useMarketClickHandler();
-  return data ? (
-    <MarketNameCell
-      value={data.tradableInstrument.instrument.code}
-      data={data}
-      onMarketClick={onMarketClick}
-    />
-  ) : (
-    ' - '
-  );
-};
-
 const ClosedMarketsDataGrid = ({
   rowData,
   error,
@@ -229,11 +199,6 @@ const ClosedMarketsDataGrid = ({
           },
         },
       },
-      {
-        headerName: t('Successor market'),
-        field: 'successorMarketID',
-        cellRenderer: 'SuccessorMarketRenderer',
-      },
       {
         headerName: t('Best bid'),
         field: 'bestBidPrice',
@@ -346,9 +311,7 @@ const ClosedMarketsDataGrid = ({
       defaultColDef={{
         resizable: true,
         minWidth: 100,
-        flex: 1,
       }}
-      components={{ SuccessorMarketRenderer }}
       overlayNoRowsTemplate={error ? error.message : t('No markets')}
     />
   );

libs/cypress/src/index.ts

@@ -3,6 +3,7 @@ import { addMockGQLCommand } from './lib/mock-gql';
 import { addMockSubscription } from './lib/mock-ws';
 import { addMockWalletCommand } from './lib/mock-rest';
 import { addMockWeb3ProviderCommand } from './lib/commands/mock-web3-provider';
+import { addSlackCommand } from './lib/commands/slack';
 import { addHighlightLog } from './lib/commands/highlight-log';
 import { addGetAssets } from './lib/commands/get-assets';
 import { addVegaWalletReceiveFaucetedAsset } from './lib/commands/vega-wallet-receive-fauceted-asset';
@@ -25,6 +26,7 @@ import { addVegaWalletTopUpRewardsPool } from './lib/commands/vega-wallet-top-up
 import { addAssociateTokensToVegaWallet } from './lib/commands/associate-tokens-to-vega-wallet';
 
 addGetTestIdcommand();
+addSlackCommand();
 addMockGQLCommand();
 addMockSubscription();
 addMockWalletCommand();

libs/cypress/src/lib/commands/slack.ts

@@ -0,0 +1,28 @@
+declare global {
+  // eslint-disable-next-line @typescript-eslint/no-namespace
+  namespace Cypress {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    interface Chainable<Subject> {
+      slack(message: string): void;
+    }
+  }
+}
+
+export function addSlackCommand() {
+  // @ts-ignore - ignoring Cypress type error which gets resolved when Cypress uses the command
+  Cypress.Commands.add('slack', (message) => {
+    const text = `${message}: ${JSON.stringify(Cypress.spec)}`;
+
+    cy.log('NOTIFYING SLACK');
+
+    const webhook = Cypress.env('SLACK_WEBHOOK');
+
+    if (!webhook) {
+      return;
+    }
+
+    cy.request('POST', webhook, {
+      text,
+    });
+  });
+}

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

@@ -1,195 +0,0 @@
-import { Controller, type Control } from 'react-hook-form';
-import type { Market } from '@vegaprotocol/markets';
-import type { OrderObj } from '@vegaprotocol/orders';
-import type { OrderFormFields } from '../../hooks/use-order-form';
-import { toDecimal, validateAmount } from '@vegaprotocol/utils';
-import { t } from '@vegaprotocol/i18n';
-import {
-  FormGroup,
-  Input,
-  InputError,
-  Tooltip,
-} from '@vegaprotocol/ui-toolkit';
-
-export interface DealTicketSizeIcebergProps {
-  control: Control<OrderFormFields>;
-  market: Market;
-  peakSizeError?: string;
-  minimumVisibleSizeError?: string;
-  update: (obj: Partial<OrderObj>) => void;
-  peakSize: string;
-  minimumVisibleSize: string;
-  size: string;
-}
-
-export const DealTicketSizeIceberg = ({
-  control,
-  market,
-  update,
-  peakSizeError,
-  minimumVisibleSizeError,
-  peakSize,
-  minimumVisibleSize,
-  size,
-}: DealTicketSizeIcebergProps) => {
-  const sizeStep = toDecimal(market?.positionDecimalPlaces);
-
-  const renderPeakSizeError = () => {
-    if (peakSizeError) {
-      return (
-        <InputError testId="deal-ticket-peak-error-message-size-limit">
-          {peakSizeError}
-        </InputError>
-      );
-    }
-
-    return null;
-  };
-
-  const renderMinimumSizeError = () => {
-    if (minimumVisibleSizeError) {
-      return (
-        <InputError testId="deal-ticket-minimum-error-message-size-limit">
-          {minimumVisibleSizeError}
-        </InputError>
-      );
-    }
-
-    return null;
-  };
-
-  return (
-    <div className="mb-2">
-      <div className="flex items-center gap-4">
-        <div className="flex-1">
-          <FormGroup
-            label={
-              <Tooltip
-                description={
-                  <div>
-                    {t(
-                      'The maximum volume that can be traded at once. Must be less than the total size of the order.'
-                    )}
-                  </div>
-                }
-              >
-                <span className="text-xs">{t('Peak size')}</span>
-              </Tooltip>
-            }
-            labelFor="input-order-peak-size"
-            className="!mb-1"
-          >
-            <Controller
-              name="icebergOpts.peakSize"
-              control={control}
-              rules={{
-                required: t('You need to provide a peak size'),
-                min: {
-                  value: sizeStep,
-                  message: t('Peak size cannot be lower than ' + sizeStep),
-                },
-                max: {
-                  value: size,
-                  message: t(
-                    'Peak size cannot be greater than the size (%s) ',
-                    [size]
-                  ),
-                },
-                validate: validateAmount(sizeStep, 'peakSize'),
-              }}
-              render={() => (
-                <Input
-                  id="input-order-peak-size"
-                  className="w-full"
-                  type="number"
-                  value={peakSize}
-                  onChange={(e) =>
-                    update({
-                      icebergOpts: {
-                        peakSize: e.target.value,
-                        minimumVisibleSize,
-                      },
-                    })
-                  }
-                  step={sizeStep}
-                  min={sizeStep}
-                  max={size}
-                  data-testid="order-peak-size"
-                  onWheel={(e) => e.currentTarget.blur()}
-                />
-              )}
-            />
-          </FormGroup>
-        </div>
-        <div className="flex-0 items-center">
-          <div className="flex"></div>
-          <div className="flex"></div>
-        </div>
-        <div className="flex-1">
-          <FormGroup
-            label={
-              <Tooltip
-                description={
-                  <div>
-                    {t(
-                      'When the order trades and its size falls below this threshold, it will be reset to the peak size and moved to the back of the priority order. Must be less than or equal to peak size, and greater than 0.'
-                    )}
-                  </div>
-                }
-              >
-                <span className="text-xs">{t('Minimum size')}</span>
-              </Tooltip>
-            }
-            labelFor="input-order-minimum-size"
-            className="!mb-1"
-          >
-            <Controller
-              name="icebergOpts.minimumVisibleSize"
-              control={control}
-              rules={{
-                required: t('You need to provide a minimum visible size'),
-                min: {
-                  value: sizeStep,
-                  message: t(
-                    'Minimum visible size cannot be lower than ' + sizeStep
-                  ),
-                },
-                max: {
-                  value: peakSize,
-                  message: t(
-                    'Minimum visible size cannot be greater than the peak size (%s)',
-                    [peakSize]
-                  ),
-                },
-                validate: validateAmount(sizeStep, 'minimumVisibleSize'),
-              }}
-              render={() => (
-                <Input
-                  id="input-order-minimum-size"
-                  className="w-full"
-                  type="number"
-                  value={minimumVisibleSize}
-                  onChange={(e) =>
-                    update({
-                      icebergOpts: {
-                        peakSize,
-                        minimumVisibleSize: e.target.value,
-                      },
-                    })
-                  }
-                  step={sizeStep}
-                  min={sizeStep}
-                  max={peakSize}
-                  data-testid="order-minimum-size"
-                  onWheel={(e) => e.currentTarget.blur()}
-                />
-              )}
-            />
-          </FormGroup>
-        </div>
-      </div>
-      {renderPeakSizeError()}
-      {renderMinimumSizeError()}
-    </div>
-  );
-};

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

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

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

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

libs/deal-ticket/src/hooks/use-order-form.ts

@@ -4,6 +4,7 @@ import { getDefaultOrder, useOrder } from '@vegaprotocol/orders';
 import { useEffect } from 'react';
 import { useForm } from 'react-hook-form';
 import type { OrderSubmission } from '@vegaprotocol/wallet';
+import type { Exact } from 'type-fest';
 
 export type OrderFormFields = OrderObj & {
   summary: string;
@@ -50,11 +51,13 @@ export const useOrderForm = (marketId: string) => {
     }
   }, [order, isSubmitted, getValues, setValue]);
 
-  const handleSubmitWrapper = (cb: (o: OrderSubmission) => void) => {
+  const handleSubmitWrapper = (
+    cb: <T>(o: Exact<OrderSubmission, T>) => void
+  ) => {
     return handleSubmit(() => {
-      // remove the persist and iceberg key from the order in the store, the wallet will reject
+      // remove the persist key from the order in the store, the wallet will reject
       // an order that contains unrecognized additional keys
-      cb(omit(order, 'persist', 'iceberg'));
+      cb(omit(order, 'persist'));
     });
   };
 

libs/liquidity/src/lib/__generated__/MarketLiquidity.ts

@@ -180,4 +180,4 @@ export function useLiquidityProviderFeeShareLazyQuery(baseOptions?: Apollo.LazyQ
         }
 export type LiquidityProviderFeeShareQueryHookResult = ReturnType<typeof useLiquidityProviderFeeShareQuery>;
 export type LiquidityProviderFeeShareLazyQueryHookResult = ReturnType<typeof useLiquidityProviderFeeShareLazyQuery>;
-export type LiquidityProviderFeeShareQueryResult = Apollo.QueryResult<LiquidityProviderFeeShareQuery, LiquidityProviderFeeShareQueryVariables>;
+export type LiquidityProviderFeeShareQueryResult = Apollo.QueryResult<LiquidityProviderFeeShareQuery, LiquidityProviderFeeShareQueryVariables>;

libs/market-depth/src/lib/orderbook-manager.tsx

@@ -66,13 +66,10 @@ export const OrderbookManager = ({ marketId }: OrderbookManagerProps) => {
         decimalPlaces={market?.decimalPlaces ?? 0}
         positionDecimalPlaces={market?.positionDecimalPlaces ?? 0}
         assetSymbol={market?.tradableInstrument.instrument.product.quoteName}
-        onClick={({ price, size }) => {
+        onClick={(price: string) => {
           if (price) {
             updateOrder(marketId, { price });
           }
-          if (size) {
-            updateOrder(marketId, { size });
-          }
         }}
         midPrice={marketData?.midPrice}
       />

libs/market-depth/src/lib/orderbook-row.tsx

@@ -11,7 +11,7 @@ interface OrderbookRowProps {
   decimalPlaces: number;
   positionDecimalPlaces: number;
   price: string;
-  onClick?: (args: { price?: string; size?: string }) => void;
+  onClick?: (price: string) => void;
   type: VolumeType;
 }
 
@@ -43,7 +43,6 @@ const CumulativeVol = memo(
     testId,
     positionDecimalPlaces,
     cumulativeValue,
-    onClick,
   }: {
     ask?: number;
     bid?: number;
@@ -51,7 +50,6 @@ const CumulativeVol = memo(
     testId?: string;
     className?: string;
     positionDecimalPlaces: number;
-    onClick?: (size?: string | number) => void;
   }) => {
     const volume = cumulativeValue ? (
       <NumericCell
@@ -63,15 +61,7 @@ const CumulativeVol = memo(
       />
     ) : null;
 
-    return onClick && volume ? (
-      <button
-        data-testid={testId}
-        onClick={() => onClick(cumulativeValue)}
-        className="hover:dark:bg-neutral-800 hover:bg-neutral-200 text-right pr-1"
-      >
-        {volume}
-      </button>
-    ) : (
+    return (
       <div className="pr-1" data-testid={testId}>
         {volume}
       </div>
@@ -99,9 +89,7 @@ export const OrderbookRow = React.memo(
           <PriceCell
             testId={`price-${price}`}
             value={BigInt(price)}
-            onClick={() =>
-              onClick && onClick({ price: addDecimal(price, decimalPlaces) })
-            }
+            onClick={() => onClick && onClick(addDecimal(price, decimalPlaces))}
             valueFormatted={addDecimalsFixedFormatNumber(price, decimalPlaces)}
             className={
               type === VolumeType.ask
@@ -109,15 +97,8 @@ export const OrderbookRow = React.memo(
                 : 'text-market-green-600 dark:text-market-green'
             }
           />
-          <PriceCell
+          <NumericCell
             testId={`${txtId}-vol-${price}`}
-            onClick={(value) =>
-              onClick &&
-              value &&
-              onClick({
-                size: addDecimal(value, positionDecimalPlaces),
-              })
-            }
             value={value}
             valueFormatted={addDecimalsFixedFormatNumber(
               value,
@@ -126,13 +107,6 @@ export const OrderbookRow = React.memo(
           />
           <CumulativeVol
             testId={`cumulative-vol-${price}`}
-            onClick={() =>
-              onClick &&
-              cumulativeValue &&
-              onClick({
-                size: addDecimal(cumulativeValue, positionDecimalPlaces),
-              })
-            }
             positionDecimalPlaces={positionDecimalPlaces}
             cumulativeValue={cumulativeValue}
           />

libs/market-depth/src/lib/orderbook.spec.tsx

@@ -70,7 +70,7 @@ describe('Orderbook', () => {
     ).toBeInTheDocument();
     // Before resolution change the price is 122.934
     await fireEvent.click(await screen.getByTestId('price-122901'));
-    expect(onClickSpy).toBeCalledWith({ price: '122.901' });
+    expect(onClickSpy).toBeCalledWith('122.901');
     const resolutionSelect = screen.getByTestId(
       'resolution'
     ) as HTMLSelectElement;
@@ -86,6 +86,6 @@ describe('Orderbook', () => {
       10
     );
     await fireEvent.click(await screen.getByTestId('price-12294'));
-    expect(onClickSpy).toBeCalledWith({ price: '122.94' });
+    expect(onClickSpy).toBeCalledWith('122.94');
   });
 });

libs/market-depth/src/lib/orderbook.tsx

@@ -32,7 +32,7 @@ const OrderbookTable = ({
   decimalPlaces: number;
   positionDecimalPlaces: number;
   type: VolumeType;
-  onClick?: (args: { price?: string; size?: string }) => void;
+  onClick?: (price: string) => void;
 }) => {
   return (
     <div
@@ -69,7 +69,7 @@ const OrderbookTable = ({
 interface OrderbookProps {
   decimalPlaces: number;
   positionDecimalPlaces: number;
-  onClick?: (args: { price?: string; size?: string }) => void;
+  onClick?: (price: string) => void;
   midPrice?: string;
   bids: PriceLevelFieldsFragment[];
   asks: PriceLevelFieldsFragment[];

libs/markets/src/lib/components/market-info/MarketInfo.graphql

@@ -16,16 +16,6 @@ fragment DataSource on DataSourceDefinition {
         }
       }
     }
-    ... on DataSourceDefinitionInternal {
-      sourceType {
-        ... on DataSourceSpecConfigurationTime {
-          conditions {
-            operator
-            value
-          }
-        }
-      }
-    }
   }
 }
 

libs/markets/src/lib/components/market-info/__generated__/MarketInfo.ts

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

libs/markets/src/lib/components/market-info/market-info-accordion.tsx

@@ -129,7 +129,6 @@ export const MarketInfoAccordion = ({
             .filter((a) => a.type === Schema.AccountType.ACCOUNT_TYPE_INSURANCE)
             .map((a) => (
               <AccordionItem
-                key={`${a.type}:${a.asset.id}`}
                 itemId={`${a.type}:${a.asset.id}`}
                 title={t('Insurance pool')}
                 content={<InsurancePoolInfoPanel market={market} account={a} />}
@@ -204,7 +203,6 @@ export const MarketInfoAccordion = ({
           {(market.priceMonitoringSettings?.parameters?.triggers || []).map(
             (_, triggerIndex) => (
               <AccordionItem
-                key={`trigger-${triggerIndex}`}
                 itemId={`trigger-${triggerIndex}`}
                 title={t(`Price monitoring bounds ${triggerIndex + 1}`)}
                 content={

libs/markets/src/lib/markets.mock.ts

@@ -141,7 +141,6 @@ export const createMarketFragment = (
       },
       __typename: 'TradableInstrument',
     },
-    successorMarketID: null,
     __typename: 'Market',
   };
 

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

@@ -22,7 +22,7 @@ export type OrdersQueryVariables = Types.Exact<{
 
 export type OrdersQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, ordersConnection?: { __typename?: 'OrderConnection', edges?: Array<{ __typename?: 'OrderEdge', cursor?: string | null, node: { __typename?: 'Order', id: string, type?: Types.OrderType | null, side: Types.Side, size: string, status: Types.OrderStatus, rejectionReason?: Types.OrderRejectionReason | null, price: string, timeInForce: Types.OrderTimeInForce, remaining: string, expiresAt?: any | null, createdAt: any, updatedAt?: any | null, postOnly?: boolean | null, reduceOnly?: boolean | null, market: { __typename?: 'Market', id: string }, liquidityProvision?: { __typename: 'LiquidityProvision' } | null, peggedOrder?: { __typename: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | null, icebergOrder?: { __typename: 'IcebergOrder', peakSize: string, minimumVisibleSize: string, reservedRemaining: string } | null } }> | null, pageInfo?: { __typename?: 'PageInfo', startCursor: string, endCursor: string, hasNextPage: boolean, hasPreviousPage: boolean } | null } | null } | null };
 
-export type OrderUpdateFieldsFragment = { __typename?: 'OrderUpdate', id: string, marketId: string, type?: Types.OrderType | null, side: Types.Side, size: string, status: Types.OrderStatus, rejectionReason?: Types.OrderRejectionReason | null, price: string, timeInForce: Types.OrderTimeInForce, remaining: string, expiresAt?: any | null, createdAt: any, updatedAt?: any | null, liquidityProvisionId?: string | null, peggedOrder?: { __typename: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | null, icebergOrder?: { __typename: 'IcebergOrder', peakSize: string, minimumVisibleSize: string, reservedRemaining: string } | null };
+export type OrderUpdateFieldsFragment = { __typename?: 'OrderUpdate', id: string, marketId: string, type?: Types.OrderType | null, side: Types.Side, size: string, status: Types.OrderStatus, rejectionReason?: Types.OrderRejectionReason | null, price: string, timeInForce: Types.OrderTimeInForce, remaining: string, expiresAt?: any | null, createdAt: any, updatedAt?: any | null, liquidityProvisionId?: string | null, peggedOrder?: { __typename: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | null, icebergOrder?: { __typename?: 'IcebergOrder', peakSize: string, minimumVisibleSize: string, reservedRemaining: string } | null };
 
 export type OrdersUpdateSubscriptionVariables = Types.Exact<{
   partyId: Types.Scalars['ID'];
@@ -30,7 +30,7 @@ export type OrdersUpdateSubscriptionVariables = Types.Exact<{
 }>;
 
 
-export type OrdersUpdateSubscription = { __typename?: 'Subscription', orders?: Array<{ __typename?: 'OrderUpdate', id: string, marketId: string, type?: Types.OrderType | null, side: Types.Side, size: string, status: Types.OrderStatus, rejectionReason?: Types.OrderRejectionReason | null, price: string, timeInForce: Types.OrderTimeInForce, remaining: string, expiresAt?: any | null, createdAt: any, updatedAt?: any | null, liquidityProvisionId?: string | null, peggedOrder?: { __typename: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | null, icebergOrder?: { __typename: 'IcebergOrder', peakSize: string, minimumVisibleSize: string, reservedRemaining: string } | null }> | null };
+export type OrdersUpdateSubscription = { __typename?: 'Subscription', orders?: Array<{ __typename?: 'OrderUpdate', id: string, marketId: string, type?: Types.OrderType | null, side: Types.Side, size: string, status: Types.OrderStatus, rejectionReason?: Types.OrderRejectionReason | null, price: string, timeInForce: Types.OrderTimeInForce, remaining: string, expiresAt?: any | null, createdAt: any, updatedAt?: any | null, liquidityProvisionId?: string | null, peggedOrder?: { __typename: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | null, icebergOrder?: { __typename?: 'IcebergOrder', peakSize: string, minimumVisibleSize: string, reservedRemaining: string } | null }> | null };
 
 export const OrderFieldsFragmentDoc = gql`
     fragment OrderFields on Order {
@@ -89,7 +89,6 @@ export const OrderUpdateFieldsFragmentDoc = gql`
     offset
   }
   icebergOrder {
-    __typename
     peakSize
     minimumVisibleSize
     reservedRemaining

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

@@ -65,6 +65,7 @@ export const mapOrderUpdateToOrder = (
     liquidityProvision: liquidityProvision,
     icebergOrder: order.icebergOrder
       ? {
+          __typename: 'IcebergOrder',
           ...order.icebergOrder,
         }
       : undefined,

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

@@ -267,14 +267,12 @@ export const OrderListTable = memo<
                 <div className="flex gap-2 items-center justify-end">
                   {isOrderAmendable(data) && !props.isReadOnly && (
                     <>
-                      {!data.icebergOrder && (
-                        <ButtonLink
-                          data-testid="edit"
-                          onClick={() => onEdit(data)}
-                        >
-                          {t('Edit')}
-                        </ButtonLink>
-                      )}
+                      <ButtonLink
+                        data-testid="edit"
+                        onClick={() => onEdit(data)}
+                      >
+                        {t('Edit')}
+                      </ButtonLink>
                       <ButtonLink
                         data-testid="cancel"
                         onClick={() => onCancel(data)}

libs/orders/src/lib/order-hooks/__generated__/OrdersSubscription.ts

@@ -56,4 +56,4 @@ export function useOrderSubSubscription(baseOptions: Apollo.SubscriptionHookOpti
         return Apollo.useSubscription<OrderSubSubscription, OrderSubSubscriptionVariables>(OrderSubDocument, options);
       }
 export type OrderSubSubscriptionHookResult = ReturnType<typeof useOrderSubSubscription>;
-export type OrderSubSubscriptionResult = Apollo.SubscriptionResult<OrderSubSubscription>;
+export type OrderSubSubscriptionResult = Apollo.SubscriptionResult<OrderSubSubscription>;

libs/orders/src/lib/order-hooks/use-order-store.ts

@@ -16,13 +16,7 @@ export type OrderObj = {
   persist: boolean; // key used to determine if order should be kept in localStorage
   postOnly?: boolean;
   reduceOnly?: boolean;
-  iceberg?: boolean;
-  icebergOpts?: {
-    peakSize: string;
-    minimumVisibleSize: string;
-  };
 };
-
 type OrderMap = { [marketId: string]: OrderObj | undefined };
 
 type UpdateOrder = (

libs/types/src/__generated__/types.ts

@@ -96,8 +96,6 @@ export enum AccountType {
   ACCOUNT_TYPE_HOLDING = 'ACCOUNT_TYPE_HOLDING',
   /** Insurance pool account - only for 'system' party */
   ACCOUNT_TYPE_INSURANCE = 'ACCOUNT_TYPE_INSURANCE',
-  /** Per liquidity provider, per market account for holding LPs' fees before distribution */
-  ACCOUNT_TYPE_LP_LIQUIDITY_FEES = 'ACCOUNT_TYPE_LP_LIQUIDITY_FEES',
   /**
    * Margin - The leverage account for parties, contains funds set aside for the margin needed to support
    * a party's open positions. Each party will have a margin account for each market they have traded in.

libs/types/src/global-types-mappings.ts

@@ -45,7 +45,6 @@ export const AccountTypeMapping: {
   ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES: 'Reward Maker paid fees',
   ACCOUNT_TYPE_SETTLEMENT: 'Settlement',
   ACCOUNT_TYPE_HOLDING: 'Holding',
-  ACCOUNT_TYPE_LP_LIQUIDITY_FEES: 'LP Liquidity Fees',
 };
 
 /**

libs/ui-toolkit/src/components/button/button.tsx

@@ -30,14 +30,14 @@ const primary = [
   'enabled:active:bg-vega-yellow-550 enabled:active:border-vega-yellow-550',
 ];
 const secondary = [
-  'text-white',
+  'text-white dark:text-black',
   'border-vega-pink',
   'dark:bg-vega-pink bg-vega-pink-550',
   'enabled:hover:bg-vega-pink enabled:hover:border-vega-pink',
   'enabled:active:bg-vega-pink enabled:active:border-vega-pink',
 ];
 const ternary = [
-  'text-black',
+  'text-white dark:text-black',
   'border-vega-green',
   'dark:bg-vega-green bg-vega-green-550',
   'enabled:hover:bg-vega-green enabled:hover:border-vega-green',

libs/ui-toolkit/src/components/checkbox/checkbox.stories.tsx

@@ -15,13 +15,6 @@ Default.args = {
   label: 'Regular checkbox',
 };
 
-export const Overflow = Template.bind({});
-Overflow.args = {
-  name: 'overflow',
-  label:
-    'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.',
-};
-
 export const Disabled = Template.bind({});
 Disabled.args = {
   disabled: true,

libs/ui-toolkit/src/components/checkbox/checkbox.tsx

@@ -20,7 +20,7 @@ export const Checkbox = ({
   disabled = false,
 }: CheckboxProps) => {
   const rootClasses = classNames(
-    'relative flex justify-center items-center w-[15px] h-[15px] mt-1',
+    'relative flex justify-center items-center w-[15px] h-[15px]',
     'border rounded-sm overflow-hidden',
     {
       'opacity-40 cursor-default': disabled,
@@ -30,7 +30,7 @@ export const Checkbox = ({
   );
 
   return (
-    <div className="flex gap-1">
+    <div className="flex gap-1 items-center">
       <CheckboxPrimitive.Root
         name={name}
         id={name}

libs/ui-toolkit/src/components/form-group/form-group.tsx

@@ -4,7 +4,7 @@ import type { ReactNode } from 'react';
 export interface FormGroupProps {
   children: ReactNode;
   className?: string;
-  label: string | ReactNode; // For accessibility reasons this must always be set for screen readers. If you want it to not show, then use the hideLabel prop"
+  label: string; // For accessibility reasons this must always be set for screen readers. If you want it to not show, then use the hideLabel prop"
   labelFor: string; // Same as above
   hideLabel?: boolean;
   labelDescription?: string;

libs/ui-toolkit/src/utils/shared.ts

@@ -8,11 +8,10 @@ export const defaultFormElement = (hasError?: boolean) =>
     'flex items-center w-full text-sm',
     'p-2 border-2 rounded',
     'bg-transparent',
-    'border',
+    'border border-vega-light-200 dark:border-vega-dark-200',
     'focus:border-vega-light-300 dark:focus:border-vega-dark-300',
     'disabled:opacity-60',
     {
-      'border-vega-pink text-vega-pink': hasError,
-      'border-vega-light-200 dark:border-vega-dark-200': !hasError,
+      'border-vega-pink': hasError,
     }
   );

libs/utils/src/lib/format/range.ts

@@ -7,7 +7,7 @@ import {
 export const formatValue = (
   value: string | number | null | undefined,
   decimalPlaces: number,
-  quantum?: string | number,
+  quantum?: string,
   formatDecimals?: number,
   emptyValue = '-'
 ): string => {

libs/wallet/src/__generated__/TransactionResult.ts

@@ -28,7 +28,7 @@ export type OrderTxUpdateSubscriptionVariables = Types.Exact<{
 }>;
 
 
-export type OrderTxUpdateSubscription = { __typename?: 'Subscription', orders?: Array<{ __typename?: 'OrderUpdate', type?: Types.OrderType | null, id: string, status: Types.OrderStatus, rejectionReason?: Types.OrderRejectionReason | null, createdAt: any, size: string, price: string, timeInForce: Types.OrderTimeInForce, expiresAt?: any | null, side: Types.Side, marketId: string }> | null };
+export type OrderTxUpdateSubscription = { __typename?: 'Subscription', orders?: Array<{ __typename?: 'OrderUpdate', type?: Types.OrderType | null, id: string, status: Types.OrderStatus, rejectionReason?: Types.OrderRejectionReason | null, createdAt: any, size: string, price: string, timeInForce: Types.OrderTimeInForce, expiresAt?: any | null, side: Types.Side, marketId: string  }> | null };
 
 export type DepositBusEventFieldsFragment = { __typename?: 'Deposit', id: string, status: Types.DepositStatus, amount: string, createdTimestamp: any, creditedTimestamp?: any | null, txHash?: string | null, asset: { __typename?: 'Asset', id: string, symbol: string, decimals: number } };
 
@@ -88,6 +88,7 @@ export const OrderTxUpdateFieldsFragmentDoc = gql`
   expiresAt
   side
   marketId
+  remaining
 }
     `;
 export const DepositBusEventFieldsFragmentDoc = gql`
@@ -237,4 +238,4 @@ export function useDepositBusEventSubscription(baseOptions: Apollo.SubscriptionH
         return Apollo.useSubscription<DepositBusEventSubscription, DepositBusEventSubscriptionVariables>(DepositBusEventDocument, options);
       }
 export type DepositBusEventSubscriptionHookResult = ReturnType<typeof useDepositBusEventSubscription>;
-export type DepositBusEventSubscriptionResult = Apollo.SubscriptionResult<DepositBusEventSubscription>;
+export type DepositBusEventSubscriptionResult = Apollo.SubscriptionResult<DepositBusEventSubscription>;

libs/wallet/src/connectors/vega-connector.ts

@@ -47,10 +47,6 @@ export interface OrderSubmission {
   expiresAt?: string;
   postOnly?: boolean;
   reduceOnly?: boolean;
-  icebergOpts?: {
-    peakSize: string;
-    minimumVisibleSize: string;
-  };
 }
 
 export interface OrderCancellation {

libs/wallet/src/utils.ts

@@ -50,13 +50,6 @@ export const normalizeOrderSubmission = (
       : undefined,
   postOnly: order.postOnly,
   reduceOnly: order.reduceOnly,
-  icebergOpts: order.icebergOpts && {
-    peakSize: removeDecimal(order.icebergOpts.peakSize, positionDecimalPlaces),
-    minimumVisibleSize: removeDecimal(
-      order.icebergOpts.minimumVisibleSize,
-      positionDecimalPlaces
-    ),
-  },
 });
 
 export const normalizeOrderAmendment = <T extends Exact<OrderAmendment, T>>(