feat(trading): show gray bar is user is not active

feat(trading): tier as of last epoch copy change
feat(trading): move to node guard
2024-01-05 11:22:39 +02:00 · 2024-01-05 11:18:23 +02:00 · 2024-01-04 14:53:38 +02:00 · 2024-01-03 16:30:16 +02:00 · 2024-01-03 16:13:01 +02:00 · 2024-01-03 12:26:31 +02:00
86 changed files with 1111 additions and 1292 deletions
@@ -227,31 +227,3 @@ 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('Proposal page displayed on mobile', function () {
+    it.skip('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.skip('Able to view new asset proposal', function () {
+    it('Able to view new asset proposal', function () {
      const proposalTitle = 'Test new asset proposal';
      const newAssetProposalBody = getNewAssetTxBody();
      cy.VegaWalletSubmitProposal(newAssetProposalBody);
@@ -60,7 +60,7 @@ const PartyLink = ({ id, truncate = false, ...props }: PartyLinkProps) => {
  }

  return (
-    <span>
+    <span className="whitespace-nowrap">
      {useName && <Icon size={4} name="cube" className="mr-2" />}
      <Link
        className="underline font-mono"
@@ -60,7 +60,7 @@ const DeterministicOrderDetails = ({
  const o = data.orderByID;
  return (
    <div className={wrapperClasses}>
-      <div className="mb-0">
+      <div className="mb-12 lg:mb-0">
        <div className="relative block px-3 py-6 md:px-6 lg:-mr-7">
          <h2 className="text-3xl font-bold mb-4 display-5">
            <abbr title={tifFull[o.timeInForce]} className="bb-dotted mr-2">
@@ -89,9 +89,9 @@ const DeterministicOrderDetails = ({
              <span>{t('Reference')}</span>: {o.reference}
            </p>
          ) : null}
-          <div className="grid grid-cols-2 md:grid-cols-5 gap-x-6 mt-4">
-            <div className="mb-6 md:mb-0">
-              <h2 className="text-2xl font-bold text-dark mb-0 md:mb-4">
+          <div className="grid md:grid-cols-5 gap-x-6 mt-4">
+            <div className="mb-12 md:mb-0">
+              <h2 className="text-2xl font-bold text-dark mb-4">
                {t('Status')}
              </h2>
              <h5 className="text-lg font-medium text-gray-500 mb-0 capitalize">
@@ -99,17 +99,15 @@ const DeterministicOrderDetails = ({
              </h5>
            </div>

-            <div className="mb-6 md:mb-0">
-              <h2 className="text-2xl font-bold text-dark mb-0 md:mb-4">
-                {t('Size')}
-              </h2>
+            <div className="mb-12 md:mb-0">
+              <h2 className="text-2xl font-bold text-dark mb-4">{t('Size')}</h2>
              <h5 className="text-lg font-medium text-gray-500 mb-0">
                <SizeInMarket size={o.size} marketId={o.market.id} />
              </h5>
            </div>

-            <div className="mb-6 md:mb-0">
-              <h2 className="text-2xl font-bold text-dark mb-0 md:mb-4">
+            <div className="">
+              <h2 className="text-2xl font-bold text-dark mb-4">
                {t('Version')}
              </h2>
              <h5 className="text-lg font-medium text-gray-500 mb-0">
@@ -117,8 +115,8 @@ const DeterministicOrderDetails = ({
              </h5>
            </div>
            {o.type ? (
-              <div className="mb-6 md:mb-0">
-                <h2 className="text-2xl font-bold text-dark mb-0 md:mb-4">
+              <div className="">
+                <h2 className="text-2xl font-bold text-dark mb-4">
                  {t('Type')}
                </h2>
                <h5 className="text-lg font-medium text-gray-500 mb-0">
@@ -30,12 +30,12 @@ export const Signature = ({ signature }: SignatureProps) => {

  return (
    <div className="inline-flex border rounded signature-component relative pr-[20px]">
-      <div
+      <span
        className="bg-gray-100 px-2.5 py-0.5 text-xs text-gray-500 select-none cursor-default"
-        title={`${signature.algo}`}
+        title={`Version ${signature.version}`}
      >
-        <span>v{signature.version}</span>
-      </div>
+        {signature.algo}
+      </span>
      <div
        className={
          isOpen
@@ -73,7 +73,7 @@ export const Layout = () => {
          <ProtocolUpgradeInProgressNotification />
        </div>
        <div className={fixedWidthClasses}>
-          <main className="md:p-4">
+          <main className="p-4">
            {!isHome && <BreadcrumbsContainer className="mb-4" />}
            <Outlet />
          </main>
@@ -196,7 +196,6 @@ export function createNewMarketProposalTxBody(): ProposalSubmissionBody {
                timeWindow: '3600',
                scalingFactor: 10,
              },
-              // FIXME: workaround because of https://github.com/vegaprotocol/vega/issues/10343
              triggeringRatio: '0.7',
              auctionExtension: '1',
            },
@@ -335,7 +334,6 @@ export function createSuccessorMarketProposalTxBody(
                timeWindow: '3600',
                scalingFactor: 10,
              },
-              // FIXME: workaround because of https://github.com/vegaprotocol/vega/issues/10343
              triggeringRatio: '0.7',
              auctionExtension: '1',
            },
@@ -205,6 +205,7 @@ query Proposal(
            }
          }
          liquidityMonitoringParameters {
+            triggeringRatio
            targetStakeParameters {
              timeWindow
              scalingFactor
@@ -365,6 +366,7 @@ query Proposal(
              }
            }
            liquidityMonitoringParameters {
+              triggeringRatio
              targetStakeParameters {
                timeWindow
                scalingFactor
@@ -28,6 +28,3 @@ 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=
@@ -54,5 +54,3 @@ To run the UI automation tests with a mocked API, run:
 ```bash
 yarn nx run trading-e2e:e2e
 ```
-
-To run tests with market sim please read [the readme](e2e/README.md).
@@ -314,7 +314,7 @@ describe('Closed', () => {
  });

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

 const components = {
@@ -53,7 +53,6 @@ export const MarketsPage = () => {
                size="extra-small"
                data-testid="propose-new-market"
                href={externalLink}
-                target="_blank"
              >
                {t('Propose a new market')}
              </TradingAnchorButton>
@@ -29,7 +29,6 @@ export const useColumnDefs = () => {
      {
        headerName: t('Market'),
        field: 'tradableInstrument.instrument.code',
-        pinned: true,
        cellRenderer: ({
          value,
          data,
@@ -4,7 +4,6 @@ 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();
@@ -17,10 +16,10 @@ export const Rewards = () => {
  }, [updateTitle, title]);
  return (
    <ErrorBoundary feature="rewards">
-      <TinyScroll className="p-4 max-h-full overflow-auto">
+      <div className="container mx-auto p-4">
        <h1 className="px-4 pb-4 text-2xl">{title}</h1>
        <RewardsContainer />
-      </TinyScroll>
+      </div>
    </ErrorBoundary>
  );
 };
@@ -38,11 +38,7 @@ export const FeesContainer = () => {
  const { data: markets, loading: marketsLoading } = useMarketList();

  const { data: programData, loading: programLoading } =
-    useDiscountProgramsQuery({
-      errorPolicy: 'ignore',
-      fetchPolicy: 'cache-and-network',
-      pollInterval: 15000,
-    });
+    useDiscountProgramsQuery({ errorPolicy: 'ignore' });

  const volumeDiscountWindowLength =
    programData?.currentVolumeDiscountProgram?.windowLength || 1;
@@ -53,8 +49,6 @@ export const FeesContainer = () => {
      partyId: pubKey || '',
    },
    skip: !pubKey,
-    fetchPolicy: 'cache-and-network',
-    pollInterval: 15000,
  });

  const previousEpoch = (Number(feesData?.epoch.id) || 0) - 1;
@@ -1,5 +1,4 @@
 import type { DiscountProgramsQuery, FeesQuery } from './__generated__/Fees';
-
 export const useReferralStats = (
  previousEpoch?: number,
  referralStats?: NonNullable<
@@ -42,9 +42,13 @@ 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,6 +47,9 @@ export const MarketLiquiditySupplied = ({
  ]);

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

  const variables = useMemo(
    () => ({
@@ -91,6 +94,7 @@ 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/6" role="gridcell">
+      <div className="w-2/5" role="gridcell">
        <h3 className="flex items-baseline">
-          <span className="overflow-hidden text-xs md:text-sm lg:text-base text-ellipsis whitespace-nowrap">
+          <span className="overflow-hidden 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-2/6 overflow-hidden text-xs lg:text-sm whitespace-nowrap text-ellipsis text-right"
+        className="w-1/5 overflow-hidden text-xs lg:text-sm whitespace-nowrap text-ellipsis"
        title={symbol}
        data-testid="market-selector-price"
        role="gridcell"
@@ -121,14 +121,14 @@ const MarketData = ({
        {price} {symbol}
      </div>
      <div
-        className="w-2/6 sm:w-1/6 overflow-hidden text-xs lg:text-sm whitespace-nowrap text-ellipsis text-right"
+        className="w-1/5 overflow-hidden text-xs text-right lg:text-sm whitespace-nowrap text-ellipsis"
        title={t('24h vol')}
        data-testid="market-selector-volume"
        role="gridcell"
      >
        {volume}
      </div>
-      <div className="hidden sm:w-1/6 sm:flex justify-end" role="gridcell">
+      <div className="flex justify-end w-1/5" role="gridcell">
        {oneDayCandles && (
          <Sparkline
            width={64}
@@ -64,7 +64,7 @@ export const MarketSelector = ({
            setFilter((curr) => ({ ...curr, product }));
          }}
        />
-        <div className="text-sm flex sm:grid grid-cols-[2fr_1fr_1fr] gap-1 ">
+        <div className="text-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/6" role="columnheader">
+        <div className="w-2/5" role="columnheader">
          {t('Name')}
        </div>
-        <div className="w-2/6 text-right pr-4" role="columnheader">
+        <div className="w-1/5" role="columnheader">
          {t('Price')}
        </div>
-        <div className="w-2/6 sm:w-1/6 text-right" role="columnheader">
+        <div className="w-1/5 text-right" role="columnheader">
          {t('24h volume')}
        </div>
-        <div className="hidden sm:w-1/6" role="columnheader" />
+        <div className="w-1/5" role="columnheader" />
      </div>
      <div ref={listRef}>
        <List
@@ -5,7 +5,6 @@ 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
@@ -31,16 +30,7 @@ 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')}
-          <span
-            className={classNames(
-              'transition-transform ease-in-out duration-300',
-              {
-                'rotate-180': open,
-              }
-            )}
-          >
-            <VegaIcon name={VegaIconNames.CHEVRON_DOWN} size={20} />
-          </span>
+          <VegaIcon name={VegaIconNames.CHEVRON_DOWN} size={20} />
        </h1>
      }
    >
@@ -14,7 +14,6 @@ import {
  VegaIconNames,
  type VegaIconSize,
  TradingInput,
-  TinyScroll,
 } from '@vegaprotocol/ui-toolkit';
 import { IconNames } from '@blueprintjs/icons';
 import {
@@ -150,45 +149,47 @@ export const ActiveRewards = ({ currentEpoch }: { currentEpoch: number }) => {

  return (
    <Card title={t('Active rewards')} className="lg:col-span-full">
-      {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;
+      <div className="">
+        {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"
+            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}
-                />
-              )
-            );
-          })}
-      </TinyScroll>
+              return (
+                node && (
+                  <ActiveRewardCard
+                    key={i}
+                    transferNode={node}
+                    kind={transfer.kind}
+                    currentEpoch={currentEpoch}
+                  />
+                )
+              );
+            })}
+        </div>
+      </div>
    </Card>
  );
 };
@@ -1,3 +1,3 @@
 CONSOLE_IMAGE_NAME=vegaprotocol/trading:latest
-VEGA_VERSION=v0.73.10
+VEGA_VERSION=v0.73.9
 LOCAL_SERVER=false
@@ -1,3 +1,2 @@
 CONSOLE_IMAGE_NAME=vegaprotocol/trading:develop
-VEGA_VERSION=v0.73.10
-LOCAL_SERVER=false
+VEGA_VERSION=v0.73.9
@@ -1,3 +1,3 @@
 CONSOLE_IMAGE_NAME=vegaprotocol/trading:main
-VEGA_VERSION=v0.73.10
+VEGA_VERSION=v0.73.8
 LOCAL_SERVER=false
@@ -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,18 +274,3 @@ 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 
-
@@ -18,7 +18,7 @@ def setup_simple_market(
    custom_market_name=market_name,
    custom_asset_name="tDAI",
    custom_asset_symbol="tDAI",
-    custom_quantum=1,
+    custom_quantum=1
 ):
    for wallet in wallets:
        vega.create_key(wallet.name)
@@ -117,30 +117,18 @@ def setup_simple_successor_market(
    return market_id


-def setup_opening_auction_market(
-    vega: VegaService,
-    market_id: str = None,
-    buy_orders=default_buy_orders,
-    sell_orders=default_sell_orders,
-    add_liquidity=True,
-    custom_market_name="BTC:DAI_2023",
-    custom_asset_name="tDAI",
-    custom_asset_symbol="tDAI",
-    **kwargs,
-):
+def setup_opening_auction_market(vega: VegaService, market_id: str = None, buy_orders=default_buy_orders, sell_orders=default_sell_orders, add_liquidity=True, **kwargs):
    if not market_exists(vega, market_id):
-        market_id = setup_simple_market(
-            vega,
-            custom_market_name=custom_market_name,
-            custom_asset_name=custom_asset_name,
-            custom_asset_symbol=custom_asset_symbol,
-            **kwargs,
-        )
+        market_id = setup_simple_market(vega, **kwargs)

    if add_liquidity:
        submit_liquidity(vega, MM_WALLET.name, market_id)
-    submit_multiple_orders(vega, MM_WALLET.name, market_id, "SIDE_SELL", sell_orders)
-    submit_multiple_orders(vega, MM_WALLET2.name, market_id, "SIDE_BUY", buy_orders)
+    submit_multiple_orders(
+        vega, MM_WALLET.name, market_id, "SIDE_SELL", sell_orders
+    )
+    submit_multiple_orders(
+        vega, MM_WALLET2.name, market_id, "SIDE_BUY", buy_orders
+    )

    vega.forward("10s")
    vega.wait_fn(1)
@@ -158,37 +146,13 @@ def market_exists(vega: VegaService, market_id: str):


 # Add sell orders and buy orders to put on the book
-def setup_continuous_market(
-    vega: VegaService,
-    market_id: str = None,
-    buy_orders=default_buy_orders,
-    sell_orders=default_sell_orders,
-    add_liquidity=True,
-    custom_market_name="BTC:DAI_2023",
-    custom_asset_name="tDAI",
-    custom_asset_symbol="tDAI",
-    **kwargs,
-):
-    if (
-        not market_exists(vega, market_id)
-        or buy_orders != default_buy_orders
-        or sell_orders != default_sell_orders
-    ):
+def setup_continuous_market(vega: VegaService, market_id: str = None, buy_orders=default_buy_orders, sell_orders=default_sell_orders, add_liquidity=True, **kwargs):
+    if not market_exists(vega, market_id) or buy_orders != default_buy_orders or sell_orders != default_sell_orders:
        market_id = setup_opening_auction_market(
-            vega,
-            market_id,
-            buy_orders,
-            sell_orders,
-            add_liquidity,
-            custom_market_name=custom_market_name,
-            custom_asset_name=custom_asset_name,
-            custom_asset_symbol=custom_asset_symbol,
-            **kwargs,
-        )
+            vega, market_id, buy_orders, sell_orders, add_liquidity, **kwargs)

-    submit_order(
-        vega, "Key 1", market_id, "SIDE_BUY", sell_orders[0][0], sell_orders[0][1]
-    )
+    submit_order(vega, "Key 1", market_id, "SIDE_BUY",
+                 sell_orders[0][0], sell_orders[0][1])

    vega.forward("10s")
    vega.wait_fn(1)
@@ -286,8 +250,6 @@ def setup_perps_market(
 def market_exists(vega: VegaService, market_id: str):
    if market_id is None:
        return False
-    all_markets = vega.all_markets()
+    all_markets = vega.all_markets() 
    market_ids = [market.id for market in all_markets]
-    print("Checking for market ID:", market_id)
-    print("Available market IDs:", market_ids)
-    return market_id in market_ids
+    return market_id in market_ids
@@ -70,6 +70,7 @@ def test_iceberg_open_order(continuous_market, vega: VegaServiceNull, page: Page
    expect(
        page.locator(".ag-center-cols-container .ag-row [col-id='size']").first
    ).to_have_text("-102")
+    page.pause()
    expect(
        page.locator(".ag-center-cols-container .ag-row [col-id='type'] ").first
    ).to_have_text("Limit (Iceberg)")
@@ -16,6 +16,7 @@ def vega(request):
 def continuous_market(vega):
    return setup_continuous_market(vega)

+
@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("No trading")
+    expect(row_selector.locator('[col-id="state"]')).to_have_text("Trading Terminated")
    expect(row_selector.locator('[col-id="settlementDate"]')).to_have_text("Unknown")

    # TODO Create test for terminated market with settlement date in future
@@ -15,10 +15,9 @@ def test_market_selector(continuous_market, page: Page):
    # 6001-MARK-025
    btc_market = page.locator('[data-testid="market-selector-list"] a')
    expect(btc_market.locator("h3")).to_have_text("BTC:DAI_2023Futr")
-    # tbd - 5465
-    # expect(btc_market.locator('[data-testid="market-selector-volume"]')).to_have_text(
-    #     "1"
-    # )
+    expect(btc_market.locator('[data-testid="market-selector-volume"]')).to_have_text(
+        "0.00"
+    )
    expect(btc_market.locator('[data-testid="market-selector-price"]')).to_have_text(
        "107.50 tDAI"
    )
@@ -57,9 +56,8 @@ def test_market_selector_filter(continuous_market, page: Page):
    # 6001-MARK-029
    page.get_by_test_id("search-term").fill("btc")
    expect(page.locator('[data-testid="market-selector-list"] a')).to_have_count(1)
-    # tbd - 5465
-    expect(page.locator('[data-testid="market-selector-list"] a').nth(0)).to_contain_text(
-        "BTC:DAI_2023107.50 tDAI"
+    expect(page.locator('[data-testid="market-selector-list"] a').nth(0)).to_have_text(
+        "BTC:DAI_2023107.50 tDAI0.00"
    )

    page.get_by_test_id("search-term").clear()
@@ -83,7 +81,6 @@ def test_market_selector_filter(continuous_market, page: Page):
    page.get_by_test_id("asset-trigger").click()
    page.get_by_role("menuitemcheckbox").nth(0).get_by_text("tDAI").click()
    expect(page.locator('[data-testid="market-selector-list"] a')).to_have_count(1)
-    # tbd - 5465
-    expect(page.locator('[data-testid="market-selector-list"] a').nth(0)).to_contain_text(
-        "BTC:DAI_2023107.50 tDAI"
+    expect(page.locator('[data-testid="market-selector-list"] a').nth(0)).to_have_text(
+        "BTC:DAI_2023107.50 tDAI0.00"
    )
@@ -64,6 +64,7 @@ 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()

@@ -74,6 +75,7 @@ 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()

@@ -107,6 +109,7 @@ 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 "No trading" because of the invalid oracle
+    # market state should be changed to "Trading Terminated" because of the invalid oracle
    expect(trading_mode).to_have_text("No trading")
-    expect(market_state).to_have_text("No trading")
+    expect(market_state).to_have_text("Trading Terminated")

    # settle market
    vega.submit_termination_and_settlement_data(
@@ -1,34 +1,13 @@
 import pytest
-
+import logging
 import vega_sim.proto.vega as vega_protos
+from typing import Tuple, Any
 from playwright.sync_api import Page, expect
 from conftest import init_vega, init_page, auth_setup
 from fixtures.market import setup_continuous_market, market_exists
 from actions.utils import next_epoch, change_keys
 from wallet_config import MM_WALLET, PARTY_A, PARTY_B, PARTY_C, PARTY_D
-from vega_sim.null_service import VegaServiceNull
-
-# region Constants
-ACTIVITY = "activity"
-HOARDER = "hoarder"
-COMBO = "combo"
-
-REWARDS_URL = "/#/rewards"
-
-# test IDs
-COMBINED_MULTIPLIERS = "combined-multipliers"
-TOTAL_REWARDS = "total-rewards"
-PRICE_TAKING_COL_ID = '[col-id="priceTaking"]'
-TOTAL_COL_ID = '[col-id="total"]'
-ROW = "row"
-STREAK_REWARD_MULTIPLIER_VALUE = "streak-reward-multiplier-value"
-HOARDER_REWARD_MULTIPLIER_VALUE = "hoarder-reward-multiplier-value"
-HOARDER_BONUS_TOTAL_HOARDED = "hoarder-bonus-total-hoarded"
-EARNED_BY_ME_BUTTON = "earned-by-me-button"
-TRANSFER_AMOUNT = "transfer-amount"
-EPOCH_STREAK = "epoch-streak"
-
-# endregion
+from vega_sim.service import VegaService


@pytest.fixture(scope="module")
@@ -45,19 +24,19 @@ def market_ids():

@pytest.fixture(scope="module")
 def vega_activity_tier_0(request):
-    with init_vega(request) as vega_activity_tier_0:
+   # with init_vega(request) as vega_activity_tier_0:
        yield vega_activity_tier_0


@pytest.fixture(scope="module")
 def vega_hoarder_tier_0(request):
-    with init_vega(request) as vega_hoarder_tier_0:
+   # with init_vega(request) as vega_hoarder_tier_0:
        yield vega_hoarder_tier_0


@pytest.fixture(scope="module")
 def vega_combo_tier_0(request):
-    with init_vega(request) as vega_combo_tier_0:
+  #  with init_vega(request) as vega_combo_tier_0:
        yield vega_combo_tier_0


@@ -69,48 +48,79 @@ def vega_activity_tier_1(request):

@pytest.fixture(scope="module")
 def vega_hoarder_tier_1(request):
-    with init_vega(request) as vega_hoarder_tier_1:
+    #with init_vega(request) as vega_hoarder_tier_1:
        yield vega_hoarder_tier_1


@pytest.fixture(scope="module")
 def vega_combo_tier_1(request):
-    with init_vega(request) as vega_combo_tier_1:
+   # with init_vega(request) as vega_combo_tier_1:
        yield vega_combo_tier_1


@pytest.fixture
 def auth(vega_instance, page):
-    return auth_setup(vega_instance, page)
+    vega, _, _ = vega_instance
+    return auth_setup(vega, page)


@pytest.fixture
 def page(vega_instance, browser, request):
-    with init_page(vega_instance, browser, request) as page_instance:
+    vega, _, _ = vega_instance
+    with init_page(vega, browser, request) as page_instance:
        yield page_instance


@pytest.fixture
 def vega_instance(
-    reward_program,
-    vega_activity_tier_0,
-    vega_hoarder_tier_0,
-    vega_combo_tier_0,
-    vega_activity_tier_1,
-    vega_hoarder_tier_1,
-    vega_combo_tier_1,
-    tier,
-):
-    if reward_program == "activity":
-        return vega_activity_tier_0 if tier == 1 else vega_activity_tier_1
-    elif reward_program == "hoarder":
-        return vega_hoarder_tier_0 if tier == 1 else vega_hoarder_tier_1
-    elif reward_program == "combo":
-        return vega_combo_tier_0 if tier == 1 else vega_combo_tier_1
+    reward_program: str,
+    vega_activity_tier_0: Any,
+    vega_hoarder_tier_0: Any,
+    vega_combo_tier_0: Any,
+    vega_activity_tier_1: Any,
+    vega_hoarder_tier_1: Any,
+    vega_combo_tier_1: Any,
+    market_ids: list,
+    tier: int,
+) -> Tuple[Any, Any, Any]:
+    """
+    Create a Vega instance based on the reward program and tier.
+
+    :param reward_program: The reward program type.
+    :param vega_activity_tier_0: The Vega instance for activity tier 0.
+    :param vega_hoarder_tier_0: The Vega instance for hoarder tier 0.
+    :param vega_combo_tier_0: The Vega instance for combo tier 0.
+    :param vega_activity_tier_1: The Vega instance for activity tier 1.
+    :param vega_hoarder_tier_1: The Vega instance for hoarder tier 1.
+    :param vega_combo_tier_1: The Vega instance for combo tier 1.
+    :param market_ids: List of market IDs.
+    :param tier: The tier level.
+    :return: Tuple containing the Vega instance, market ID, and tDAI asset ID.
+    """
+
+    vega_tiers = {
+        "activity": (vega_activity_tier_0, vega_activity_tier_1),
+        "hoarder": (vega_hoarder_tier_0, vega_hoarder_tier_1),
+        "combo": (vega_combo_tier_0, vega_combo_tier_1),
+    }
+
+    if reward_program not in vega_tiers or tier not in (0, 1):
+        logging.error(f"Invalid reward_program '{reward_program}' or tier '{tier}'")
+        raise ValueError(f"Invalid reward_program '{reward_program}' or tier '{tier}'")
+
+    vega = vega_tiers[reward_program][tier]
+
+    # Set up market with the reward program
+    logging.info("Setting up Vega Instance")
+    market_id, tDAI_asset_id = set_market_reward_program(
+        vega, reward_program, market_ids, tier
+    )
+
+    return vega, market_id, tDAI_asset_id


-def setup_market_with_reward_program(vega: VegaServiceNull, reward_programs, tier):
-    print(f"Started setup_market_with_{reward_programs}_{tier}")
+def setup_market_with_reward_program(vega: VegaService, reward_programs, tier):
+    print("Started setup_market_with_reward_program")
    tDAI_market = setup_continuous_market(vega)
    tDAI_asset_id = vega.find_asset_id(symbol="tDAI")
    vega.mint(key_name=PARTY_B.name, asset=tDAI_asset_id, amount=100000)
@@ -118,7 +128,7 @@ def setup_market_with_reward_program(vega: VegaServiceNull, reward_programs, tie
    vega.mint(key_name=PARTY_A.name, asset=tDAI_asset_id, amount=100000)
    vega.mint(key_name=PARTY_D.name, asset=tDAI_asset_id, amount=100000)
    next_epoch(vega=vega)
-    if ACTIVITY in reward_programs:
+    if "activity" in reward_programs:
        vega.update_network_parameter(
            proposal_key=MM_WALLET.name,
            parameter="rewards.activityStreak.benefitTiers",
@@ -127,7 +137,7 @@ def setup_market_with_reward_program(vega: VegaServiceNull, reward_programs, tie
        print("update_network_parameter activity done")
        next_epoch(vega=vega)

-    if HOARDER in reward_programs:
+    if "hoarder" in reward_programs:
        vega.update_network_parameter(
            proposal_key=MM_WALLET.name,
            parameter="rewards.vesting.benefitTiers",
@@ -150,7 +160,6 @@ def setup_market_with_reward_program(vega: VegaServiceNull, reward_programs, tie
        asset_for_metric=tDAI_asset_id,
        metric=vega_protos.vega.DISPATCH_METRIC_MAKER_FEES_PAID,
        # lock_period= 5,
-        # TODO test lock period
        amount=100,
        factor=1.0,
    )
@@ -172,17 +181,7 @@ def setup_market_with_reward_program(vega: VegaServiceNull, reward_programs, tie
    )

    vega.wait_for_total_catchup()
-    if tier == 1:
-        next_epoch(vega=vega)
-        vega.submit_order(
-            trading_key=PARTY_B.name,
-            market_id=tDAI_market,
-            order_type="TYPE_LIMIT",
-            time_in_force="TIME_IN_FORCE_GTC",
-            side="SIDE_BUY",
-            price=1,
-            volume=1,
-        )
+    """  if tier == 1:
        next_epoch(vega=vega)
        vega.submit_order(
            trading_key=PARTY_B.name,
@@ -200,62 +199,46 @@ def setup_market_with_reward_program(vega: VegaServiceNull, reward_programs, tie
            side="SIDE_BUY",
            volume=1,
        )
-        vega.wait_for_total_catchup()
-        next_epoch(vega=vega)
-        next_epoch(vega=vega)
-        if HOARDER in reward_programs:
-            vega.submit_order(
-            trading_key=PARTY_B.name,
-            market_id=tDAI_market,
-            order_type="TYPE_MARKET",
-            time_in_force="TIME_IN_FORCE_IOC",
-            side="SIDE_BUY",
-            volume=1,
-        )
-        vega.submit_order(
-            trading_key=PARTY_D.name,
-            market_id=tDAI_market,
-            order_type="TYPE_MARKET",
-            time_in_force="TIME_IN_FORCE_IOC",
-            side="SIDE_BUY",
-            volume=1,
-        )
-        vega.wait_for_total_catchup()
-        next_epoch(vega=vega)
-        next_epoch(vega=vega)
-    next_epoch(vega=vega)
+        vega.wait_for_total_catchup() """
+
+        #next_epoch(vega=vega)
    return tDAI_market, tDAI_asset_id


 def set_market_reward_program(vega, reward_program, market_ids, tier):
-    market_id_key = f"vega_{reward_program}_tier_{tier}"
-    if reward_program == COMBO:
-        market_id_key = COMBO
+    market_id_key = f"vega_{reward_program}"
+    if reward_program == "combo":
+        market_id_key = "combo"
+
    market_id = market_ids.get(market_id_key, "default_id")

    print(f"Checking if market exists: {market_id}")
    if not market_exists(vega, market_id):
-        print(
-            f"Market doesn't exist for {reward_program} {tier}. Setting up new market."
-        )
+        print(f"Market doesn't exist for {reward_program}. Setting up new market.")

        reward_programs = [reward_program]
-        if reward_program == COMBO:
-            reward_programs = [ACTIVITY, HOARDER]
+        if reward_program == "combo":
+            reward_programs = ["activity", "hoarder"]

-        market_id, _ = setup_market_with_reward_program(vega, reward_programs, tier)
+        market_id = setup_market_with_reward_program(vega, reward_programs, tier)
        market_ids[market_id_key] = market_id

-    return market_id, market_ids
+    print(f"Using market ID: {market_id}")
+    return market_id


 ACTIVITY_STREAKS = """
 {
    "tiers": [
        {
-            "minimum_activity_streak": 2, 
+            "minimum_activity_streak": 1, 
            "reward_multiplier": "2.0", 
            "vesting_multiplier": "1.1"
+        },
+        {
+            "minimum_activity_streak": 5,
+            "reward_multiplier": "3.0",
+            "vesting_multiplier": "1.2"   
        }
    ]
 }
@@ -264,8 +247,12 @@ VESTING = """
 {
    "tiers": [
        {
-            "minimum_quantum_balance": "10000000",
+            "minimum_quantum_balance": "5000000",
            "reward_multiplier": "2"
+        },
+        {
+            "minimum_quantum_balance": "11666668",
+            "reward_multiplier": "3"   
        }
    ]
 }
@@ -275,195 +262,134 @@ VESTING = """
@pytest.mark.parametrize(
    "reward_program, tier, total_rewards",
    [
-        (ACTIVITY, 0, "50.00 tDAI"),
-        (HOARDER, 0, "50.00 tDAI"),
-        (COMBO, 0, "50.00 tDAI"),
-        (ACTIVITY, 1, "116.66666 tDAI"),
-        (HOARDER, 1, "166.66666 tDAI "),
-        (COMBO, 1, "183.33333 tDAI"),
+        #("activity", 0, "50.00 tDAI"),
+        #("hoarder", 0, "50.00 tDAI"),
+        #("combo", 0, "50.00 tDAI"),
+        ("activity", 1, "110.00 tDAI"),
+        #("hoarder", 1, "116.66666 tDAI"),
+        #("combo", 1, "125.00 tDAI"),
    ],
 )
-@pytest.mark.usefixtures("auth", "risk_accepted", "market_ids")
+@pytest.mark.skip("tbd")
+@pytest.mark.usefixtures("auth", "risk_accepted")
 def test_network_reward_pot(
-    reward_program,
-    vega_instance: VegaServiceNull,
-    page: Page,
-    total_rewards,
-    tier,
-    market_ids,
+    reward_program, vega_instance: VegaService, page: Page, total_rewards, tier
 ):
-    print("reward program: " + reward_program, " tier:", tier)
-    market_id, market_ids = set_market_reward_program(
-        vega_instance, reward_program, market_ids, tier
-    )
-    page.goto(REWARDS_URL)
-    
-    change_keys(page, vega_instance, PARTY_B.name)
-    expect(page.get_by_test_id(TOTAL_REWARDS)).to_have_text(total_rewards)
-
-
-@pytest.mark.parametrize(
-    "reward_program, tier, reward_multiplier, streak_multiplier, hoarder_multiplier",
-    [
-        (ACTIVITY, 0, "1x", "1x", "1x"),
-        (HOARDER, 0, "1x", "1x", "1x"),
-        (COMBO, 0, "1x", "1x", "1x"),
-        (ACTIVITY, 1, "2x", "2x", "1x"),
-        (HOARDER, 1, "2x", "1x", "2x"),
-        (COMBO, 1, "4x", "2x", "2x"),
-    ],
-)
-@pytest.mark.usefixtures("auth", "risk_accepted", "market_ids")
-def test_reward_multiplier(
-    reward_program,
-    vega_instance: VegaServiceNull,
-    page: Page,
-    reward_multiplier,
-    streak_multiplier,
-    hoarder_multiplier,
-    tier,
-    market_ids,
-):
-    print("reward program: " + reward_program, " tier:", tier)
-    market_id, market_ids = set_market_reward_program(
-        vega_instance, reward_program, market_ids, tier
-    )
-    page.goto(REWARDS_URL)
-    change_keys(page, vega_instance, PARTY_B.name)
-    expect(page.get_by_test_id(COMBINED_MULTIPLIERS)).to_have_text(reward_multiplier)
-    expect(page.get_by_test_id(STREAK_REWARD_MULTIPLIER_VALUE)).to_have_text(
-        streak_multiplier
-    )
-    expect(page.get_by_test_id(HOARDER_REWARD_MULTIPLIER_VALUE)).to_have_text(
-        hoarder_multiplier
-    )
-
-
-@pytest.mark.parametrize(
-    "reward_program, tier, epoch_streak",
-    [
-        (ACTIVITY, 0, "1"),
-        (ACTIVITY, 1, "7"),
-    ],
-)
-@pytest.mark.usefixtures("auth", "risk_accepted", "market_ids")
-def test_activity_streak(
-    reward_program,
-    vega_instance: VegaServiceNull,
-    page: Page,
-    epoch_streak,
-    tier,
-    market_ids,
-):
-    print("reward program: " + reward_program, " tier:", tier)
-    market_id, market_ids = set_market_reward_program(
-        vega_instance, reward_program, market_ids, tier
-    )
-    page.goto(REWARDS_URL)
-    change_keys(page, vega_instance, PARTY_B.name)
+    vega, market_id, tDAI_asset_id = vega_instance
+    next_epoch(vega=vega)
+   
+    page.goto(f"/#/rewards")
    if tier == 1:
-        expect(page.get_by_test_id(EPOCH_STREAK)).to_have_text(
-            "Active trader: " + epoch_streak + " epochs so far (Tier 1 as of last epoch)"
+        page.pause()
+        next_epoch(vega=vega)
+        next_epoch(vega=vega)
+        vega.submit_order(
+            trading_key=PARTY_B.name,
+            market_id=market_id,
+            order_type="TYPE_MARKET",
+            time_in_force="TIME_IN_FORCE_IOC",
+            side="SIDE_BUY",
+            volume=1,
        )
-    else:
-        expect(page.get_by_test_id(EPOCH_STREAK)).to_have_text(
-            "Active trader: " + epoch_streak + " epochs so far "
+        vega.submit_order(
+            trading_key=PARTY_D.name,
+            market_id=market_id,
+            order_type="TYPE_MARKET",
+            time_in_force="TIME_IN_FORCE_IOC",
+            side="SIDE_BUY",
+            volume=1,
        )
-
-
-@pytest.mark.parametrize(
-    "reward_program, tier, rewards_hoarded",
-    [
-        (HOARDER, 0, "5,000,000"),
-        (HOARDER, 1, "16,666,666"),
-    ],
-)
-@pytest.mark.usefixtures("auth", "risk_accepted", "market_ids")
-def test_hoarder_bonus(
-    reward_program,
-    vega_instance: VegaServiceNull,
-    page: Page,
-    rewards_hoarded,
-    tier,
-    market_ids,
-):
-    print("reward program: " + reward_program, " tier:", tier)
-    market_id, market_ids = set_market_reward_program(
-        vega_instance, reward_program, market_ids, tier
-    )
-    page.goto(REWARDS_URL)
-    change_keys(page, vega_instance, PARTY_B.name)
-    expect(page.get_by_test_id(HOARDER_BONUS_TOTAL_HOARDED)).to_contain_text(
-        rewards_hoarded
-    )
-
-
-@pytest.mark.parametrize(
-    "reward_program, tier, price_taking, total, earned_by_me",
-    [
-        (ACTIVITY, 0, "100.00100.00%", "100.00", "50.00"),
-        (HOARDER, 0, "100.00100.00%", "100.00", "50.00"),
-        (COMBO, 0, "100.00100.00%", "100.00", "50.00"),
-        (ACTIVITY, 1, "300.00100.00%", "300.00", "116.66666"),
-        (HOARDER, 1, "299.99999100.00%", "299.99999", "166.66666"),
-        (COMBO, 1, "299.99999100.00%", "299.99999", "183.33333"),
-    ],
-)
-@pytest.mark.usefixtures("auth", "risk_accepted", "market_ids")
-def test_reward_history(
-    reward_program,
-    vega_instance: VegaServiceNull,
-    page: Page,
-    price_taking,
-    total,
-    earned_by_me,
-    tier,
-    market_ids,
-):
-    print("reward program: " + reward_program, " tier:", tier)
-    market_id, market_ids = set_market_reward_program(
-        vega_instance, reward_program, market_ids, tier
-    )
-    page.goto(REWARDS_URL)
-    change_keys(page, vega_instance, PARTY_B.name)
-    page.locator('[name="fromEpoch"]').fill("1")
-    expect((page.get_by_role(ROW).locator(PRICE_TAKING_COL_ID)).nth(1)).to_have_text(
-        price_taking
-    )
-    expect((page.get_by_role(ROW).locator(TOTAL_COL_ID)).nth(1)).to_have_text(total)
-    page.get_by_test_id(EARNED_BY_ME_BUTTON).click()
-    expect((page.get_by_role(ROW).locator(TOTAL_COL_ID)).nth(1)).to_have_text(
-        earned_by_me
-    )
-
-
-@pytest.mark.parametrize(
-    "reward_program, tier",
-    [
-        (ACTIVITY, 1),
-    ],
-)
-@pytest.mark.usefixtures("auth", "risk_accepted", "market_ids")
-def test_redeem(
-    reward_program, vega_instance: VegaServiceNull, page: Page, tier, market_ids
-):
-    print("reward program: " + reward_program, " tier:", tier)
-    market_id, market_ids = set_market_reward_program(
-        vega_instance, reward_program, market_ids, tier
-    )
-    page.goto(REWARDS_URL)
-    change_keys(page, vega_instance, PARTY_B.name)
-    page.get_by_test_id("redeem-rewards-button").click()
-    available_to_withdraw = page.get_by_test_id(
-        "available-to-withdraw-value"
-    ).text_content()
-    option_value = page.locator(
-        '[data-testid="transfer-form"] [name="fromAccount"] option[value^="ACCOUNT_TYPE_VESTED_REWARDS"]'
-    ).first.get_attribute("value")
-
-    page.select_option(
-        '[data-testid="transfer-form"] [name="fromAccount"]', option_value
-    )
+        vega.wait_for_total_catchup()
+        page.pause()
+        next_epoch(vega=vega)
+        page.pause()
+        next_epoch(vega=vega)
+    change_keys(page, vega, PARTY_B.name)
+    page.pause()
    
-    page.get_by_test_id("use-max-button").first.click()
-    expect(page.get_by_test_id(TRANSFER_AMOUNT)).to_have_text(available_to_withdraw)
+    expect(page.get_by_test_id("total-rewards")).to_have_text(total_rewards)
+    # TODO Add test ID and Assert for locked,
+
+
+
+""" @pytest.mark.parametrize(
+    "reward_program",
+    [
+        ("activity"),
+        # ("hoarder"),
+        # ("combo"),
+    ],
+)
+@pytest.mark.usefixtures("auth", "risk_accepted")
+def test_vesting(vega_setup, vega: VegaService, page: Page):
+    expect() """
+
+@pytest.mark.skip("tbd")
+@pytest.mark.parametrize(
+    "reward_program, tier, reward_multiplier",
+    [
+        ("activity", 0, "1x"),
+        ("hoarder", 0, "1x"),
+        ("combo", 0, "1x"),
+        ("activity", 1, "2x"),
+        ("hoarder", 1, "2x"),
+        ("combo", 1, "4x"),
+    ],
+)
+@pytest.mark.usefixtures("auth", "risk_accepted")
+def test_reward_multiplier(reward_program, vega_instance: VegaService, page: Page, reward_multiplier, tier):
+    vega, market_id, tDAI_asset_id = vega_instance
+    page.goto(f"/#/rewards")
+    change_keys(page, vega, PARTY_B.name)
+    expect(page.get_by_test_id("combined-multipliers")).to_have_text(reward_multiplier)
+    #TODO add test ids and assert for individual multipliers
+
+""" 
+@pytest.mark.parametrize(
+    "reward_program",
+    [
+        ("activity"),
+        # ("hoarder"),
+        # ("combo"),
+    ],
+)
+@pytest.mark.usefixtures("auth", "risk_accepted")
+def test_activity_streak(vega_setup, vega: VegaService, page: Page):
+    expect()
+
+
+@pytest.mark.parametrize(
+    "reward_program",
+    [
+        ("activity"),
+        # ("hoarder"),
+        # ("combo"),
+    ],
+)
+@pytest.mark.usefixtures("auth", "risk_accepted")
+def test_hoarder_Bonus(vega_setup, vega: VegaService, page: Page):
+    expect()
+
+
+@pytest.mark.parametrize(
+    "reward_program",
+    [
+        ("activity"),
+        # ("hoarder"),
+        # ("combo"),
+    ],
+)
+@pytest.mark.usefixtures("auth", "risk_accepted")
+def test_Rewards_history(vega_setup, vega: VegaService, page: Page):
+    expect()
+
+
+@pytest.mark.usefixtures("auth", "risk_accepted")
+def test_redeem(vega_setup, vega: VegaService, page: Page):
+    expect()
+
+
+@pytest.mark.usefixtures("auth", "risk_accepted")
+def test_redeem(vega_setup, vega: VegaService, page: Page):
+    expect()
+ """
@@ -1,65 +0,0 @@
-import pytest
-import vega_sim.proto.vega as vega_protos
-from playwright.sync_api import Page, expect
-from vega_sim.null_service import VegaServiceNull
-from actions.utils import next_epoch, change_keys
-from wallet_config import MM_WALLET, PARTY_A, PARTY_B
-
-
-@pytest.mark.usefixtures("risk_accepted", "auth")
-def test_vesting(continuous_market, vega: VegaServiceNull, page: Page):
-    tDAI_asset_id = vega.find_asset_id(symbol="tDAI")
-    vega.update_network_parameter(
-        MM_WALLET.name, parameter="reward.asset", new_value=tDAI_asset_id
-    )
-    vega.mint(key_name=PARTY_B.name, asset=tDAI_asset_id, amount=100000)
-    vega.mint(key_name=PARTY_A.name, asset=tDAI_asset_id, amount=100000)
-    next_epoch(vega=vega)
-    vega.recurring_transfer(
-        from_key_name=PARTY_A.name,
-        from_account_type=vega_protos.vega.ACCOUNT_TYPE_GENERAL,
-        to_account_type=vega_protos.vega.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-        asset=tDAI_asset_id,
-        reference="reward",
-        asset_for_metric=tDAI_asset_id,
-        metric=vega_protos.vega.DISPATCH_METRIC_MAKER_FEES_PAID,
-        lock_period=5,
-        amount=100,
-        factor=1.0,
-    )
-    vega.submit_order(
-        trading_key=PARTY_B.name,
-        market_id=continuous_market,
-        order_type="TYPE_MARKET",
-        time_in_force="TIME_IN_FORCE_IOC",
-        side="SIDE_BUY",
-        volume=1,
-    )
-    vega.submit_order(
-        trading_key=PARTY_A.name,
-        market_id=continuous_market,
-        order_type="TYPE_MARKET",
-        time_in_force="TIME_IN_FORCE_IOC",
-        side="SIDE_BUY",
-        volume=1,
-    )
-    vega.wait_for_total_catchup()
-
-    page.goto("/#/rewards")
-    change_keys(page, vega, PARTY_B.name)
-    next_epoch(vega=vega)
-    page.reload()
-
-    expect(page.get_by_test_id("locked-value")).to_have_text("50.00")
-    
-    # Proceed through the 5 epoch lock period
-    next_epoch(vega=vega)
-    next_epoch(vega=vega)
-    next_epoch(vega=vega)
-    next_epoch(vega=vega)
-    next_epoch(vega=vega)
-    page.reload()
-
-    expect(page.get_by_test_id("locked-value")).to_have_text("0.00")
-    expect(page.get_by_test_id("vesting-value")).to_have_text("37.50")
-    expect(page.get_by_test_id("available-to-withdraw-value")).to_have_text("12.50")
@@ -146,7 +146,7 @@ def test_transfer_vesting_below_minimum(
    vega.wait_fn(10)
    vega.wait_for_total_catchup()

-    page.get_by_test_id("use-max-button").first.click()
+    page.get_by_text("Use max").first.click()
    page.locator('[data-testid=transfer-form] [type="submit"]').click()
    wait_for_toast_confirmation(page)
    vega.forward("10s")
@@ -67,7 +67,6 @@ const defaultColDef = {
  sortable: true,
  tooltipComponent: TooltipCellComponent,
  comparator: accountValuesComparator,
-  minWidth: 150,
 };
 export interface GetRowsParams extends Omit<IGetRowsParams, 'successCallback'> {
  successCallback(rowsThisBlock: AccountFields[], lastRow?: number): void;
@@ -140,8 +139,6 @@ 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.'
        ),
@@ -256,8 +253,8 @@ export const AccountTable = ({
        colId: 'accounts-actions',
        field: 'asset.id',
        ...COL_DEFS.actions,
-        minWidth: showDepositButton ? 110 : COL_DEFS.actions.minWidth,
-        maxWidth: showDepositButton ? 110 : COL_DEFS.actions.maxWidth,
+        minWidth: showDepositButton ? 105 : COL_DEFS.actions.minWidth,
+        maxWidth: showDepositButton ? 105 : COL_DEFS.actions.maxWidth,
        cellRenderer: ({
          value: assetId,
          node,
@@ -23,9 +23,7 @@ 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;
@@ -34,13 +32,12 @@ 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',
-          width: 90,
-          pinned: true,
+          minWidth: 200,
          sort: 'desc',
          cellRenderer: ({
            value,
@@ -144,7 +141,7 @@ const BreakdownTable = forwardRef<AgGridReact, BreakdownTableProps>(
        components={{ PriceCell, ProgressBarCell }}
        tooltipShowDelay={500}
        defaultColDef={defaultColDef}
-        columnDefs={colDefs}
+        columnDefs={coldefs}
        domLayout="autoHeight"
      />
    );
@@ -438,7 +438,6 @@ export const TransferForm = ({
                shouldValidate: true,
              })
            }
-            data-testid="use-max-button"
          >
            {t('Use max')}
          </button>
@@ -15,6 +15,7 @@ export async function proposeMarket(publicKey: string) {
  log('sending proposal tx');
  const proposalTx = createNewMarketProposal();
  const result = await sendVegaTx(publicKey, proposalTx);
+
  return result.result;
 }

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

    const marketTradingModeError = validateMarketTradingMode(
      marketTradingMode,
-      t('No trading')
+      t('Trading terminated')
    );
-
    if (marketTradingModeError !== true) {
      return {
        message: marketTradingModeError,
@@ -11,6 +11,9 @@ 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: '',
@@ -72,6 +75,7 @@ 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, COL_DEFS } from '@vegaprotocol/datagrid';
+import { AgGrid } from '@vegaprotocol/datagrid';
 import {
  type VegaICellRendererParams,
  type VegaValueFormatterParams,
@@ -21,7 +21,7 @@ export const DepositsTable = (
 ) => {
  const columnDefs = useMemo<ColDef[]>(
    () => [
-      { headerName: 'Asset', field: 'asset.symbol', pinned: true },
+      { headerName: 'Asset', field: 'asset.symbol' },
      {
        headerName: 'Amount',
        field: 'amount',
@@ -74,11 +74,5 @@ export const DepositsTable = (
    ],
    []
  );
-  return (
-    <AgGrid
-      columnDefs={columnDefs}
-      defaultColDef={COL_DEFS.default}
-      {...props}
-    />
-  );
+  return <AgGrid columnDefs={columnDefs} {...props} />;
 };
@@ -48,7 +48,6 @@ export const FillsTable = forwardRef<AgGridReact, Props>(
          field: 'market.tradableInstrument.instrument.code',
          cellRenderer: 'MarketNameCell',
          cellRendererParams: { idPath: 'market.id', onMarketClick },
-          pinned: true,
        },
        {
          headerName: t('Size'),
@@ -144,7 +143,6 @@ 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,6 +54,9 @@ 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,7 +22,9 @@ 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}}).",
-  "No trading": "No trading",
+  "Trading terminated": "Trading terminated",
  "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",
@@ -383,7 +383,7 @@
  "MoreMarketsInfo": "To see Explorer data on existing markets visit",
  "MoreNetParamsInfo": "To see Explorer data on network params visit",
  "MoreProposalsInfo": "To see Explorer data on proposals visit",
-  "multisigContractIncorrect": "was incorrectly configured as at the end of the last epoch so rewards were penalised. Validator and delegator rewards will continue to be penalised until this is resolved.",
+  "multisigContractIncorrect": "is incorrectly configured. Validator and delegator rewards will be penalised until this is resolved.",
  "multisigContractLink": "Ethereum Multisig Contract",
  "multisigPenalty": "Multisig penalty",
  "myPendingStake": "My pending stake",
@@ -83,6 +83,11 @@ 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 {
-  ColDef,
+  ColGroupDef,
  ITooltipParams,
  ValueFormatterParams,
 } from 'ag-grid-community';
@@ -60,11 +60,10 @@ const dateValueFormatter = ({ value }: { value?: string | null }) => {
  return getDateTimeFormat().format(new Date(value));
 };

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

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

-    const defs: ColDef[] = [
+    const defs: ColGroupDef[] = [
      {
-        headerName: t('Party'),
-        field: 'partyId',
-        headerTooltip: t('The public key of the party making this commitment.'),
-        cellRenderer: copyCellRenderer,
-        pinned: 'left',
+        headerName: '',
+        children: [
+          {
+            headerName: t('Party'),
+            field: 'partyId',
+            headerTooltip: t(
+              'The public key of the party making this commitment.'
+            ),
+            cellRenderer: copyCellRenderer,
+          },
+        ],
      },
      {
-        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
-                ]
+        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>
+                );
              }
-            </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
-              );
-
-            return (
-              <>
-                <span>{formattedCurrentCommitmentAmount}</span> (
-                <span className="text-warning">
-                  {formattedPendingCommitmentAmount}
+              return (
+                <span>
+                  {
+                    LiquidityProvisionStatusMapping[
+                      value as LiquidityProvisionStatus
+                    ]
+                  }
                </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 '-';
+              );
+            },
+          },
+          {
+            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 currentCommitmentAmount = data?.currentCommitmentAmount
-            ? new BigNumber(data?.currentCommitmentAmount)
+              const formattedPendingCommitmentAmount =
+                addDecimalsFormatNumberQuantum(
+                  pendingCommitmentAmount,
+                  assetDecimalPlaces ?? 0,
+                  quantum ?? 0
+                );
+
+              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)
                .times(Number(stakeToCcyVolume) || 1)
-                .toString()
-            : undefined;
+                .toString();

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

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

-          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: 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.'
-        ),
-
-        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,
-      },
-      {
-        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)
-            );
+                return (
+                  <>
+                    <span>{formattedCurrentCommitmentAmount}</span> (
+                    <span className="text-warning">
+                      {formattedPendingCommitmentAmount}
+                    </span>
+                    )
+                  </>
+                );
+              } else {
+                return formattedPendingCommitmentAmount;
+              }
+            },
+            tooltipValueGetter: stakeToCcyVolumeFormatter,
          },
-          'text-red-500': ({ data }: { data: LiquidityProvisionData }) => {
-            if (!data.sla) return false;
-            return new BigNumber(
-              data.sla.currentEpochFractionOfTimeOnBook
-            ).isLessThan(data.commitmentMinTimeFraction);
+          {
+            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.'
+            ),
+
+            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,
+          },
+        ],
      },
      {
-        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 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('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 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(`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,
+        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('Updated'),
+            headerTooltip: t(
+              'The date and time this liquidity provision was last updated.'
+            ),
+            field: 'updatedAt',
+            type: 'rightAligned',
+            valueFormatter: dateValueFormatter,
+          },
+        ],
      },
    ];
    return defs;
@@ -124,11 +124,27 @@ 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',
      })
    );

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

@@ -121,9 +121,11 @@ export const getTargetStake = (
 export const useCheckLiquidityStatus = ({
  suppliedStake,
  targetStake,
+  triggeringRatio,
 }: {
  suppliedStake: string | number;
  targetStake: string | number;
+  triggeringRatio: string | number;
 }): {
  status: Intent;
  percentage: BigNumber;
@@ -140,12 +142,23 @@ export const useCheckLiquidityStatus = ({
      percentage,
    };
  }
-  if (new BigNumber(suppliedStake).gte(targetStake)) {
+  if (new BigNumber(suppliedStake).gte(new BigNumber(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,6 +188,7 @@ query MarketInfo($marketId: ID!) {
      long
    }
    liquidityMonitoringParameters {
+      triggeringRatio
      targetStakeParameters {
        timeWindow
        scalingFactor
@@ -262,7 +262,6 @@ export const MarketInfoAccordion = ({
                    <PriceMonitoringBoundsInfoPanel
                      market={market}
                      triggerIndex={triggerIndex}
-                      key={id}
                    />
                  }
                />
@@ -698,13 +698,17 @@ export const PriceMonitoringBoundsInfoPanel = ({

  const quoteUnit = getQuoteName(market);

+  const trigger =
+    market.priceMonitoringSettings?.parameters?.triggers?.[triggerIndex];
+
  const bounds = data?.priceMonitoringBounds?.[triggerIndex];
-  const trigger = bounds?.trigger;

  if (!trigger) {
+    console.error(
+      `Could not find data for trigger ${triggerIndex} (market id: ${market.id})`
+    );
    return null;
  }
-
  return (
    <>
      <div className="mb-2 grid grid-cols-2 text-sm">
@@ -745,6 +749,7 @@ export const LiquidityMonitoringParametersInfoPanel = ({
  parentMarket,
 }: MarketInfoProps) => {
  const marketData = {
+    triggeringRatio: market.liquidityMonitoringParameters.triggeringRatio,
    timeWindow:
      market.liquidityMonitoringParameters.targetStakeParameters.timeWindow,
    scalingFactor:
@@ -753,6 +758,8 @@ export const LiquidityMonitoringParametersInfoPanel = ({

  const parentMarketData = parentMarket
    ? {
+        triggeringRatio:
+          parentMarket.liquidityMonitoringParameters.triggeringRatio,
        timeWindow:
          parentMarket.liquidityMonitoringParameters.targetStakeParameters
            .timeWindow,
@@ -95,6 +95,7 @@ export const marketInfoQuery = (
        long: '0.008508132993273576',
      },
      liquidityMonitoringParameters: {
+        triggeringRatio: '0.7',
        targetStakeParameters: {
          timeWindow: 3600,
          scalingFactor: 10,
@@ -101,6 +101,8 @@ 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,6 +35,9 @@ fragment MarketFields on Market {
    open
    close
  }
+  liquidityMonitoringParameters {
+    triggeringRatio
+  }
 }

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

 export type OrderListTableProps = TypedDataAgGrid<Order> & {
@@ -83,9 +82,6 @@ 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,6 +31,9 @@ describe('OrderViewDialog', () => {
            liquidityFee: '0.001',
          },
        },
+        liquidityMonitoringParameters: {
+          triggeringRatio: '1',
+        },
        tradableInstrument: {
          __typename: 'TradableInstrument',
          instrument: {
@@ -40,7 +40,6 @@ const defaultColDef = {
  resizable: true,
  sortable: true,
  filterParams: { buttons: ['reset'] },
-  minWidth: 100,
 };

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

 export const PositionsTable = ({
@@ -84,330 +83,6 @@ 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')}
@@ -420,7 +95,349 @@ export const PositionsTable = ({
        MarketNameCell,
      }}
      rowHeight={45}
-      columnDefs={colDefs}
+      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,
+      ])}
      {...props}
    />
  );
@@ -29,7 +29,6 @@ export const useColumnDefs = () => {
        colId: 'market',
        headerName: t('Market'),
        field: 'terms.change.instrument.code',
-        pinned: true,
        cellStyle: { lineHeight: '14px' },
        cellRenderer: ({
          value,
@@ -134,6 +134,7 @@ fragment NewMarketFields on NewMarket {
  #     timeWindow
  #     scalingFactor
  #   }
+  #   triggeringRatio
  #   auctionExtensionSecs
  # }
  # linearSlippageFactor
@@ -298,6 +299,7 @@ fragment UpdateMarketFields on UpdateMarket {
        timeWindow
        scalingFactor
      }
+      triggeringRatio
      # auctionExtensionSecs
    }
    riskParameters {
@@ -92,6 +92,7 @@ export const marketUpdateProposal: ProposalListFieldsFragment = {
          triggers: [],
        },
        liquidityMonitoringParameters: {
+          triggeringRatio: '0',
          targetStakeParameters: {
            scalingFactor: 0,
            timeWindow: 0,
@@ -162,6 +162,7 @@ const generateUpdateMarketProposal = (
          __typename: liquidityMonitoring
            ? 'LiquidityMonitoringParameters'
            : undefined,
+          triggeringRatio: '0',
          targetStakeParameters: {
            __typename: undefined,
            scalingFactor: 0,
@@ -5585,8 +5585,6 @@ 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,21 +85,19 @@ export function Dialog({
                  <VegaIcon name={VegaIconNames.CROSS} size={24} />
                </DialogPrimitives.Close>
              )}
-              <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 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>
            </div>
          </div>
@@ -5,16 +5,15 @@ 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 setPosition = useToastsConfiguration((store) => store.setPosition);
+  const setPostion = useToastsConfiguration((store) => store.setPosition);
  const position = useToastsConfiguration((store) => store.position);
  const setToast = useToasts((store) => store.setToast);
  const handleChange = useCallback(
    (position: ToastPosition) => {
-      setPosition(position);
+      setPostion(position);
      setToast({
        id: 'test-toast',
        intent: Intent.Primary,
@@ -22,49 +21,11 @@ export const ToastPositionSetter = () => {
        onClose: () => useToasts.getState().remove('test-toast'),
      });
    },
-    [setToast, setPosition, t]
+    [setToast, setPostion, 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',
-            'sm:opacity-0 sm:hover:!opacity-100 sm:group-hover:opacity-50',
+            'opacity-0 hover:!opacity-100 group-hover:opacity-50',
            {
              hidden: validToasts.length === 0,
            }
@@ -149,7 +149,6 @@ 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',
+        name: 'View only pubkey',
        publicKey: this.pubkey,
      },
    ]);
@@ -149,6 +149,9 @@ describe('WithdrawFormContainer', () => {
              liquidityFee: '0.001',
            },
          },
+          liquidityMonitoringParameters: {
+            triggeringRatio: '0.7',
+          },
          tradableInstrument: {
            __typename: 'TradableInstrument',
            instrument: {
@@ -15,7 +15,6 @@ import {
  VegaIconNames,
 } from '@vegaprotocol/ui-toolkit';
 import {
-  COL_DEFS,
  type TypedDataAgGrid,
  type VegaICellRendererParams,
  type VegaValueFormatterParams,
@@ -47,7 +46,7 @@ export const WithdrawalsTable = ({

  const columnDefs = useMemo<ColDef[]>(
    () => [
-      { headerName: t('Asset'), field: 'asset.symbol', pinned: true },
+      { headerName: t('Asset'), field: 'asset.symbol' },
      {
        headerName: t('Amount'),
        field: 'amount',
@@ -136,7 +135,6 @@ 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.7",
+    "@radix-ui/react-tooltip": "^1.0.3",
    "@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.7":
+"@radix-ui/react-tooltip@^1.0.3":
  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
Madalina Raicu	08e77935ce	feat(trading): show gray bar is user is not active	2024-01-05 11:22:39 +02:00
Madalina Raicu	fe0e43ba1b	feat(trading): tier as of last epoch copy change	2024-01-05 11:18:23 +02:00
Madalina Raicu	268b4d308a	feat(trading): move to node guard	2024-01-04 14:53:38 +02:00
Madalina Raicu	42dfc217d7	chore(trading): load assets and markets on startup	2024-01-03 16:30:16 +02:00
Madalina Raicu	185c2e9b41	feat(trading): remove fill and show rewards history when pubkey is not connected	2024-01-03 16:13:01 +02:00
Madalina Raicu	7479478192	feat(trading): fix lint issues on active-rewards.spec	2024-01-03 12:26:31 +02:00
Madalina Raicu	f3f049d21b	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/activity-streaks	2024-01-03 12:11:00 +02:00
Madalina Raicu	900ff07493	Merge branch 'feat/activity-streaks' of github.com:vegaprotocol/frontend-monorepo into feat/activity-streaks	2024-01-03 12:02:52 +02:00
bwallacee	7a984aa798	feat(trading): test ids	2024-01-03 09:59:29 +00:00
Madalina Raicu	45242de622	feat(trading): add search by asset and market	2023-12-29 19:25:21 +02:00
Madalina Raicu	c13842a0c6	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/activity-streaks	2023-12-29 14:39:01 +02:00
Madalina Raicu	4b3fddb8ad	chore(trading): update tests	2023-12-29 13:41:42 +02:00
Madalina Raicu	a5c844b70c	chore(trading): use flex instead of grid in container	2023-12-29 13:30:59 +02:00
Madalina Raicu	ed10862122	feat(trading): refactor streaks	2023-12-29 13:26:58 +02:00
Madalina Raicu	fc2cf01305	feat(trading): use h3	2023-12-29 12:51:20 +02:00
Madalina Raicu	7c0b362efe	Merge branch 'feat/activity-streaks' of github.com:vegaprotocol/frontend-monorepo into feat/activity-streaks	2023-12-29 12:14:20 +02:00
bwallacee	acbcced3c0	feat(trading): add market-sim tests for local dev	2023-12-28 16:21:31 +00:00
Madalina Raicu	5d05b9c264	chore(trading): remove xmlns from icons	2023-12-28 14:40:26 +02:00
Madalina Raicu	f926067315	fix(trading): tier number fix	2023-12-28 13:12:02 +02:00
Madalina Raicu	e058937072	feat(trading): use i18n pluralisation	2023-12-27 18:45:39 +02:00
Madalina Raicu	011c5591f5	feat(trading): enrich rewards page query	2023-12-27 17:55:19 +02:00
Madalina Raicu	bb98000c11	feat(trading): search by entity scope	2023-12-27 14:36:33 +02:00
Madalina Raicu	afceb010da	fix(trading): add tiers check length	2023-12-27 12:42:42 +02:00
Madalina Raicu	61ae417561	fix(trading): fix tiers color	2023-12-27 11:27:12 +02:00
Madalina Raicu	1c7ffd8298	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/activity-streaks	2023-12-27 10:36:02 +02:00
Madalina Raicu	1d258532b8	chore(trading): add active reward card tests	2023-12-22 20:17:56 +02:00
Madalina Raicu	fb96fef15a	feat(trading): active cards show dispatch asset if no market	2023-12-22 19:07:17 +02:00
Madalina Raicu	69070bbb61	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/activity-streaks	2023-12-22 16:34:56 +02:00
Madalina Raicu	e8f1bb6b6b	feat(trading): render empty tears if no streak	2023-12-22 16:06:34 +02:00
Madalina Raicu	255aab2189	feat(trading): render empty tears if no streak	2023-12-22 15:58:37 +02:00
Madalina Raicu	bac852c4b5	feat(trading): render empty tears if no streak	2023-12-22 15:55:14 +02:00
Madalina Raicu	156bde18c2	feat(trading): show tier next to steak and fix maximum tier	2023-12-22 15:51:34 +02:00
Madalina Raicu	d440abfdaf	feat(trading): apply cards reward filter	2023-12-22 15:29:43 +02:00
Madalina Raicu	0f1a2f4041	feat(trading): overflow cards & remove reference	2023-12-22 13:27:03 +02:00
Madalina Raicu	5ac6977a64	fix(trading): streak render gray fix	2023-12-21 08:42:08 +00:00
Madalina Raicu	c91f67e828	fix(trading): streak render gray fix	2023-12-21 08:40:42 +00:00
Madalina Raicu	50118721aa	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/activity-streaks	2023-12-20 16:26:28 +00:00
Madalina Raicu	20553bd113	fix(trading): fix activity streaks test	2023-12-20 13:15:19 +00:00
Madalina Raicu	8f103df254	fix(trading): update font glitch and copy	2023-12-20 13:14:11 +00:00
Madalina Raicu	c4dd62bab6	chore: add extra check for safe prog	2023-12-20 10:46:58 +00:00
Madalina Raicu	9aa9136067	chore(trading): add streaks tests	2023-12-20 10:40:44 +00:00
Madalina Raicu	41f8bcabaf	fix(trading): fix icons attributes	2023-12-19 22:50:48 +00:00
Madalina Raicu	6a2f13a7a1	feat(trading): update tier index function	2023-12-19 22:37:09 +00:00
Madalina Raicu	748d8748c5	feat(trading): add font alpha calt	2023-12-19 19:25:27 +00:00
Madalina Raicu	a74349648f	feat(trading): update colors	2023-12-19 18:31:38 +00:00
Madalina Raicu	77f6e0a5c2	Merge branch 'fix/alpha-lyrae' of github.com:vegaprotocol/frontend-monorepo into feat/activity-streaks	2023-12-19 12:42:12 +00:00
Madalina Raicu	9ac654524c	feat(trading): center point on streaks	2023-12-19 12:38:57 +00:00
Matthew Russell	6593ce3d7e	fix: alpha lyrae font not working in woff2	2023-12-19 12:33:03 +00:00
Madalina Raicu	21fffba2cb	feat: update responsiveness	2023-12-18 19:57:46 +00:00
Madalina Raicu	c75a620d69	feat: update grid cols streaks	2023-12-18 19:45:56 +00:00
Madalina Raicu	7d122f0902	feat: update user tier index for reward hoarder bonus	2023-12-18 19:33:40 +00:00
Madalina Raicu	8505e2b930	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/activity-streaks	2023-12-18 19:28:26 +00:00
Madalina Raicu	750fd921fd	feat: add translation	2023-12-18 19:27:22 +00:00
Madalina Raicu	3a3d46ff63	feat: extract market name for active reward cards	2023-12-18 19:18:33 +00:00
Madalina Raicu	fd7374668f	feat: add activity streak and reward hoarder bonus	2023-12-17 18:33:04 +00:00
Madalina Raicu	42130c17e4	fix: update dispatch metric description	2023-12-15 09:24:53 +00:00
Madalina Raicu	5793144f27	feat: refactor activity streak component	2023-12-14 17:07:09 +00:00
Madalina Raicu	acbe4ac16b	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/activity-streaks	2023-12-14 17:05:39 +00:00
Madalina Raicu	7accad6739	Merge branch 'feat/activity-streaks' of github.com:vegaprotocol/frontend-monorepo into feat/activity-streaks	2023-12-14 17:05:28 +00:00
m.rayandcandida-d	f9b13817fe	Update libs/types/src/global-types-mappings.ts Co-authored-by: candida-d <62548908+candida-d@users.noreply.github.com>	2023-12-14 17:05:14 +00:00
Madalina Raicu	17fa1505e9	Merge branch 'feat/activity-streaks' of github.com:vegaprotocol/frontend-monorepo into feat/activity-streaks	2023-12-14 17:05:04 +00:00
m.rayandcandida-d	1c34685d4f	Update libs/types/src/global-types-mappings.ts Co-authored-by: candida-d <62548908+candida-d@users.noreply.github.com>	2023-12-14 16:13:57 +00:00
m.rayandcandida-d	864b7a4367	Update libs/types/src/global-types-mappings.ts Co-authored-by: candida-d <62548908+candida-d@users.noreply.github.com>	2023-12-14 16:13:51 +00:00
m.rayandcandida-d	37cf62ba97	Update libs/types/src/global-types-mappings.ts Co-authored-by: candida-d <62548908+candida-d@users.noreply.github.com>	2023-12-14 16:13:44 +00:00
m.rayandcandida-d	b0b602e068	Update libs/types/src/global-types-mappings.ts Co-authored-by: candida-d <62548908+candida-d@users.noreply.github.com>	2023-12-14 16:13:38 +00:00
m.rayandcandida-d	ead2deb8ea	Update libs/types/src/global-types-mappings.ts Co-authored-by: candida-d <62548908+candida-d@users.noreply.github.com>	2023-12-14 16:13:31 +00:00
Madalina Raicu	68429a31a8	fix: revert env file	2023-12-12 13:14:41 +00:00
Madalina Raicu	31d1fc21c6	feat: refactor components	2023-12-12 13:13:29 +00:00
Madalina Raicu	942132e478	feat(trading): activity streaks and active rewards	2023-12-12 00:01:14 +00:00