chore: add trading view env vars

chore(trading): clean up triggering ratio (#5604 )
fix(trading): use No trading instead of Trading terminated (#5624 )
2024-01-16 12:27:36 -05:00 · 2024-01-16 18:10:32 +01:00 · 2024-01-16 18:30:42 +02:00 · 2024-01-15 20:56:52 +00:00 · 2024-01-15 15:26:13 +00:00 · 2024-01-11 11:23:48 +00:00
67 changed files with 841 additions and 849 deletions
@@ -227,3 +227,31 @@ jobs:
          name: worker-logs
          path: ./logs/
          retention-days: 15
+      #----------------------------------------------
+      #  -----  upload market-sim logs  -----
+      #----------------------------------------------
+      - name: Find Directory
+        id: find-dir
+        run: |
+          DIR=$(find /tmp -type d -name "vega-sim-*" -print -quit)
+          if [[ -d "$DIR" ]]; then
+            echo "Found directory: $DIR"
+            echo "DIR=$DIR" >> $GITHUB_ENV
+          else
+            echo "Directory not found."
+            exit 1
+          fi
+
+      - name: Compress Files
+        if: env.DIR
+        run: |
+          tar -czvf ${{ github.workspace }}/market-sim-logs.tar.gz -C "$DIR" .
+          echo "Compressed files at ${{ github.workspace }}/market-sim-logs.tar.gz"
+
+      - name: Upload Compressed market-sim-logs
+        uses: actions/upload-artifact@v3
+        if: env.DIR
+        with:
+          name: market-sim-logs
+          path: ${{ github.workspace }}/market-sim-logs.tar.gz
+          retention-days: 15
@@ -44,7 +44,7 @@ context('Proposal page', { tags: '@smoke' }, function () {
      cy.getByTestId('icon-cross').click();
    });

-    it.skip('Proposal page displayed on mobile', function () {
+    it('Proposal page displayed on mobile', function () {
      const proposalTitle = 'Add Lorem Ipsum market';

      cy.common_switch_to_mobile_and_click_toggle();
@@ -55,7 +55,7 @@ context('Proposal page', { tags: '@smoke' }, function () {
      });
    });

-    it('Able to view new asset proposal', function () {
+    it.skip('Able to view new asset proposal', function () {
      const proposalTitle = 'Test new asset proposal';
      const newAssetProposalBody = getNewAssetTxBody();
      cy.VegaWalletSubmitProposal(newAssetProposalBody);
@@ -196,6 +196,7 @@ export function createNewMarketProposalTxBody(): ProposalSubmissionBody {
                timeWindow: '3600',
                scalingFactor: 10,
              },
+              // FIXME: workaround because of https://github.com/vegaprotocol/vega/issues/10343
              triggeringRatio: '0.7',
              auctionExtension: '1',
            },
@@ -334,6 +335,7 @@ export function createSuccessorMarketProposalTxBody(
                timeWindow: '3600',
                scalingFactor: 10,
              },
+              // FIXME: workaround because of https://github.com/vegaprotocol/vega/issues/10343
              triggeringRatio: '0.7',
              auctionExtension: '1',
            },
@@ -205,7 +205,6 @@ query Proposal(
            }
          }
          liquidityMonitoringParameters {
-            triggeringRatio
            targetStakeParameters {
              timeWindow
              scalingFactor
@@ -366,7 +365,6 @@ query Proposal(
              }
            }
            liquidityMonitoringParameters {
-              triggeringRatio
              targetStakeParameters {
                timeWindow
                scalingFactor
@@ -28,3 +28,6 @@ NX_REFERRALS=true

 NX_TENDERMINT_URL=https://be.vega.community
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket
+
+NX_CHARTING_LIBRARY_PATH=https://assets.vega.community/trading-view-bundle/v0.0.1/
+NX_CHARTING_LIBRARY_HASH=PDjWaqPFndDp+LCvqbKvntWriaqNzNpZ5i9R/BULzCg=
@@ -314,7 +314,7 @@ describe('Closed', () => {
  });

  it('display market actions', async () => {
-    // Use market with a succcessor Id as the actions dropdown will optionally
+    // Use market with a successor Id as the actions dropdown will optionally
    // show a link to the successor market
    const marketsWithSuccessorAndParent = [
      {
@@ -137,6 +137,8 @@ const ClosedMarketsDataGrid = ({
        headerName: t('Market'),
        field: 'code',
        cellRenderer: 'MarketCodeCell',
+        width: 150,
+        resizable: true,
      },
      {
        headerName: t('Status'),
@@ -280,6 +282,7 @@ const ClosedMarketsDataGrid = ({
  return (
    <AgGrid
      rowData={rowData}
+      defaultColDef={COL_DEFS.default}
      columnDefs={colDefs}
      getRowId={({ data }) => data.id}
      overlayNoRowsTemplate={error ? error.message : t('No markets')}
@@ -17,6 +17,7 @@ const defaultColDef = {
  filter: true,
  resizable: true,
  filterParams: { buttons: ['reset'] },
+  minWidth: 120,
 };

 const components = {
@@ -53,6 +53,7 @@ export const MarketsPage = () => {
                size="extra-small"
                data-testid="propose-new-market"
                href={externalLink}
+                target="_blank"
              >
                {t('Propose a new market')}
              </TradingAnchorButton>
@@ -29,6 +29,7 @@ export const useColumnDefs = () => {
      {
        headerName: t('Market'),
        field: 'tradableInstrument.instrument.code',
+        pinned: true,
        cellRenderer: ({
          value,
          data,
@@ -4,6 +4,7 @@ import { useT } from '../../lib/use-t';
 import { RewardsContainer } from '../../components/rewards-container';
 import { usePageTitleStore } from '../../stores';
 import { ErrorBoundary } from '../../components/error-boundary';
+import { TinyScroll } from '@vegaprotocol/ui-toolkit';

 export const Rewards = () => {
  const t = useT();
@@ -16,10 +17,10 @@ export const Rewards = () => {
  }, [updateTitle, title]);
  return (
    <ErrorBoundary feature="rewards">
-      <div className="container mx-auto p-4">
+      <TinyScroll className="p-4 max-h-full overflow-auto">
        <h1 className="px-4 pb-4 text-2xl">{title}</h1>
        <RewardsContainer />
-      </div>
+      </TinyScroll>
    </ErrorBoundary>
  );
 };
@@ -42,13 +42,9 @@ export const LiquidityHeader = () => {
  const assetDecimalPlaces = asset?.decimals || 0;
  const symbol = asset?.symbol;

-  const triggeringRatio =
-    market?.liquidityMonitoringParameters.triggeringRatio || '1';
-
  const { percentage, status } = useCheckLiquidityStatus({
    suppliedStake: suppliedStake || 0,
    targetStake: targetStake || 0,
-    triggeringRatio,
  });

  const feesObject = feesPaidRes?.paidLiquidityFees?.edges?.find(
@@ -47,9 +47,6 @@ export const MarketLiquiditySupplied = ({
  ]);

  const stakeToCcyVolume = params.market_liquidity_stakeToCcyVolume;
-  const triggeringRatio = Number(
-    params.market_liquidity_targetstake_triggering_ratio
-  );

  const variables = useMemo(
    () => ({
@@ -94,7 +91,6 @@ export const MarketLiquiditySupplied = ({
  const { percentage, status } = useCheckLiquidityStatus({
    suppliedStake: market?.suppliedStake || 0,
    targetStake: market?.targetStake || 0,
-    triggeringRatio,
  });

  const showMessage =
@@ -97,9 +97,9 @@ const MarketData = ({

  return (
    <>
-      <div className="w-2/5" role="gridcell">
+      <div className="w-2/6" role="gridcell">
        <h3 className="flex items-baseline">
-          <span className="overflow-hidden text-sm lg:text-base text-ellipsis whitespace-nowrap">
+          <span className="overflow-hidden text-xs md:text-sm lg:text-base text-ellipsis whitespace-nowrap">
            {market.tradableInstrument.instrument.code}
          </span>
          {allProducts && productType && (
@@ -113,7 +113,7 @@ const MarketData = ({
        )}
      </div>
      <div
-        className="w-1/5 overflow-hidden text-xs lg:text-sm whitespace-nowrap text-ellipsis"
+        className="w-2/6 overflow-hidden text-xs lg:text-sm whitespace-nowrap text-ellipsis text-right"
        title={symbol}
        data-testid="market-selector-price"
        role="gridcell"
@@ -121,14 +121,14 @@ const MarketData = ({
        {price} {symbol}
      </div>
      <div
-        className="w-1/5 overflow-hidden text-xs text-right lg:text-sm whitespace-nowrap text-ellipsis"
+        className="w-2/6 sm:w-1/6 overflow-hidden text-xs lg:text-sm whitespace-nowrap text-ellipsis text-right"
        title={t('24h vol')}
        data-testid="market-selector-volume"
        role="gridcell"
      >
        {volume}
      </div>
-      <div className="flex justify-end w-1/5" role="gridcell">
+      <div className="hidden sm:w-1/6 sm:flex justify-end" role="gridcell">
        {oneDayCandles && (
          <Sparkline
            width={64}
@@ -64,7 +64,7 @@ export const MarketSelector = ({
            setFilter((curr) => ({ ...curr, product }));
          }}
        />
-        <div className="text-sm grid grid-cols-[2fr_1fr_1fr] gap-1 ">
+        <div className="text-sm flex sm:grid grid-cols-[2fr_1fr_1fr] gap-1 ">
          <div className="flex-1">
            <TradingInput
              onChange={(e) =>
@@ -182,16 +182,16 @@ const MarketList = ({
          'p-2 mx-2 border-b border-default text-xs text-secondary'
        )}
      >
-        <div className="w-2/5" role="columnheader">
+        <div className="w-2/6" role="columnheader">
          {t('Name')}
        </div>
-        <div className="w-1/5" role="columnheader">
+        <div className="w-2/6 text-right pr-4" role="columnheader">
          {t('Price')}
        </div>
-        <div className="w-1/5 text-right" role="columnheader">
+        <div className="w-2/6 sm:w-1/6 text-right" role="columnheader">
          {t('24h volume')}
        </div>
-        <div className="w-1/5" role="columnheader" />
+        <div className="hidden sm:w-1/6" role="columnheader" />
      </div>
      <div ref={listRef}>
        <List
@@ -5,6 +5,7 @@ import { useParams } from 'react-router-dom';
 import * as PopoverPrimitive from '@radix-ui/react-popover';
 import { useState } from 'react';
 import { useT } from '../../lib/use-t';
+import classNames from 'classnames';

 /**
 * This is only rendered for the mobile navigation
@@ -30,7 +31,16 @@ export const NavHeader = () => {
      trigger={
        <h1 className="flex gap-1 sm:gap-2 md:gap-4 items-center text-default text-lg whitespace-nowrap xl:pr-4 xl:border-r border-default">
          {data ? data.tradableInstrument.instrument.code : t('Select market')}
-          <VegaIcon name={VegaIconNames.CHEVRON_DOWN} size={20} />
+          <span
+            className={classNames(
+              'transition-transform ease-in-out duration-300',
+              {
+                'rotate-180': open,
+              }
+            )}
+          >
+            <VegaIcon name={VegaIconNames.CHEVRON_DOWN} size={20} />
+          </span>
        </h1>
      }
    >
@@ -14,6 +14,7 @@ import {
  VegaIconNames,
  type VegaIconSize,
  TradingInput,
+  TinyScroll,
 } from '@vegaprotocol/ui-toolkit';
 import { IconNames } from '@blueprintjs/icons';
 import {
@@ -149,47 +150,45 @@ export const ActiveRewards = ({ currentEpoch }: { currentEpoch: number }) => {

  return (
    <Card title={t('Active rewards')} className="lg:col-span-full">
-      <div className="">
-        {transfers.length > 1 && (
-          <TradingInput
-            onChange={(e) =>
-              setFilter((curr) => ({ ...curr, searchTerm: e.target.value }))
+      {transfers.length > 1 && (
+        <TradingInput
+          onChange={(e) =>
+            setFilter((curr) => ({ ...curr, searchTerm: e.target.value }))
+          }
+          value={filter.searchTerm}
+          type="text"
+          placeholder={t(
+            'Search by reward dispatch metric, entity scope or asset name'
+          )}
+          data-testid="search-term"
+          className="mb-4 w-20 mr-2"
+          prependElement={<VegaIcon name={VegaIconNames.SEARCH} />}
+        />
+      )}
+      <TinyScroll className="grid gap-x-8 gap-y-10 h-fit grid-cols-[repeat(auto-fill,_minmax(230px,_1fr))] md:grid-cols-[repeat(auto-fill,_minmax(230px,_1fr))] lg:grid-cols-[repeat(auto-fill,_minmax(320px,_1fr))] xl:grid-cols-[repeat(auto-fill,_minmax(335px,_1fr))] max-h-[40rem] overflow-auto pr-2">
+        {transfers
+          .filter((n) => applyFilter(n, filter))
+          .map((node, i) => {
+            const { transfer } = node;
+            if (
+              transfer.kind.__typename !== 'RecurringTransfer' ||
+              !transfer.kind.dispatchStrategy?.dispatchMetric
+            ) {
+              return null;
            }
-            value={filter.searchTerm}
-            type="text"
-            placeholder={t(
-              'Search by reward dispatch metric, entity scope or asset name'
-            )}
-            data-testid="search-term"
-            className="mb-4 w-20"
-            prependElement={<VegaIcon name={VegaIconNames.SEARCH} />}
-          />
-        )}
-        <div className="grid gap-x-8 gap-y-10 h-fit grid-cols-[repeat(auto-fill,_minmax(230px,_1fr))] md:grid-cols-[repeat(auto-fill,_minmax(230px,_1fr))] lg:grid-cols-[repeat(auto-fill,_minmax(320px,_1fr))] xl:grid-cols-[repeat(auto-fill,_minmax(343px,_1fr))] max-h-[40rem] overflow-auto">
-          {transfers
-            .filter((n) => applyFilter(n, filter))
-            .map((node, i) => {
-              const { transfer } = node;
-              if (
-                transfer.kind.__typename !== 'RecurringTransfer' ||
-                !transfer.kind.dispatchStrategy?.dispatchMetric
-              ) {
-                return null;
-              }

-              return (
-                node && (
-                  <ActiveRewardCard
-                    key={i}
-                    transferNode={node}
-                    kind={transfer.kind}
-                    currentEpoch={currentEpoch}
-                  />
-                )
-              );
-            })}
-        </div>
-      </div>
+            return (
+              node && (
+                <ActiveRewardCard
+                  key={i}
+                  transferNode={node}
+                  kind={transfer.kind}
+                  currentEpoch={currentEpoch}
+                />
+              )
+            );
+          })}
+      </TinyScroll>
    </Card>
  );
 };
@@ -8,7 +8,7 @@ import docker
 import http.server
 import sys
 from dotenv import load_dotenv
-
+from playwright.sync_api import Error as PlaywrightError
 from docker.models.containers import Container
 from docker.errors import APIError
 from contextlib import contextmanager
@@ -274,3 +274,18 @@ def perps_market(vega, request):
    if hasattr(request, "param"):
        kwargs.update(request.param)
    return setup_perps_market(vega, **kwargs)
+
+
+@pytest.fixture(autouse=True)
+def retry_on_http_error(request):
+    retry_count = 3 
+    for i in range(retry_count):
+        try:
+            yield
+            return 
+        except requests.exceptions.HTTPError:
+            if i < retry_count - 1:
+                print(f"Retrying due to HTTPError (attempt {i+1}/{retry_count})")
+            else:
+                raise 
+
@@ -16,7 +16,6 @@ def vega(request):
 def continuous_market(vega):
    return setup_continuous_market(vega)

-@pytest.mark.skip("Issue 5581")
@pytest.mark.usefixtures("auth", "risk_accepted")
 def test_liquidity_provision_amendment(continuous_market, vega: VegaServiceNull, page: Page):
    # TODO Refactor asserting the grid
@@ -131,7 +131,7 @@ def test_terminated_market_no_settlement_date(page: Page, vega: VegaServiceNull)
    row_selector = page.locator(
        '[data-testid="tab-closed-markets"] .ag-center-cols-container .ag-row'
    ).first
-    expect(row_selector.locator('[col-id="state"]')).to_have_text("Trading Terminated")
+    expect(row_selector.locator('[col-id="state"]')).to_have_text("No trading")
    expect(row_selector.locator('[col-id="settlementDate"]')).to_have_text("Unknown")

    # TODO Create test for terminated market with settlement date in future
@@ -64,7 +64,6 @@ def setup_market_monitoring_auction(vega: VegaServiceNull, simple_market):
    submit_order(vega, MM_WALLET.name, simple_market, "SIDE_SELL", 1, 1 + 0.1 / 2)
    submit_order(vega, MM_WALLET2.name, simple_market, "SIDE_SELL", 1, 1)

-    vega.forward("10s")
    vega.wait_fn(1)
    vega.wait_for_total_catchup()

@@ -75,7 +74,6 @@ def setup_market_monitoring_auction(vega: VegaServiceNull, simple_market):
    submit_order(vega, MM_WALLET2.name, simple_market, "SIDE_BUY", 100, 95)
    submit_order(vega, MM_WALLET2.name, simple_market, "SIDE_BUY", 1, 105)

-    vega.forward("10s")
    vega.wait_fn(1)
    vega.wait_for_total_catchup()

@@ -109,7 +107,6 @@ def test_market_monitoring_auction_price_volatility_limit_order(
    page.get_by_test_id("place-order").click()

    wait_for_toast_confirmation(page)
-    vega.forward("10s")
    vega.wait_fn(1)
    vega.wait_for_total_catchup()
    page.get_by_test_id("All").click()
@@ -174,9 +174,9 @@ def test_market_lifecycle(proposed_market, vega: VegaServiceNull, page: Page):
    vega.wait_fn(1)
    vega.wait_for_total_catchup()

-    # market state should be changed to "Trading Terminated" because of the invalid oracle
+    # market state should be changed to "No trading" because of the invalid oracle
    expect(trading_mode).to_have_text("No trading")
-    expect(market_state).to_have_text("Trading Terminated")
+    expect(market_state).to_have_text("No trading")

    # settle market
    vega.submit_termination_and_settlement_data(
@@ -67,6 +67,7 @@ const defaultColDef = {
  sortable: true,
  tooltipComponent: TooltipCellComponent,
  comparator: accountValuesComparator,
+  minWidth: 150,
 };
 export interface GetRowsParams extends Omit<IGetRowsParams, 'successCallback'> {
  successCallback(rowsThisBlock: AccountFields[], lastRow?: number): void;
@@ -139,6 +140,8 @@ export const AccountTable = ({
      {
        headerName: t('Asset'),
        field: 'asset.symbol',
+        pinned: true,
+        minWidth: 75,
        headerTooltip: t(
          'Asset is the collateral that is deposited into the Vega protocol.'
        ),
@@ -253,8 +256,8 @@ export const AccountTable = ({
        colId: 'accounts-actions',
        field: 'asset.id',
        ...COL_DEFS.actions,
-        minWidth: showDepositButton ? 105 : COL_DEFS.actions.minWidth,
-        maxWidth: showDepositButton ? 105 : COL_DEFS.actions.maxWidth,
+        minWidth: showDepositButton ? 110 : COL_DEFS.actions.minWidth,
+        maxWidth: showDepositButton ? 110 : COL_DEFS.actions.maxWidth,
        cellRenderer: ({
          value: assetId,
          node,
@@ -23,7 +23,9 @@ import { AccountType } from '@vegaprotocol/types';
 const defaultColDef = {
  resizable: true,
  sortable: true,
+  minWidth: 100,
 };
+
 interface BreakdownTableProps extends AgGridReactProps {
  data: AccountFields[] | null;
  onMarketClick?: (marketId: string, metaKey?: boolean) => void;
@@ -32,12 +34,13 @@ interface BreakdownTableProps extends AgGridReactProps {
 const BreakdownTable = forwardRef<AgGridReact, BreakdownTableProps>(
  ({ data }, ref) => {
    const t = useT();
-    const coldefs = useMemo(() => {
+    const colDefs = useMemo(() => {
      const defs: ColDef[] = [
        {
          headerName: t('Market'),
          field: 'market.tradableInstrument.instrument.code',
-          minWidth: 200,
+          width: 90,
+          pinned: true,
          sort: 'desc',
          cellRenderer: ({
            value,
@@ -141,7 +144,7 @@ const BreakdownTable = forwardRef<AgGridReact, BreakdownTableProps>(
        components={{ PriceCell, ProgressBarCell }}
        tooltipShowDelay={500}
        defaultColDef={defaultColDef}
-        columnDefs={coldefs}
+        columnDefs={colDefs}
        domLayout="autoHeight"
      />
    );
@@ -15,7 +15,6 @@ export async function proposeMarket(publicKey: string) {
  log('sending proposal tx');
  const proposalTx = createNewMarketProposal();
  const result = await sendVegaTx(publicKey, proposalTx);
-
  return result.result;
 }

@@ -119,6 +118,7 @@ function createNewMarketProposal(): ProposalSubmissionBody {
                timeWindow: '3600',
                scalingFactor: 10,
              },
+              // FIXME: workaround because of https://github.com/vegaprotocol/vega/issues/10343
              triggeringRatio: '0.7',
              auctionExtension: '1',
            },
@@ -9,4 +9,7 @@ export const COL_DEFS = {
    type: 'rightAligned',
    pinned: 'right' as const,
  },
+  default: {
+    minWidth: 100,
+  },
 };
@@ -329,8 +329,9 @@ export const DealTicket = ({

    const marketTradingModeError = validateMarketTradingMode(
      marketTradingMode,
-      t('Trading terminated')
+      t('No trading')
    );
+
    if (marketTradingModeError !== true) {
      return {
        message: marketTradingModeError,
@@ -11,9 +11,6 @@ export function generateMarket(override?: PartialDeep<Market>): Market {
    positionDecimalPlaces: 1,
    tradingMode: Schema.MarketTradingMode.TRADING_MODE_CONTINUOUS,
    state: Schema.MarketState.STATE_ACTIVE,
-    liquidityMonitoringParameters: {
-      triggeringRatio: '1',
-    },
    marketTimestamps: {
      __typename: 'MarketTimestamps',
      close: '',
@@ -75,7 +72,6 @@ export function generateMarket(override?: PartialDeep<Market>): Market {
        __typename: 'Instrument',
      },
    },
-
    fees: {
      factors: {
        makerFee: '0.001',
@@ -6,7 +6,7 @@ import {
  isNumeric,
 } from '@vegaprotocol/utils';
 import { type ColDef } from 'ag-grid-community';
-import { AgGrid } from '@vegaprotocol/datagrid';
+import { AgGrid, COL_DEFS } from '@vegaprotocol/datagrid';
 import {
  type VegaICellRendererParams,
  type VegaValueFormatterParams,
@@ -21,7 +21,7 @@ export const DepositsTable = (
 ) => {
  const columnDefs = useMemo<ColDef[]>(
    () => [
-      { headerName: 'Asset', field: 'asset.symbol' },
+      { headerName: 'Asset', field: 'asset.symbol', pinned: true },
      {
        headerName: 'Amount',
        field: 'amount',
@@ -74,5 +74,11 @@ export const DepositsTable = (
    ],
    []
  );
-  return <AgGrid columnDefs={columnDefs} {...props} />;
+  return (
+    <AgGrid
+      columnDefs={columnDefs}
+      defaultColDef={COL_DEFS.default}
+      {...props}
+    />
+  );
 };
@@ -48,6 +48,7 @@ export const FillsTable = forwardRef<AgGridReact, Props>(
          field: 'market.tradableInstrument.instrument.code',
          cellRenderer: 'MarketNameCell',
          cellRendererParams: { idPath: 'market.id', onMarketClick },
+          pinned: true,
        },
        {
          headerName: t('Size'),
@@ -143,6 +144,7 @@ export const FillsTable = forwardRef<AgGridReact, Props>(
      <AgGrid
        ref={ref}
        columnDefs={columnDefs}
+        defaultColDef={COL_DEFS.default}
        overlayNoRowsTemplate={t('No fills')}
        getRowId={({ data }) => data?.id}
        tooltipShowDelay={0}
@@ -54,9 +54,6 @@ export const generateFill = (override?: PartialDeep<Trade>) => {
      decimalPlaces: 5,
      state: MarketState.STATE_ACTIVE,
      tradingMode: MarketTradingMode.TRADING_MODE_CONTINUOUS,
-      liquidityMonitoringParameters: {
-        triggeringRatio: '1',
-      },
      fees: {
        __typename: 'Fees',
        factors: {
@@ -22,9 +22,7 @@ export const generateFundingPayment = (
      decimalPlaces: 5,
      state: MarketState.STATE_ACTIVE,
      tradingMode: MarketTradingMode.TRADING_MODE_CONTINUOUS,
-      liquidityMonitoringParameters: {
-        triggeringRatio: '1',
-      },
+
      fees: {
        __typename: 'Fees',
        factors: {
@@ -116,7 +116,7 @@
  "Total fees": "Total fees",
  "Total margin available": "Total margin available",
  "TOTAL_MARGIN_AVAILABLE": "Total margin available = general {{assetSymbol}} balance ({{generalAccountBalance}} {{assetSymbol}}) + margin balance ({{marginAccountBalance}} {{assetSymbol}}) - maintenance level ({{marginMaintenance}} {{assetSymbol}}).",
-  "Trading terminated": "Trading terminated",
+  "No trading": "No trading",
  "Trailing percent offset cannot be higher than 99.9": "Trailing percent offset cannot be higher than 99.9",
  "Trailing percent offset cannot be lower than {{trailingPercentOffsetStep}}": "Trailing percent offset cannot be lower than {{trailingPercentOffsetStep}}",
  "Trailing percentage offset": "Trailing percentage offset",
@@ -83,11 +83,6 @@ describe('LiquidityTable', () => {
      h.querySelector('[ref="eText"]')?.textContent?.trim()
    );
    const expectedHeaders = [
-      undefined,
-      undefined,
-      undefined,
-      undefined,
-      undefined,
      'Party',
      'Status',
      'Commitment ()',
@@ -18,7 +18,7 @@ import {
  truncateMiddle,
 } from '@vegaprotocol/ui-toolkit';
 import type {
-  ColGroupDef,
+  ColDef,
  ITooltipParams,
  ValueFormatterParams,
 } from 'ag-grid-community';
@@ -60,10 +60,11 @@ const dateValueFormatter = ({ value }: { value?: string | null }) => {
  return getDateTimeFormat().format(new Date(value));
 };

-const defaultColDef = {
+const defaultColDef: ColDef = {
  resizable: true,
  sortable: true,
  tooltipComponent: TooltipCellComponent,
+  minWidth: 120,
 };

 export interface LiquidityTableProps
@@ -168,333 +169,300 @@ export const LiquidityTable = ({
      )}`;
    };

-    const defs: ColGroupDef[] = [
+    const defs: ColDef[] = [
      {
-        headerName: '',
-        children: [
-          {
-            headerName: t('Party'),
-            field: 'partyId',
-            headerTooltip: t(
-              'The public key of the party making this commitment.'
-            ),
-            cellRenderer: copyCellRenderer,
-          },
-        ],
+        headerName: t('Party'),
+        field: 'partyId',
+        headerTooltip: t('The public key of the party making this commitment.'),
+        cellRenderer: copyCellRenderer,
+        pinned: 'left',
      },
      {
-        headerName: t('Commitment details'),
-        marryChildren: true,
-        children: [
-          {
-            headerName: t('Status'),
-            headerTooltip: t('The current status of this liquidity provision.'),
-            field: 'status',
-            cellRenderer: ({
-              data,
-              value,
-            }: VegaICellRendererParams<LiquidityProvisionData, 'status'>) => {
-              if (!value) return value;
-              if (
-                data?.status === LiquidityProvisionStatus.STATUS_PENDING &&
-                (data?.currentCommitmentAmount || data?.currentFee)
-              ) {
-                return (
-                  <span className="text-warning">
-                    {t('Updating next epoch')}
-                  </span>
-                );
+        headerName: t('Status'),
+        headerTooltip: t('The current status of this liquidity provision.'),
+        field: 'status',
+        cellRenderer: ({
+          data,
+          value,
+        }: VegaICellRendererParams<LiquidityProvisionData, 'status'>) => {
+          if (!value) return value;
+          if (
+            data?.status === LiquidityProvisionStatus.STATUS_PENDING &&
+            (data?.currentCommitmentAmount || data?.currentFee)
+          ) {
+            return (
+              <span className="text-warning">{t('Updating next epoch')}</span>
+            );
+          }
+          return (
+            <span>
+              {
+                LiquidityProvisionStatusMapping[
+                  value as LiquidityProvisionStatus
+                ]
              }
-              return (
-                <span>
-                  {
-                    LiquidityProvisionStatusMapping[
-                      value as LiquidityProvisionStatus
-                    ]
-                  }
-                </span>
+            </span>
+          );
+        },
+      },
+      {
+        headerName: t(`Commitment ({{symbol}})`, { symbol }),
+        field: 'commitmentAmount',
+        type: 'rightAligned',
+        headerTooltip: t(
+          'The amount committed to the market by this liquidity provider.'
+        ),
+        cellRenderer: ({
+          data,
+          value,
+        }: VegaICellRendererParams<
+          LiquidityProvisionData,
+          'commitmentAmount'
+        >) => {
+          if (!value) return '-';
+          const currentCommitmentAmount = data?.currentCommitmentAmount;
+          const pendingCommitmentAmount = value;
+
+          const formattedPendingCommitmentAmount =
+            addDecimalsFormatNumberQuantum(
+              pendingCommitmentAmount,
+              assetDecimalPlaces ?? 0,
+              quantum ?? 0
+            );
+
+          if (
+            currentCommitmentAmount &&
+            currentCommitmentAmount !== pendingCommitmentAmount
+          ) {
+            const formattedCurrentCommitmentAmount =
+              addDecimalsFormatNumberQuantum(
+                currentCommitmentAmount,
+                assetDecimalPlaces ?? 0,
+                quantum ?? 0
              );
-            },
-          },
-          {
-            headerName: t(`Commitment ({{symbol}})`, { symbol }),
-            field: 'commitmentAmount',
-            type: 'rightAligned',
-            headerTooltip: t(
-              'The amount committed to the market by this liquidity provider.'
-            ),
-            cellRenderer: ({
-              data,
-              value,
-            }: VegaICellRendererParams<
-              LiquidityProvisionData,
-              'commitmentAmount'
-            >) => {
-              if (!value) return '-';
-              const currentCommitmentAmount = data?.currentCommitmentAmount;
-              const pendingCommitmentAmount = value;

-              const formattedPendingCommitmentAmount =
-                addDecimalsFormatNumberQuantum(
-                  pendingCommitmentAmount,
-                  assetDecimalPlaces ?? 0,
-                  quantum ?? 0
-                );
+            return (
+              <>
+                <span>{formattedCurrentCommitmentAmount}</span> (
+                <span className="text-warning">
+                  {formattedPendingCommitmentAmount}
+                </span>
+                )
+              </>
+            );
+          } else {
+            return formattedPendingCommitmentAmount;
+          }
+        },
+        tooltipValueGetter: assetDecimalsFormatter,
+      },
+      {
+        headerName: t('Obligation'),
+        field: 'commitmentAmount',
+        type: 'rightAligned',
+        headerTooltip: t(
+          `The liquidity provider's obligation to the market, calculated as the liquidity commitment amount multiplied by the value of the stake_to_ccy_volume network parameter to convert into units of liquidity volume.`
+        ),
+        cellRenderer: ({
+          data,
+          value,
+        }: VegaICellRendererParams<
+          LiquidityProvisionData,
+          'commitmentAmount'
+        >) => {
+          if (!value) return '-';

-              if (
-                currentCommitmentAmount &&
-                currentCommitmentAmount !== pendingCommitmentAmount
-              ) {
-                const formattedCurrentCommitmentAmount =
-                  addDecimalsFormatNumberQuantum(
-                    currentCommitmentAmount,
-                    assetDecimalPlaces ?? 0,
-                    quantum ?? 0
-                  );
-
-                return (
-                  <>
-                    <span>{formattedCurrentCommitmentAmount}</span> (
-                    <span className="text-warning">
-                      {formattedPendingCommitmentAmount}
-                    </span>
-                    )
-                  </>
-                );
-              } else {
-                return formattedPendingCommitmentAmount;
-              }
-            },
-            tooltipValueGetter: assetDecimalsFormatter,
-          },
-          {
-            headerName: t('Obligation'),
-            field: 'commitmentAmount',
-            type: 'rightAligned',
-            headerTooltip: t(
-              `The liquidity provider's obligation to the market, calculated as the liquidity commitment amount multiplied by the value of the stake_to_ccy_volume network parameter to convert into units of liquidity volume.`
-            ),
-            cellRenderer: ({
-              data,
-              value,
-            }: VegaICellRendererParams<
-              LiquidityProvisionData,
-              'commitmentAmount'
-            >) => {
-              if (!value) return '-';
-
-              const currentCommitmentAmount = data?.currentCommitmentAmount
-                ? new BigNumber(data?.currentCommitmentAmount)
-                    .times(Number(stakeToCcyVolume) || 1)
-                    .toString()
-                : undefined;
-
-              const pendingCommitmentAmount = new BigNumber(value)
+          const currentCommitmentAmount = data?.currentCommitmentAmount
+            ? new BigNumber(data?.currentCommitmentAmount)
                .times(Number(stakeToCcyVolume) || 1)
-                .toString();
+                .toString()
+            : undefined;

-              const formattedPendingCommitmentAmount =
-                addDecimalsFormatNumberQuantum(
-                  pendingCommitmentAmount,
-                  assetDecimalPlaces ?? 0,
-                  quantum ?? 0
-                );
+          const pendingCommitmentAmount = new BigNumber(value)
+            .times(Number(stakeToCcyVolume) || 1)
+            .toString();

-              if (
-                currentCommitmentAmount &&
-                currentCommitmentAmount !== pendingCommitmentAmount
-              ) {
-                const formattedCurrentCommitmentAmount =
-                  addDecimalsFormatNumberQuantum(
-                    currentCommitmentAmount,
-                    assetDecimalPlaces ?? 0,
-                    quantum ?? 0
-                  );
+          const formattedPendingCommitmentAmount =
+            addDecimalsFormatNumberQuantum(
+              pendingCommitmentAmount,
+              assetDecimalPlaces ?? 0,
+              quantum ?? 0
+            );

-                return (
-                  <>
-                    <span>{formattedCurrentCommitmentAmount}</span> (
-                    <span className="text-warning">
-                      {formattedPendingCommitmentAmount}
-                    </span>
-                    )
-                  </>
-                );
-              } else {
-                return formattedPendingCommitmentAmount;
-              }
-            },
-            tooltipValueGetter: stakeToCcyVolumeFormatter,
-          },
-          {
-            headerName: t('Fee'),
-            headerTooltip: t(
-              'The fee percentage (per trade) proposed by each liquidity provider.'
-            ),
-            field: 'fee',
-            type: 'rightAligned',
-            cellRenderer: ({
-              data,
-              value,
-            }: VegaICellRendererParams<LiquidityProvisionData, 'fee'>) => {
-              if (!value) return '-';
-              const formattedPendingFee =
-                formatNumberPercentage(new BigNumber(value).times(100), 2) ||
-                '-';
-              if (data?.currentFee && data?.currentFee !== value) {
-                const formattedCurrentFee = formatNumberPercentage(
-                  new BigNumber(data.currentFee).times(100),
-                  2
-                );
-                return (
-                  <>
-                    <span>{formattedCurrentFee}</span> (
-                    <span className="text-warning">{formattedPendingFee}</span>)
-                  </>
-                );
-              }
-              return formattedPendingFee;
-            },
-          },
-          {
-            headerName: t('Adjusted stake'),
-            field: 'feeShare.virtualStake',
-            type: 'rightAligned',
-            headerTooltip: t(
-              'The effective stake of the liquidity provider, adjusted for length of commitment and impact on equity like share.'
-            ),
+          if (
+            currentCommitmentAmount &&
+            currentCommitmentAmount !== pendingCommitmentAmount
+          ) {
+            const formattedCurrentCommitmentAmount =
+              addDecimalsFormatNumberQuantum(
+                currentCommitmentAmount,
+                assetDecimalPlaces ?? 0,
+                quantum ?? 0
+              );

-            valueFormatter: assetDecimalsQuantumFormatter,
-            tooltipValueGetter: assetDecimalsFormatter,
-          },
-          {
-            headerName: t(`Share`),
-            field: 'feeShare.equityLikeShare',
-            type: 'rightAligned',
-            headerTooltip: t(
-              'The equity-like share of liquidity of the market used to determine allocation of LP fees. Calculated based on share of total liquidity, with a premium added for length of commitment.'
-            ),
-            valueFormatter: percentageFormatter,
-          },
-        ],
+            return (
+              <>
+                <span>{formattedCurrentCommitmentAmount}</span> (
+                <span className="text-warning">
+                  {formattedPendingCommitmentAmount}
+                </span>
+                )
+              </>
+            );
+          } else {
+            return formattedPendingCommitmentAmount;
+          }
+        },
+        tooltipValueGetter: stakeToCcyVolumeFormatter,
      },
      {
-        headerName: t('Live liquidity data'),
-        marryChildren: true,
-        children: [
-          {
-            headerName: t('Live supplied liquidity'),
-            field: 'balance',
-            type: 'rightAligned',
-            headerTooltip: t(
-              `The amount of liquidity volume supplied by the LP order in order to meet the obligation. If the obligation is already met in full by other limit orders from the same Vega key the LP order is not required and this value will be zero. Also note if the target stake for the market is less than the obligation the full value of the obligation may not be required.`
-            ),
-            valueFormatter: stakeToCcyVolumeQuantumFormatter,
-            tooltipValueGetter: stakeToCcyVolumeFormatter,
-          },
-          {
-            headerName: t('Fees accrued this epoch'),
-            field: 'earmarkedFees',
-            type: 'rightAligned',
-            headerTooltip: t(
-              `The liquidity fees accrued by each provider, which will be distributed at the end of the epoch after applying any penalties.`
-            ),
-            valueFormatter: assetDecimalsQuantumFormatter,
-            tooltipValueGetter: feesAccruedTooltip,
-            cellClassRules: {
-              'text-warning': ({ data }: { data: LiquidityProvisionData }) => {
-                if (!data.sla) return false;
-                return (
-                  new BigNumber(
-                    data.sla.currentEpochFractionOfTimeOnBook
-                  ).isLessThan(1) &&
-                  new BigNumber(
-                    data.sla.currentEpochFractionOfTimeOnBook
-                  ).isGreaterThan(data.commitmentMinTimeFraction)
-                );
-              },
-              'text-red-500': ({ data }: { data: LiquidityProvisionData }) => {
-                if (!data.sla) return false;
-                return new BigNumber(
-                  data.sla.currentEpochFractionOfTimeOnBook
-                ).isLessThan(data.commitmentMinTimeFraction);
-              },
-            },
-          },
-          {
-            headerName: t(`Live time on book`),
-            field: 'sla.currentEpochFractionOfTimeOnBook',
-            type: 'rightAligned',
-            headerTooltip: t('Current epoch fraction of time on the book.'),
-            valueFormatter: percentageFormatter,
-          },
-          {
-            headerName: t('Live liquidity score (%)'),
-            field: 'feeShare.averageScore',
-            type: 'rightAligned',
-            headerTooltip: t(
-              'The liquidity score of the provider, used to determine allocation of fees to the best performing LPs. Posting volume closer to the mid on both sides of the book will improve this score.'
-            ),
-            valueFormatter: percentageFormatter,
-          },
-        ],
+        headerName: t('Fee'),
+        headerTooltip: t(
+          'The fee percentage (per trade) proposed by each liquidity provider.'
+        ),
+        field: 'fee',
+        type: 'rightAligned',
+        cellRenderer: ({
+          data,
+          value,
+        }: VegaICellRendererParams<LiquidityProvisionData, 'fee'>) => {
+          if (!value) return '-';
+          const formattedPendingFee =
+            formatNumberPercentage(new BigNumber(value).times(100), 2) || '-';
+          if (data?.currentFee && data?.currentFee !== value) {
+            const formattedCurrentFee = formatNumberPercentage(
+              new BigNumber(data.currentFee).times(100),
+              2
+            );
+            return (
+              <>
+                <span>{formattedCurrentFee}</span> (
+                <span className="text-warning">{formattedPendingFee}</span>)
+              </>
+            );
+          }
+          return formattedPendingFee;
+        },
      },
      {
-        headerName: t('Last epoch SLA details'),
-        marryChildren: true,
-        children: [
-          {
-            headerName: t(`Last time on book`),
-            field: 'sla.lastEpochFractionOfTimeOnBook',
-            type: 'rightAligned',
-            headerTooltip: t(
-              'Fraction of time on the book at the end of the last epoch.'
-            ),
-            valueFormatter: percentageFormatter,
-          },
-          {
-            headerName: t(`Last fee penalty`),
-            field: 'sla.lastEpochFeePenalty',
-            type: 'rightAligned',
-            headerTooltip: t(
-              'Penalty applied on the fees a liquidity provider collected in the last epoch. This percentage increased if an LP did not meet the SLA, or if they met it but other LPs outscored them in the previous epoch.'
-            ),
-            valueFormatter: percentageFormatter,
-          },
-          {
-            headerName: t(`Last bond penalty`),
-            field: 'sla.lastEpochBondPenalty',
-            type: 'rightAligned',
-            headerTooltip: t(
-              `Penalty applied on a provider's bond penalty at the end of the last epoch. This percentage increased if an LP: had a shortfall and their bond needed to be used to cover it, did not meet the SLA, and/or reduced their commitment to the point that the market was below its target stake.`
-            ),
-            valueFormatter: percentageFormatter,
-          },
-        ],
+        headerName: t('Adjusted stake'),
+        field: 'feeShare.virtualStake',
+        type: 'rightAligned',
+        headerTooltip: t(
+          'The effective stake of the liquidity provider, adjusted for length of commitment and impact on equity like share.'
+        ),
+
+        valueFormatter: assetDecimalsQuantumFormatter,
+        tooltipValueGetter: assetDecimalsFormatter,
      },
      {
-        headerName: '',
-        marryChildren: true,
-        children: [
-          {
-            headerName: t('Created'),
-            headerTooltip: t(
-              'The date and time this liquidity provision was created.'
-            ),
-            field: 'createdAt',
-            type: 'rightAligned',
-            valueFormatter: dateValueFormatter,
+        headerName: t(`Share`),
+        field: 'feeShare.equityLikeShare',
+        type: 'rightAligned',
+        headerTooltip: t(
+          'The equity-like share of liquidity of the market used to determine allocation of LP fees. Calculated based on share of total liquidity, with a premium added for length of commitment.'
+        ),
+        valueFormatter: percentageFormatter,
+      },
+      {
+        headerName: t('Live supplied liquidity'),
+        field: 'balance',
+        type: 'rightAligned',
+        headerTooltip: t(
+          `The amount of liquidity volume supplied by the LP order in order to meet the obligation. If the obligation is already met in full by other limit orders from the same Vega key the LP order is not required and this value will be zero. Also note if the target stake for the market is less than the obligation the full value of the obligation may not be required.`
+        ),
+        valueFormatter: stakeToCcyVolumeQuantumFormatter,
+        tooltipValueGetter: stakeToCcyVolumeFormatter,
+      },
+      {
+        headerName: t('Fees accrued this epoch'),
+        field: 'earmarkedFees',
+        type: 'rightAligned',
+        headerTooltip: t(
+          `The liquidity fees accrued by each provider, which will be distributed at the end of the epoch after applying any penalties.`
+        ),
+        valueFormatter: assetDecimalsQuantumFormatter,
+        tooltipValueGetter: feesAccruedTooltip,
+        cellClassRules: {
+          'text-warning': ({ data }: { data: LiquidityProvisionData }) => {
+            if (!data.sla) return false;
+            return (
+              new BigNumber(
+                data.sla.currentEpochFractionOfTimeOnBook
+              ).isLessThan(1) &&
+              new BigNumber(
+                data.sla.currentEpochFractionOfTimeOnBook
+              ).isGreaterThan(data.commitmentMinTimeFraction)
+            );
          },
-          {
-            headerName: t('Updated'),
-            headerTooltip: t(
-              'The date and time this liquidity provision was last updated.'
-            ),
-            field: 'updatedAt',
-            type: 'rightAligned',
-            valueFormatter: dateValueFormatter,
+          'text-red-500': ({ data }: { data: LiquidityProvisionData }) => {
+            if (!data.sla) return false;
+            return new BigNumber(
+              data.sla.currentEpochFractionOfTimeOnBook
+            ).isLessThan(data.commitmentMinTimeFraction);
          },
-        ],
+        },
+      },
+      {
+        headerName: t(`Live time on book`),
+        field: 'sla.currentEpochFractionOfTimeOnBook',
+        type: 'rightAligned',
+        headerTooltip: t('Current epoch fraction of time on the book.'),
+        valueFormatter: percentageFormatter,
+      },
+      {
+        headerName: t('Live liquidity score (%)'),
+        field: 'feeShare.averageScore',
+        type: 'rightAligned',
+        headerTooltip: t(
+          'The liquidity score of the provider, used to determine allocation of fees to the best performing LPs. Posting volume closer to the mid on both sides of the book will improve this score.'
+        ),
+        valueFormatter: percentageFormatter,
+      },
+      {
+        headerName: t(`Last time on book`),
+        field: 'sla.lastEpochFractionOfTimeOnBook',
+        type: 'rightAligned',
+        headerTooltip: t(
+          'Fraction of time on the book at the end of the last epoch.'
+        ),
+        valueFormatter: percentageFormatter,
+      },
+      {
+        headerName: t(`Last fee penalty`),
+        field: 'sla.lastEpochFeePenalty',
+        type: 'rightAligned',
+        headerTooltip: t(
+          'Penalty applied on the fees a liquidity provider collected in the last epoch. This percentage increased if an LP did not meet the SLA, or if they met it but other LPs outscored them in the previous epoch.'
+        ),
+        valueFormatter: percentageFormatter,
+      },
+      {
+        headerName: t(`Last bond penalty`),
+        field: 'sla.lastEpochBondPenalty',
+        type: 'rightAligned',
+        headerTooltip: t(
+          `Penalty applied on a provider's bond penalty at the end of the last epoch. This percentage increased if an LP: had a shortfall and their bond needed to be used to cover it, did not meet the SLA, and/or reduced their commitment to the point that the market was below its target stake.`
+        ),
+        valueFormatter: percentageFormatter,
+      },
+      {
+        headerName: t('Created'),
+        headerTooltip: t(
+          'The date and time this liquidity provision was created.'
+        ),
+        field: 'createdAt',
+        type: 'rightAligned',
+        valueFormatter: dateValueFormatter,
+      },
+      {
+        headerName: t('Updated'),
+        headerTooltip: t(
+          'The date and time this liquidity provision was last updated.'
+        ),
+        field: 'updatedAt',
+        type: 'rightAligned',
+        valueFormatter: dateValueFormatter,
      },
    ];
    return defs;
@@ -124,27 +124,11 @@ describe('getChange', () => {
 });

 describe('useCheckLiquidityStatus', () => {
-  it('should return amber if liquidity is enough', () => {
-    const { result } = renderHook(() =>
-      useCheckLiquidityStatus({
-        suppliedStake: '60',
-        targetStake: '100',
-        triggeringRatio: '0.5',
-      })
-    );
-
-    expect(result.current).toEqual({
-      status: Intent.Warning,
-      percentage: new BigNumber('60'),
-    });
-  });
-
  it('should return red if liquidity is not enough', () => {
    const { result } = renderHook(() =>
      useCheckLiquidityStatus({
        suppliedStake: '60',
        targetStake: '100',
-        triggeringRatio: '1',
      })
    );

@@ -159,7 +143,6 @@ describe('useCheckLiquidityStatus', () => {
      useCheckLiquidityStatus({
        suppliedStake: '101',
        targetStake: '100',
-        triggeringRatio: '1',
      })
    );

@@ -121,11 +121,9 @@ export const getTargetStake = (
 export const useCheckLiquidityStatus = ({
  suppliedStake,
  targetStake,
-  triggeringRatio,
 }: {
  suppliedStake: string | number;
  targetStake: string | number;
-  triggeringRatio: string | number;
 }): {
  status: Intent;
  percentage: BigNumber;
@@ -142,23 +140,12 @@ export const useCheckLiquidityStatus = ({
      percentage,
    };
  }
-  if (new BigNumber(suppliedStake).gte(new BigNumber(targetStake))) {
+  if (new BigNumber(suppliedStake).gte(targetStake)) {
    // show a green status, e.g. "🟢 $13,666,999 liquidity supplied"
    return {
      status: Intent.Success,
      percentage,
    };
-    // ELSE IF supplied_stake > NETPARAM[market.liquidity.targetstake.triggering.ratio] * target_stake THEN
-  } else if (
-    new BigNumber(suppliedStake).gte(
-      new BigNumber(targetStake).multipliedBy(triggeringRatio)
-    )
-  ) {
-    // show an amber status, e.g. "🟠 $3,456,123 liquidity supplied"
-    return {
-      status: Intent.Warning,
-      percentage,
-    };
    // ELSE show a red status, e.g. "🔴 $600,002 liquidity supplied"
  } else {
    return {
@@ -188,7 +188,6 @@ query MarketInfo($marketId: ID!) {
      long
    }
    liquidityMonitoringParameters {
-      triggeringRatio
      targetStakeParameters {
        timeWindow
        scalingFactor
@@ -745,7 +745,6 @@ export const LiquidityMonitoringParametersInfoPanel = ({
  parentMarket,
 }: MarketInfoProps) => {
  const marketData = {
-    triggeringRatio: market.liquidityMonitoringParameters.triggeringRatio,
    timeWindow:
      market.liquidityMonitoringParameters.targetStakeParameters.timeWindow,
    scalingFactor:
@@ -754,8 +753,6 @@ export const LiquidityMonitoringParametersInfoPanel = ({

  const parentMarketData = parentMarket
    ? {
-        triggeringRatio:
-          parentMarket.liquidityMonitoringParameters.triggeringRatio,
        timeWindow:
          parentMarket.liquidityMonitoringParameters.targetStakeParameters
            .timeWindow,
@@ -95,7 +95,6 @@ export const marketInfoQuery = (
        long: '0.008508132993273576',
      },
      liquidityMonitoringParameters: {
-        triggeringRatio: '0.7',
        targetStakeParameters: {
          timeWindow: 3600,
          scalingFactor: 10,
@@ -101,8 +101,6 @@ export const useTooltipMapping: () => Record<string, ReactNode> = () => {
    auctionExtensionSecs: t(
      'Auction extension duration in seconds, should the price breach its theoretical level over the specified horizon at the specified probability level.'
    ),
-
-    triggeringRatio: t('The triggering ratio for entering liquidity auction.'),
    timeWindow: t('The length of time over which open interest is measured.'),
    scalingFactor: t(
      'The scaling between the liquidity demand estimate, based on open interest and target stake.'
@@ -35,9 +35,6 @@ fragment MarketFields on Market {
    open
    close
  }
-  liquidityMonitoringParameters {
-    triggeringRatio
-  }
 }

 query Markets {
@@ -53,9 +53,6 @@ export const createMarketFragment = (
        liquidityFee: '',
      },
    },
-    liquidityMonitoringParameters: {
-      triggeringRatio: '1',
-    },
    tradableInstrument: {
      instrument: {
        id: '',
@@ -20,9 +20,6 @@ export const generateOrder = (partialOrder?: PartialDeep<Order>) => {
          makerFee: '0.1',
        },
      },
-      liquidityMonitoringParameters: {
-        triggeringRatio: '1',
-      },
      marketTimestamps: {
        __typename: 'MarketTimestamps',
        close: '',
@@ -21,9 +21,6 @@ export const generateStopOrder = (
      __typename: 'Market',
      id: 'market-id',
      decimalPlaces: 1,
-      liquidityMonitoringParameters: {
-        triggeringRatio: '0.7',
-      },
      fees: {
        __typename: 'Fees',
        factors: {
@@ -39,6 +39,7 @@ const defaultColDef = {
  resizable: true,
  sortable: true,
  filterParams: { buttons: ['reset'] },
+  minWidth: 100,
 };

 export type OrderListTableProps = TypedDataAgGrid<Order> & {
@@ -82,6 +83,9 @@ export const OrderListTable = memo<
            field: 'market.tradableInstrument.instrument.code',
            cellRenderer: 'MarketNameCell',
            cellRendererParams: { idPath: 'market.id', onMarketClick },
+            pinned: true,
+            width: 130,
+            resizable: true,
          },
          {
            headerName: t('Filled'),
@@ -31,9 +31,6 @@ describe('OrderViewDialog', () => {
            liquidityFee: '0.001',
          },
        },
-        liquidityMonitoringParameters: {
-          triggeringRatio: '1',
-        },
        tradableInstrument: {
          __typename: 'TradableInstrument',
          instrument: {
@@ -40,6 +40,7 @@ const defaultColDef = {
  resizable: true,
  sortable: true,
  filterParams: { buttons: ['reset'] },
+  minWidth: 100,
 };

 export type StopOrdersTableProps = TypedDataAgGrid<StopOrder> & {
@@ -61,6 +62,7 @@ export const StopOrdersTable = memo(
          field: 'market.tradableInstrument.instrument.code',
          cellRenderer: 'MarketNameCell',
          cellRendererParams: { idPath: 'market.id', onMarketClick },
+          pinned: true,
        },
        {
          headerName: t('Trigger'),
@@ -71,6 +71,7 @@ const defaultColDef = {
  filterParams: { buttons: ['reset'] },
  tooltipComponent: TooltipCellComponent,
  resizable: true,
+  minWidth: 110,
 };

 export const PositionsTable = ({
@@ -83,6 +84,330 @@ export const PositionsTable = ({
  ...props
 }: Props) => {
  const t = useT();
+
+  const colDefs = useMemo<ColDef[]>(() => {
+    const columnDefs: (ColDef | null)[] = [
+      multipleKeys
+        ? {
+            headerName: t('Vega key'),
+            field: 'partyId',
+            valueGetter: ({ data }: VegaValueGetterParams<Position>) =>
+              (data?.partyId &&
+                pubKeys &&
+                pubKeys.find((key) => key.publicKey === data.partyId)?.name) ||
+              data?.partyId,
+          }
+        : null,
+      {
+        headerName: t('Market'),
+        field: 'marketCode',
+        resizable: true,
+        onCellClicked: ({ data }) => {
+          if (!onMarketClick) return;
+          onMarketClick(data.marketId);
+        },
+        pinned: true,
+        cellRenderer: ({
+          value,
+          data,
+        }: VegaICellRendererParams<Position, 'marketCode'>) => {
+          if (!data || !value) return '-';
+          return (
+            <StackedCell
+              primary={value}
+              secondary={
+                <>
+                  {data?.assetSymbol}
+                  <MarketProductPill productType={data.productType} />
+                </>
+              }
+            />
+          );
+        },
+      },
+      {
+        headerName: t('Size / Notional'),
+        field: 'openVolume',
+        type: 'rightAligned',
+        cellClass: 'font-mono text-right',
+        cellClassRules: signedNumberCssClassRules,
+        filter: 'agNumberColumnFilter',
+        valueGetter: ({ data }: { data: Position }) => {
+          return data?.openVolume === undefined
+            ? undefined
+            : toBigNum(data?.openVolume, data.positionDecimalPlaces).toNumber();
+        },
+        valueFormatter: ({
+          data,
+        }: VegaValueFormatterParams<Position, 'openVolume'>): string => {
+          if (!data?.openVolume) return '-';
+
+          const vol = volumePrefix(
+            addDecimalsFormatNumber(data.openVolume, data.positionDecimalPlaces)
+          );
+
+          return vol;
+        },
+        cellRenderer: OpenVolumeCell,
+      },
+      {
+        headerName: t('Entry / Mark'),
+        field: 'markPrice',
+        type: 'rightAligned',
+        cellClass: 'font-mono text-right',
+        cellRenderer: ({
+          data,
+        }: VegaICellRendererParams<Position, 'markPrice'>) => {
+          if (
+            !data?.averageEntryPrice ||
+            !data?.markPrice ||
+            !data?.marketDecimalPlaces
+          ) {
+            return <>-</>;
+          }
+
+          if (
+            data.marketTradingMode ===
+            MarketTradingMode.TRADING_MODE_OPENING_AUCTION
+          ) {
+            return <>-</>;
+          }
+
+          const entry = addDecimalsFormatNumber(
+            data.averageEntryPrice,
+            data.marketDecimalPlaces
+          );
+          const mark = addDecimalsFormatNumber(
+            data.markPrice,
+            data.marketDecimalPlaces
+          );
+          return (
+            <StackedCell
+              primary={entry}
+              secondary={
+                <PriceFlashCell
+                  value={Number(data.markPrice)}
+                  valueFormatted={mark}
+                />
+              }
+            />
+          );
+        },
+        filter: 'agNumberColumnFilter',
+        valueGetter: ({ data }: VegaValueGetterParams<Position>) => {
+          return !data ||
+            !data.markPrice ||
+            data.marketTradingMode ===
+              MarketTradingMode.TRADING_MODE_OPENING_AUCTION
+            ? undefined
+            : toBigNum(data.markPrice, data.marketDecimalPlaces).toNumber();
+        },
+      },
+      {
+        headerName: t('Margin / Leverage'),
+        colId: 'margin',
+        type: 'rightAligned',
+        cellClass: 'font-mono text-right',
+        filter: 'agNumberColumnFilter',
+        valueGetter: ({ data }: VegaValueGetterParams<Position>) => {
+          return !data
+            ? undefined
+            : toBigNum(
+                data.marginAccountBalance,
+                data.assetDecimals
+              ).toNumber();
+        },
+        cellRenderer: ({ data }: VegaICellRendererParams<Position>) => {
+          if (
+            !data ||
+            !data.marginAccountBalance ||
+            !data.marketDecimalPlaces
+          ) {
+            return null;
+          }
+          const margin = addDecimalsFormatNumberQuantum(
+            data.marginAccountBalance,
+            data.assetDecimals,
+            data.quantum
+          );
+
+          const lev = data?.currentLeverage ? data.currentLeverage : 1;
+          const leverage = formatNumber(Math.max(1, lev), 1);
+          return <StackedCell primary={margin} secondary={leverage + 'x'} />;
+        },
+      },
+      {
+        colId: 'liquidationPrice',
+        headerName: 'Liquidation',
+        headerTooltip: t('Worst case liquidation price'),
+        cellClass: 'font-mono text-right',
+        type: 'rightAligned',
+        // Cannot be sortable as data is fetched within the cell
+        sortable: false,
+        filter: false,
+        cellRenderer: ({ data }: VegaICellRendererParams<Position>) => {
+          if (!data) {
+            return '-';
+          }
+          return (
+            <div className="flex h-[45px] items-center">
+              <LiquidationPrice
+                className="block text-right grow"
+                marketId={data.marketId}
+                openVolume={data.openVolume}
+                collateralAvailable={data.totalBalance}
+                decimalPlaces={data.marketDecimalPlaces}
+              />
+            </div>
+          );
+        },
+      },
+      {
+        headerName: t('Realised PNL'),
+        field: 'realisedPNL',
+        type: 'rightAligned',
+        cellClassRules: signedNumberCssClassRules,
+        cellClass: 'font-mono text-right',
+        filter: 'agNumberColumnFilter',
+        valueGetter: realisedPNLValueGetter,
+        cellRenderer: (
+          args: VegaICellRendererParams<Position, 'realisedPNL'>
+        ) => {
+          const LOSS_SOCIALIZATION_LINK = DocsLinks?.LOSS_SOCIALIZATION ?? '';
+
+          if (!args.data || args.value === undefined) {
+            return null;
+          }
+
+          const losses = parseInt(args.data?.lossSocializationAmount ?? '0');
+
+          if (losses <= 0) {
+            // eslint-disable-next-line react/jsx-no-useless-fragment
+            return (
+              <Tooltip description={args.valueFormatted} align="end">
+                <div>
+                  <PNLCell {...args} />
+                </div>
+              </Tooltip>
+            );
+          }
+
+          const lossesFormatted = addDecimalsFormatNumber(
+            args.data.lossSocializationAmount,
+            args.data.assetDecimals
+          );
+
+          return (
+            <Tooltip
+              align="end"
+              description={
+                <>
+                  <p className="mb-2">
+                    {t('Realised PNL: {{value}}', {
+                      nsSeparator: '*',
+                      replace: { value: args.value },
+                    })}
+                  </p>
+                  <p className="mb-2">
+                    {t('Lifetime loss socialisation deductions: {{losses}}', {
+                      nsSeparator: '*',
+                      replace: {
+                        losses: lossesFormatted,
+                      },
+                    })}
+                  </p>
+                  <p className="mb-2">
+                    {t(
+                      `You received less {{assetSymbol}} in gains that you should have when the market moved in your favour. This occurred because one or more other trader(s) were closed out and did not have enough funds to cover their losses, and the market's insurance pool was empty.`,
+                      { assetSymbol: args.data.assetSymbol }
+                    )}
+                  </p>
+                  {LOSS_SOCIALIZATION_LINK && (
+                    <ExternalLink href={LOSS_SOCIALIZATION_LINK}>
+                      {t('Read more about loss socialisation')}
+                    </ExternalLink>
+                  )}
+                </>
+              }
+            >
+              <div>
+                <PNLCell {...args} />
+              </div>
+            </Tooltip>
+          );
+        },
+        valueFormatter: ({
+          data,
+        }: VegaValueFormatterParams<Position, 'realisedPNL'>) => {
+          return !data
+            ? ''
+            : addDecimalsFormatNumberQuantum(
+                data.realisedPNL,
+                data.assetDecimals,
+                data.quantum
+              );
+        },
+        headerTooltip: t(
+          'Profit or loss is realised whenever your position is reduced to zero and the margin is released back to your collateral balance. P&L excludes any fees paid.'
+        ),
+      },
+      {
+        headerName: t('Unrealised PNL'),
+        field: 'unrealisedPNL',
+        type: 'rightAligned',
+        cellClassRules: signedNumberCssClassRules,
+        cellClass: 'font-mono text-right',
+        filter: 'agNumberColumnFilter',
+        valueGetter: unrealisedPNLValueGetter,
+        // @ts-ignore no type overlap but function can be identical
+        tooltipValueGetter: unrealisedPNLValueGetter,
+        valueFormatter: ({
+          data,
+        }: VegaValueFormatterParams<Position, 'unrealisedPNL'>) =>
+          !data
+            ? ''
+            : addDecimalsFormatNumberQuantum(
+                data.unrealisedPNL,
+                data.assetDecimals,
+                data.quantum
+              ),
+        headerTooltip: t(
+          'Unrealised profit is the current profit on your open position. Margin is still allocated to your position.'
+        ),
+      },
+      onClose && !isReadOnly
+        ? {
+            ...COL_DEFS.actions,
+            cellRenderer: ({ data }: VegaICellRendererParams<Position>) => {
+              return (
+                <div className="flex items-center justify-end gap-2">
+                  {data?.openVolume &&
+                  data?.openVolume !== '0' &&
+                  data.partyId === pubKey ? (
+                    <ButtonLink
+                      data-testid="close-position"
+                      onClick={() => data && onClose(data)}
+                      title={t('Close position')}
+                    >
+                      <VegaIcon name={VegaIconNames.CROSS} size={16} />
+                    </ButtonLink>
+                  ) : null}
+                  {data?.assetId && (
+                    <PositionActionsDropdown assetId={data?.assetId} />
+                  )}
+                </div>
+              );
+            },
+            minWidth: 55,
+            maxWidth: 55,
+          }
+        : null,
+    ];
+    return columnDefs.filter<ColDef>(
+      (colDef: ColDef | null): colDef is ColDef => colDef !== null
+    );
+  }, [isReadOnly, multipleKeys, onClose, onMarketClick, pubKey, pubKeys, t]);
+
  return (
    <AgGrid
      overlayNoRowsTemplate={t('No positions')}
@@ -95,349 +420,7 @@ export const PositionsTable = ({
        MarketNameCell,
      }}
      rowHeight={45}
-      columnDefs={useMemo<ColDef[]>(() => {
-        const columnDefs: (ColDef | null)[] = [
-          multipleKeys
-            ? {
-                headerName: t('Vega key'),
-                field: 'partyId',
-                valueGetter: ({ data }: VegaValueGetterParams<Position>) =>
-                  (data?.partyId &&
-                    pubKeys &&
-                    pubKeys.find((key) => key.publicKey === data.partyId)
-                      ?.name) ||
-                  data?.partyId,
-              }
-            : null,
-          {
-            headerName: t('Market'),
-            field: 'marketCode',
-            onCellClicked: ({ data }) => {
-              if (!onMarketClick) return;
-              onMarketClick(data.marketId);
-            },
-            cellRenderer: ({
-              value,
-              data,
-            }: VegaICellRendererParams<Position, 'marketCode'>) => {
-              if (!data || !value) return '-';
-              return (
-                <StackedCell
-                  primary={value}
-                  secondary={
-                    <>
-                      {data?.assetSymbol}
-                      <MarketProductPill productType={data.productType} />
-                    </>
-                  }
-                />
-              );
-            },
-          },
-          {
-            headerName: t('Size / Notional'),
-            field: 'openVolume',
-            type: 'rightAligned',
-            cellClass: 'font-mono text-right',
-            cellClassRules: signedNumberCssClassRules,
-            filter: 'agNumberColumnFilter',
-            valueGetter: ({ data }: { data: Position }) => {
-              return data?.openVolume === undefined
-                ? undefined
-                : toBigNum(
-                    data?.openVolume,
-                    data.positionDecimalPlaces
-                  ).toNumber();
-            },
-            valueFormatter: ({
-              data,
-            }: VegaValueFormatterParams<Position, 'openVolume'>): string => {
-              if (!data?.openVolume) return '-';
-
-              const vol = volumePrefix(
-                addDecimalsFormatNumber(
-                  data.openVolume,
-                  data.positionDecimalPlaces
-                )
-              );
-
-              return vol;
-            },
-            cellRenderer: OpenVolumeCell,
-          },
-          {
-            headerName: t('Entry / Mark'),
-            field: 'markPrice',
-            type: 'rightAligned',
-            cellClass: 'font-mono text-right',
-            cellRenderer: ({
-              data,
-            }: VegaICellRendererParams<Position, 'markPrice'>) => {
-              if (
-                !data?.averageEntryPrice ||
-                !data?.markPrice ||
-                !data?.marketDecimalPlaces
-              ) {
-                return <>-</>;
-              }
-
-              if (
-                data.marketTradingMode ===
-                MarketTradingMode.TRADING_MODE_OPENING_AUCTION
-              ) {
-                return <>-</>;
-              }
-
-              const entry = addDecimalsFormatNumber(
-                data.averageEntryPrice,
-                data.marketDecimalPlaces
-              );
-              const mark = addDecimalsFormatNumber(
-                data.markPrice,
-                data.marketDecimalPlaces
-              );
-              return (
-                <StackedCell
-                  primary={entry}
-                  secondary={
-                    <PriceFlashCell
-                      value={Number(data.markPrice)}
-                      valueFormatted={mark}
-                    />
-                  }
-                />
-              );
-            },
-            filter: 'agNumberColumnFilter',
-            valueGetter: ({ data }: VegaValueGetterParams<Position>) => {
-              return !data ||
-                !data.markPrice ||
-                data.marketTradingMode ===
-                  MarketTradingMode.TRADING_MODE_OPENING_AUCTION
-                ? undefined
-                : toBigNum(data.markPrice, data.marketDecimalPlaces).toNumber();
-            },
-          },
-          {
-            headerName: t('Margin / Leverage'),
-            colId: 'margin',
-            type: 'rightAligned',
-            cellClass: 'font-mono text-right',
-            filter: 'agNumberColumnFilter',
-            valueGetter: ({ data }: VegaValueGetterParams<Position>) => {
-              return !data
-                ? undefined
-                : toBigNum(
-                    data.marginAccountBalance,
-                    data.assetDecimals
-                  ).toNumber();
-            },
-            cellRenderer: ({ data }: VegaICellRendererParams<Position>) => {
-              if (
-                !data ||
-                !data.marginAccountBalance ||
-                !data.marketDecimalPlaces
-              ) {
-                return null;
-              }
-              const margin = addDecimalsFormatNumberQuantum(
-                data.marginAccountBalance,
-                data.assetDecimals,
-                data.quantum
-              );
-
-              const lev = data?.currentLeverage ? data.currentLeverage : 1;
-              const leverage = formatNumber(Math.max(1, lev), 1);
-              return (
-                <StackedCell primary={margin} secondary={leverage + 'x'} />
-              );
-            },
-          },
-          {
-            colId: 'liquidationPrice',
-            headerName: 'Liquidation',
-            headerTooltip: t('Worst case liquidation price'),
-            cellClass: 'font-mono text-right',
-            type: 'rightAligned',
-            // Cannot be sortable as data is fetched within the cell
-            sortable: false,
-            filter: false,
-            cellRenderer: ({ data }: VegaICellRendererParams<Position>) => {
-              if (!data) {
-                return '-';
-              }
-              return (
-                <div className="flex h-[45px] items-center">
-                  <LiquidationPrice
-                    className="block text-right grow"
-                    marketId={data.marketId}
-                    openVolume={data.openVolume}
-                    collateralAvailable={data.totalBalance}
-                    decimalPlaces={data.marketDecimalPlaces}
-                  />
-                </div>
-              );
-            },
-          },
-          {
-            headerName: t('Realised PNL'),
-            field: 'realisedPNL',
-            type: 'rightAligned',
-            cellClassRules: signedNumberCssClassRules,
-            cellClass: 'font-mono text-right',
-            filter: 'agNumberColumnFilter',
-            valueGetter: realisedPNLValueGetter,
-            cellRenderer: (
-              args: VegaICellRendererParams<Position, 'realisedPNL'>
-            ) => {
-              const LOSS_SOCIALIZATION_LINK =
-                DocsLinks?.LOSS_SOCIALIZATION ?? '';
-
-              if (!args.data || args.value === undefined) {
-                return null;
-              }
-
-              const losses = parseInt(
-                args.data?.lossSocializationAmount ?? '0'
-              );
-
-              if (losses <= 0) {
-                // eslint-disable-next-line react/jsx-no-useless-fragment
-                return (
-                  <Tooltip description={args.valueFormatted} align="end">
-                    <div>
-                      <PNLCell {...args} />
-                    </div>
-                  </Tooltip>
-                );
-              }
-
-              const lossesFormatted = addDecimalsFormatNumber(
-                args.data.lossSocializationAmount,
-                args.data.assetDecimals
-              );
-
-              return (
-                <Tooltip
-                  align="end"
-                  description={
-                    <>
-                      <p className="mb-2">
-                        {t('Realised PNL: {{value}}', {
-                          nsSeparator: '*',
-                          replace: { value: args.value },
-                        })}
-                      </p>
-                      <p className="mb-2">
-                        {t(
-                          'Lifetime loss socialisation deductions: {{losses}}',
-                          {
-                            nsSeparator: '*',
-                            replace: {
-                              losses: lossesFormatted,
-                            },
-                          }
-                        )}
-                      </p>
-                      <p className="mb-2">
-                        {t(
-                          `You received less {{assetSymbol}} in gains that you should have when the market moved in your favour. This occurred because one or more other trader(s) were closed out and did not have enough funds to cover their losses, and the market's insurance pool was empty.`,
-                          { assetSymbol: args.data.assetSymbol }
-                        )}
-                      </p>
-                      {LOSS_SOCIALIZATION_LINK && (
-                        <ExternalLink href={LOSS_SOCIALIZATION_LINK}>
-                          {t('Read more about loss socialisation')}
-                        </ExternalLink>
-                      )}
-                    </>
-                  }
-                >
-                  <div>
-                    <PNLCell {...args} />
-                  </div>
-                </Tooltip>
-              );
-            },
-            valueFormatter: ({
-              data,
-            }: VegaValueFormatterParams<Position, 'realisedPNL'>) => {
-              return !data
-                ? ''
-                : addDecimalsFormatNumberQuantum(
-                    data.realisedPNL,
-                    data.assetDecimals,
-                    data.quantum
-                  );
-            },
-            headerTooltip: t(
-              'Profit or loss is realised whenever your position is reduced to zero and the margin is released back to your collateral balance. P&L excludes any fees paid.'
-            ),
-          },
-          {
-            headerName: t('Unrealised PNL'),
-            field: 'unrealisedPNL',
-            type: 'rightAligned',
-            cellClassRules: signedNumberCssClassRules,
-            cellClass: 'font-mono text-right',
-            filter: 'agNumberColumnFilter',
-            valueGetter: unrealisedPNLValueGetter,
-            // @ts-ignore no type overlap but function can be identical
-            tooltipValueGetter: unrealisedPNLValueGetter,
-            valueFormatter: ({
-              data,
-            }: VegaValueFormatterParams<Position, 'unrealisedPNL'>) =>
-              !data
-                ? ''
-                : addDecimalsFormatNumberQuantum(
-                    data.unrealisedPNL,
-                    data.assetDecimals,
-                    data.quantum
-                  ),
-            headerTooltip: t(
-              'Unrealised profit is the current profit on your open position. Margin is still allocated to your position.'
-            ),
-          },
-          onClose && !isReadOnly
-            ? {
-                ...COL_DEFS.actions,
-                cellRenderer: ({ data }: VegaICellRendererParams<Position>) => {
-                  return (
-                    <div className="flex items-center justify-end gap-2">
-                      {data?.openVolume &&
-                      data?.openVolume !== '0' &&
-                      data.partyId === pubKey ? (
-                        <ButtonLink
-                          data-testid="close-position"
-                          onClick={() => data && onClose(data)}
-                          title={t('Close position')}
-                        >
-                          <VegaIcon name={VegaIconNames.CROSS} size={16} />
-                        </ButtonLink>
-                      ) : null}
-                      {data?.assetId && (
-                        <PositionActionsDropdown assetId={data?.assetId} />
-                      )}
-                    </div>
-                  );
-                },
-                minWidth: 55,
-                maxWidth: 55,
-              }
-            : null,
-        ];
-        return columnDefs.filter<ColDef>(
-          (colDef: ColDef | null): colDef is ColDef => colDef !== null
-        );
-      }, [
-        isReadOnly,
-        multipleKeys,
-        onClose,
-        onMarketClick,
-        pubKey,
-        pubKeys,
-        t,
-      ])}
+      columnDefs={colDefs}
      {...props}
    />
  );
@@ -29,6 +29,7 @@ export const useColumnDefs = () => {
        colId: 'market',
        headerName: t('Market'),
        field: 'terms.change.instrument.code',
+        pinned: true,
        cellStyle: { lineHeight: '14px' },
        cellRenderer: ({
          value,
@@ -134,7 +134,6 @@ fragment NewMarketFields on NewMarket {
  #     timeWindow
  #     scalingFactor
  #   }
-  #   triggeringRatio
  #   auctionExtensionSecs
  # }
  # linearSlippageFactor
@@ -299,7 +298,6 @@ fragment UpdateMarketFields on UpdateMarket {
        timeWindow
        scalingFactor
      }
-      triggeringRatio
      # auctionExtensionSecs
    }
    riskParameters {
@@ -92,7 +92,6 @@ export const marketUpdateProposal: ProposalListFieldsFragment = {
          triggers: [],
        },
        liquidityMonitoringParameters: {
-          triggeringRatio: '0',
          targetStakeParameters: {
            scalingFactor: 0,
            timeWindow: 0,
@@ -162,7 +162,6 @@ const generateUpdateMarketProposal = (
          __typename: liquidityMonitoring
            ? 'LiquidityMonitoringParameters'
            : undefined,
-          triggeringRatio: '0',
          targetStakeParameters: {
            __typename: undefined,
            scalingFactor: 0,
@@ -5585,6 +5585,8 @@ export enum StopOrderRejectionReason {
  REJECTION_REASON_MAX_STOP_ORDERS_PER_PARTY_REACHED = 'REJECTION_REASON_MAX_STOP_ORDERS_PER_PARTY_REACHED',
  /** Stop orders submission must be reduce only */
  REJECTION_REASON_MUST_BE_REDUCE_ONLY = 'REJECTION_REASON_MUST_BE_REDUCE_ONLY',
+  /** Stop orders are not allowed during the opening auction */
+  REJECTION_REASON_STOP_ORDER_NOT_ALLOWED_DURING_OPENING_AUCTION = 'REJECTION_REASON_STOP_ORDER_NOT_ALLOWED_DURING_OPENING_AUCTION',
  /** Stop orders are not allowed without a position */
  REJECTION_REASON_STOP_ORDER_NOT_ALLOWED_WITHOUT_A_POSITION = 'REJECTION_REASON_STOP_ORDER_NOT_ALLOWED_WITHOUT_A_POSITION',
  /** This stop order does not close the position */
@@ -85,19 +85,21 @@ export function Dialog({
                  <VegaIcon name={VegaIconNames.CROSS} size={24} />
                </DialogPrimitives.Close>
              )}
-              <div className="flex gap-4 max-w-full">
-                {icon && <div className="fill-current">{icon}</div>}
-                <div data-testid="dialog-content" className="flex-1 max-w-full">
-                  {title && (
-                    <h1
-                      className="text-xl uppercase mb-4 pr-2"
-                      data-testid="dialog-title"
-                    >
-                      {title}
-                    </h1>
-                  )}
-                  <div>{children}</div>
-                </div>
+              <div data-testid="dialog-content" className="flex-1 max-w-full">
+                {title && (
+                  <span
+                    className="text-xl uppercase flex gap-4"
+                    data-testid="dialog-title"
+                  >
+                    {icon && (
+                      <span className="fill-current flex items-center">
+                        {icon}
+                      </span>
+                    )}
+                    {title}
+                  </span>
+                )}
+                <div>{children}</div>
              </div>
            </div>
          </div>
@@ -5,15 +5,16 @@ import { ToastPosition, useToastsConfiguration, useToasts } from './use-toasts';
 import { useCallback } from 'react';
 import { Intent } from '../../utils/intent';
 import { useT } from '../../use-t';
+import { useScreenDimensions } from '@vegaprotocol/react-helpers';

 export const ToastPositionSetter = () => {
  const t = useT();
-  const setPostion = useToastsConfiguration((store) => store.setPosition);
+  const setPosition = useToastsConfiguration((store) => store.setPosition);
  const position = useToastsConfiguration((store) => store.position);
  const setToast = useToasts((store) => store.setToast);
  const handleChange = useCallback(
    (position: ToastPosition) => {
-      setPostion(position);
+      setPosition(position);
      setToast({
        id: 'test-toast',
        intent: Intent.Primary,
@@ -21,11 +22,49 @@ export const ToastPositionSetter = () => {
        onClose: () => useToasts.getState().remove('test-toast'),
      });
    },
-    [setToast, setPostion, t]
+    [setToast, setPosition, t]
  );
  const buttonCssClasses =
    'flex items-center px-1 py-1 relative rounded bg-vega-clight-400 dark:bg-vega-cdark-400';
  const activeIcon = 'fill-vega-clight-900 dark:fill-vega-cdark-900';
+
+  const { screenSize } = useScreenDimensions();
+
+  const isMobileScreen = screenSize === 'xs';
+
+  if (isMobileScreen) {
+    return (
+      <div className="flex justify-between">
+        <div className={classNames('grid grid-cols-1 grid-rows-2 gap-1')}>
+          <button
+            className={buttonCssClasses}
+            onClick={() => handleChange(ToastPosition.TopCenter)}
+          >
+            <Icon
+              className={classNames(
+                position === ToastPosition.TopCenter && activeIcon
+              )}
+              size={3}
+              name={IconNames.ARROW_UP}
+            />
+          </button>
+          <button
+            className={buttonCssClasses}
+            onClick={() => handleChange(ToastPosition.BottomCenter)}
+          >
+            <Icon
+              className={classNames(
+                position === ToastPosition.BottomCenter && activeIcon
+              )}
+              size={3}
+              name={IconNames.ARROW_DOWN}
+            />
+          </button>
+        </div>
+      </div>
+    );
+  }
+
  return (
    <div className="flex justify-between">
      <div className={classNames('grid grid-cols-3 grid-rows-2 gap-1')}>
@@ -92,7 +92,7 @@ export const ToastsContainer = ({
          className={classNames(
            'absolute right-0 top-[-38px] z-20 w-full',
            'transition-opacity',
-            'opacity-0 hover:!opacity-100 group-hover:opacity-50',
+            'sm:opacity-0 sm:hover:!opacity-100 sm:group-hover:opacity-50',
            {
              hidden: validToasts.length === 0,
            }
@@ -149,6 +149,7 @@ interface ProposalNewMarketTerms {
          timeWindow: string;
          scalingFactor: number;
        };
+        // FIXME: workaround because of https://github.com/vegaprotocol/vega/issues/10343
        triggeringRatio: string;
        auctionExtension: string;
      };
@@ -34,7 +34,7 @@ export class ViewConnector implements VegaConnector {
    });
    return Promise.resolve([
      {
-        name: 'View only pubkey',
+        name: 'View only',
        publicKey: this.pubkey,
      },
    ]);
@@ -149,9 +149,6 @@ describe('WithdrawFormContainer', () => {
              liquidityFee: '0.001',
            },
          },
-          liquidityMonitoringParameters: {
-            triggeringRatio: '0.7',
-          },
          tradableInstrument: {
            __typename: 'TradableInstrument',
            instrument: {
@@ -15,6 +15,7 @@ import {
  VegaIconNames,
 } from '@vegaprotocol/ui-toolkit';
 import {
+  COL_DEFS,
  type TypedDataAgGrid,
  type VegaICellRendererParams,
  type VegaValueFormatterParams,
@@ -46,7 +47,7 @@ export const WithdrawalsTable = ({

  const columnDefs = useMemo<ColDef[]>(
    () => [
-      { headerName: t('Asset'), field: 'asset.symbol' },
+      { headerName: t('Asset'), field: 'asset.symbol', pinned: true },
      {
        headerName: t('Amount'),
        field: 'amount',
@@ -135,6 +136,7 @@ export const WithdrawalsTable = ({
    <AgGrid
      overlayNoRowsTemplate={t('No withdrawals')}
      columnDefs={columnDefs}
+      defaultColDef={COL_DEFS.default}
      components={{
        RecipientCell,
        StatusCell,
@@ -38,7 +38,7 @@
    "@radix-ui/react-slider": "^1.1.0",
    "@radix-ui/react-switch": "^1.0.2",
    "@radix-ui/react-tabs": "^1.0.2",
-    "@radix-ui/react-tooltip": "^1.0.3",
+    "@radix-ui/react-tooltip": "^1.0.7",
    "@sentry/nextjs": "^6.19.3",
    "@sentry/react": "^6.19.2",
    "@sentry/tracing": "^6.19.2",
@@ -4864,7 +4864,7 @@
    "@radix-ui/react-separator" "1.0.3"
    "@radix-ui/react-toggle-group" "1.0.4"

-"@radix-ui/react-tooltip@^1.0.3":
+"@radix-ui/react-tooltip@^1.0.7":
  version "1.0.7"
  resolved "https://registry.yarnpkg.com/@radix-ui/react-tooltip/-/react-tooltip-1.0.7.tgz#8f55070f852e7e7450cc1d9210b793d2e5a7686e"
  integrity sha512-lPh5iKNFVQ/jav/j6ZrWq3blfDJ0OH9R6FlNUHPMqdLuQ9vwDgFsRxvl8b7Asuy5c8xmoojHUxKHQSOAvMHxyw==
Author	SHA1	Message	Date
Matthew Russell	4ef9614630	chore: add trading view env vars	2024-01-16 12:27:36 -05:00
m.ray	bc9d87fe30	chore(trading): clean up triggering ratio (#5604 )	2024-01-16 18:10:32 +01:00
m.ray	6a21862378	fix(trading): use `No trading` instead of `Trading terminated` (#5624 )	2024-01-16 18:30:42 +02:00
Ben	0fb4348e9c	chore(trading): upload market-sim logs (#5622 )	2024-01-15 20:56:52 +00:00
m.ray	b751bcf17d	feat(trading): mobile responsiveness tweaks (#5613 )	2024-01-15 15:26:13 +00:00
m.ray	d32f27fcb1	feat(trading): mobile responsiveness - market selector (#5582 )	2024-01-11 11:23:48 +00:00
m.ray	d05cd6a2ed	fix(trading): tiny scroll for rewards (#5586 )	2024-01-10 15:49:58 +00:00
m.ray	c003e5fa30	fix(trading): liquidity table improve readability and remove grouping (#5598 )	2024-01-10 15:49:35 +00:00
Ben	f62d3289ab	chore(trading): retry on http error (#5601 )	2024-01-10 15:44:01 +00:00
Ben	a3d3d18c5c	chore(trading): fix price monitoring test (#5600 )	2024-01-10 14:56:17 +00:00