feat(ci): fix condition for tools define-dist-variables

apps/explorer/src/app/components/assets/assets-table.tsx

@@ -24,7 +24,7 @@ export const AssetsTable = ({ data }: AssetsTableProps) => {
   const navigate = useNavigate();
   const ref = useRef<AgGridReact>(null);
   const showColumnsOnDesktop = () => {
-    ref.current?.api.setColumnsVisible(
+    ref.current?.columnApi.setColumnsVisible(
       ['id', 'type', 'status'],
       window.innerWidth > BREAKPOINT_MD
     );

apps/explorer/src/app/components/markets/markets-table.tsx

@@ -29,7 +29,7 @@ export const MarketsTable = ({ data }: MarketsTableProps) => {
   const gridRef = useRef<AgGridReact>(null);
   useLayoutEffect(() => {
     const showColumnsOnDesktop = () => {
-      gridRef.current?.api.setColumnsVisible(
+      gridRef.current?.columnApi.setColumnsVisible(
         ['id', 'state', 'asset'],
         window.innerWidth > BREAKPOINT_MD
       );

apps/explorer/src/app/components/proposals/proposals-table.tsx

@@ -44,11 +44,11 @@ export const ProposalsTable = ({ data }: ProposalsTableProps) => {
   const gridRef = useRef<AgGridReact>(null);
   useLayoutEffect(() => {
     const showColumnsOnDesktop = () => {
-      gridRef.current?.api.setColumnsVisible(
+      gridRef.current?.columnApi.setColumnsVisible(
         ['voting', 'cDate', 'eDate', 'type'],
         window.innerWidth > BREAKPOINT_MD
       );
-      gridRef.current?.api.setColumnWidth(
+      gridRef.current?.columnApi.setColumnWidth(
         'actions',
         window.innerWidth > BREAKPOINT_MD ? 221 : 80
       );

apps/trading/.env

@@ -25,4 +25,3 @@ NX_ICEBERG_ORDERS=true
 # NX_PRODUCT_PERPETUALS
 NX_METAMASK_SNAPS=true
 NX_REFERRALS=true
-NX_TEAM_COMPETITION=true

apps/trading/client-pages/market/market.tsx

@@ -1,4 +1,4 @@
-import { useEffect } from 'react';
+import React, { useEffect, useMemo } from 'react';
 import { addDecimalsFormatNumber, titlefy } from '@vegaprotocol/utils';
 import { useScreenDimensions } from '@vegaprotocol/react-helpers';
 import { useThrottledDataProvider } from '@vegaprotocol/data-provider';
@@ -72,6 +72,17 @@ export const MarketPage = () => {
     }
   }, [update, lastMarketId, data?.id]);
 
+  const pinnedAsset = data && getAsset(data);
+
+  const tradeView = useMemo(() => {
+    if (pinnedAsset) {
+      if (largeScreen) {
+        return <TradeGrid market={data} pinnedAsset={pinnedAsset} />;
+      }
+      return <TradePanels market={data} pinnedAsset={pinnedAsset} />;
+    }
+  }, [largeScreen, data, pinnedAsset]);
+
   if (loading) {
     return (
       <Splash>
@@ -107,8 +118,6 @@ export const MarketPage = () => {
     );
   }
 
-  const pinnedAsset = data && getAsset(data);
-
   return (
     <>
       <TitleUpdater
@@ -116,11 +125,7 @@ export const MarketPage = () => {
         marketName={data?.tradableInstrument.instrument.name}
         decimalPlaces={data?.decimalPlaces}
       />
-      {largeScreen ? (
-        <TradeGrid market={data} pinnedAsset={pinnedAsset} />
-      ) : (
-        <TradePanels market={data} pinnedAsset={pinnedAsset} />
-      )}
+      {tradeView}
     </>
   );
 };

apps/trading/client-pages/market/trade-grid.tsx

@@ -1,10 +1,11 @@
-import { memo, type ReactNode } from 'react';
+import { memo } from 'react';
+import type { ReactNode } from 'react';
 import { LayoutPriority } from 'allotment';
 import classNames from 'classnames';
 import AutoSizer from 'react-virtualized-auto-sizer';
-import { useFeatureFlags } from '@vegaprotocol/environment';
-import { type PinnedAsset } from '@vegaprotocol/accounts';
-import { type Market } from '@vegaprotocol/markets';
+import type { PinnedAsset } from '@vegaprotocol/accounts';
+import { OracleBanner, useMarket } from '@vegaprotocol/markets';
+import type { Market } from '@vegaprotocol/markets';
 import { Tab, LocalStoragePersistTabs as Tabs } from '@vegaprotocol/ui-toolkit';
 import {
   ResizableGrid,
@@ -12,19 +13,31 @@ import {
   usePaneLayout,
 } from '../../components/resizable-grid';
 import { TradingViews } from './trade-views';
+import {
+  MarketSuccessorBanner,
+  MarketSuccessorProposalBanner,
+  MarketTerminationBanner,
+} from '../../components/market-banner';
+import { useFeatureFlags } from '@vegaprotocol/environment';
 import { useT } from '../../lib/use-t';
 import { ErrorBoundary } from '../../components/error-boundary';
-import { MarketBanner } from '../../components/market-banner';
 
 interface TradeGridProps {
-  market: Market;
-  pinnedAsset?: PinnedAsset | undefined;
+  market: Market | null;
+  pinnedAsset?: PinnedAsset;
 }
 
 const MainGrid = memo(
-  ({ market, pinnedAsset }: { market: Market; pinnedAsset?: PinnedAsset }) => {
+  ({
+    marketId,
+    pinnedAsset,
+  }: {
+    marketId: string;
+    pinnedAsset?: PinnedAsset;
+  }) => {
     const featureFlags = useFeatureFlags((state) => state.flags);
     const t = useT();
+    const { data: market } = useMarket(marketId);
     const [sizes, handleOnLayoutChange] = usePaneLayout({ id: 'top' });
     const [sizesMiddle, handleOnMiddleLayoutChange] = usePaneLayout({
       id: 'middle-1',
@@ -52,17 +65,17 @@ const MainGrid = memo(
                     menu={<TradingViews.chart.menu />}
                   >
                     <ErrorBoundary feature="chart">
-                      <TradingViews.chart.component marketId={market.id} />
+                      <TradingViews.chart.component marketId={marketId} />
                     </ErrorBoundary>
                   </Tab>
                   <Tab id="depth" name={t('Depth')}>
                     <ErrorBoundary feature="depth">
-                      <TradingViews.depth.component marketId={market.id} />
+                      <TradingViews.depth.component marketId={marketId} />
                     </ErrorBoundary>
                   </Tab>
                   <Tab id="liquidity" name={t('Liquidity')}>
                     <ErrorBoundary feature="liquidity">
-                      <TradingViews.liquidity.component marketId={market.id} />
+                      <TradingViews.liquidity.component marketId={marketId} />
                     </ErrorBoundary>
                   </Tab>
                   {market &&
@@ -70,21 +83,17 @@ const MainGrid = memo(
                     'Perpetual' ? (
                     <Tab id="funding-history" name={t('Funding history')}>
                       <ErrorBoundary feature="funding-history">
-                        <TradingViews.funding.component marketId={market.id} />
+                        <TradingViews.funding.component marketId={marketId} />
                       </ErrorBoundary>
                     </Tab>
                   ) : null}
                   {market &&
                   market.tradableInstrument.instrument.product.__typename ===
                     'Perpetual' ? (
-                    <Tab
-                      id="funding-payments"
-                      name={t('Funding payments')}
-                      settings={<TradingViews.fundingPayments.settings />}
-                    >
+                    <Tab id="funding-payments" name={t('Funding payments')}>
                       <ErrorBoundary feature="funding-payments">
                         <TradingViews.fundingPayments.component
-                          marketId={market.id}
+                          marketId={marketId}
                         />
                       </ErrorBoundary>
                     </Tab>
@@ -100,16 +109,12 @@ const MainGrid = memo(
                 <Tabs storageKey="console-trade-grid-main-right">
                   <Tab id="orderbook" name={t('Orderbook')}>
                     <ErrorBoundary feature="orderbook">
-                      <TradingViews.orderbook.component marketId={market.id} />
+                      <TradingViews.orderbook.component marketId={marketId} />
                     </ErrorBoundary>
                   </Tab>
-                  <Tab
-                    id="trades"
-                    name={t('Trades')}
-                    settings={<TradingViews.trades.settings />}
-                  >
+                  <Tab id="trades" name={t('Trades')}>
                     <ErrorBoundary feature="trades">
-                      <TradingViews.trades.component marketId={market.id} />
+                      <TradingViews.trades.component marketId={marketId} />
                     </ErrorBoundary>
                   </Tab>
                 </Tabs>
@@ -128,7 +133,6 @@ const MainGrid = memo(
                 id="positions"
                 name={t('Positions')}
                 menu={<TradingViews.positions.menu />}
-                settings={<TradingViews.positions.settings />}
               >
                 <ErrorBoundary feature="positions">
                   <TradingViews.positions.component />
@@ -138,26 +142,17 @@ const MainGrid = memo(
                 id="open-orders"
                 name={t('Open')}
                 menu={<TradingViews.activeOrders.menu />}
-                settings={<TradingViews.activeOrders.settings />}
               >
                 <ErrorBoundary feature="activeOrders">
                   <TradingViews.activeOrders.component />
                 </ErrorBoundary>
               </Tab>
-              <Tab
-                id="closed-orders"
-                name={t('Closed')}
-                settings={<TradingViews.closedOrders.settings />}
-              >
+              <Tab id="closed-orders" name={t('Closed')}>
                 <ErrorBoundary feature="closedOrders">
                   <TradingViews.closedOrders.component />
                 </ErrorBoundary>
               </Tab>
-              <Tab
-                id="rejected-orders"
-                name={t('Rejected')}
-                settings={<TradingViews.rejectedOrders.settings />}
-              >
+              <Tab id="rejected-orders" name={t('Rejected')}>
                 <ErrorBoundary feature="rejectedOrders">
                   <TradingViews.rejectedOrders.component />
                 </ErrorBoundary>
@@ -166,35 +161,25 @@ const MainGrid = memo(
                 id="orders"
                 name={t('All')}
                 menu={<TradingViews.orders.menu />}
-                settings={<TradingViews.orders.settings />}
               >
                 <ErrorBoundary feature="orders">
                   <TradingViews.orders.component />
                 </ErrorBoundary>
               </Tab>
               {featureFlags.STOP_ORDERS ? (
-                <Tab
-                  id="stop-orders"
-                  name={t('Stop orders')}
-                  settings={<TradingViews.stopOrders.settings />}
-                >
+                <Tab id="stop-orders" name={t('Stop orders')}>
                   <ErrorBoundary feature="stop-orders">
                     <TradingViews.stopOrders.component />
                   </ErrorBoundary>
                 </Tab>
               ) : null}
-              <Tab
-                id="fills"
-                name={t('Fills')}
-                settings={<TradingViews.fills.settings />}
-              >
+              <Tab id="fills" name={t('Fills')}>
                 <TradingViews.fills.component />
               </Tab>
               <Tab
                 id="accounts"
                 name={t('Collateral')}
                 menu={<TradingViews.collateral.menu />}
-                settings={<TradingViews.collateral.settings />}
               >
                 <ErrorBoundary feature="collateral">
                   <TradingViews.collateral.component
@@ -212,6 +197,7 @@ const MainGrid = memo(
 MainGrid.displayName = 'MainGrid';
 
 export const TradeGrid = ({ market, pinnedAsset }: TradeGridProps) => {
+  const featureFlags = useFeatureFlags((state) => state.flags);
   const wrapperClasses = classNames(
     'h-full grid',
     'grid-rows-[min-content_1fr]'
@@ -220,10 +206,17 @@ export const TradeGrid = ({ market, pinnedAsset }: TradeGridProps) => {
   return (
     <div className={wrapperClasses}>
       <div>
-        <MarketBanner market={market} />
+        {featureFlags.SUCCESSOR_MARKETS && (
+          <>
+            <MarketSuccessorBanner market={market} />
+            <MarketSuccessorProposalBanner marketId={market?.id} />
+          </>
+        )}
+        <MarketTerminationBanner market={market} />
+        <OracleBanner marketId={market?.id || ''} />
       </div>
       <div className="min-h-0 p-0.5">
-        <MainGrid market={market} pinnedAsset={pinnedAsset} />
+        <MainGrid marketId={market?.id || ''} pinnedAsset={pinnedAsset} />
       </div>
     </div>
   );

apps/trading/client-pages/market/trade-panels.tsx

@@ -1,30 +1,29 @@
 import { type PinnedAsset } from '@vegaprotocol/accounts';
 import { type Market } from '@vegaprotocol/markets';
-// TODO: handle oracle banner
-// import { OracleBanner } from '@vegaprotocol/markets';
+import { OracleBanner } from '@vegaprotocol/markets';
 import { useState } from 'react';
 import AutoSizer from 'react-virtualized-auto-sizer';
 import classNames from 'classnames';
-import {
-  Popover,
-  Splash,
-  VegaIcon,
-  VegaIconNames,
-} from '@vegaprotocol/ui-toolkit';
+import { Splash } from '@vegaprotocol/ui-toolkit';
 import { useT } from '../../lib/use-t';
-import { MarketBanner } from '../../components/market-banner';
+import {
+  MarketSuccessorBanner,
+  MarketSuccessorProposalBanner,
+  MarketTerminationBanner,
+} from '../../components/market-banner';
 import { ErrorBoundary } from '../../components/error-boundary';
 import { type TradingView } from './trade-views';
 import { TradingViews } from './trade-views';
+import { useFeatureFlags } from '@vegaprotocol/environment';
 
 interface TradePanelsProps {
-  market: Market;
+  market: Market | null;
   pinnedAsset?: PinnedAsset;
 }
 
 export const TradePanels = ({ market, pinnedAsset }: TradePanelsProps) => {
+  const featureFlags = useFeatureFlags((state) => state.flags);
   const [view, setView] = useState<TradingView>('chart');
-  const viewCfg = TradingViews[view];
 
   const renderView = () => {
     const Component = TradingViews[view].component;
@@ -45,36 +44,35 @@ export const TradePanels = ({ market, pinnedAsset }: TradePanelsProps) => {
   };
 
   const renderMenu = () => {
-    if ('menu' in viewCfg || 'settings' in viewCfg) {
+    const viewCfg = TradingViews[view];
+
+    if ('menu' in viewCfg) {
+      const Menu = viewCfg.menu;
+
       return (
         <div className="flex items-center justify-end gap-1 p-1 bg-vega-clight-800 dark:bg-vega-cdark-800 border-b border-default">
-          {'menu' in viewCfg ? <viewCfg.menu /> : null}
-          {'settings' in viewCfg ? (
-            <Popover
-              align="end"
-              trigger={
-                <span className="ml-1 flex items-center justify-center h-6 w-6">
-                  <VegaIcon name={VegaIconNames.COG} size={16} />
-                </span>
-              }
-            >
-              <div className="p-4 flex justify-end">
-                <viewCfg.settings />
-              </div>
-            </Popover>
-          ) : null}
+          <Menu />
         </div>
       );
     }
+
+    return null;
   };
 
   return (
     <div className="h-full grid grid-rows-[min-content_min-content_1fr_min-content]">
       <div>
-        <MarketBanner market={market} />
+        {featureFlags.SUCCESSOR_MARKETS && (
+          <>
+            <MarketSuccessorBanner market={market} />
+            <MarketSuccessorProposalBanner marketId={market?.id} />
+          </>
+        )}
+        <MarketTerminationBanner market={market} />
+        <OracleBanner marketId={market?.id || ''} />
       </div>
       <div>{renderMenu()}</div>
-      <div className="h-full relative">
+      <div className="h-full">
         <AutoSizer>
           {({ width, height }) => (
             <div style={{ width, height }} className="overflow-auto">
@@ -112,9 +110,7 @@ export const TradePanels = ({ market, pinnedAsset }: TradePanelsProps) => {
                 key={key}
                 view={key}
                 isActive={isActive}
-                onClick={() => {
-                  setView(key);
-                }}
+                onClick={() => setView(key)}
               />
             );
           })}

apps/trading/client-pages/market/trade-views.tsx

@@ -1,36 +1,15 @@
 import { DepthChartContainer } from '@vegaprotocol/market-depth';
 import { Filter, OpenOrdersMenu } from '@vegaprotocol/orders';
-import {
-  TradesContainer,
-  TradesSettings,
-} from '../../components/trades-container';
+import { TradesContainer } from '../../components/trades-container';
 import { OrderbookContainer } from '../../components/orderbook-container';
-import {
-  FillsContainer,
-  FillsSettings,
-} from '../../components/fills-container';
-import {
-  PositionsContainer,
-  PositionsSettings,
-} from '../../components/positions-container';
-import {
-  AccountsContainer,
-  AccountsSettings,
-} from '../../components/accounts-container';
+import { FillsContainer } from '../../components/fills-container';
+import { PositionsContainer } from '../../components/positions-container';
+import { AccountsContainer } from '../../components/accounts-container';
 import { LiquidityContainer } from '../../components/liquidity-container';
 import { FundingContainer } from '../../components/funding-container';
-import {
-  FundingPaymentsContainer,
-  FundingPaymentsSettings,
-} from '../../components/funding-payments-container';
-import {
-  OrdersContainer,
-  OrdersSettings,
-} from '../../components/orders-container';
-import {
-  StopOrdersContainer,
-  StopOrdersSettings,
-} from '../../components/stop-orders-container';
+import { FundingPaymentsContainer } from '../../components/funding-payments-container';
+import { OrdersContainer } from '../../components/orders-container';
+import { StopOrdersContainer } from '../../components/stop-orders-container';
 import { AccountsMenu } from '../../components/accounts-menu';
 import { PositionsMenu } from '../../components/positions-menu';
 import { ChartContainer, ChartMenu } from '../../components/chart-container';
@@ -53,46 +32,37 @@ export const TradingViews = {
   },
   fundingPayments: {
     component: FundingPaymentsContainer,
-    settings: FundingPaymentsSettings,
   },
   orderbook: {
     component: OrderbookContainer,
   },
   trades: {
     component: TradesContainer,
-    settings: TradesSettings,
   },
   positions: {
     component: PositionsContainer,
     menu: PositionsMenu,
-    settings: PositionsSettings,
   },
   activeOrders: {
     component: () => <OrdersContainer filter={Filter.Open} />,
     menu: OpenOrdersMenu,
-    settings: () => <OrdersSettings filter={Filter.Open} />,
   },
   closedOrders: {
     component: () => <OrdersContainer filter={Filter.Closed} />,
-    settings: () => <OrdersSettings filter={Filter.Closed} />,
   },
   rejectedOrders: {
     component: () => <OrdersContainer filter={Filter.Rejected} />,
-    settings: () => <OrdersSettings filter={Filter.Rejected} />,
   },
   orders: {
     component: OrdersContainer,
     menu: OpenOrdersMenu,
-    settings: OrdersSettings,
   },
   stopOrders: {
     component: StopOrdersContainer,
-    settings: StopOrdersSettings,
   },
   collateral: {
     component: AccountsContainer,
     menu: AccountsMenu,
-    settings: AccountsSettings,
   },
-  fills: { component: FillsContainer, settings: FillsSettings },
+  fills: { component: FillsContainer },
 } as const;

apps/trading/client-pages/markets/market-list-table.tsx

@@ -42,7 +42,7 @@ export const createDataGridSlice: StateCreator<DataGridSlice> = (set) => ({
   },
 });
 
-export const useMarketsStore = create<DataGridSlice>()(
+const useMarketsStore = create<DataGridSlice>()(
   persist(createDataGridSlice, {
     name: 'vega_market_list_store',
   })

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

@@ -16,7 +16,6 @@ import {
 } from '@vegaprotocol/environment';
 import { useT } from '../../lib/use-t';
 import { ErrorBoundary } from '../../components/error-boundary';
-import { MarketsSettings } from './markets-settings';
 
 export const MarketsPage = () => {
   const t = useT();
@@ -35,11 +34,7 @@ export const MarketsPage = () => {
     <div className="h-full pt-0.5 pb-3 px-1.5">
       <div className="h-full my-1 border rounded-sm border-default">
         <Tabs storageKey="console-markets">
-          <Tab
-            id="open-markets"
-            name={t('Open markets')}
-            settings={<MarketsSettings />}
-          >
+          <Tab id="open-markets" name={t('Open markets')}>
             <ErrorBoundary feature="markets-open">
               <OpenMarkets />
             </ErrorBoundary>
@@ -47,7 +42,6 @@ export const MarketsPage = () => {
           <Tab
             id="proposed-markets"
             name={t('Proposed markets')}
-            settings={<MarketsSettings />}
             menu={
               <TradingAnchorButton
                 size="extra-small"
@@ -62,11 +56,7 @@ export const MarketsPage = () => {
               <Proposed />
             </ErrorBoundary>
           </Tab>
-          <Tab
-            id="closed-markets"
-            name={t('Closed markets')}
-            settings={<MarketsSettings />}
-          >
+          <Tab id="closed-markets" name={t('Closed markets')}>
             <ErrorBoundary feature="markets-closed">
               <Closed />
             </ErrorBoundary>

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

@@ -1,8 +0,0 @@
-import { GridSettings } from '../../components/grid-settings/grid-settings';
-import { useMarketsStore } from './market-list-table';
-
-export const MarketsSettings = () => (
-  <GridSettings
-    updateGridStore={useMarketsStore((store) => store.updateGridStore)}
-  />
-);

apps/trading/client-pages/portfolio/portfolio.tsx

@@ -5,29 +5,14 @@ import { titlefy } from '@vegaprotocol/utils';
 import { useIncompleteWithdrawals } from '@vegaprotocol/withdraws';
 import { Tab, LocalStoragePersistTabs as Tabs } from '@vegaprotocol/ui-toolkit';
 import { usePageTitleStore } from '../../stores';
-import {
-  AccountsContainer,
-  AccountsSettings,
-} from '../../components/accounts-container';
+import { AccountsContainer } from '../../components/accounts-container';
 import { DepositsContainer } from '../../components/deposits-container';
-import {
-  FillsContainer,
-  FillsSettings,
-} from '../../components/fills-container';
-import {
-  FundingPaymentsContainer,
-  FundingPaymentsSettings,
-} from '../../components/funding-payments-container';
-import {
-  PositionsContainer,
-  PositionsSettings,
-} from '../../components/positions-container';
+import { FillsContainer } from '../../components/fills-container';
+import { FundingPaymentsContainer } from '../../components/funding-payments-container';
+import { PositionsContainer } from '../../components/positions-container';
 import { PositionsMenu } from '../../components/positions-menu';
 import { WithdrawalsContainer } from '../../components/withdrawals-container';
-import {
-  OrdersContainer,
-  OrdersSettings,
-} from '../../components/orders-container';
+import { OrdersContainer } from '../../components/orders-container';
 import { LedgerContainer } from '../../components/ledger-container';
 import {
   ResizableGrid,
@@ -91,27 +76,22 @@ export const Portfolio = () => {
                 id="positions"
                 name={t('Positions')}
                 menu={<PositionsMenu />}
-                settings={<PositionsSettings />}
               >
                 <ErrorBoundary feature="portfolio-positions">
                   <PositionsContainer allKeys />
                 </ErrorBoundary>
               </Tab>
-              <Tab id="orders" name={t('Orders')} settings={<OrdersSettings />}>
+              <Tab id="orders" name={t('Orders')}>
                 <ErrorBoundary feature="portfolio-orders">
                   <OrdersContainer />
                 </ErrorBoundary>
               </Tab>
-              <Tab id="fills" name={t('Fills')} settings={<FillsSettings />}>
+              <Tab id="fills" name={t('Fills')}>
                 <ErrorBoundary feature="portfolio-fills">
                   <FillsContainer />
                 </ErrorBoundary>
               </Tab>
-              <Tab
-                id="funding-payments"
-                name={t('Funding payments')}
-                settings={<FundingPaymentsSettings />}
-              >
+              <Tab id="funding-payments" name={t('Funding payments')}>
                 <ErrorBoundary feature="portfolio-funding-payments">
                   <FundingPaymentsContainer />
                 </ErrorBoundary>
@@ -134,7 +114,6 @@ export const Portfolio = () => {
               <Tab
                 id="collateral"
                 name={t('Collateral')}
-                settings={<AccountsSettings />}
                 menu={<AccountsMenu />}
               >
                 <ErrorBoundary feature="portfolio-accounts">

apps/trading/client-pages/referrals/apply-code-form.tsx

@@ -296,7 +296,7 @@ export const ApplyCodeForm = ({ onSuccess }: { onSuccess?: () => void }) => {
     <>
       <div
         data-testid="referral-apply-code-form"
-        className="bg-vega-clight-800 dark:bg-vega-cdark-800 mx-auto md:w-2/3 max-w-md rounded-lg p-8"
+        className="bg-vega-clight-800 dark:bg-vega-cdark-800 mx-auto w-2/3 max-w-md rounded-lg p-8"
       >
         <h3 className="calt mb-4 text-center text-2xl">
           {t('Apply a referral code')}

apps/trading/client-pages/referrals/constants.ts

@@ -3,7 +3,7 @@ export const GRADIENT =
   'bg-gradient-to-b from-vega-clight-800 dark:from-vega-cdark-800 to-transparent';
 
 export const SKY_BACKGROUND =
-  'bg-[url(/sky-light.png)] dark:bg-[url(/sky-dark.png)] bg-[37%_0px] bg-[length:1440px] bg-no-repeat bg-local';
+  'bg-[url(/sky-light.png)] dark:bg-[url(/sky-dark.png)] bg-[40%_0px] bg-[length:1440px] bg-no-repeat bg-local';
 
 // TODO: Update the links to use the correct referral related pages
 export const REFERRAL_DOCS_LINK =

apps/trading/client-pages/referrals/create-code-form.tsx

@@ -49,7 +49,7 @@ export const CreateCodeForm = () => {
   return (
     <div
       data-testid="referral-create-code-form"
-      className="md:w-2/3 max-w-md mx-auto bg-vega-clight-800 dark:bg-vega-cdark-800 p-8 rounded-lg"
+      className="w-2/3 max-w-md mx-auto bg-vega-clight-800 dark:bg-vega-cdark-800 p-8 rounded-lg"
     >
       <h3 className="mb-4 text-2xl text-center calt">
         {t('Create a referral code')}

apps/trading/client-pages/referrals/how-it-works-table.tsx

@@ -1,5 +1,5 @@
 import { useT } from '../../lib/use-t';
-import { Table } from '../../components/table';
+import { Table } from './table';
 
 export const HowItWorksTable = () => {
   const t = useT();

apps/trading/client-pages/referrals/landing-banner.tsx

@@ -5,16 +5,16 @@ import { useT } from '../../lib/use-t';
 export const LandingBanner = () => {
   const t = useT();
   return (
-    <div className={classNames('relative mb-10 lg:mb-20')}>
+    <div className={classNames('relative mb-20')}>
       <div className="">
         <div
           aria-hidden
-          className="absolute top-20 right-[220px] md:right-[240px] max-sm:hidden"
+          className="absolute top-20 right-[120px] md:right-[240px] max-sm:hidden"
         >
           <AnimatedDudeWithWire />
         </div>
-        <div className="pt-10 lg:pt-20 sm:w-[50%]">
-          <h1 className="text-3xl _text-[6vw] lg:!text-6xl leading-[1em] font-alpha calt mb-10">
+        <div className="pt-20 sm:w-[50%]">
+          <h1 className="text-6xl font-alpha calt mb-10">
             {t('Vega community referrals')}
           </h1>
           <p className="text-lg mb-1">
@@ -22,7 +22,7 @@ export const LandingBanner = () => {
               'Referral programs can be proposed and created via community governance.'
             )}
           </p>
-          <p className="text-lg mb-1">
+          <p className="text-lg mb-10">
             {t(
               'Once live, users can generate referral codes to share with their friends and earn commission on their trades, while referred traders can access fee discounts based on the running volume of the group.'
             )}

apps/trading/client-pages/referrals/layout.tsx

@@ -13,7 +13,7 @@ export const Layout = ({
     <div
       className={classNames(
         'max-w-[1440px]',
-        'mx-auto px-4 lg:px-32 pb-32',
+        'mx-auto px-16 md:px-32 pb-32',
         'relative z-0',
         className
       )}

apps/trading/client-pages/referrals/referral-statistics.tsx

@@ -14,7 +14,7 @@ import {
   useUpdateReferees,
 } from './hooks/use-referral';
 import classNames from 'classnames';
-import { Table } from '../../components/table';
+import { Table } from './table';
 import {
   addDecimalsFormatNumber,
   getDateFormat,

apps/trading/client-pages/referrals/referrals.tsx

@@ -72,7 +72,7 @@ export const Referrals = () => {
       {showNav && <Nav />}
       <div
         className={classNames({
-          'py-8 lg:py-16': showNav,
+          'py-16': showNav,
           'h-[300px] relative': loading || error,
         })}
       >

apps/trading/client-pages/referrals/table.tsx

@@ -1,17 +1,13 @@
 import { Tooltip, VegaIcon, VegaIconNames } from '@vegaprotocol/ui-toolkit';
 import classNames from 'classnames';
 import { forwardRef, type ReactNode, type HTMLAttributes } from 'react';
-
-export const BORDER_COLOR = 'border-vega-clight-500 dark:border-vega-cdark-500';
-export const GRADIENT =
-  'bg-gradient-to-b from-vega-clight-800 dark:from-vega-cdark-800 to-transparent';
+import { BORDER_COLOR, GRADIENT } from './constants';
 
 type TableColumnDefinition = {
   displayName?: ReactNode;
   name: string;
   tooltip?: string;
   className?: string;
-  testId?: string;
 };
 
 type TableProps = {
@@ -46,7 +42,7 @@ export const Table = forwardRef<
               key={name}
               col-id={name}
               className={classNames(
-                'px-5 py-3 text-xs  text-vega-clight-100 dark:text-vega-cdark-100 font-normal',
+                'px-5 py-3 text-sm  text-vega-clight-100 dark:text-vega-cdark-100 font-normal',
                 INNER_BORDER_STYLE
               )}
             >
@@ -70,7 +66,7 @@ export const Table = forwardRef<
         ref={ref}
         className={classNames(
           'w-full',
-          'border-separate border rounded-md border-spacing-0 overflow-hidden',
+          'border-separate border rounded-md border-spacing-0',
           BORDER_COLOR,
           GRADIENT,
           className
@@ -86,10 +82,10 @@ export const Table = forwardRef<
                 'max-md:flex flex-col w-full': !noCollapse,
               })}
             >
-              {columns.map(({ name, displayName, className, testId }, j) => (
+              {columns.map(({ name, displayName, className }, j) => (
                 <td
                   className={classNames(
-                    'px-5 py-3',
+                    'px-5 py-3 text-base',
                     {
                       'max-md:flex max-md:flex-col max-md:justify-between':
                         !noCollapse,
@@ -114,7 +110,7 @@ export const Table = forwardRef<
                       {displayName}
                     </span>
                   )}
-                  <span data-testid={`${testId || name}-${i}`}>{d[name]}</span>
+                  <span>{d[name]}</span>
                 </td>
               ))}
             </tr>

apps/trading/client-pages/referrals/tag.tsx

@@ -2,15 +2,7 @@ import type { HTMLAttributes } from 'react';
 import classNames from 'classnames';
 
 type TagProps = {
-  color?:
-    | 'yellow'
-    | 'green'
-    | 'blue'
-    | 'purple'
-    | 'pink'
-    | 'orange'
-    | 'red'
-    | 'none';
+  color?: 'yellow' | 'green' | 'blue' | 'purple' | 'pink' | 'orange' | 'none';
 };
 export const Tag = ({
   color = 'none',

apps/trading/client-pages/referrals/tiers.tsx

@@ -3,12 +3,11 @@ import {
   getDateTimeFormat,
 } from '@vegaprotocol/utils';
 import { useReferralProgram } from './hooks/use-referral-program';
-import { Table } from '../../components/table';
+import { Table } from './table';
 import classNames from 'classnames';
 import { BORDER_COLOR, GRADIENT } from './constants';
-import { Tag } from '../../components/helpers/tag';
-import { getTierColor, getTierGradient } from '../../components/helpers/tiers';
-import type { ReactNode } from 'react';
+import { Tag } from './tag';
+import type { ComponentProps, ReactNode } from 'react';
 import { ExternalLink, truncateMiddle } from '@vegaprotocol/ui-toolkit';
 import {
   DApp,
@@ -20,6 +19,25 @@ import {
 import { useT, ns } from '../../lib/use-t';
 import { Trans } from 'react-i18next';
 
+// rainbow-ish order
+const TIER_COLORS: Array<ComponentProps<typeof Tag>['color']> = [
+  'pink',
+  'orange',
+  'yellow',
+  'green',
+  'blue',
+  'purple',
+];
+
+const getTierColor = (tier: number) => {
+  const tiers = Object.keys(TIER_COLORS).length;
+  let index = Math.abs(tier - 1);
+  if (tier >= tiers) {
+    index = index % tiers;
+  }
+  return TIER_COLORS[index];
+};
+
 const Loading = ({ variant }: { variant: 'large' | 'inline' }) => (
   <div
     className={classNames(
@@ -35,12 +53,10 @@ const StakingTier = ({
   tier,
   referralRewardMultiplier,
   minimumStakedTokens,
-  max,
 }: {
   tier: number;
   referralRewardMultiplier: string;
   minimumStakedTokens: string;
-  max?: number;
 }) => {
   const t = useT();
   const minimum = addDecimalsFormatNumber(minimumStakedTokens, 18);
@@ -81,7 +97,7 @@ const StakingTier = ({
         )}
       >
         <div>
-          <Tag color={getTierColor(tier, max)}>
+          <Tag color={getTierColor(tier)}>
             {t('Multiplier')} {referralRewardMultiplier}x
           </Tag>
           <p className="mt-1 text-sm text-vega-clight-100 dark:text-vega-cdark-100">
@@ -143,9 +159,7 @@ export const TiersContainer = () => {
 
   return (
     <>
-      <h2 className="text-3xl mt-10 font-alpha calt">
-        {t('Current program details')}
-      </h2>
+      <h2 className="text-3xl mt-10">{t('Current program details')}</h2>
       {details?.id && (
         <p>
           <Trans
@@ -184,18 +198,7 @@ export const TiersContainer = () => {
       </div>
 
       {/* Container */}
-      <div
-        className={classNames(
-          'md:bg-vega-clight-800',
-          'md:dark:bg-vega-cdark-800',
-          'md:text-black',
-          'md:dark:text-white',
-          'md:rounded-lg',
-          'md:p-6',
-          'mt-1',
-          'mb-20'
-        )}
-      >
+      <div className="bg-vega-clight-800 dark:bg-vega-cdark-800 text-black dark:text-white rounded-lg p-6 mt-1 mb-20">
         {/* Benefit tiers */}
         <div className="flex flex-col mb-5">
           <h3 className="text-2xl calt">{t('Benefit tiers')}</h3>
@@ -258,7 +261,6 @@ const StakingTiers = ({
       <StakingTier
         key={i}
         tier={tier}
-        max={data.length}
         referralRewardMultiplier={referralRewardMultiplier}
         minimumStakedTokens={minimumStakedTokens}
       />
@@ -320,7 +322,22 @@ const TiersTable = ({
       className="bg-white dark:bg-vega-cdark-900"
       data={data.map((d) => ({
         ...d,
-        className: classNames(getTierGradient(d.tier, data.length)),
+        className: classNames({
+          'from-vega-yellow-400 dark:from-vega-yellow-600 to-20%  bg-highlight':
+            'yellow' === getTierColor(d.tier),
+          'from-vega-green-400 dark:from-vega-green-600 to-20%  bg-highlight':
+            'green' === getTierColor(d.tier),
+          'from-vega-blue-400 dark:from-vega-blue-600 to-20%  bg-highlight':
+            'blue' === getTierColor(d.tier),
+          'from-vega-purple-400 dark:from-vega-purple-600 to-20%  bg-highlight':
+            'purple' === getTierColor(d.tier),
+          'from-vega-pink-400 dark:from-vega-pink-600 to-20%  bg-highlight':
+            'pink' === getTierColor(d.tier),
+          'from-vega-orange-400 dark:from-vega-orange-600 to-20%  bg-highlight':
+            'orange' === getTierColor(d.tier),
+          'from-vega-clight-200 dark:from-vega-cdark-200 to-20%  bg-highlight':
+            'none' === getTierColor(d.tier),
+        }),
       }))}
     />
   );

apps/trading/client-pages/referrals/tile.tsx

@@ -19,11 +19,9 @@ export const Tile = ({
   return (
     <div
       className={classNames(
-        'text-black dark:text-white',
-        'overflow-hidden relative',
-        'p-3 md:p-6',
-        'rounded-lg',
-        'bg-vega-clight-800 dark:bg-vega-cdark-800',
+        'rounded-lg overflow-hidden relative',
+        'bg-vega-clight-800 dark:bg-vega-cdark-800 text-black dark:text-white',
+        'p-6',
         className
       )}
     >
@@ -57,10 +55,7 @@ export const StatTile = ({
       >
         {title}
       </h3>
-      <div
-        data-testid={`${testId}-value`}
-        className="text-2xl lg:text-5xl text-left"
-      >
+      <div data-testid={`${testId}-value`} className="text-5xl text-left">
         {children}
       </div>
       {description && (
@@ -124,7 +119,7 @@ export const CodeTile = ({
         >
           <div
             className={classNames(
-              'relative bg-rainbow bg-clip-text text-transparent text-2xl lg:text-5xl overflow-hidden',
+              'relative bg-rainbow bg-clip-text text-transparent text-5xl overflow-hidden',
               FADE_OUT_STYLE
             )}
           >

apps/trading/client-pages/teams/index.ts

@@ -1 +0,0 @@
-export { Teams } from './teams';

apps/trading/client-pages/teams/teams.tsx

@@ -1,7 +0,0 @@
-export const Teams = () => {
-  return (
-    <div>
-      <h1>Teams</h1>
-    </div>
-  );
-};

apps/trading/components/accounts-container/accounts-container.tsx

@@ -73,7 +73,7 @@ export const AccountsContainer = ({
   );
 };
 
-export const useAccountStore = create<DataGridSlice>()(
+const useAccountStore = create<DataGridSlice>()(
   persist(createDataGridSlice, {
     name: 'vega_accounts_store',
   })

apps/trading/components/accounts-container/accounts-settings.tsx

@@ -1,8 +0,0 @@
-import { GridSettings } from '../grid-settings/grid-settings';
-import { useAccountStore } from './accounts-container';
-
-export const AccountsSettings = () => (
-  <GridSettings
-    updateGridStore={useAccountStore((store) => store.updateGridStore)}
-  />
-);

apps/trading/components/accounts-container/index.ts

@@ -1,2 +1 @@
 export * from './accounts-container';
-export * from './accounts-settings';

apps/trading/components/card/card.tsx

@@ -9,7 +9,6 @@ export const Card = ({
   loading = false,
   highlight = false,
   testId,
-  noBackgroundOnMobile = false,
 }: {
   children: ReactNode;
   title: string;
@@ -17,33 +16,20 @@ export const Card = ({
   loading?: boolean;
   highlight?: boolean;
   testId?: string;
-  noBackgroundOnMobile?: boolean;
 }) => {
   return (
     <div
       data-testid={testId}
       className={classNames(
-        'col-span-full lg:col-auto',
-        {
-          'rounded-lg bg-vega-clight-800 dark:bg-vega-cdark-800 p-0.5':
-            !noBackgroundOnMobile,
-          'mt-3 md:mt-0 md:rounded-lg md:bg-vega-clight-800 md:dark:bg-vega-cdark-800 md:p-0.5':
-            noBackgroundOnMobile,
-        },
+        'bg-vega-clight-800 dark:bg-vega-cdark-800 col-span-full p-0.5 lg:col-auto',
+        'rounded-lg',
         {
           'bg-rainbow': highlight,
         },
         className
       )}
     >
-      <div
-        className={classNames('h-full w-full', {
-          'bg-vega-clight-800 dark:bg-vega-cdark-800 rounded p-4':
-            !noBackgroundOnMobile,
-          'md:bg-vega-clight-800 md:dark:bg-vega-cdark-800 md:rounded md:p-4':
-            noBackgroundOnMobile,
-        })}
-      >
+      <div className="bg-vega-clight-800 dark:bg-vega-cdark-800 h-full w-full rounded p-4">
         <h2 className="mb-3">{title}</h2>
         {loading ? <CardLoader /> : children}
       </div>

apps/trading/components/fees-container/fees-container.tsx

@@ -13,7 +13,7 @@ import { MarketFees } from './market-fees';
 import { useVolumeStats } from './use-volume-stats';
 import { useReferralStats } from './use-referral-stats';
 import { formatPercentage, getAdjustedFee } from './utils';
-import { Table as SimpleTable } from '../../components/table';
+import { Table, Td, Th, THead, Tr } from './table';
 import BigNumber from 'bignumber.js';
 import { Links } from '../../lib/links';
 import { Link } from 'react-router-dom';
@@ -24,8 +24,6 @@ import {
   truncateMiddle,
 } from '@vegaprotocol/ui-toolkit';
 import { useT } from '../../lib/use-t';
-import classNames from 'classnames';
-import { getTierGradient } from '../helpers/tiers';
 
 export const FeesContainer = () => {
   const t = useT();
@@ -168,7 +166,6 @@ export const FeesContainer = () => {
         className="lg:col-span-full xl:col-span-2"
         loading={loading}
         data-testid="volume-discount-card"
-        noBackgroundOnMobile={true}
       >
         <VolumeTiers
           tiers={volumeTiers}
@@ -182,14 +179,12 @@ export const FeesContainer = () => {
         className="lg:col-span-full xl:col-span-2"
         loading={loading}
         data-testid="referral-discount-card"
-        noBackgroundOnMobile={true}
       >
         <ReferralTiers
           tiers={referralTiers}
           tierIndex={referralTierIndex}
           epochsInSet={epochsInSet}
           referralVolumeInWindow={referralVolumeInWindow}
-          referralDiscountWindowLength={referralDiscountWindowLength}
         />
       </Card>
       <Card
@@ -197,7 +192,6 @@ export const FeesContainer = () => {
         className="lg:col-span-full"
         loading={marketsLoading}
         data-testid="fees-by-market-card"
-        noBackgroundOnMobile={true}
       >
         <MarketFees
           markets={markets}
@@ -483,65 +477,44 @@ const VolumeTiers = ({
 
   return (
     <div>
-      <SimpleTable
-        className="bg-white dark:bg-vega-cdark-900"
-        columns={[
-          { name: 'tier', displayName: t('Tier'), testId: 'col-tier-value' },
-          {
-            name: 'discount',
-            displayName: t('Discount'),
-            testId: 'discount-value',
-          },
-          {
-            name: 'minTradingVolume',
-            displayName: t('Min. trading volume'),
-            testId: 'min-volume-value',
-          },
-          {
-            name: 'myVolume',
-            displayName: t('myVolume', 'My volume (last {{count}} epochs)', {
-              count: windowLength,
-            }),
-            testId: 'my-volume-value',
-          },
-          {
-            name: 'indicator',
-            className: 'max-md:hidden',
-            testId: 'your-tier',
-          },
-        ]}
-        data={Array.from(tiers).map((tier, i) => {
-          const isUserTier = tierIndex === i;
-          const indicator = isUserTier ? (
-            <YourTier testId={`your-volume-tier-${i}`} />
-          ) : null;
-          const tierIndicator = (
-            <div className="flex justify-between">
-              <span data-testid={`tier-value-${i}`}>{i + 1}</span>
-              <span className="md:hidden">{indicator}</span>
-            </div>
-          );
-          return {
-            tier: tierIndicator,
-            discount: (
-              <>{formatPercentage(Number(tier.volumeDiscountFactor))}%</>
-            ),
-            minTradingVolume: (
-              <>{formatNumber(tier.minimumRunningNotionalTakerVolume)}</>
-            ),
-            myVolume: isUserTier ? (
-              formatNumber(lastEpochVolume)
-            ) : (
-              <span className="md:hidden">-</span>
-            ),
-            indicator: indicator,
-            className: classNames(
-              getTierGradient(i + 1, tiers.length),
-              'text-xs'
-            ),
-          };
-        })}
-      />
+      <Table>
+        <THead>
+          <Tr>
+            <Th data-testid="tier-header">{t('Tier')}</Th>
+            <Th data-testid="discount-header">{t('Discount')}</Th>
+            <Th data-testid="min-volume-header">{t('Min. trading volume')}</Th>
+            <Th data-testid="my-volume-header">
+              {t('myVolume', 'My volume (last {{count}} epochs)', {
+                count: windowLength,
+              })}
+            </Th>
+            <Th data-testid="actions-header" />
+          </Tr>
+        </THead>
+        <tbody>
+          {Array.from(tiers).map((tier, i) => {
+            const isUserTier = tierIndex === i;
+
+            return (
+              <Tr key={i} data-testid={`tier-row-${i}`}>
+                <Td data-testid={`tier-value-${i}`}>{i + 1}</Td>
+                <Td data-testid={`discount-value-${i}`}>
+                  {formatPercentage(Number(tier.volumeDiscountFactor))}%
+                </Td>
+                <Td data-testid={`min-volume-value-${i}`}>
+                  {formatNumber(tier.minimumRunningNotionalTakerVolume)}
+                </Td>
+                <Td data-testid={`my-volume-value-${i}`}>
+                  {isUserTier ? formatNumber(lastEpochVolume) : ''}
+                </Td>
+                <Td data-testid={`your-tier-${i}`}>
+                  {isUserTier ? <YourTier /> : null}
+                </Td>
+              </Tr>
+            );
+          })}
+        </tbody>
+      </Table>
     </div>
   );
 };
@@ -551,7 +524,6 @@ const ReferralTiers = ({
   tierIndex,
   epochsInSet,
   referralVolumeInWindow,
-  referralDiscountWindowLength,
 }: {
   tiers: Array<{
     referralDiscountFactor: string;
@@ -561,7 +533,6 @@ const ReferralTiers = ({
   tierIndex: number;
   epochsInSet: number;
   referralVolumeInWindow: number;
-  referralDiscountWindowLength: number;
 }) => {
   const t = useT();
 
@@ -573,81 +544,60 @@ const ReferralTiers = ({
 
   return (
     <div>
-      <SimpleTable
-        className="bg-white dark:bg-vega-cdark-900"
-        columns={[
-          { name: 'tier', displayName: t('Tier'), testId: 'col-tier-value' },
-          {
-            name: 'discount',
-            displayName: t('Discount'),
-            tooltip: t(
-              "The proportion of the referee's taker fees to be discounted"
-            ),
-            testId: 'discount-value',
-          },
-          {
-            name: 'volume',
-            displayName: t(
-              'minTradingVolume',
-              'Min. trading volume (last {{count}} epochs)',
-              {
-                count: referralDiscountWindowLength,
-              }
-            ),
-            tooltip: t(
-              'The minimum running notional for the given benefit tier'
-            ),
-            testId: 'min-volume-value',
-          },
-          {
-            name: 'epochs',
-            displayName: t('Min. epochs'),
-            tooltip: t(
-              'The minimum number of epochs the party needs to be in the referral set to be eligible for the benefit'
-            ),
-            testId: 'required-epochs-value',
-          },
-          {
-            name: 'indicator',
-            className: 'max-md:hidden',
-            testId: 'user-tier-or-unlocks',
-          },
-        ]}
-        data={Array.from(tiers).map((tier, i) => {
-          const isUserTier = tierIndex === i;
-          const requiredVolume = Number(tier.minimumRunningNotionalTakerVolume);
+      <Table>
+        <THead>
+          <Tr>
+            <Th data-testid="tier-header">{t('Tier')}</Th>
+            <Th data-testid="discount-header">{t('Discount')}</Th>
+            <Th data-testid="min-volume-header">{t('Min. trading volume')}</Th>
+            <Th data-testid="required-epochs-header">{t('Required epochs')}</Th>
+            <Th data-testid="extra-header" />
+          </Tr>
+        </THead>
+        <tbody>
+          {Array.from(tiers).map((tier, i) => {
+            const isUserTier = tierIndex === i;
 
-          const indicator = isUserTier ? (
-            <YourTier testId={`your-referral-tier-${i}`} />
-          ) : referralVolumeInWindow >= requiredVolume &&
-            epochsInSet < tier.minimumEpochs ? (
-            <span className="text-muted text-xs">
-              Unlocks in {tier.minimumEpochs - epochsInSet} epochs
-            </span>
-          ) : null;
+            const requiredVolume = Number(
+              tier.minimumRunningNotionalTakerVolume
+            );
+            let unlocksIn = null;
 
-          const tierIndicator = (
-            <div className="flex justify-between">
-              <span data-testid={`tier-value-${i}`}>{i + 1}</span>
-              <span className="md:hidden">{indicator}</span>
-            </div>
-          );
+            if (
+              referralVolumeInWindow >= requiredVolume &&
+              epochsInSet < tier.minimumEpochs
+            ) {
+              unlocksIn = (
+                <span className="text-muted">
+                  Unlocks in {tier.minimumEpochs - epochsInSet} epochs
+                </span>
+              );
+            }
 
-          return {
-            tier: tierIndicator,
-            discount: (
-              <>{formatPercentage(Number(tier.referralDiscountFactor))}%</>
-            ),
-            volume: formatNumber(tier.minimumRunningNotionalTakerVolume),
-            epochs: tier.minimumEpochs,
-            indicator,
-            className: classNames(
-              getTierGradient(i + 1, tiers.length),
-              'text-xs'
-            ),
-          };
-        })}
-      />
+            return (
+              <Tr key={i} data-testid={`tier-row-${i}`}>
+                <Td data-testid={`tier-value-${i}`}>{i + 1}</Td>
+                <Td data-testid={`discount-value-${i}`}>
+                  {formatPercentage(Number(tier.referralDiscountFactor))}%
+                </Td>
+                <Td data-testid={`min-volume-value-${i}`}>
+                  {formatNumber(tier.minimumRunningNotionalTakerVolume)}
+                </Td>
+                <Td data-testid={`required-epochs-value-${i}`}>
+                  {tier.minimumEpochs}
+                </Td>
+                <Td data-testid={`user-tier-or-unlocks-${i}`}>
+                  {isUserTier ? (
+                    <YourTier testId={`your-tier-${i}`} />
+                  ) : (
+                    unlocksIn
+                  )}
+                </Td>
+              </Tr>
+            );
+          })}
+        </tbody>
+      </Table>
     </div>
   );
 };
@@ -661,7 +611,7 @@ const YourTier = ({ testId }: YourTierProps) => {
 
   return (
     <span
-      className="bg-rainbow whitespace-nowrap rounded-xl px-4 py-1.5 text-white text-xs"
+      className="bg-rainbow whitespace-nowrap rounded-xl px-4 py-1.5 text-white"
       data-testid={testId}
     >
       {t('Your tier')}

apps/trading/components/fees-container/market-fees.tsx

@@ -8,53 +8,43 @@ import { useNavigateWithMeta } from '../../lib/hooks/use-market-click-handler';
 import { Links } from '../../lib/links';
 import { useT } from '../../lib/use-t';
 import { useMemo } from 'react';
-import { type ColDef } from 'ag-grid-community/dist/lib/entities/colDef';
 
-const useFeesTableColumnDefs = (): ColDef[] => {
+const useFeesTableColumnDefs = () => {
   const t = useT();
   return useMemo(
-    () =>
-      [
-        {
-          field: 'code',
-          cellRenderer: 'MarketCodeCell',
-          pinned: 'left',
-          width: 150,
-        },
-        {
-          field: 'liquidityFee',
-          valueFormatter: ({ value }: { value: number }) => value + '%',
-        },
-        {
-          field: 'feeAfterDiscount',
-          headerName: t('Total fee after discount'),
-          valueFormatter: ({ value }: { value: number }) => value + '%',
-        },
-        {
-          field: 'totalFee',
-          headerName: t('Total fee before discount'),
-          valueFormatter: ({ value }: { value: number }) => value + '%',
-        },
-        {
-          field: 'infraFee',
-          valueFormatter: ({ value }: { value: number }) => value + '%',
-        },
-        {
-          field: 'makerFee',
-          valueFormatter: ({ value }: { value: number }) => value + '%',
-        },
-      ] as ColDef[],
+    () => [
+      { field: 'code', cellRenderer: 'MarketCodeCell' },
+      {
+        field: 'feeAfterDiscount',
+        headerName: t('Total fee after discount'),
+        valueFormatter: ({ value }: { value: number }) => value + '%',
+      },
+      {
+        field: 'infraFee',
+        valueFormatter: ({ value }: { value: number }) => value + '%',
+      },
+      {
+        field: 'makerFee',
+        valueFormatter: ({ value }: { value: number }) => value + '%',
+      },
+      {
+        field: 'liquidityFee',
+        valueFormatter: ({ value }: { value: number }) => value + '%',
+      },
+      {
+        field: 'totalFee',
+        headerName: t('Total fee before discount'),
+        valueFormatter: ({ value }: { value: number }) => value + '%',
+      },
+    ],
     [t]
   );
 };
 
 const feesTableDefaultColDef = {
   flex: 1,
-  minWidth: 62,
   resizable: true,
   sortable: true,
-  suppressMovable: true,
-  pinned: false,
 };
 
 const components = {
@@ -72,8 +62,6 @@ export const MarketFees = ({
 }) => {
   const navigateWithMeta = useNavigateWithMeta();
 
-  const colDef = useFeesTableColumnDefs();
-
   const rows = compact(markets || []).map((m) => {
     const infraFee = new BigNumber(m.fees.factors.infrastructureFee);
     const makerFee = new BigNumber(m.fees.factors.makerFee);
@@ -100,9 +88,9 @@ export const MarketFees = ({
   });
 
   return (
-    <div className="border rounded-lg md:rounded-sm overflow-hidden border-default">
+    <div className="border rounded-sm border-default">
       <AgGrid
-        columnDefs={colDef}
+        columnDefs={useFeesTableColumnDefs()}
         rowData={rows}
         getRowId={({ data }) => data.id}
         defaultColDef={feesTableDefaultColDef}

apps/trading/components/fills-container/fills-container.tsx

@@ -38,7 +38,7 @@ export const FillsContainer = () => {
   );
 };
 
-export const useFillsStore = create<DataGridSlice>()(
+const useFillsStore = create<DataGridSlice>()(
   persist(createDataGridSlice, {
     name: 'vega_fills_store',
   })

apps/trading/components/fills-container/fills-settings.tsx

@@ -1,8 +0,0 @@
-import { GridSettings } from '../grid-settings/grid-settings';
-import { useFillsStore } from './fills-container';
-
-export const FillsSettings = () => (
-  <GridSettings
-    updateGridStore={useFillsStore((store) => store.updateGridStore)}
-  />
-);

apps/trading/components/fills-container/index.ts

@@ -1,2 +1 @@
 export * from './fills-container';
-export * from './fills-settings';

apps/trading/components/funding-payments-container/funding-payments-container.tsx

@@ -45,7 +45,7 @@ export const FundingPaymentsContainer = ({
   );
 };
 
-export const useFundingPaymentsStore = create<DataGridSlice>()(
+const useFundingPaymentsStore = create<DataGridSlice>()(
   persist(createDataGridSlice, {
     name: 'vega_funding_payments_store',
   })

apps/trading/components/funding-payments-container/funding-payments-settings.tsx

@@ -1,8 +0,0 @@
-import { GridSettings } from '../grid-settings/grid-settings';
-import { useFundingPaymentsStore } from './funding-payments-container';
-
-export const FundingPaymentsSettings = () => (
-  <GridSettings
-    updateGridStore={useFundingPaymentsStore((store) => store.updateGridStore)}
-  />
-);

apps/trading/components/funding-payments-container/index.ts

@@ -1,2 +1 @@
 export * from './funding-payments-container';
-export * from './funding-payments-settings';

apps/trading/components/grid-settings/grid-settings.tsx

@@ -1,24 +0,0 @@
-import { useT } from '../../lib/use-t';
-import type { DataGridStore } from '../../stores/datagrid-store-slice';
-import { TradingButton as Button } from '@vegaprotocol/ui-toolkit';
-
-export const GridSettings = ({
-  updateGridStore,
-}: {
-  updateGridStore: (gridStore: DataGridStore) => void;
-}) => {
-  const t = useT();
-  return (
-    <Button
-      onClick={() =>
-        updateGridStore({
-          columnState: undefined,
-          filterModel: undefined,
-        })
-      }
-      size="extra-small"
-    >
-      {t('Reset Columns')}
-    </Button>
-  );
-};

apps/trading/components/helpers/tiers.tsx

@@ -1,48 +0,0 @@
-import type { ComponentProps } from 'react';
-import type { Tag } from './tag';
-import classNames from 'classnames';
-
-// rainbow-ish order
-export const TIER_COLORS: Array<ComponentProps<typeof Tag>['color']> = [
-  'none', // worst tier if 8 tiers, otherwise relative to the best tier
-  'red',
-  'pink',
-  'orange',
-  'yellow',
-  'green',
-  'blue',
-  'purple', // best tier
-];
-
-export const getTierColor = (tier: number, max = TIER_COLORS.length) => {
-  const available =
-    max < TIER_COLORS.length
-      ? TIER_COLORS.slice(TIER_COLORS.length - max)
-      : TIER_COLORS;
-  const tiers = Object.keys(available).length;
-  let index = Math.abs(tier - 1);
-  if (tier >= tiers) {
-    index = index % tiers;
-  }
-  return available[index];
-};
-
-export const getTierGradient = (tier: number, max = TIER_COLORS.length) =>
-  classNames({
-    'from-vega-yellow-400 dark:from-vega-yellow-600 to-20%  bg-highlight':
-      'yellow' === getTierColor(tier, max),
-    'from-vega-green-400 dark:from-vega-green-600 to-20%  bg-highlight':
-      'green' === getTierColor(tier, max),
-    'from-vega-blue-400 dark:from-vega-blue-600 to-20%  bg-highlight':
-      'blue' === getTierColor(tier, max),
-    'from-vega-purple-400 dark:from-vega-purple-600 to-20%  bg-highlight':
-      'purple' === getTierColor(tier, max),
-    'from-vega-pink-400 dark:from-vega-pink-600 to-20%  bg-highlight':
-      'pink' === getTierColor(tier, max),
-    'from-vega-orange-400 dark:from-vega-orange-600 to-20%  bg-highlight':
-      'orange' === getTierColor(tier, max),
-    'from-vega-red-400 dark:from-vega-red-600 to-20%  bg-highlight':
-      'red' === getTierColor(tier, max),
-    'from-vega-clight-600 dark:from-vega-cdark-600 to-20%  bg-highlight':
-      'none' === getTierColor(tier, max),
-  });

apps/trading/components/market-banner/index.ts

@@ -1 +1,3 @@
-export { MarketBanner } from './market-banner';
+export * from './market-successor-banner';
+export * from './market-successor-proposal-banner';
+export * from './market-termination-banner';

apps/trading/components/market-banner/market-banner.tsx

@@ -1,205 +0,0 @@
-import compact from 'lodash/compact';
-import { MarketState } from '@vegaprotocol/types';
-import { Intent, NotificationBanner } from '@vegaprotocol/ui-toolkit';
-import {
-  useMarketState,
-  type Market,
-  useMaliciousOracle,
-} from '@vegaprotocol/markets';
-import { useState } from 'react';
-import { type MarketViewProposalFieldsFragment } from '@vegaprotocol/proposals';
-import { MarketSuspendedBanner } from './market-suspended-banner';
-import { MarketUpdateBanner } from './market-update-banner';
-import { MarketUpdateStateBanner } from './market-update-state-banner';
-import { MarketSettledBanner } from './market-settled-banner';
-import { MarketSuccessorProposalBanner } from './market-successor-proposal-banner';
-import { MarketOracleBanner, type Oracle } from './market-oracle-banner';
-import {
-  useSuccessorMarketProposals,
-  useUpdateMarketProposals,
-  useUpdateMarketStateProposals,
-} from './use-market-proposals';
-
-type UpdateMarketBanner = {
-  kind: 'UpdateMarket';
-  proposals: MarketViewProposalFieldsFragment[];
-};
-
-type UpdateMarketStateBanner = {
-  kind: 'UpdateMarketState';
-  proposals: MarketViewProposalFieldsFragment[];
-};
-
-type NewMarketBanner = {
-  kind: 'NewMarket'; // aka a proposal of NewMarket which succeeds the current market
-  proposals: MarketViewProposalFieldsFragment[];
-};
-
-type SettledBanner = {
-  kind: 'Settled';
-  market: Market;
-};
-
-type SuspendedBanner = {
-  kind: 'Suspended';
-  market: Market;
-};
-
-type OracleBanner = {
-  kind: 'Oracle';
-  oracle: Oracle;
-};
-
-type Banner =
-  | UpdateMarketBanner
-  | UpdateMarketStateBanner
-  | NewMarketBanner
-  | SettledBanner
-  | SuspendedBanner
-  | OracleBanner;
-
-export const MarketBanner = ({ market }: { market: Market }) => {
-  const { data: marketState } = useMarketState(market.id);
-
-  const { proposals: successorProposals, loading: successorLoading } =
-    useSuccessorMarketProposals(market.id);
-
-  const { proposals: updateMarketProposals, loading: updateMarketLoading } =
-    useUpdateMarketProposals(market.id);
-
-  const {
-    proposals: updateMarketStateProposals,
-    loading: updateMarketStateLoading,
-  } = useUpdateMarketStateProposals(market.id);
-
-  const { data: maliciousOracle, loading: oracleLoading } = useMaliciousOracle(
-    market.id
-  );
-
-  const loading =
-    successorLoading ||
-    updateMarketLoading ||
-    updateMarketStateLoading ||
-    oracleLoading;
-
-  if (loading) {
-    return null;
-  }
-
-  const banners = compact([
-    updateMarketStateProposals.length
-      ? {
-          kind: 'UpdateMarketState' as const,
-          proposals: updateMarketStateProposals,
-        }
-      : undefined,
-    updateMarketProposals.length
-      ? {
-          kind: 'UpdateMarket' as const,
-          proposals: updateMarketProposals,
-        }
-      : undefined,
-    successorProposals.length
-      ? {
-          kind: 'NewMarket' as const,
-          proposals: successorProposals,
-        }
-      : undefined,
-    marketState === MarketState.STATE_SETTLED
-      ? {
-          kind: 'Settled' as const,
-          market,
-        }
-      : undefined,
-    marketState === MarketState.STATE_SUSPENDED_VIA_GOVERNANCE
-      ? {
-          kind: 'Suspended' as const,
-          market,
-        }
-      : undefined,
-    maliciousOracle !== undefined
-      ? {
-          kind: 'Oracle' as const,
-          oracle: maliciousOracle,
-        }
-      : undefined,
-  ]);
-
-  return <BannerQueue banners={banners} market={market} />;
-};
-
-const BannerQueue = ({
-  banners,
-  market,
-}: {
-  banners: Banner[];
-  market: Market;
-}) => {
-  // for showing banner by index
-  const [index, setIndex] = useState(0);
-
-  const banner = banners[index];
-  if (!banner) return null;
-
-  let content = null;
-  let intent = Intent.Primary;
-
-  switch (banner.kind) {
-    case 'UpdateMarket': {
-      content = <MarketUpdateBanner proposals={banner.proposals} />;
-      break;
-    }
-    case 'UpdateMarketState': {
-      content = (
-        <MarketUpdateStateBanner proposals={banner.proposals} market={market} />
-      );
-      break;
-    }
-    case 'NewMarket': {
-      content = <MarketSuccessorProposalBanner proposals={banner.proposals} />;
-      intent = Intent.Warning;
-      break;
-    }
-    case 'Settled': {
-      content = <MarketSettledBanner market={market} />;
-      break;
-    }
-    case 'Suspended': {
-      content = <MarketSuspendedBanner />;
-      intent = Intent.Warning;
-      break;
-    }
-    case 'Oracle': {
-      // @ts-ignore oracle cannot be undefined
-      content = <MarketOracleBanner oracle={banner.oracle} />;
-      intent = Intent.Danger;
-      break;
-    }
-    default: {
-      return null;
-    }
-  }
-
-  const showCount = banners.length > 1;
-
-  const onClose = () => {
-    setIndex((x) => x + 1);
-  };
-
-  return (
-    <NotificationBanner
-      intent={intent}
-      onClose={onClose}
-      data-testid="market-banner"
-    >
-      <div className="flex items-center justify-between">
-        {content}
-        {showCount ? (
-          <p>
-            {index + 1}/{banners.length}
-          </p>
-        ) : null}
-      </div>
-    </NotificationBanner>
-  );
-};

apps/trading/components/market-banner/market-oracle-banner.spec.tsx

@@ -1,58 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import { MarketOracleBanner } from './market-oracle-banner';
-
-jest.mock('@vegaprotocol/markets', () => ({
-  ...jest.requireActual('@vegaprotocol/markets'),
-  OracleDialog: ({ open }: { open: boolean }) => {
-    return <div data-testid="oracle-dialog">{open ? 'open' : 'closed'}</div>;
-  },
-}));
-
-const oracle = {
-  dataSourceSpecId: 'someId',
-  provider: {
-    name: 'Test oracle',
-    url: 'https://zombo.com',
-    description_markdown:
-      'Some markdown describing the oracle provider.\n\nTwitter: @FacesPics2\n',
-    oracle: {
-      status: 'COMPROMISED' as const,
-      status_reason: 'Reason here',
-      first_verified: '2021-01-01T00:00:00Z',
-      last_verified: '2022-01-01T00:00:00Z',
-      type: 'public_key' as const,
-      public_key: '0xfCEAdAFab14d46e20144F48824d0C09B1a03F2BC',
-    },
-    proofs: [
-      {
-        format: 'url' as const,
-        available: true,
-        type: 'web' as const,
-        url: 'https://proofweb.com',
-      },
-      {
-        format: 'signed_message' as const,
-        available: true,
-        type: 'public_key' as const,
-        public_key: '0xfCEAdAFab14d46e20144F48824d0C09B1a03F2BC',
-        message: 'SOMEHEX',
-      },
-    ],
-    github_link:
-      'https://github.com/vegaprotocol/well-known/blob/main/oracle-providers/eth_address-0xfCEAdAFab14d46e20144F48824d0C09B1a03F2BC.toml',
-  },
-};
-
-describe('MarketOracleBanner', () => {
-  it('should render successfully', async () => {
-    render(<MarketOracleBanner oracle={oracle} />);
-
-    expect(screen.getByTestId('oracle-dialog')).toHaveTextContent('closed');
-    expect(screen.getByTestId('oracle-banner-status')).toHaveTextContent(
-      'COMPROMISED'
-    );
-    await userEvent.click(screen.getByRole('button', { name: 'Show more' }));
-    expect(screen.getByTestId('oracle-dialog')).toHaveTextContent('open');
-  });
-});

apps/trading/components/market-banner/market-oracle-banner.tsx

@@ -1,46 +0,0 @@
-import { useState } from 'react';
-import { Trans } from 'react-i18next';
-import {
-  OracleDialog,
-  useOracleStatuses,
-  type useMaliciousOracle,
-} from '@vegaprotocol/markets';
-import { ButtonLink } from '@vegaprotocol/ui-toolkit';
-
-export type Oracle = ReturnType<typeof useMaliciousOracle>['data'];
-
-export const MarketOracleBanner = ({
-  oracle,
-}: {
-  oracle: NonNullable<Oracle>;
-}) => {
-  const [open, setOpen] = useState(false);
-  const oracleStatuses = useOracleStatuses();
-
-  return (
-    <>
-      <OracleDialog open={open} onChange={setOpen} {...oracle} />
-      <p>
-        <Trans
-          defaults="Oracle status for this market is <0>{{status}}</0>. {{description}} <1>Show more</1>"
-          components={[
-            <span key="oracle-status" data-testid="oracle-banner-status">
-              status
-            </span>,
-            <ButtonLink
-              key="oracle-button"
-              onClick={() => setOpen((x) => !x)}
-              data-testid="oracle-banner-dialog-trigger"
-            >
-              Show more
-            </ButtonLink>,
-          ]}
-          values={{
-            status: oracle.provider.oracle.status,
-            description: oracleStatuses[oracle.provider.oracle.status],
-          }}
-        />
-      </p>
-    </>
-  );
-};

apps/trading/components/market-banner/market-settled-banner.spec.tsx

@@ -1,219 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import { addDays, subDays, subHours } from 'date-fns';
-import { MockedProvider, type MockedResponse } from '@apollo/react-testing';
-import {
-  SuccessorMarketDocument,
-  MarketCandlesDocument,
-  MarketCandlesUpdateDocument,
-  SuccessorMarketIdDocument,
-  type Market,
-  type SuccessorMarketQuery,
-  type SuccessorMarketQueryVariables,
-  type MarketCandlesQuery,
-  type MarketCandlesQueryVariables,
-  type MarketCandlesUpdateSubscription,
-  type MarketCandlesUpdateSubscriptionVariables,
-  type SuccessorMarketIdQuery,
-  type SuccessorMarketIdQueryVariables,
-} from '@vegaprotocol/markets';
-import { MemoryRouter } from 'react-router-dom';
-import { createMarketFragment } from '@vegaprotocol/mock';
-import { Interval, MarketState, MarketTradingMode } from '@vegaprotocol/types';
-import { MarketSettledBanner } from './market-settled-banner';
-
-describe('MarketSettledBanner', () => {
-  const now = 1701388800000;
-  const origDateNow = Date.now;
-
-  beforeAll(() => {
-    Date.now = () => now;
-  });
-
-  afterAll(() => {
-    Date.now = origDateNow;
-  });
-
-  const marketId = 'market-0';
-  const successorId = 'successor-id';
-  const successorName = 'successor-name';
-
-  const successorMarketIdMock: MockedResponse<
-    SuccessorMarketIdQuery,
-    SuccessorMarketIdQueryVariables
-  > = {
-    request: {
-      query: SuccessorMarketIdDocument,
-      variables: {
-        marketId: marketId,
-      },
-    },
-    result: {
-      data: {
-        market: {
-          successorMarketID: successorId,
-        },
-      },
-    },
-  };
-
-  const successorMock: MockedResponse<
-    SuccessorMarketQuery,
-    SuccessorMarketQueryVariables
-  > = {
-    request: {
-      query: SuccessorMarketDocument,
-      variables: {
-        marketId: successorId,
-      },
-    },
-    result: {
-      data: {
-        market: {
-          id: successorId,
-          state: MarketState.STATE_ACTIVE,
-          tradingMode: MarketTradingMode.TRADING_MODE_CONTINUOUS,
-          positionDecimalPlaces: 0,
-          tradableInstrument: {
-            instrument: {
-              name: successorName,
-              code: 'code',
-            },
-          },
-          proposal: {
-            id: 'proposal-id',
-          },
-        },
-      },
-    },
-  };
-
-  const since = subDays(new Date(now), 5).toISOString();
-  const successorCandlesMock: MockedResponse<
-    MarketCandlesQuery,
-    MarketCandlesQueryVariables
-  > = {
-    request: {
-      query: MarketCandlesDocument,
-      variables: {
-        marketId: successorId,
-        interval: Interval.INTERVAL_I1H,
-        since,
-      },
-    },
-    result: {
-      data: {
-        marketsConnection: {
-          edges: [
-            {
-              node: {
-                candlesConnection: {
-                  edges: [
-                    {
-                      node: {
-                        high: '100',
-                        low: '100',
-                        open: '100',
-                        close: '100',
-                        volume: '100',
-                        periodStart: subHours(new Date(now), 1).toISOString(),
-                      },
-                    },
-                    {
-                      node: {
-                        high: '100',
-                        low: '100',
-                        open: '100',
-                        close: '200',
-                        volume: '100',
-                        periodStart: subHours(new Date(now), 2).toISOString(),
-                      },
-                    },
-                  ],
-                },
-              },
-            },
-          ],
-        },
-      },
-    },
-  };
-
-  const successorCandlesUpdateMock: MockedResponse<
-    MarketCandlesUpdateSubscription,
-    MarketCandlesUpdateSubscriptionVariables
-  > = {
-    request: {
-      query: MarketCandlesUpdateDocument,
-      variables: {
-        marketId: successorId,
-        interval: Interval.INTERVAL_I1H,
-        // @ts-ignore this query doesn't need the 'since' variable, but the data-provider
-        // uses all variables for both the query and the subscription so its needed here
-        // to match the mock
-        since,
-      },
-    },
-    result: {
-      data: {
-        candles: {
-          high: '100',
-          low: '100',
-          open: '100',
-          close: '100',
-          volume: '100',
-          periodStart: '2020-01-01T00:00:00',
-        },
-      },
-    },
-  };
-
-  const renderComponent = (market: Market, mocks?: MockedResponse[]) => {
-    return render(
-      <MemoryRouter>
-        <MockedProvider mocks={mocks}>
-          <MarketSettledBanner market={market} />
-        </MockedProvider>
-      </MemoryRouter>
-    );
-  };
-
-  it('shows that the market is settled if there is no successor', () => {
-    const market = createMarketFragment({
-      id: marketId,
-      successorMarketID: undefined,
-    });
-    renderComponent(market, [successorMarketIdMock, successorMock]);
-    expect(
-      screen.getByText('This market has been settled')
-    ).toBeInTheDocument();
-  });
-
-  it('shows that the market has been succeeded with an active market', async () => {
-    const market = createMarketFragment({
-      id: marketId,
-      successorMarketID: successorId,
-      marketTimestamps: {
-        close: addDays(new Date(now), 1).toISOString(),
-      },
-    });
-    renderComponent(market, [
-      successorMarketIdMock,
-      successorMock,
-      successorCandlesMock,
-      successorCandlesUpdateMock,
-    ]);
-    expect(
-      await screen.findByText('This market has been succeeded')
-    ).toBeInTheDocument();
-    expect(
-      await screen.findByText(/has a 24h trading volume of 200$/i)
-    ).toBeInTheDocument();
-    expect(
-      screen.getByText('This market expires in 1 day.')
-    ).toBeInTheDocument();
-    expect(screen.getByRole('link', { name: successorName })).toHaveAttribute(
-      'href',
-      `/markets/${successorId}`
-    );
-  });
-});

apps/trading/components/market-banner/market-settled-banner.tsx

@@ -1,122 +0,0 @@
-import { Link } from 'react-router-dom';
-import { Trans } from 'react-i18next';
-import { isBefore, formatDuration, intervalToDuration } from 'date-fns';
-import {
-  calcCandleVolume,
-  useCandles,
-  useSuccessorMarket,
-  type Market,
-} from '@vegaprotocol/markets';
-import {
-  addDecimalsFormatNumber,
-  getMarketExpiryDate,
-  isNumeric,
-} from '@vegaprotocol/utils';
-import { useT, ns } from '../../lib/use-t';
-import { Links } from '../../lib/links';
-
-const getExpiryDate = (tags: string[], close?: string): Date | null => {
-  const expiryDate = getMarketExpiryDate(tags);
-  return expiryDate || (close && new Date(close)) || null;
-};
-
-export const MarketSettledBanner = ({ market }: { market: Market }) => {
-  const t = useT();
-  const { data: successorMarket } = useSuccessorMarket(market.id);
-
-  const expiry = market
-    ? getExpiryDate(
-        market.tradableInstrument.instrument.metadata.tags || [],
-        market.marketTimestamps.close
-      )
-    : null;
-
-  const duration =
-    expiry && isBefore(new Date(Date.now()), expiry)
-      ? intervalToDuration({ start: new Date(Date.now()), end: expiry })
-      : null;
-
-  const { oneDayCandles } = useCandles({
-    marketId: successorMarket?.id,
-  });
-
-  const candleVolume = oneDayCandles?.length
-    ? calcCandleVolume(oneDayCandles)
-    : null;
-
-  const successorVolume =
-    candleVolume && isNumeric(successorMarket?.positionDecimalPlaces)
-      ? addDecimalsFormatNumber(
-          candleVolume,
-          successorMarket?.positionDecimalPlaces as number
-        )
-      : null;
-
-  if (successorMarket) {
-    return (
-      <div>
-        <p>{t('This market has been succeeded')}</p>
-        {duration && (
-          <div className="mt-1">
-            <span>
-              {t('This market expires in {{duration}}.', {
-                duration: formatDuration(duration, {
-                  format: [
-                    'years',
-                    'months',
-                    'weeks',
-                    'days',
-                    'hours',
-                    'minutes',
-                  ],
-                }),
-              })}
-            </span>
-            <>
-              {' '}
-              {successorVolume ? (
-                <Trans
-                  defaults="The successor market <0>{{instrumentName}}</0> has a 24h trading volume of {{successorVolume}}"
-                  values={{
-                    successorVolume,
-                    instrumentName:
-                      successorMarket?.tradableInstrument.instrument.name,
-                  }}
-                  components={[
-                    <Link
-                      to={Links.MARKET(successorMarket.id)}
-                      key="link"
-                      target="_blank"
-                    >
-                      successor market name
-                    </Link>,
-                  ]}
-                />
-              ) : (
-                <Trans
-                  defaults="The successor market is <0>{{instrumentName}}</0>"
-                  values={{
-                    instrumentName:
-                      successorMarket?.tradableInstrument.instrument.name,
-                  }}
-                  components={[
-                    <Link
-                      to={Links.MARKET(successorMarket.id)}
-                      key="link"
-                      target="_blank"
-                    >
-                      successor market name
-                    </Link>,
-                  ]}
-                  ns={ns}
-                />
-              )}
-            </>
-          </div>
-        )}
-      </div>
-    );
-  }
-
-  return <p>{t('This market has been settled')}</p>;
-};

apps/trading/components/market-banner/market-successor-banner.spec.tsx

@@ -0,0 +1,155 @@
+import { render, screen } from '@testing-library/react';
+import { MockedProvider } from '@apollo/react-testing';
+import { MarketSuccessorBanner } from './market-successor-banner';
+import * as Types from '@vegaprotocol/types';
+import * as allUtils from '@vegaprotocol/utils';
+import type { Market } from '@vegaprotocol/markets';
+import type { PartialDeep } from 'type-fest';
+
+const market = {
+  id: 'marketId',
+  tradableInstrument: {
+    instrument: {
+      metadata: {
+        tags: [],
+      },
+    },
+  },
+  marketTimestamps: {
+    close: null,
+  },
+} as unknown as Market;
+
+let mockDataSuccessorMarket: PartialDeep<Market> | null = null;
+let mockDataMarketState: Market['state'] | null = null;
+jest.mock('@vegaprotocol/data-provider', () => ({
+  ...jest.requireActual('@vegaprotocol/data-provider'),
+  useDataProvider: jest.fn().mockImplementation((args) => {
+    if (args.skip) {
+      return {
+        data: null,
+        error: null,
+      };
+    }
+    return {
+      data: mockDataSuccessorMarket,
+      error: null,
+    };
+  }),
+}));
+jest.mock('@vegaprotocol/utils', () => ({
+  ...jest.requireActual('@vegaprotocol/utils'),
+  getMarketExpiryDate: jest.fn(),
+}));
+let mockCandles = {};
+jest.mock('@vegaprotocol/markets', () => ({
+  ...jest.requireActual('@vegaprotocol/markets'),
+  useMarketState: (marketId: string) =>
+    marketId
+      ? {
+          data: mockDataMarketState,
+        }
+      : { data: undefined },
+  useSuccessorMarket: (marketId: string) =>
+    marketId
+      ? {
+          data: mockDataSuccessorMarket,
+        }
+      : { data: undefined },
+  useCandles: () => mockCandles,
+}));
+
+describe('MarketSuccessorBanner', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockDataSuccessorMarket = {
+      id: 'successorMarketID',
+      state: Types.MarketState.STATE_ACTIVE,
+      tradingMode: Types.MarketTradingMode.TRADING_MODE_CONTINUOUS,
+      tradableInstrument: {
+        instrument: {
+          name: 'Successor Market Name',
+        },
+      },
+    };
+  });
+  describe('should be hidden', () => {
+    it('when no market', () => {
+      const { container } = render(<MarketSuccessorBanner market={null} />, {
+        wrapper: MockedProvider,
+      });
+      expect(container).toBeEmptyDOMElement();
+    });
+
+    it('no successor market data', () => {
+      mockDataSuccessorMarket = null;
+      const { container } = render(<MarketSuccessorBanner market={market} />, {
+        wrapper: MockedProvider,
+      });
+      expect(container).toBeEmptyDOMElement();
+    });
+  });
+
+  describe('should be displayed', () => {
+    it('should be rendered', () => {
+      render(<MarketSuccessorBanner market={market} />, {
+        wrapper: MockedProvider,
+      });
+      expect(
+        screen.getByText('This market has been succeeded')
+      ).toBeInTheDocument();
+      expect(
+        screen.getByRole('link', { name: 'Successor Market Name' })
+      ).toHaveAttribute('href', '/#/markets/successorMarketID');
+    });
+
+    it('no successor market data, market settled', () => {
+      mockDataSuccessorMarket = null;
+      mockDataMarketState = Types.MarketState.STATE_SETTLED;
+      render(<MarketSuccessorBanner market={market} />, {
+        wrapper: MockedProvider,
+      });
+      expect(
+        screen.getByText('This market has been settled')
+      ).toBeInTheDocument();
+    });
+
+    it('should display optionally successor volume', () => {
+      mockDataSuccessorMarket = {
+        ...mockDataSuccessorMarket,
+        positionDecimalPlaces: 3,
+      };
+      mockCandles = {
+        oneDayCandles: [
+          { volume: 123 },
+          { volume: 456 },
+          { volume: 789 },
+          { volume: 99999 },
+        ],
+      };
+
+      render(<MarketSuccessorBanner market={market} />, {
+        wrapper: MockedProvider,
+      });
+      expect(
+        screen.getByText('has a 24h trading volume of 101.367', {
+          exact: false,
+        })
+      ).toBeInTheDocument();
+    });
+
+    it('should display optionally duration', () => {
+      jest
+        .spyOn(allUtils, 'getMarketExpiryDate')
+        .mockReturnValue(
+          new Date(Date.now() + 24 * 60 * 60 * 1000 + 60 * 1000)
+        );
+      render(<MarketSuccessorBanner market={market} />, {
+        wrapper: MockedProvider,
+      });
+      expect(
+        screen.getByText(/^This market expires in 1 day/)
+      ).toBeInTheDocument();
+    });
+  });
+});

apps/trading/components/market-banner/market-successor-banner.tsx

@@ -0,0 +1,146 @@
+import { useState } from 'react';
+import { isBefore, formatDuration, intervalToDuration } from 'date-fns';
+import type { Market } from '@vegaprotocol/markets';
+import {
+  calcCandleVolume,
+  useCandles,
+  useMarketState,
+  useSuccessorMarket,
+} from '@vegaprotocol/markets';
+import {
+  ExternalLink,
+  Intent,
+  NotificationBanner,
+} from '@vegaprotocol/ui-toolkit';
+import {
+  addDecimalsFormatNumber,
+  getMarketExpiryDate,
+  isNumeric,
+} from '@vegaprotocol/utils';
+import * as Types from '@vegaprotocol/types';
+import { useT, ns } from '../../lib/use-t';
+import { Trans } from 'react-i18next';
+
+const getExpiryDate = (tags: string[], close?: string): Date | null => {
+  const expiryDate = getMarketExpiryDate(tags);
+  return expiryDate || (close && new Date(close)) || null;
+};
+
+export const MarketSuccessorBanner = ({
+  market,
+}: {
+  market: Market | null;
+}) => {
+  const t = useT();
+  const { data: marketState } = useMarketState(market?.id);
+  const isSettled = marketState === Types.MarketState.STATE_SETTLED;
+  const { data: successorData, loading } = useSuccessorMarket(market?.id);
+
+  const [visible, setVisible] = useState(true);
+
+  const expiry = market
+    ? getExpiryDate(
+        market.tradableInstrument.instrument.metadata.tags || [],
+        market.marketTimestamps.close
+      )
+    : null;
+
+  const duration =
+    expiry && isBefore(new Date(), expiry)
+      ? intervalToDuration({ start: new Date(), end: expiry })
+      : null;
+
+  const { oneDayCandles } = useCandles({
+    marketId: successorData?.id,
+  });
+
+  const candleVolume = oneDayCandles?.length
+    ? calcCandleVolume(oneDayCandles)
+    : null;
+
+  const successorVolume =
+    candleVolume && isNumeric(successorData?.positionDecimalPlaces)
+      ? addDecimalsFormatNumber(
+          candleVolume,
+          successorData?.positionDecimalPlaces as number
+        )
+      : null;
+
+  if (!loading && (isSettled || successorData) && visible) {
+    return (
+      <NotificationBanner
+        intent={Intent.Primary}
+        onClose={() => {
+          setVisible(false);
+        }}
+      >
+        <div className="uppercase">
+          {successorData
+            ? t('This market has been succeeded')
+            : t('This market has been settled')}
+        </div>
+        {(duration || successorData) && (
+          <div className="mt-1">
+            {duration && (
+              <span>
+                {t('This market expires in {{duration}}.', {
+                  duration: formatDuration(duration, {
+                    format: [
+                      'years',
+                      'months',
+                      'weeks',
+                      'days',
+                      'hours',
+                      'minutes',
+                    ],
+                  }),
+                })}
+              </span>
+            )}
+            {successorData && (
+              <>
+                {' '}
+                {successorVolume ? (
+                  <Trans
+                    defaults="The successor market <0>{{instrumentName}}</0> has a 24h trading volume of {{successorVolume}}"
+                    values={{
+                      successorVolume,
+                      instrumentName:
+                        successorData?.tradableInstrument.instrument.name,
+                    }}
+                    components={[
+                      <ExternalLink
+                        href={`/#/markets/${successorData?.id}`}
+                        key="link"
+                      >
+                        successor market name
+                      </ExternalLink>,
+                    ]}
+                  />
+                ) : (
+                  <Trans
+                    defaults="The successor market is <0>{{instrumentName}}</0>"
+                    values={{
+                      instrumentName:
+                        successorData?.tradableInstrument.instrument.name,
+                    }}
+                    components={[
+                      <ExternalLink
+                        href={`/#/markets/${successorData?.id}`}
+                        key="link"
+                      >
+                        successor market name
+                      </ExternalLink>,
+                    ]}
+                    ns={ns}
+                  />
+                )}
+              </>
+            )}
+          </div>
+        )}
+      </NotificationBanner>
+    );
+  }
+  return null;
+};

apps/trading/components/market-banner/market-successor-proposal-banner.spec.tsx

@@ -1,77 +1,164 @@
-import { render, screen } from '@testing-library/react';
+import { act, render, screen, waitFor } from '@testing-library/react';
+import type { SingleExecutionResult } from '@apollo/client';
+import type { MockedResponse } from '@apollo/react-testing';
+import { MockedProvider } from '@apollo/react-testing';
 import { MarketSuccessorProposalBanner } from './market-successor-proposal-banner';
-import { ProposalState } from '@vegaprotocol/types';
+import type { MarketViewProposalsQuery } from '@vegaprotocol/proposals';
+import { MarketViewProposalsDocument } from '@vegaprotocol/proposals';
+import * as Types from '@vegaprotocol/types';
 
-const proposal = {
-  __typename: 'Proposal' as const,
-  id: 'proposal-1',
-  state: ProposalState.STATE_OPEN,
-  terms: {
-    __typename: 'ProposalTerms' as const,
-    closingDatetime: '2023-09-27',
-    enactmentDatetime: '2023-09-28',
-    change: {
-      __typename: 'NewMarket' as const,
-      instrument: {
-        name: 'New proposal of the market successor',
-      },
-      successorConfiguration: {
-        parentMarketId: 'marketId',
-      },
+const marketProposalMock: MockedResponse<MarketViewProposalsQuery> = {
+  request: {
+    query: MarketViewProposalsDocument,
+    variables: {
+      inState: Types.ProposalState.STATE_OPEN,
+      proposalType: Types.ProposalType.TYPE_NEW_MARKET,
     },
   },
-};
-const proposal2 = {
-  __typename: 'Proposal' as const,
-  id: 'proposal-2',
-  state: ProposalState.STATE_OPEN,
-  terms: {
-    __typename: 'ProposalTerms' as const,
-    closingDatetime: '2023-09-27',
-    enactmentDatetime: '2023-09-28',
-    change: {
-      __typename: 'NewMarket' as const,
-      instrument: {
-        name: 'New second proposal of the market successor',
-      },
-      successorConfiguration: {
-        parentMarketId: 'marketId',
+  result: {
+    data: {
+      proposalsConnection: {
+        edges: [
+          {
+            node: {
+              __typename: 'Proposal',
+              id: 'proposal-1',
+              state: Types.ProposalState.STATE_OPEN,
+              terms: {
+                __typename: 'ProposalTerms',
+                closingDatetime: '2023-09-27',
+                enactmentDatetime: '2023-09-28',
+                change: {
+                  __typename: 'NewMarket',
+                  instrument: {
+                    name: 'New proposal of the market successor',
+                  },
+                  successorConfiguration: {
+                    parentMarketId: 'marketId',
+                  },
+                },
+              },
+            },
+          },
+        ],
       },
     },
   },
 };
 
 describe('MarketSuccessorProposalBanner', () => {
-  it('should display single proposal', () => {
-    render(<MarketSuccessorProposalBanner proposals={[proposal]} />);
-
-    expect(
-      screen.getByText('A successor to this market has been proposed')
-    ).toBeInTheDocument();
-
-    expect(screen.getByRole('link')).toHaveAttribute(
-      'href',
-      expect.stringContaining(proposal.id)
+  it('should display single proposal', async () => {
+    render(
+      <MockedProvider mocks={[marketProposalMock]}>
+        <MarketSuccessorProposalBanner marketId="marketId" />
+      </MockedProvider>
     );
+    await waitFor(() => {
+      expect(
+        screen.getByText('A successors to this market has been proposed')
+      ).toBeInTheDocument();
+    });
+    expect(
+      screen
+        .getByRole('link')
+        .getAttribute('href')
+        ?.endsWith('/proposals/proposal-1') ?? false
+    ).toBe(true);
+  });
+  it('should display plural proposals', async () => {
+    const dualProposalMock = {
+      ...marketProposalMock,
+      result: {
+        ...marketProposalMock.result,
+        data: {
+          proposalsConnection: {
+            edges: [
+              ...((
+                marketProposalMock?.result as SingleExecutionResult<MarketViewProposalsQuery>
+              )?.data?.proposalsConnection?.edges ?? []),
+              {
+                node: {
+                  __typename: 'Proposal',
+                  id: 'proposal-2',
+                  state: Types.ProposalState.STATE_OPEN,
+                  terms: {
+                    __typename: 'ProposalTerms',
+                    change: {
+                      __typename: 'NewMarket',
+                      instrument: {
+                        name: 'New second proposal of the market successor',
+                      },
+                      successorConfiguration: {
+                        parentMarketId: 'marketId',
+                      },
+                    },
+                  },
+                },
+              },
+            ],
+          },
+        },
+      },
+    };
+
+    render(
+      <MockedProvider mocks={[dualProposalMock]}>
+        <MarketSuccessorProposalBanner marketId="marketId" />
+      </MockedProvider>
+    );
+    await waitFor(() => {
+      expect(
+        screen.getByText('Successors to this market have been proposed')
+      ).toBeInTheDocument();
+    });
+    expect(
+      screen
+        .getAllByRole('link')[0]
+        .getAttribute('href')
+        ?.endsWith('/proposals/proposal-1') ?? false
+    ).toBe(true);
+    expect(
+      screen
+        .getAllByRole('link')[1]
+        .getAttribute('href')
+        ?.endsWith('/proposals/proposal-2') ?? false
+    ).toBe(true);
   });
 
-  it('should display plural proposals', () => {
-    const proposals = [proposal, proposal2];
-    render(<MarketSuccessorProposalBanner proposals={proposals} />);
-
-    expect(
-      screen.getByText('Successors to this market have been proposed')
-    ).toBeInTheDocument();
-
-    const links = screen.getAllByRole('link');
-    expect(links).toHaveLength(proposals.length);
-    expect(links[0]).toHaveAttribute(
-      'href',
-      expect.stringContaining(proposal.id)
+  it('banner should be hidden because no proposals', () => {
+    const { container } = render(
+      <MockedProvider>
+        <MarketSuccessorProposalBanner marketId="marketId" />
+      </MockedProvider>
     );
-    expect(links[1]).toHaveAttribute(
-      'href',
-      expect.stringContaining(proposal2.id)
+    expect(container).toBeEmptyDOMElement();
+  });
+
+  it('banner should be hidden because no proposals for the market', () => {
+    const { container } = render(
+      <MockedProvider mocks={[marketProposalMock]}>
+        <MarketSuccessorProposalBanner marketId="otherMarketId" />
+      </MockedProvider>
     );
+    expect(container).toBeEmptyDOMElement();
+  });
+
+  it('banner should be hidden after user close click', async () => {
+    const { container } = render(
+      <MockedProvider mocks={[marketProposalMock]}>
+        <MarketSuccessorProposalBanner marketId="marketId" />
+      </MockedProvider>
+    );
+    await waitFor(() => {
+      expect(
+        screen.getByText('A successors to this market has been proposed')
+      ).toBeInTheDocument();
+    });
+    await act(() => {
+      screen.getByTestId('notification-banner-close').click();
+    });
+    await waitFor(() => {
+      expect(container).toBeEmptyDOMElement();
+    });
   });
 });

apps/trading/components/market-banner/market-successor-proposal-banner.tsx

@@ -1,51 +1,89 @@
-import { Fragment } from 'react';
-import { type MarketViewProposalFieldsFragment } from '@vegaprotocol/proposals';
-import { ExternalLink } from '@vegaprotocol/ui-toolkit';
+import { Fragment, useState } from 'react';
+import {
+  marketViewProposalsDataProvider,
+  type NewMarketSuccessorFieldsFragment,
+} from '@vegaprotocol/proposals';
+
+import {
+  ExternalLink,
+  Intent,
+  NotificationBanner,
+} from '@vegaprotocol/ui-toolkit';
 import { DApp, TOKEN_PROPOSAL, useLinks } from '@vegaprotocol/environment';
+import * as Types from '@vegaprotocol/types';
+import { useDataProvider } from '@vegaprotocol/data-provider';
 import { useT } from '../../lib/use-t';
 
 export const MarketSuccessorProposalBanner = ({
-  proposals,
+  marketId,
 }: {
-  proposals: MarketViewProposalFieldsFragment[];
+  marketId?: string;
 }) => {
   const t = useT();
+  const { data: proposals } = useDataProvider({
+    dataProvider: marketViewProposalsDataProvider,
+    skip: !marketId,
+    variables: {
+      inState: Types.ProposalState.STATE_OPEN,
+      proposalType: Types.ProposalType.TYPE_NEW_MARKET,
+    },
+  });
+
+  const successors =
+    proposals?.filter((item) => {
+      if (item.terms.change.__typename === 'NewMarket') {
+        const newMarket = item.terms.change;
+        if (
+          newMarket.successorConfiguration?.parentMarketId === marketId &&
+          item.state === Types.ProposalState.STATE_OPEN
+        ) {
+          return true;
+        }
+      }
+      return false;
+    }) ?? [];
+  const [visible, setVisible] = useState(true);
   const tokenLink = useLinks(DApp.Governance);
-
-  return (
-    <div>
-      <div className="uppercase mb-1">
-        {proposals.length === 1
-          ? t('A successor to this market has been proposed')
-          : t('Successors to this market have been proposed')}
-      </div>
-      <div>
-        {t(
-          'checkOutProposalsAndVote',
-          'Check out the terms of the proposals and vote:',
-          {
-            count: proposals.length,
-          }
-        )}{' '}
-        {proposals.map((item, i) => {
-          if (item.terms.change.__typename !== 'NewMarket') {
-            return null;
-          }
-
-          const externalLink = tokenLink(
-            TOKEN_PROPOSAL.replace(':id', item.id || '')
-          );
-
-          return (
-            <Fragment key={i}>
-              <ExternalLink href={externalLink} key={i}>
-                {item.terms.change.instrument.name}
-              </ExternalLink>
-              {i < proposals.length - 1 && ', '}
-            </Fragment>
-          );
-        })}
-      </div>
-    </div>
-  );
+  if (visible && successors.length) {
+    return (
+      <NotificationBanner
+        intent={Intent.Primary}
+        onClose={() => {
+          setVisible(false);
+        }}
+      >
+        <div className="uppercase mb-1">
+          {successors.length === 1
+            ? t('A successors to this market has been proposed')
+            : t('Successors to this market have been proposed')}
+        </div>
+        <div>
+          {t(
+            'checkOutProposalsAndVote',
+            'Check out the terms of the proposals and vote:',
+            {
+              count: successors.length,
+            }
+          )}{' '}
+          {successors.map((item, i) => {
+            const externalLink = tokenLink(
+              TOKEN_PROPOSAL.replace(':id', item.id || '')
+            );
+            return (
+              <Fragment key={i}>
+                <ExternalLink href={externalLink} key={i}>
+                  {
+                    (item.terms?.change as NewMarketSuccessorFieldsFragment)
+                      ?.instrument.name
+                  }
+                </ExternalLink>
+                {i < successors.length - 1 && ', '}
+              </Fragment>
+            );
+          })}
+        </div>
+      </NotificationBanner>
+    );
+  }
+  return null;
 };

apps/trading/components/market-banner/market-suspended-banner.tsx

@@ -1,6 +0,0 @@
-import { useT } from '../../lib/use-t';
-
-export const MarketSuspendedBanner = () => {
-  const t = useT();
-  return <p>{t('Market was suspended by governance')}</p>;
-};

apps/trading/components/market-banner/market-termination-banner.spec.tsx

@@ -0,0 +1,230 @@
+import { render, screen, waitFor } from '@testing-library/react';
+import * as Types from '@vegaprotocol/types';
+import type { MockedResponse } from '@apollo/client/testing';
+import { MockedProvider } from '@apollo/client/testing';
+import type { MarketViewProposalsQuery } from '@vegaprotocol/proposals';
+import { MarketViewProposalsDocument } from '@vegaprotocol/proposals';
+import type { Market } from '@vegaprotocol/markets';
+import { MarketTerminationBanner } from './market-termination-banner';
+
+const marketMock = {
+  id: 'market-1',
+  decimalPlaces: 3,
+  tradableInstrument: {
+    instrument: {
+      product: {
+        __typename: 'Future',
+        quoteName: 'tDAI',
+      },
+    },
+  },
+} as Market;
+
+const passedProposalMock: MockedResponse<MarketViewProposalsQuery> = {
+  request: {
+    query: MarketViewProposalsDocument,
+    variables: {
+      inState: Types.ProposalState.STATE_PASSED,
+      proposalType: Types.ProposalType.TYPE_UPDATE_MARKET_STATE,
+    },
+  },
+  result: {
+    data: {
+      proposalsConnection: {
+        edges: [
+          {
+            node: {
+              id: '1',
+              state: Types.ProposalState.STATE_PASSED,
+              terms: {
+                closingDatetime: '2023-09-27T11:48:18Z',
+                enactmentDatetime: '2023-09-30T11:48:18',
+                change: {
+                  __typename: 'UpdateMarketState',
+                  updateType:
+                    Types.MarketUpdateType.MARKET_STATE_UPDATE_TYPE_TERMINATE,
+                  price: '',
+                  market: {
+                    id: 'market-1',
+                    tradableInstrument: {
+                      instrument: {
+                        name: 'Market one name',
+                        code: 'Market one',
+                      },
+                    },
+                  },
+                },
+              },
+            },
+          },
+          {
+            node: {
+              id: '2',
+              state: Types.ProposalState.STATE_PASSED,
+              terms: {
+                closingDatetime: '2023-09-27T11:48:18Z',
+                enactmentDatetime: '2023-10-01T11:48:18',
+                change: {
+                  __typename: 'UpdateMarketState',
+                  updateType:
+                    Types.MarketUpdateType.MARKET_STATE_UPDATE_TYPE_TERMINATE,
+                  price: '',
+                  market: {
+                    id: 'market-2',
+                    tradableInstrument: {
+                      instrument: {
+                        name: 'Market two name',
+                        code: 'Market two',
+                      },
+                    },
+                  },
+                },
+              },
+            },
+          },
+        ],
+      },
+    },
+  },
+};
+const openProposalMock: MockedResponse<MarketViewProposalsQuery> = {
+  request: {
+    query: MarketViewProposalsDocument,
+    variables: {
+      inState: Types.ProposalState.STATE_OPEN,
+      proposalType: Types.ProposalType.TYPE_UPDATE_MARKET_STATE,
+    },
+  },
+  result: {
+    data: {
+      proposalsConnection: {
+        edges: [
+          {
+            node: {
+              id: '3',
+              state: Types.ProposalState.STATE_OPEN,
+              terms: {
+                closingDatetime: '2023-09-27T11:48:18Z',
+                enactmentDatetime: '2023-10-01T11:48:18',
+                change: {
+                  __typename: 'UpdateMarketState',
+                  updateType:
+                    Types.MarketUpdateType.MARKET_STATE_UPDATE_TYPE_TERMINATE,
+                  price: '',
+                  market: {
+                    id: 'market-3',
+                    tradableInstrument: {
+                      instrument: {
+                        name: 'Market three name',
+                        code: 'Market three',
+                      },
+                    },
+                  },
+                },
+              },
+            },
+          },
+          {
+            node: {
+              id: '4',
+              state: Types.ProposalState.STATE_OPEN,
+              terms: {
+                closingDatetime: '2023-09-27T11:48:18Z',
+                enactmentDatetime: '2023-10-11T11:48:18',
+                change: {
+                  __typename: 'UpdateMarketState',
+                  updateType:
+                    Types.MarketUpdateType.MARKET_STATE_UPDATE_TYPE_TERMINATE,
+                  price: '',
+                  market: {
+                    id: 'market-3',
+                    tradableInstrument: {
+                      instrument: {
+                        name: 'Market three name',
+                        code: 'Market three',
+                      },
+                    },
+                  },
+                },
+              },
+            },
+          },
+          {
+            node: {
+              id: '5',
+              state: Types.ProposalState.STATE_OPEN,
+              terms: {
+                closingDatetime: '2023-09-27T11:48:18Z',
+                enactmentDatetime: '2023-10-01T11:48:18',
+                change: {
+                  __typename: 'UpdateMarketState',
+                  updateType:
+                    Types.MarketUpdateType.MARKET_STATE_UPDATE_TYPE_TERMINATE,
+                  price: '',
+                  market: {
+                    id: 'market-4',
+                    tradableInstrument: {
+                      instrument: {
+                        name: 'Market four name',
+                        code: 'Market four',
+                      },
+                    },
+                  },
+                },
+              },
+            },
+          },
+        ],
+      },
+    },
+  },
+};
+const mocks: MockedResponse[] = [passedProposalMock, openProposalMock];
+
+describe('MarketTerminationBanner', () => {
+  beforeAll(() => {
+    jest.useFakeTimers().setSystemTime(new Date('2023-09-28T10:10:10.000Z'));
+  });
+
+  afterAll(() => {
+    jest.useRealTimers();
+  });
+
+  it('should be properly rendered', async () => {
+    const { container } = render(
+      <MockedProvider mocks={mocks}>
+        <MarketTerminationBanner market={marketMock} />
+      </MockedProvider>
+    );
+    await waitFor(() => {
+      expect(container).not.toBeEmptyDOMElement();
+    });
+    expect(
+      screen.getByTestId('termination-warning-banner-market-1')
+    ).toBeInTheDocument();
+  });
+
+  it('should render link to proposals', async () => {
+    const { container } = render(
+      <MockedProvider mocks={mocks}>
+        <MarketTerminationBanner market={{ ...marketMock, id: 'market-3' }} />
+      </MockedProvider>
+    );
+    await waitFor(() => {
+      expect(container).not.toBeEmptyDOMElement();
+    });
+    expect(screen.getByText('View proposals')).toBeInTheDocument();
+  });
+
+  it('should render link to proposal', async () => {
+    const { container } = render(
+      <MockedProvider mocks={mocks}>
+        <MarketTerminationBanner market={{ ...marketMock, id: 'market-4' }} />
+      </MockedProvider>
+    );
+    await waitFor(() => {
+      expect(container).not.toBeEmptyDOMElement();
+    });
+    expect(screen.getByText('View proposal')).toBeInTheDocument();
+  });
+});

apps/trading/components/market-banner/market-termination-banner.tsx

@@ -1,120 +1,44 @@
-import { type ReactNode } from 'react';
-import sortBy from 'lodash/sortBy';
+import type { ReactNode } from 'react';
+import { useState } from 'react';
 import { format, formatDuration, intervalToDuration } from 'date-fns';
-import { type MarketViewProposalFieldsFragment } from '@vegaprotocol/proposals';
-import { ProposalState } from '@vegaprotocol/types';
+import {
+  ExternalLink,
+  Intent,
+  NotificationBanner,
+} from '@vegaprotocol/ui-toolkit';
+import type { MarketViewProposalFieldsFragment } from '@vegaprotocol/proposals';
+import { marketViewProposalsDataProvider } from '@vegaprotocol/proposals';
+import * as Types from '@vegaprotocol/types';
+import type { Market } from '@vegaprotocol/markets';
+import { getQuoteName } from '@vegaprotocol/markets';
+import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
+import sortBy from 'lodash/sortBy';
 import {
   DApp,
   TOKEN_PROPOSAL,
   TOKEN_PROPOSALS,
   useLinks,
 } from '@vegaprotocol/environment';
-import { getQuoteName, type Market } from '@vegaprotocol/markets';
-import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
+import { useDataProvider } from '@vegaprotocol/data-provider';
 import { useT } from '../../lib/use-t';
-import { ExternalLink } from '@vegaprotocol/ui-toolkit';
 
-export const MarketUpdateStateBanner = ({
-  market,
-  proposals,
-}: {
-  market: Market;
-  proposals: MarketViewProposalFieldsFragment[];
-}) => {
-  const t = useT();
-  const governanceLink = useLinks(DApp.Governance);
-
-  const openProposals = sortBy(
-    proposals.filter((p) => p.state === ProposalState.STATE_OPEN),
-    (p) => p.terms.enactmentDatetime
+const filterProposals = (
+  data: MarketViewProposalFieldsFragment[] | null,
+  marketId: string,
+  now: number
+) =>
+  sortBy(
+    (data || []).filter(
+      (item) =>
+        item.terms.change.__typename === 'UpdateMarketState' &&
+        item.terms.change.market.id === marketId &&
+        item.terms.change.updateType ===
+          Types.MarketUpdateType.MARKET_STATE_UPDATE_TYPE_TERMINATE &&
+        item.terms.enactmentDatetime &&
+        new Date(item.terms.enactmentDatetime).getTime() > now
+    ),
+    (item) => item.terms.enactmentDatetime
   );
-  const passedProposals = sortBy(
-    proposals.filter((p) => p.state === ProposalState.STATE_PASSED),
-    (p) => p.terms.enactmentDatetime
-  );
-
-  if (!passedProposals.length && !openProposals.length) {
-    return null;
-  }
-
-  const name = market.tradableInstrument.instrument.code;
-  const assetSymbol = getQuoteName(market);
-
-  const proposalLink =
-    !passedProposals.length && openProposals[0]?.id
-      ? governanceLink(TOKEN_PROPOSAL.replace(':id', openProposals[0]?.id))
-      : undefined;
-
-  const proposalsLink =
-    openProposals.length > 1 ? governanceLink(TOKEN_PROPOSALS) : undefined;
-
-  let content: ReactNode;
-
-  if (passedProposals.length) {
-    const { date, duration, price } = getMessageVariables(passedProposals[0]);
-    content = (
-      <>
-        <p className="uppercase mb-1">
-          {t('Trading on market {{name}} will stop on {{date}}', {
-            name,
-            date,
-          })}
-        </p>
-        <p>
-          {t(
-            'You will no longer be able to hold a position on this market when it closes in {{duration}}.',
-            { duration }
-          )}{' '}
-          {price &&
-            assetSymbol &&
-            t('The final price will be {{price}} {{assetSymbol}}.', {
-              price: addDecimalsFormatNumber(price, market.decimalPlaces),
-              assetSymbol,
-            })}
-        </p>
-      </>
-    );
-  } else if (openProposals.length > 1) {
-    content = (
-      <>
-        <p className="uppercase mb-1">
-          {t(
-            'Trading on market {{name}} may stop. There are open proposals to close this market',
-            { name }
-          )}
-        </p>
-        <p>
-          <ExternalLink href={proposalsLink}>
-            {t('View proposals')}
-          </ExternalLink>
-        </p>
-      </>
-    );
-  } else {
-    const { date, price } = getMessageVariables(openProposals[0]);
-    content = (
-      <>
-        <p className="mb-1">
-          {t(
-            'Trading on market {{name}} may stop on {{date}}. There is an open proposal to close this market.',
-            { name, date }
-          )}
-        </p>
-        <p>
-          {price &&
-            assetSymbol &&
-            t('Proposed final price is {{price}} {{assetSymbol}}.', {
-              price: addDecimalsFormatNumber(price, market.decimalPlaces),
-              assetSymbol,
-            })}{' '}
-          <ExternalLink href={proposalLink}>{t('View proposal')}</ExternalLink>
-        </p>
-      </>
-    );
-  }
-
-  return <div data-testid={`update-state-banner-${market.id}`}>{content}</div>;
-};
 
 const getMessageVariables = (proposal: MarketViewProposalFieldsFragment) => {
   const enactmentDatetime = new Date(proposal.terms.enactmentDatetime);
@@ -138,3 +62,126 @@ const getMessageVariables = (proposal: MarketViewProposalFieldsFragment) => {
     price,
   };
 };
+
+export const MarketTerminationBanner = ({
+  market,
+}: {
+  market: Market | null;
+}) => {
+  const t = useT();
+  const [visible, setVisible] = useState(true);
+  const skip = !market || !visible;
+  const { data: passedProposalsData } = useDataProvider({
+    dataProvider: marketViewProposalsDataProvider,
+    skip,
+    variables: {
+      inState: Types.ProposalState.STATE_PASSED,
+      proposalType: Types.ProposalType.TYPE_UPDATE_MARKET_STATE,
+    },
+  });
+
+  const { data: openProposalsData } = useDataProvider({
+    dataProvider: marketViewProposalsDataProvider,
+    skip,
+    variables: {
+      inState: Types.ProposalState.STATE_OPEN,
+      proposalType: Types.ProposalType.TYPE_UPDATE_MARKET_STATE,
+    },
+  });
+
+  const governanceLink = useLinks(DApp.Governance);
+
+  if (!market) return null;
+  const now = Date.now();
+  const passedProposals = filterProposals(passedProposalsData, market.id, now);
+  const openProposals = filterProposals(openProposalsData, market.id, now);
+
+  const name = market.tradableInstrument.instrument.code;
+  if (!passedProposals.length && !openProposals.length) {
+    return null;
+  }
+
+  const assetSymbol = getQuoteName(market);
+  const proposalLink =
+    !passedProposals.length && openProposals[0]?.id
+      ? governanceLink(TOKEN_PROPOSAL.replace(':id', openProposals[0]?.id))
+      : undefined;
+  const proposalsLink =
+    openProposals.length > 1 ? governanceLink(TOKEN_PROPOSALS) : undefined;
+  let content: ReactNode;
+  if (passedProposals.length) {
+    const { date, duration, price } = getMessageVariables(passedProposals[0]);
+    content = (
+      <>
+        <div className="uppercase mb-1">
+          {t('Trading on Market {{name}} will stop on {{date}}', {
+            name,
+            date,
+          })}
+        </div>
+        <div>
+          {t(
+            'You will no longer be able to hold a position on this market when it closes in {{duration}}.',
+            { duration }
+          )}{' '}
+          {price &&
+            assetSymbol &&
+            t('The final price will be {{price}} {{assetSymbol}}.', {
+              price: addDecimalsFormatNumber(price, market.decimalPlaces),
+              assetSymbol,
+            })}
+        </div>
+      </>
+    );
+  } else if (openProposals.length > 1) {
+    content = (
+      <>
+        <div className="uppercase mb-1">
+          {t(
+            'Trading on Market {{name}} may stop. There are open proposals to close this market',
+            { name }
+          )}
+        </div>
+        <div>
+          <ExternalLink href={proposalsLink}>
+            {t('View proposals')}
+          </ExternalLink>
+        </div>
+      </>
+    );
+  } else {
+    const { date, price } = getMessageVariables(openProposals[0]);
+    content = (
+      <>
+        <div className="uppercase mb-1">
+          {t(
+            'Trading on Market {{name}} may stop on {{date}}. There is open proposal to close this market.',
+            { name, date }
+          )}
+        </div>
+        <div>
+          {price &&
+            assetSymbol &&
+            t('Proposed final price is {{price}} {{assetSymbol}}.', {
+              price: addDecimalsFormatNumber(price, market.decimalPlaces),
+              assetSymbol,
+            })}
+        </div>
+        <div>
+          <ExternalLink href={proposalLink}>{t('View proposal')}</ExternalLink>
+        </div>
+      </>
+    );
+  }
+  return (
+    <NotificationBanner
+      intent={openProposals.length ? Intent.Warning : Intent.Info}
+      onClose={() => {
+        setVisible(false);
+      }}
+      data-testid={`termination-warning-banner-${market.id}`}
+    >
+      {content}
+    </NotificationBanner>
+  );
+};

apps/trading/components/market-banner/market-update-banner.spec.tsx

@@ -1,84 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import { ProposalState } from '@vegaprotocol/types';
-import { MarketUpdateBanner } from './market-update-banner';
-import { type MarketViewProposalFieldsFragment } from '@vegaprotocol/proposals';
-
-describe('MarketUpdateBanner', () => {
-  const change = {
-    __typename: 'UpdateMarket' as const,
-    marketId: 'update-market-id',
-  };
-
-  const openProposal = {
-    __typename: 'Proposal' as const,
-    id: 'proposal-1',
-    state: ProposalState.STATE_OPEN,
-    terms: {
-      __typename: 'ProposalTerms' as const,
-      closingDatetime: '2023-09-27',
-      enactmentDatetime: '2023-09-28',
-      change,
-    },
-  };
-  const passedProposal = {
-    __typename: 'Proposal' as const,
-    id: 'proposal-2',
-    state: ProposalState.STATE_PASSED,
-    terms: {
-      __typename: 'ProposalTerms' as const,
-      closingDatetime: '2023-09-27',
-      enactmentDatetime: '2023-09-28',
-      change,
-    },
-  };
-
-  it('renders content for a single open proposal', () => {
-    render(
-      <MarketUpdateBanner
-        proposals={[openProposal as MarketViewProposalFieldsFragment]}
-      />
-    );
-
-    expect(
-      screen.getByText(/^changes have been proposed/i)
-    ).toBeInTheDocument();
-    expect(screen.getByRole('link', { name: 'View proposal' })).toHaveAttribute(
-      'href',
-      expect.stringContaining(openProposal.id as string)
-    );
-  });
-
-  it('renders content for a single passed proposal', () => {
-    render(
-      <MarketUpdateBanner
-        proposals={[passedProposal as MarketViewProposalFieldsFragment]}
-      />
-    );
-
-    expect(
-      screen.getByText(/^proposal set to change market/i)
-    ).toBeInTheDocument();
-    expect(screen.getByRole('link', { name: 'View proposal' })).toHaveAttribute(
-      'href',
-      expect.stringContaining(passedProposal.id)
-    );
-  });
-
-  it('renders content for multiple passed proposals', () => {
-    const proposals = [
-      openProposal,
-      openProposal,
-    ] as MarketViewProposalFieldsFragment[];
-
-    render(<MarketUpdateBanner proposals={proposals} />);
-
-    expect(
-      screen.getByText(
-        new RegExp(`^There are ${proposals.length} open proposals`)
-      )
-    ).toBeInTheDocument();
-    expect(
-      screen.getByRole('link', { name: 'View proposals' })
-    ).toHaveAttribute('href', expect.stringContaining('proposals'));
-  });
-});

apps/trading/components/market-banner/market-update-banner.tsx

@@ -1,71 +0,0 @@
-import sortBy from 'lodash/sortBy';
-import { format } from 'date-fns';
-import {
-  DApp,
-  TOKEN_PROPOSAL,
-  TOKEN_PROPOSALS,
-  useLinks,
-} from '@vegaprotocol/environment';
-import { type MarketViewProposalFieldsFragment } from '@vegaprotocol/proposals';
-import { ExternalLink } from '@vegaprotocol/ui-toolkit';
-import { ProposalState } from '@vegaprotocol/types';
-import { useT } from '../../lib/use-t';
-
-export const MarketUpdateBanner = ({
-  proposals,
-}: {
-  proposals: MarketViewProposalFieldsFragment[];
-}) => {
-  const governanceLink = useLinks(DApp.Governance);
-  const t = useT();
-  const openProposals = sortBy(
-    proposals.filter((p) => p.state === ProposalState.STATE_OPEN),
-    (p) => p.terms.enactmentDatetime
-  );
-  const passedProposals = sortBy(
-    proposals.filter((p) => p.state === ProposalState.STATE_PASSED),
-    (p) => p.terms.enactmentDatetime
-  );
-
-  let content = null;
-
-  if (openProposals.length > 1) {
-    content = (
-      <p>
-        {t('There are {{count}} open proposals to change this market', {
-          count: openProposals.length,
-        })}
-        <ExternalLink href={governanceLink(TOKEN_PROPOSALS)}>
-          {t('View proposals')}
-        </ExternalLink>
-      </p>
-    );
-  } else if (passedProposals.length) {
-    const proposal = passedProposals[0];
-    const proposalLink = governanceLink(
-      TOKEN_PROPOSAL.replace(':id', proposal?.id || '')
-    );
-
-    content = (
-      <p>
-        {t('Proposal set to change market on {{date}}.', {
-          date: format(new Date(proposal.terms.enactmentDatetime), 'dd MMMM'),
-        })}
-        <ExternalLink href={proposalLink}>{t('View proposal')}</ExternalLink>,
-      </p>
-    );
-  } else {
-    const proposal = openProposals[0];
-    const proposalLink = governanceLink(
-      TOKEN_PROPOSAL.replace(':id', proposal?.id || '')
-    );
-    content = (
-      <p>
-        {t('Changes have been proposed for this market.')}{' '}
-        <ExternalLink href={proposalLink}>{t('View proposal')}</ExternalLink>
-      </p>
-    );
-  }
-
-  return <div data-testid="market-proposal-notification">{content}</div>;
-};

apps/trading/components/market-banner/use-market-proposals.ts

@@ -1,88 +0,0 @@
-import {
-  useMarketProposals,
-  type MarketViewProposalFieldsFragment,
-} from '@vegaprotocol/proposals';
-import { ProposalState, ProposalType } from '@vegaprotocol/types';
-
-const isPending = (p: MarketViewProposalFieldsFragment) => {
-  return [ProposalState.STATE_OPEN, ProposalState.STATE_PASSED].includes(
-    p.state
-  );
-};
-
-export const useUpdateMarketStateProposals = (
-  marketId: string,
-  inState?: ProposalState
-) => {
-  const { data, error, loading } = useMarketProposals({
-    proposalType: ProposalType.TYPE_UPDATE_MARKET_STATE,
-    inState,
-  });
-
-  const proposals = data
-    ? data.filter(isPending).filter((p) => {
-        const change = p.terms.change;
-
-        if (
-          change.__typename === 'UpdateMarketState' &&
-          change.market.id === marketId
-        ) {
-          return true;
-        }
-
-        return false;
-      })
-    : [];
-
-  return { data, error, loading, proposals };
-};
-
-export const useUpdateMarketProposals = (
-  marketId: string,
-  inState?: ProposalState
-) => {
-  const { data, error, loading } = useMarketProposals({
-    proposalType: ProposalType.TYPE_UPDATE_MARKET,
-    inState,
-  });
-
-  const proposals = data
-    ? data.filter(isPending).filter((p) => {
-        const change = p.terms.change;
-        if (
-          change.__typename === 'UpdateMarket' &&
-          change.marketId === marketId
-        ) {
-          return true;
-        }
-        return false;
-      })
-    : [];
-
-  return { data, error, loading, proposals };
-};
-
-export const useSuccessorMarketProposals = (
-  marketId: string,
-  inState?: ProposalState
-) => {
-  const { data, loading, error } = useMarketProposals({
-    proposalType: ProposalType.TYPE_NEW_MARKET,
-    inState,
-  });
-
-  const proposals = data
-    ? data.filter(isPending).filter((p) => {
-        const change = p.terms.change;
-        if (
-          change.__typename === 'NewMarket' &&
-          change.successorConfiguration?.parentMarketId === marketId
-        ) {
-          return true;
-        }
-        return false;
-      })
-    : [];
-
-  return { data, error, loading, proposals };
-};

apps/trading/components/market-header/market-header.tsx

@@ -27,7 +27,7 @@ export const MarketHeader = () => {
             title={
               <Popover
                 open={open}
-                onOpenChange={setOpen}
+                onChange={setOpen}
                 trigger={
                   <HeaderTitle>
                     <span>

apps/trading/components/orders-container/orders-container.spec.tsx

@@ -1,5 +1,9 @@
 import { act, renderHook } from '@testing-library/react';
-import { STORAGE_KEY, useOrderListGridState } from './orders-container';
+import {
+  FilterStatusValue,
+  STORAGE_KEY,
+  useOrderListGridState,
+} from './orders-container';
 import { Filter } from '@vegaprotocol/orders';
 import { OrderType } from '@vegaprotocol/types';
 
@@ -12,6 +16,31 @@ describe('useOrderListGridState', () => {
     return renderHook(() => useOrderListGridState(filter));
   };
 
+  it.each(Object.values(Filter))(
+    'providers correct AgGrid filter for %s',
+    (filter) => {
+      const { result } = setup(filter);
+      expect(typeof result.current.updateGridState).toBe('function');
+      expect(result.current.gridState).toEqual({
+        columnState: undefined,
+        filterModel: {
+          status: {
+            value: FilterStatusValue[filter],
+          },
+        },
+      });
+    }
+  );
+
+  it('provides correct AgGrid filter for all', () => {
+    const { result } = setup(undefined);
+    expect(typeof result.current.updateGridState).toBe('function');
+    expect(result.current.gridState).toEqual({
+      columnState: undefined,
+      filterModel: undefined,
+    });
+  });
+
   it.each(Object.values(Filter))(
     'sets and stores column state and filters for %s',
     (filter) => {
@@ -30,7 +59,12 @@ describe('useOrderListGridState', () => {
 
       expect(result.current.gridState).toEqual({
         columnState: undefined,
-        filterModel,
+        filterModel: {
+          ...filterModel,
+          status: {
+            value: FilterStatusValue[filter],
+          },
+        },
       });
 
       const columnState = [{ colId: 'status', width: 200 }];
@@ -43,7 +77,12 @@ describe('useOrderListGridState', () => {
 
       expect(result.current.gridState).toEqual({
         columnState,
-        filterModel,
+        filterModel: {
+          ...filterModel,
+          status: {
+            value: FilterStatusValue[filter],
+          },
+        },
       });
 
       const storeKeyMap = {

apps/trading/components/orders-container/orders-container.tsx

@@ -9,7 +9,6 @@ import type { DataGridStore } from '../../stores/datagrid-store-slice';
 import { OrderStatus } from '@vegaprotocol/types';
 import { Links } from '../../lib/links';
 import { useT } from '../../lib/use-t';
-import { GridSettings } from '../grid-settings/grid-settings';
 
 const resolveNoRowsMessage = (
   filter: Filter | undefined,
@@ -39,24 +38,6 @@ export const FilterStatusValue = {
   [Filter.Rejected]: [OrderStatus.STATUS_REJECTED],
 };
 
-export const DefaultFilterModel = {
-  [Filter.Open]: {
-    status: {
-      value: FilterStatusValue[Filter.Open],
-    },
-  },
-  [Filter.Closed]: {
-    status: {
-      value: FilterStatusValue[Filter.Closed],
-    },
-  },
-  [Filter.Rejected]: {
-    status: {
-      value: FilterStatusValue[Filter.Rejected],
-    },
-  },
-};
-
 export interface OrderContainerProps {
   filter?: Filter;
 }
@@ -73,8 +54,7 @@ export const OrdersContainer = ({ filter }: OrderContainerProps) => {
     (newState) => {
       updateGridState(filter, newState);
     },
-    AUTO_SIZE_COLUMNS,
-    filter && DefaultFilterModel[filter]
+    AUTO_SIZE_COLUMNS
   );
 
   if (!pubKey) {
@@ -100,7 +80,7 @@ export const OrdersContainer = ({ filter }: OrderContainerProps) => {
 };
 
 export const STORAGE_KEY = 'vega_order_list_store';
-export const useOrderListStore = create<{
+const useOrderListStore = create<{
   open: DataGridStore;
   closed: DataGridStore;
   rejected: DataGridStore;
@@ -169,19 +149,34 @@ export const useOrderListGridState = (filter: Filter | undefined) => {
       case Filter.Open: {
         return {
           columnState: store.open.columnState,
-          filterModel: store.open.filterModel,
+          filterModel: {
+            ...store.open.filterModel,
+            status: {
+              value: FilterStatusValue[Filter.Open],
+            },
+          },
         };
       }
       case Filter.Closed: {
         return {
           columnState: store.closed.columnState,
-          filterModel: store.closed.filterModel,
+          filterModel: {
+            ...store.closed.filterModel,
+            status: {
+              value: FilterStatusValue[Filter.Closed],
+            },
+          },
         };
       }
       case Filter.Rejected: {
         return {
           columnState: store.rejected.columnState,
-          filterModel: store.rejected.filterModel,
+          filterModel: {
+            ...store.rejected.filterModel,
+            status: {
+              value: FilterStatusValue[Filter.Rejected],
+            },
+          },
         };
       }
       default: {
@@ -192,14 +187,3 @@ export const useOrderListGridState = (filter: Filter | undefined) => {
 
   return { gridState, updateGridState };
 };
-
-export const OrdersSettings = ({ filter }: { filter?: Filter }) => {
-  const updateGridState = useOrderListStore((state) => state.update);
-  return (
-    <GridSettings
-      updateGridStore={(gridStore: DataGridStore) =>
-        updateGridState(filter, gridStore)
-      }
-    />
-  );
-};

apps/trading/components/positions-container/index.ts

@@ -1,2 +1 @@
 export * from './positions-container';
-export * from './positions-settings';

apps/trading/components/positions-container/positions-settings.tsx

@@ -1,8 +0,0 @@
-import { GridSettings } from '../grid-settings/grid-settings';
-import { usePositionsStore } from './positions-container';
-
-export const PositionsSettings = () => (
-  <GridSettings
-    updateGridStore={usePositionsStore((store) => store.updateGridStore)}
-  />
-);

apps/trading/components/rewards-container/rewards-container.tsx

@@ -231,7 +231,6 @@ export const RewardsContainer = () => {
         title={t('Rewards history')}
         className="lg:col-span-full"
         loading={rewardsLoading}
-        noBackgroundOnMobile={true}
       >
         <RewardsHistoryContainer
           epoch={Number(epochData?.epoch.id)}

apps/trading/components/rewards-container/rewards-history.spec.tsx

@@ -99,25 +99,16 @@ describe('RewardsHistoryTable', () => {
   it('renders table with accounts summed up by asset', () => {
     render(<RewardHistoryTable {...props} />);
 
-    const containerLeft = within(
-      document.querySelector('.ag-pinned-left-cols-container') as HTMLElement
-    );
-    const pinnedRows = containerLeft.getAllByRole('row');
-
-    const containerCenter = within(
+    const container = within(
       document.querySelector('.ag-center-cols-container') as HTMLElement
     );
-    const rows = containerCenter.getAllByRole('row');
+    const rows = container.getAllByRole('row');
     expect(rows).toHaveLength(
       Object.keys(groupBy(rewardSummaries, 'node.assetId')).length
     );
 
     let row = within(rows[0]);
-    let pinnedRow = within(pinnedRows[0]);
-    let cells = [
-      ...pinnedRow.getAllByRole('gridcell'),
-      ...row.getAllByRole('gridcell'),
-    ];
+    let cells = row.getAllByRole('gridcell');
 
     let assetCell = getCell(cells, 'asset.symbol');
     expect(assetCell.getByTestId('stack-cell-primary')).toHaveTextContent(
@@ -149,11 +140,7 @@ describe('RewardsHistoryTable', () => {
 
     // Second row
     row = within(rows[1]);
-    pinnedRow = within(pinnedRows[1]);
-    cells = [
-      ...pinnedRow.getAllByRole('gridcell'),
-      ...row.getAllByRole('gridcell'),
-    ];
+    cells = row.getAllByRole('gridcell');
 
     assetCell = getCell(cells, 'asset.symbol');
     expect(assetCell.getByTestId('stack-cell-primary')).toHaveTextContent(

apps/trading/components/rewards-container/rewards-history.tsx

@@ -93,7 +93,6 @@ export const RewardsHistoryContainer = ({
 
 const defaultColDef = {
   flex: 1,
-  minWidth: 62,
   resizable: true,
   sortable: true,
 };
@@ -196,8 +195,6 @@ export const RewardHistoryTable = ({
           return <StackedCell primary={value} secondary={data.asset.name} />;
         },
         sort: 'desc',
-        pinned: 'left',
-        width: 150,
       },
       {
         field: 'infrastructureFees',
@@ -260,7 +257,7 @@ export const RewardHistoryTable = ({
 
   return (
     <div>
-      <div className="mb-2 flex flex-wrap items-center justify-between gap-2">
+      <div className="mb-2 flex items-center justify-between gap-2">
         <h4 className="text-muted flex items-center gap-2 text-sm">
           <label htmlFor="fromEpoch">{t('From epoch')}</label>
           <EpochInput
@@ -332,17 +329,15 @@ export const RewardHistoryTable = ({
           </TradingButton>
         </div>
       </div>
-      <div className="border rounded-lg md:rounded-sm overflow-hidden border-default">
-        <AgGrid
-          columnDefs={columnDefs}
-          defaultColDef={defaultColDef}
-          rowData={rowData}
-          rowHeight={45}
-          domLayout="autoHeight"
-          // Show loading message without wiping out the current rows
-          overlayNoRowsTemplate={loading ? t('Loading...') : t('No rows')}
-        />
-      </div>
+      <AgGrid
+        columnDefs={columnDefs}
+        defaultColDef={defaultColDef}
+        rowData={rowData}
+        rowHeight={45}
+        domLayout="autoHeight"
+        // Show loading message without wiping out the current rows
+        overlayNoRowsTemplate={loading ? t('Loading...') : t('No rows')}
+      />
     </div>
   );
 };

apps/trading/components/stop-orders-container/index.ts

@@ -1,3 +1 @@
 export * from './stop-orders-container';
-
-export * from './stop-orders-settings';

apps/trading/components/stop-orders-container/stop-orders-container.tsx

@@ -35,7 +35,7 @@ export const StopOrdersContainer = () => {
   );
 };
 
-export const useStopOrdersStore = create<DataGridSlice>()(
+const useStopOrdersStore = create<DataGridSlice>()(
   persist(createDataGridSlice, {
     name: 'vega_stop_orders_store',
   })

apps/trading/components/stop-orders-container/stop-orders-settings.tsx

@@ -1,8 +0,0 @@
-import { GridSettings } from '../grid-settings/grid-settings';
-import { useStopOrdersStore } from './stop-orders-container';
-
-export const StopOrdersSettings = () => (
-  <GridSettings
-    updateGridStore={useStopOrdersStore((store) => store.updateGridStore)}
-  />
-);

apps/trading/components/table/index.ts

@@ -1 +0,0 @@
-export * from './table';

apps/trading/components/trades-container/index.ts

@@ -1,2 +1 @@
 export * from './trades-container';
-export * from './trades-settings';

apps/trading/components/trades-container/trades-container.tsx

@@ -17,7 +17,7 @@ export const TradesContainer = ({ marketId }: TradesContainerProps) => {
   return <TradesManager marketId={marketId} gridProps={gridStoreCallbacks} />;
 };
 
-export const useTradesStore = create<DataGridSlice>()(
+const useTradesStore = create<DataGridSlice>()(
   persist(createDataGridSlice, {
     name: 'vega_trades_store',
   })

apps/trading/components/trades-container/trades-settings.tsx

@@ -1,8 +0,0 @@
-import { GridSettings } from '../grid-settings/grid-settings';
-import { useTradesStore } from './trades-container';
-
-export const TradesSettings = () => (
-  <GridSettings
-    updateGridStore={useTradesStore((store) => store.updateGridStore)}
-  />
-);

apps/trading/e2e/.env

@@ -1,3 +1,3 @@
 CONSOLE_IMAGE_NAME=vegaprotocol/trading:latest
-VEGA_VERSION=v0.73.10
+VEGA_VERSION=v0.73.9
 LOCAL_SERVER=false

apps/trading/e2e/.env.develop

@@ -1,3 +1,2 @@
 CONSOLE_IMAGE_NAME=vegaprotocol/trading:develop
-VEGA_VERSION=v0.73.10
-LOCAL_SERVER=false
+VEGA_VERSION=v0.73.9

apps/trading/e2e/.env.main

@@ -1,3 +1,3 @@
 CONSOLE_IMAGE_NAME=vegaprotocol/trading:main
-VEGA_VERSION=v0.73.10
+VEGA_VERSION=v0.73.8
 LOCAL_SERVER=false

apps/trading/e2e/conftest.py

@@ -8,9 +8,6 @@ import docker
 import http.server
 import sys
 from dotenv import load_dotenv
-
-from docker.models.containers import Container
-from docker.errors import APIError
 from contextlib import contextmanager
 from vega_sim.null_service import VegaServiceNull, Ports
 from playwright.sync_api import Browser, Page
@@ -103,16 +100,12 @@ def init_vega(request=None):
             container = docker_client.containers.run(
                 console_image_name, detach=True, ports={"80/tcp": vega.console_port}
             )
-
-            if not isinstance(container, Container):
-                raise Exception("container instance invalid")
-
             logger.info(
                 f"Container {container.id} started",
                 extra={"worker_id": os.environ.get("PYTEST_XDIST_WORKER")},
             )
             yield vega
-        except APIError as e:
+        except docker.errors.APIError as e:
             logger.info(f"Container creation failed.")
             logger.info(e)
             raise e

apps/trading/e2e/tests/deal_ticket/test_basic_submit.py

@@ -1,6 +1,6 @@
 import pytest
 from playwright.sync_api import Page, expect
-from vega_sim.null_service import VegaServiceNull
+from vega_sim.service import VegaService
 from datetime import datetime, timedelta
 from conftest import init_vega
 from fixtures.market import setup_continuous_market
@@ -24,7 +24,7 @@ def continuous_market(vega):
     return setup_continuous_market(vega)
 
 @pytest.mark.usefixtures("auth", "risk_accepted")
-def test_limit_buy_order_GTT(continuous_market, vega: VegaServiceNull, page: Page):
+def test_limit_buy_order_GTT(continuous_market, vega: VegaService, page: Page):
     page.goto(f"/#/markets/{continuous_market}")
     page.get_by_test_id(tif).select_option("Good 'til Time (GTT)")
     page.get_by_test_id(order_size).fill("10")
@@ -52,7 +52,7 @@ def test_limit_buy_order_GTT(continuous_market, vega: VegaServiceNull, page: Pag
     )
 
 @pytest.mark.usefixtures("auth", "risk_accepted")
-def test_limit_buy_order(continuous_market, vega: VegaServiceNull, page: Page):
+def test_limit_buy_order(continuous_market, vega: VegaService, page: Page):
     page.goto(f"/#/markets/{continuous_market}")
     
     page.get_by_test_id(order_size).fill("10")
@@ -69,7 +69,7 @@ def test_limit_buy_order(continuous_market, vega: VegaServiceNull, page: Page):
     )
 
 @pytest.mark.usefixtures("auth", "risk_accepted")
-def test_limit_sell_order(continuous_market, vega: VegaServiceNull, page: Page):
+def test_limit_sell_order(continuous_market, vega: VegaService, page: Page):
     page.goto(f"/#/markets/{continuous_market}")
     page.get_by_test_id(order_size).fill("10")
     page.get_by_test_id(order_price).fill("100")
@@ -93,7 +93,7 @@ def test_limit_sell_order(continuous_market, vega: VegaServiceNull, page: Page):
     )
 
 @pytest.mark.usefixtures("auth", "risk_accepted")
-def test_market_sell_order(continuous_market, vega: VegaServiceNull, page: Page):
+def test_market_sell_order(continuous_market, vega: VegaService, page: Page):
     page.goto(f"/#/markets/{continuous_market}")
     page.get_by_test_id(market_order).click()
     page.get_by_test_id(order_size).fill("10")
@@ -117,7 +117,7 @@ def test_market_sell_order(continuous_market, vega: VegaServiceNull, page: Page)
     )
 
 @pytest.mark.usefixtures("auth", "risk_accepted")
-def test_market_buy_order(continuous_market, vega: VegaServiceNull, page: Page):
+def test_market_buy_order(continuous_market, vega: VegaService, page: Page):
     page.goto(f"/#/markets/{continuous_market}")
     page.get_by_test_id(market_order).click()
     page.get_by_test_id(order_size).fill("10")

apps/trading/e2e/tests/deal_ticket/test_fees_margin_estimations.py

@@ -1,6 +1,6 @@
 import pytest
 from playwright.sync_api import Page, expect
-from vega_sim.null_service import VegaServiceNull
+from vega_sim.service import VegaService
 from actions.vega import submit_order
 from actions.utils import wait_for_toast_confirmation
 
@@ -13,7 +13,7 @@ market_trading_mode = "market-trading-mode"
 
 @pytest.mark.skip("tbd")
 @pytest.mark.usefixtures("auth", "risk_accepted")
-def test_margin_and_fees_estimations(continuous_market, vega: VegaServiceNull, page: Page):
+def test_margin_and_fees_estimations(continuous_market, vega: VegaService, page: Page):
     # setup continuous trading market with one user buy trade
     market_id = continuous_market
     page.goto(f"/#/markets/{market_id}")

apps/trading/e2e/tests/deal_ticket/test_stop_order.py

@@ -1,6 +1,6 @@
 import pytest
 from playwright.sync_api import Page, expect
-from vega_sim.null_service import VegaServiceNull
+from vega_sim.service import VegaService
 from actions.vega import submit_order
 from datetime import datetime, timedelta
 from conftest import init_vega
@@ -38,7 +38,7 @@ timeInForce_col = '[col-id="submission.timeInForce"]'
 updatedAt_col = '[col-id="updatedAt"]'
 close_toast = "toast-close"
 
-def create_position(vega: VegaServiceNull, market_id):
+def create_position(vega: VegaService, market_id):
     submit_order(vega, "Key 1", market_id, "SIDE_SELL", 100, 110)
     submit_order(vega, "Key 1", market_id, "SIDE_BUY", 100, 110)
     vega.forward("10s")
@@ -69,7 +69,7 @@ def test_stop_order_form_error_validation(continuous_market, page: Page):
 
 @pytest.mark.skip("core issue")
 @pytest.mark.usefixtures("auth", "risk_accepted")
-def test_submit_stop_order_rejected(continuous_market, vega: VegaServiceNull, page: Page):
+def test_submit_stop_order_rejected(continuous_market, vega: VegaService, page: Page):
     page.goto(f"/#/markets/{continuous_market}")
     page.get_by_test_id(stop_orders_tab).click()
     page.get_by_test_id(stop_order_btn).click()
@@ -108,7 +108,7 @@ def test_submit_stop_order_rejected(continuous_market, vega: VegaServiceNull, pa
 @pytest.mark.skip("core issue")
 @pytest.mark.usefixtures("auth", "risk_accepted")
 def test_submit_stop_market_order_triggered(
-    continuous_market, vega: VegaServiceNull, page: Page
+    continuous_market, vega: VegaService, page: Page
 ):
     # 7002-SORD-071
     # 7002-SORD-074
@@ -166,7 +166,7 @@ def test_submit_stop_market_order_triggered(
 @pytest.mark.skip("core issue")
 @pytest.mark.usefixtures("auth", "risk_accepted")
 def test_submit_stop_limit_order_pending(
-    continuous_market, vega: VegaServiceNull, page: Page
+    continuous_market, vega: VegaService, page: Page
 ):
     # 7002-SORD-071
     # 7002-SORD-074
@@ -227,7 +227,7 @@ def test_submit_stop_limit_order_pending(
 @pytest.mark.skip("core issue")
 @pytest.mark.usefixtures("auth", "risk_accepted")
 def test_submit_stop_limit_order_cancel(
-    continuous_market, vega: VegaServiceNull, page: Page
+    continuous_market, vega: VegaService, page: Page
 ):
     page.goto(f"/#/markets/{continuous_market}")
     page.get_by_test_id(stop_orders_tab).click()
@@ -348,7 +348,7 @@ class TestStopOcoValidation:
     @pytest.mark.skip("core issue")
     @pytest.mark.usefixtures("auth", "risk_accepted")
     def test_maximum_number_of_active_stop_orders(
-        self, continuous_market, vega: VegaServiceNull, page: Page
+        self, continuous_market, vega: VegaService, page: Page
     ):
         page.goto(f"/#/markets/{continuous_market}")
         page.get_by_test_id(stop_orders_tab).click()

apps/trading/e2e/tests/deal_ticket/test_stop_order_oco.py

@@ -1,6 +1,6 @@
 import pytest
 from playwright.sync_api import Page, expect
-from vega_sim.null_service import VegaServiceNull
+from vega_sim.service import VegaService
 from actions.vega import submit_order
 from actions.utils import wait_for_toast_confirmation
 
@@ -42,7 +42,7 @@ trigger_price_oco = "triggerPrice-oco"
 order_size_oco = "order-size-oco"
 order_limit_price_oco = "order-price-oco"
 
-def create_position(vega: VegaServiceNull, market_id):
+def create_position(vega: VegaService, market_id):
     submit_order(vega, "Key 1", market_id, "SIDE_SELL", 100, 110)
     submit_order(vega, "Key 1", market_id, "SIDE_BUY", 100, 110)
     vega.wait_fn(1)
@@ -51,7 +51,7 @@ def create_position(vega: VegaServiceNull, market_id):
 
 @pytest.mark.usefixtures("auth", "risk_accepted")
 def test_submit_stop_order_market_oco_rejected(
-    continuous_market, vega: VegaServiceNull, page: Page
+    continuous_market, vega: VegaService, page: Page
 ):
     page.goto(f"/#/markets/{continuous_market}")
     page.get_by_test_id(stop_orders_tab).click()
@@ -128,7 +128,7 @@ def test_submit_stop_order_market_oco_rejected(
 
 @pytest.mark.usefixtures("auth", "risk_accepted")
 def test_submit_stop_oco_market_order_triggered(
-    continuous_market, vega: VegaServiceNull, page: Page
+    continuous_market, vega: VegaService, page: Page
 ):
     create_position(vega, continuous_market)
     page.goto(f"/#/markets/{continuous_market}")
@@ -205,7 +205,7 @@ def test_submit_stop_oco_market_order_triggered(
 
 @pytest.mark.usefixtures("auth", "risk_accepted")
 def test_submit_stop_oco_market_order_pending(
-    continuous_market, vega: VegaServiceNull, page: Page
+    continuous_market, vega: VegaService, page: Page
 ):  
     create_position(vega, continuous_market)
     page.goto(f"/#/markets/{continuous_market}")
@@ -237,7 +237,7 @@ def test_submit_stop_oco_market_order_pending(
 
 @pytest.mark.usefixtures("page", "continuous_market", "auth", "risk_accepted")
 def test_submit_stop_oco_limit_order_pending(
-    continuous_market, vega: VegaServiceNull, page: Page
+    continuous_market, vega: VegaService, page: Page
 ):
     create_position(vega, continuous_market)
     page.goto(f"/#/markets/{continuous_market}")
@@ -288,7 +288,7 @@ def test_submit_stop_oco_limit_order_pending(
 
 @pytest.mark.usefixtures("auth", "risk_accepted")
 def test_submit_stop_oco_limit_order_cancel(
-    continuous_market, vega: VegaServiceNull, page: Page
+    continuous_market, vega: VegaService, page: Page
 ):
     create_position(vega, continuous_market)
     page.goto(f"/#/markets/{continuous_market}")

apps/trading/e2e/tests/deal_ticket/test_trading_deal_ticket_submit_account.py

@@ -1,6 +1,6 @@
 import pytest
 from playwright.sync_api import Page, expect
-from vega_sim.null_service import VegaServiceNull
+from vega_sim.service import VegaService
 from actions.utils import change_keys
 from conftest import init_vega
 from fixtures.market import setup_continuous_market
@@ -33,7 +33,7 @@ def test_should_display_info_and_button_for_deposit(continuous_market, page: Pag
     expect(page.get_by_test_id("sidebar-content")).to_contain_text("DepositFrom")
     
 @pytest.mark.usefixtures("auth", "risk_accepted")
-def test_should_show_an_error_if_your_balance_is_zero(continuous_market, vega: VegaServiceNull, page: Page):
+def test_should_show_an_error_if_your_balance_is_zero(continuous_market, vega: VegaService, page: Page):
     page.goto(f"/#/markets/{continuous_market}")
     vega.create_key("key_empty")
     change_keys(page, vega, "key_empty")

apps/trading/e2e/tests/fees/test_fees.py

@@ -1,7 +1,7 @@
 import pytest
 
 from playwright.sync_api import Page, expect
-from vega_sim.null_service import VegaServiceNull
+from vega_sim.service import VegaService
 from actions.vega import submit_order
 from wallet_config import MM_WALLET
 from conftest import init_vega, init_page, auth_setup
@@ -27,6 +27,8 @@ MIN_VOLUME_VALUE_0 = "min-volume-value-0"
 MIN_VOLUME_VALUE_1 = "min-volume-value-1"
 MY_VOLUME_VALUE_0 = "my-volume-value-0"
 MY_VOLUME_VALUE_1 = "my-volume-value-1"
+YOUR_TIER_0 = "your-tier-0"
+YOUR_TIER_1 = "your-tier-1"
 ORDER_SIZE = "order-size"
 ORDER_PRICE = "order-price"
 DISCOUNT_PILL = "discount-pill"
@@ -50,7 +52,6 @@ REQUIRED_EPOCHS_VALUE_1 = "required-epochs-value-1"
 FILLS = "Fills"
 TAB_FILLS = "tab-fills"
 FEE_BREAKDOWN_TOOLTIP = "fee-breakdown-tooltip"
-PINNED_ROW_LOCATOR = ".ag-pinned-left-cols-container .ag-row"
 ROW_LOCATOR = ".ag-center-cols-container .ag-row"
 # Col-Ids:
 COL_INSTRUMENT_CODE = '[col-id="market.tradableInstrument.instrument.code"]'
@@ -142,7 +143,7 @@ def auth(vega_instance, page):
     return auth_setup(vega_instance, page)
 
 
-def setup_market_with_volume_discount_program(vega: VegaServiceNull, tier: int):
+def setup_market_with_volume_discount_program(vega: VegaService, tier: int):
     market = setup_continuous_market(vega, custom_quantum=100000)
     vega.update_volume_discount_program(
         proposal_key=MM_WALLET.name,
@@ -168,7 +169,7 @@ def setup_market_with_volume_discount_program(vega: VegaServiceNull, tier: int):
     return market
 
 
-def setup_market_with_referral_discount_program(vega: VegaServiceNull, tier: int):
+def setup_market_with_referral_discount_program(vega: VegaService, tier: int):
     market = setup_continuous_market(vega, custom_quantum=100000)
     vega.update_referral_program(
         proposal_key=MM_WALLET.name,
@@ -207,7 +208,7 @@ def setup_market_with_referral_discount_program(vega: VegaServiceNull, tier: int
     return market
 
 
-def setup_combined_market(vega: VegaServiceNull):
+def setup_combined_market(vega: VegaService):
     market = setup_continuous_market(vega, custom_quantum=100000)
     vega.update_volume_discount_program(
         proposal_key=MM_WALLET.name,
@@ -404,10 +405,10 @@ def test_fees_page_referral_discount_program_referral_benefits(
 @pytest.mark.parametrize(
     "tier, discount_program, my_volume_test_id, my_volume_value, your_tier",
     [
-        (1, "volume", "my-volume-value-0", "103", "your-volume-tier-0"),
-        (2, "volume", "my-volume-value-1", "206", "your-volume-tier-1"),
-        (1, "referral", "my-volume-value-0", "103", "your-referral-tier-0"),
-        (2, "referral", "my-volume-value-1", "206", "your-referral-tier-1"),
+        (1, "volume", "my-volume-value-0", "103", "your-tier-0"),
+        (2, "volume", "my-volume-value-1", "206", "your-tier-1"),
+        (1, "referral", "my-volume-value-0", "103", "your-tier-0"),
+        (2, "referral", "my-volume-value-1", "206", "your-tier-1"),
     ],
 )
 @pytest.mark.usefixtures("risk_accepted", "auth", "market_ids")
@@ -438,8 +439,8 @@ def test_fees_page_discount_program_discount(
         expect(page.get_by_test_id(REQUIRED_EPOCHS_VALUE_0)).to_have_text("1")
         expect(page.get_by_test_id(REQUIRED_EPOCHS_VALUE_1)).to_have_text("2")
 
-    expect(page.get_by_test_id(your_tier).nth(1)).to_be_visible()
-    expect(page.get_by_test_id(your_tier).nth(1)).to_have_text("Your tier")
+    expect(page.get_by_test_id(your_tier)).to_be_visible()
+    expect(page.get_by_test_id(your_tier)).to_have_text("Your tier")
 
 
 @pytest.mark.parametrize(
@@ -460,9 +461,8 @@ def test_fees_page_discount_program_fees_by_market(
         vega_instance, tier, discount_program, market_ids
     )
     page.goto("/#/fees")
-    pinned = page.locator(PINNED_ROW_LOCATOR)
     row = page.locator(ROW_LOCATOR)
-    expect(pinned.locator(COL_CODE)).to_have_text("BTC:DAI_2023Futr")
+    expect(row.locator(COL_CODE)).to_have_text("BTC:DAI_2023Futr")
     expect(row.locator(COL_FEE_AFTER_DISCOUNT)).to_have_text(fees_after_discount)
     expect(row.locator(COL_INFRA_FEE)).to_have_text("0.05%")
     expect(row.locator(COL_MAKER_FEE)).to_have_text("10%")
@@ -639,8 +639,6 @@ def test_fills_maker_fee_tooltip_discount_program(
     change_keys(page, vega_instance, MM_WALLET.name)
     page.get_by_test_id(FILLS).click()
     row = page.get_by_test_id(TAB_FILLS).locator(ROW_LOCATOR).first
-    # tbd - tooltip is not visible without this wait
-    page.wait_for_timeout(1000)
     row.locator(COL_FEE).hover()
     expect(page.get_by_test_id(FEE_BREAKDOWN_TOOLTIP)).to_have_text(
         f"If the market was activeFee revenue to be received by the maker, takers' fee discounts already applied.During continuous trading the maker pays no infrastructure and liquidity fees.Infrastructure fee0.00 tDAILiquidity fee0.00 tDAIMaker fee-{fee} tDAITotal fees-{fee} tDAI"
@@ -678,8 +676,6 @@ def test_fills_taker_fee_tooltip_discount_program(
     page.goto(f"/#/markets/{market_id}")
     page.get_by_test_id(FILLS).click()
     row = page.get_by_test_id(TAB_FILLS).locator(ROW_LOCATOR).first
-    # tbd - tooltip is not visible without this wait
-    page.wait_for_timeout(1000)
     row.locator(COL_FEE).hover()
     expect(page.get_by_test_id(FEE_BREAKDOWN_TOOLTIP)).to_have_text(
         f"If the market was activeFees to be paid by the taker; discounts are already applied.Infrastructure fee{infra_fee} tDAILiquidity fee0.00 tDAIMaker fee{maker_fee} tDAITotal fees{total_fee} tDAI"

apps/trading/e2e/tests/get_started/test_get_started.py

@@ -1,7 +1,7 @@
 import pytest
 from playwright.sync_api import expect, Page
 import json
-from vega_sim.null_service import VegaServiceNull
+from vega_sim.service import VegaService
 from fixtures.market import setup_simple_market
 from conftest import init_vega
 from actions.vega import submit_order
@@ -16,11 +16,11 @@ def vega():
         yield vega
 
 @pytest.fixture(scope="class")
-def simple_market(vega: VegaServiceNull):
+def simple_market(vega: VegaService):
     return setup_simple_market(vega)
 
 class TestGetStarted:
-    def test_get_started_interactive(self, vega: VegaServiceNull, page: Page):
+    def test_get_started_interactive(self, vega: VegaService, page: Page):
         page.goto("/")
         # 0007-FUGS-001
         expect(page.get_by_test_id("order-connect-wallet")).to_be_visible
@@ -129,8 +129,7 @@ class TestGetStarted:
         page.get_by_test_id("get-started-button").click()
         # Assert dialog isn't visible
         expect(page.get_by_test_id("welcome-dialog")).not_to_be_visible()
-
-    @pytest.mark.skip("TODO: this test is flakey, needs fixing")
+        
     @pytest.mark.usefixtures("risk_accepted")
     def test_get_started_seen_already(self, simple_market, page: Page):
         page.goto(f"/#/markets/{simple_market}")
@@ -167,8 +166,7 @@ class TestGetStarted:
         page.wait_for_selector('[data-testid="sidebar-content"]', state="visible")
         expect(page.get_by_test_id("get-started-banner")).not_to_be_visible()
 
-    @pytest.mark.skip("tbd-market-sim")
-    def test_redirect_default_market(self, continuous_market, vega: VegaServiceNull, page: Page):
+    def test_redirect_default_market(self, continuous_market, vega: VegaService, page: Page):
         page.goto("/")
         # 0007-FUGS-012
         expect(page).to_have_url(
@@ -178,10 +176,10 @@ class TestGetStarted:
         # 0007-FUGS-018
         expect(page.get_by_test_id("welcome-dialog")).not_to_be_visible()
 
-class TestBrowseAll:
-    def test_get_started_browse_all(self, simple_market, vega: VegaServiceNull, page: Page):
+class TestBrowseAll: 
+    def test_get_started_browse_all(self, simple_market, vega: VegaService, page: Page):
         page.goto("/")
         print(simple_market)
         page.get_by_test_id("browse-markets-button").click()
         # 0007-FUGS-005
-        expect(page).to_have_url(f"http://localhost:{vega.console_port}/#/markets/{simple_market}")
+        expect(page).to_have_url(f"http://localhost:{vega.console_port}/#/markets/{simple_market}")

apps/trading/e2e/tests/iceberg_orders/test_iceberg_orders.py

@@ -1,6 +1,6 @@
 import pytest
 from playwright.sync_api import expect, Page
-from vega_sim.null_service import VegaServiceNull
+from vega_sim.service import VegaService
 from actions.vega import submit_order
 from conftest import init_vega
 from fixtures.market import setup_continuous_market
@@ -22,7 +22,7 @@ class TestIcebergOrdersValidations:
         return setup_continuous_market(vega)
 
     @pytest.mark.usefixtures("auth", "risk_accepted")
-    def test_iceberg_submit(self, continuous_market, vega: VegaServiceNull, page: Page):
+    def test_iceberg_submit(self, continuous_market, vega: VegaService, page: Page):
         page.goto(f"/#/markets/{continuous_market}")
         page.get_by_test_id("iceberg").click()
         page.get_by_test_id("order-peak-size").type("2")
@@ -47,7 +47,7 @@ class TestIcebergOrdersValidations:
         ).to_have_text("Limit (Iceberg)")
 
 @pytest.mark.usefixtures("auth", "risk_accepted")
-def test_iceberg_open_order(continuous_market, vega: VegaServiceNull, page: Page):
+def test_iceberg_open_order(continuous_market, vega: VegaService, page: Page):
     page.goto(f"/#/markets/{continuous_market}")
 
     submit_order(vega, "Key 1", continuous_market, "SIDE_SELL", 102, 101, 2, 1)
@@ -65,17 +65,16 @@ def test_iceberg_open_order(continuous_market, vega: VegaServiceNull, page: Page
     page.wait_for_selector(".ag-center-cols-container .ag-row")
 
     expect(
-        page.locator(".ag-center-cols-container .ag-row [col-id='remaining']").first
+        page.locator(".ag-center-cols-container .ag-row [col-id='remaining']")
     ).to_have_text("99")
     expect(
-        page.locator(".ag-center-cols-container .ag-row [col-id='size']").first
+        page.locator(".ag-center-cols-container .ag-row [col-id='size']")
     ).to_have_text("-102")
-    page.pause()
     expect(
-        page.locator(".ag-center-cols-container .ag-row [col-id='type'] ").first
+        page.locator(".ag-center-cols-container .ag-row [col-id='type'] ")
     ).to_have_text("Limit (Iceberg)")
     expect(
-        page.locator(".ag-center-cols-container .ag-row [col-id='status']").first
+        page.locator(".ag-center-cols-container .ag-row [col-id='status']")
     ).to_have_text("Active")
     expect(page.get_by_test_id("price-10100000")).to_be_visible
     expect(page.get_by_test_id("ask-vol-10100000")).to_have_text("3")

apps/trading/e2e/tests/liquidity_provision/test_liquidity_provision.py

@@ -1,6 +1,6 @@
 import pytest
 from playwright.sync_api import Page, expect
-from vega_sim.null_service import VegaServiceNull
+from vega_sim.service import VegaService
 from conftest import init_vega
 from fixtures.market import setup_continuous_market
 from actions.utils import next_epoch, truncate_middle, change_keys
@@ -18,7 +18,7 @@ def continuous_market(vega):
 
 
 @pytest.mark.usefixtures("auth", "risk_accepted")
-def test_liquidity_provision_amendment(continuous_market, vega: VegaServiceNull, page: Page):
+def test_liquidity_provision_amendment(continuous_market, vega: VegaService, page: Page):
     # TODO Refactor asserting the grid
     page.goto(f"/#/liquidity/{continuous_market}")
     change_keys(page, vega, "market_maker")
@@ -77,7 +77,7 @@ def test_liquidity_provision_amendment(continuous_market, vega: VegaServiceNull,
 
 @pytest.mark.skip("Waiting for the ability to cancel LP")
 @pytest.mark.usefixtures("auth", "risk_accepted")
-def test_liquidity_provision_inactive(continuous_market, vega: VegaServiceNull, page: Page):
+def test_liquidity_provision_inactive(continuous_market, vega: VegaService, page: Page):
     # TODO Refactor asserting the grid
     page.goto(f"/#/liquidity/{continuous_market}")
     change_keys(page, vega, "market_maker")

apps/trading/e2e/tests/market/test_closed_markets.py

@@ -1,7 +1,7 @@
 import pytest
 import re
 import vega_sim.api.governance as governance
-from vega_sim.null_service import VegaServiceNull
+from vega_sim.service import VegaService
 from playwright.sync_api import Page, expect
 from fixtures.market import setup_continuous_market
 from conftest import init_vega
@@ -14,7 +14,7 @@ def vega():
 
 
 @pytest.fixture(scope="class")
-def create_settled_market(vega: VegaServiceNull):
+def create_settled_market(vega: VegaService):
     market_id = setup_continuous_market(vega)
     vega.submit_termination_and_settlement_data(
         settlement_key="FJMKnwfZdd48C8NqvYrG",
@@ -115,7 +115,7 @@ class TestSettledMarket:
 
 
 @pytest.mark.usefixtures("risk_accepted", "auth")
-def test_terminated_market_no_settlement_date(page: Page, vega: VegaServiceNull):
+def test_terminated_market_no_settlement_date(page: Page, vega: VegaService):
     setup_continuous_market(vega)
     print("I have started test_terminated_market_no_settlement_date")
     governance.submit_oracle_data(

apps/trading/e2e/tests/market/test_market.py

@@ -1,6 +1,6 @@
 import pytest
 from playwright.sync_api import Page, expect
-from vega_sim.null_service import VegaServiceNull
+from vega_sim.service import VegaService
 from actions.vega import submit_order
 from actions.utils import change_keys
 from wallet_config import MM_WALLET, MM_WALLET2
@@ -30,9 +30,9 @@ initial_volume: float = 1
 initial_spread: float = 0.1
 market_name = "BTC:DAI_2023"
 
-@pytest.mark.skip("tbd")
+
 @pytest.mark.usefixtures("risk_accepted", "auth")
-def test_price_monitoring(simple_market, vega: VegaServiceNull, page: Page):
+def test_price_monitoring(simple_market, vega: VegaService, page: Page):
     page.goto(f"/#/markets/all")
     expect(page.locator(table_row_selector).locator(trading_mode_col)).to_have_text(
         "Opening auction"
@@ -202,21 +202,17 @@ COL_ID_FEE = ".ag-center-cols-container [col-id='fee'] .ag-cell-value"
 
 
 @pytest.mark.usefixtures("risk_accepted", "auth")
-def test_auction_uncross_fees(continuous_market, vega: VegaServiceNull, page: Page):
+def test_auction_uncross_fees(continuous_market, vega: VegaService, page: Page):
     page.goto(f"/#/markets/{continuous_market}")
     page.get_by_test_id("Fills").click()
     expect(page.locator(COL_ID_FEE)).to_have_text("0.00 tDAI")
-    # tbd - tooltip is not visible without this wait
-    page.wait_for_timeout(1000)
-    page.get_by_role("gridcell", name="0.00 tDAI").nth(0).hover()
+    page.locator(COL_ID_FEE).hover()
     expect(page.get_by_test_id("fee-breakdown-tooltip")).to_have_text(
         "If the market was suspendedDuring auction, half the infrastructure and liquidity fees will be paid.Infrastructure fee0.00 tDAILiquidity fee0.00 tDAIMaker fee0.00 tDAITotal fees0.00 tDAI"
     )
     change_keys(page, vega, "market_maker")
     expect(page.locator(COL_ID_FEE)).to_have_text("0.00 tDAI")
-    # tbd - tooltip is not visible without this wait
-    page.wait_for_timeout(1000)
-    page.get_by_role("gridcell", name="0.00 tDAI").nth(0).hover()
+    page.locator(COL_ID_FEE).hover()
     expect(page.get_by_test_id("fee-breakdown-tooltip")).to_have_text(
         "If the market was suspendedDuring auction, half the infrastructure and liquidity fees will be paid.Infrastructure fee0.00 tDAILiquidity fee0.00 tDAIMaker fee0.00 tDAITotal fees0.00 tDAI"
     )

apps/trading/e2e/tests/market/test_market_info.py

@@ -1,7 +1,7 @@
 import re
 import pytest
 from playwright.sync_api import Page, expect
-from vega_sim.null_service import VegaServiceNull
+from vega_sim.service import VegaService
 from fixtures.market import setup_continuous_market
 from conftest import init_page, init_vega, risk_accepted_setup
 
@@ -42,7 +42,7 @@ def validate_info_section(page: Page, fields: [[str, str]]):
             page.get_by_test_id("key-value-table-row").nth(rowNumber).locator("dd")
         ).to_contain_text(value)
 
-@pytest.mark.skip("tbd-market-sim")
+
 def test_market_info_current_fees(page: Page):
     # 6002-MDET-101
     page.get_by_test_id(market_title_test_id).get_by_text("Current fees").click()
@@ -54,7 +54,7 @@ def test_market_info_current_fees(page: Page):
     ]
     validate_info_section(page, fields)
 
-@pytest.mark.skip("tbd-market-sim")
+
 def test_market_info_market_price(page: Page):
     # 6002-MDET-102
     page.get_by_test_id(market_title_test_id).get_by_text("Market price").click()
@@ -66,7 +66,7 @@ def test_market_info_market_price(page: Page):
     ]
     validate_info_section(page, fields)
 
-@pytest.mark.skip("tbd-market-sim")
+
 def test_market_info_market_volume(page: Page):
     # 6002-MDET-103
     page.get_by_test_id(market_title_test_id).get_by_text("Market volume").click()
@@ -80,15 +80,15 @@ def test_market_info_market_volume(page: Page):
     ]
     validate_info_section(page, fields)
 
-@pytest.mark.skip("tbd-market-sim")
+
 def test_market_info_insurance_pool(page: Page):
     # 6002-MDET-104
     page.get_by_test_id(market_title_test_id).get_by_text("Insurance pool").click()
     fields = [["Balance", "0.00 tDAI"]]
     validate_info_section(page, fields)
 
-@pytest.mark.skip("tbd-market-sim")
-def test_market_info_key_details(page: Page, vega: VegaServiceNull):
+
+def test_market_info_key_details(page: Page, vega: VegaService):
     # 6002-MDET-201
     page.get_by_test_id(market_title_test_id).get_by_text("Key details").click()
     market_id = vega.find_market_id("BTC:DAI_2023")
@@ -106,7 +106,7 @@ def test_market_info_key_details(page: Page, vega: VegaServiceNull):
     ]
     validate_info_section(page, fields)
 
-@pytest.mark.skip("tbd-market-sim")
+
 def test_market_info_instrument(page: Page):
     # 6002-MDET-202
     page.get_by_test_id(market_title_test_id).get_by_text("Instrument").click()
@@ -121,7 +121,7 @@ def test_market_info_instrument(page: Page):
 
 # @pytest.mark.skip("oracle test to be fixed")
 
-@pytest.mark.skip("tbd-market-sim")
+
 def test_market_info_oracle(page: Page):
     # 6002-MDET-203
     page.get_by_test_id(market_title_test_id).get_by_text("Oracle").click()
@@ -135,8 +135,8 @@ def test_market_info_oracle(page: Page):
     #     "href", re.compile(rf'(\/oracles\/{vega.find_market_id("BTC:DAI_2023")})')
     # )
 
-@pytest.mark.skip("tbd-market-sim")
-def test_market_info_settlement_asset(page: Page, vega: VegaServiceNull):
+
+def test_market_info_settlement_asset(page: Page, vega: VegaService):
     # 6002-MDET-206
     page.get_by_test_id(market_title_test_id).get_by_text("Settlement asset").click()
     tdai_id = vega.find_asset_id("tDAI")
@@ -155,7 +155,7 @@ def test_market_info_settlement_asset(page: Page, vega: VegaServiceNull):
     ]
     validate_info_section(page, fields)
 
-@pytest.mark.skip("tbd-market-sim")
+
 def test_market_info_metadata(page: Page):
     # 6002-MDET-207
     page.get_by_test_id(market_title_test_id).get_by_text("Metadata").click()
@@ -164,7 +164,7 @@ def test_market_info_metadata(page: Page):
     ]
     validate_info_section(page, fields)
 
-@pytest.mark.skip("tbd-market-sim")
+
 def test_market_info_risk_model(page: Page):
     # 6002-MDET-208
     page.get_by_test_id(market_title_test_id).get_by_text("Risk model").click()
@@ -175,7 +175,7 @@ def test_market_info_risk_model(page: Page):
     ]
     validate_info_section(page, fields)
 
-@pytest.mark.skip("tbd-market-sim")
+
 def test_market_info_margin_scaling_factors(page: Page):
     # 6002-MDET-209
     page.get_by_test_id(market_title_test_id).get_by_text(
@@ -190,7 +190,7 @@ def test_market_info_margin_scaling_factors(page: Page):
     ]
     validate_info_section(page, fields)
 
-@pytest.mark.skip("tbd-market-sim")
+
 def test_market_info_risk_factors(page: Page):
     # 6002-MDET-210
     page.get_by_test_id(market_title_test_id).get_by_text("Risk factors").click()
@@ -204,7 +204,7 @@ def test_market_info_risk_factors(page: Page):
     ]
     validate_info_section(page, fields)
 
-@pytest.mark.skip("tbd-market-sim")
+
 def test_market_info_price_monitoring_bounds(page: Page):
     # 6002-MDET-211
     page.get_by_test_id(market_title_test_id).get_by_text(
@@ -220,7 +220,7 @@ def test_market_info_price_monitoring_bounds(page: Page):
     ]
     validate_info_section(page, fields)
 
-@pytest.mark.skip("tbd-market-sim")
+
 def test_market_info_liquidity_monitoring_parameters(page: Page):
     # 6002-MDET-212
     page.get_by_test_id(market_title_test_id).get_by_text(
@@ -233,7 +233,7 @@ def test_market_info_liquidity_monitoring_parameters(page: Page):
     ]
     validate_info_section(page, fields)
 
-@pytest.mark.skip("tbd-market-sim")
+
 # Liquidity resolves to 3 results
 def test_market_info_liquidit(page: Page):
     # 6002-MDET-213
@@ -246,7 +246,7 @@ def test_market_info_liquidit(page: Page):
     ]
     validate_info_section(page, fields)
 
-@pytest.mark.skip("tbd-market-sim")
+
 def test_market_info_liquidity_price_range(page: Page):
     # 6002-MDET-214
     page.get_by_test_id(market_title_test_id).get_by_text(
@@ -259,8 +259,8 @@ def test_market_info_liquidity_price_range(page: Page):
     ]
     validate_info_section(page, fields)
 
-@pytest.mark.skip("tbd-market-sim")
-def test_market_info_proposal(page: Page, vega: VegaServiceNull):
+
+def test_market_info_proposal(page: Page, vega: VegaService):
     # 6002-MDET-301
     page.get_by_test_id(market_title_test_id).get_by_text("Proposal").click()
     first_link = (
@@ -280,9 +280,8 @@ def test_market_info_proposal(page: Page, vega: VegaServiceNull):
         "href", re.compile(r"(\/proposals\/propose\/update-market)")
     )
 
-    
 @pytest.mark.skip("tbd-market-sim")
-def test_market_info_succession_line(page: Page, vega: VegaServiceNull):
+def test_market_info_succession_line(page: Page, vega: VegaService):
     page.get_by_test_id(market_title_test_id).get_by_text("Succession line").click()
     market_id = vega.find_market_id("BTC:DAI_2023")
     succession_line = page.get_by_test_id("succession-line-item")

apps/trading/e2e/tests/market/test_market_selector.py

@@ -9,16 +9,16 @@ def test_market_selector(continuous_market, page: Page):
     page.get_by_test_id("header-title").click()
     # 6001-MARK-066
     expect(page.get_by_test_id("market-selector")).to_be_visible()
+
     # 6001-MARK-021
     # 6001-MARK-022
     # 6001-MARK-024
     # 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"
     )
@@ -43,6 +43,7 @@ def test_market_selector_filter(continuous_market, page: Page):
     page.goto(f"/#/markets/{continuous_market}")
     page.get_by_test_id("header-title").click()
     # 6001-MARK-027
+
     page.get_by_test_id("product-Spot").click()
     expect(page.get_by_test_id("market-selector-list")).to_contain_text(
         "Spot markets coming soon."
@@ -57,9 +58,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 +83,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"
     )

apps/trading/e2e/tests/market/test_markets_proposed.py

@@ -2,7 +2,7 @@ import pytest
 import vega_sim.api.governance as governance
 import re
 from playwright.sync_api import Page, expect
-from vega_sim.null_service import VegaServiceNull
+from vega_sim.service import VegaService
 from conftest import init_vega
 from fixtures.market import setup_simple_market
 from wallet_config import MM_WALLET
@@ -18,7 +18,7 @@ def vega(request):
 
 
 @pytest.fixture(scope="module")
-def proposed_market(vega: VegaServiceNull):
+def proposed_market(vega: VegaService):
     # setup market without liquidity provided
     market_id = setup_simple_market(vega, approve_proposal=False)
     # approve market

apps/trading/e2e/tests/market/test_monitoring_auction_price_volatility_market.py

@@ -1,6 +1,6 @@
 import pytest
 from playwright.sync_api import Page, expect
-from vega_sim.null_service import VegaServiceNull
+from vega_sim.service import VegaService
 from actions.vega import submit_order
 from fixtures.market import setup_simple_market
 from conftest import init_vega
@@ -20,7 +20,7 @@ def simple_market(vega):
 
 
 @pytest.fixture(scope="module")
-def setup_market_monitoring_auction(vega: VegaServiceNull, simple_market):
+def setup_market_monitoring_auction(vega: VegaService, simple_market):
     vega.submit_liquidity(
         key_name=MM_WALLET.name,
         market_id=simple_market,
@@ -82,7 +82,7 @@ def setup_market_monitoring_auction(vega: VegaServiceNull, simple_market):
 
 @pytest.mark.usefixtures("risk_accepted", "auth", "setup_market_monitoring_auction")
 def test_market_monitoring_auction_price_volatility_limit_order(
-    page: Page, simple_market, vega: VegaServiceNull
+    page: Page, simple_market, vega: VegaService
 ):
     page.goto(f"/#/markets/{simple_market}")
     page.get_by_test_id("order-size").clear()

apps/trading/e2e/tests/market_lifecycle/test_market_lifecycle.py

@@ -1,16 +1,16 @@
 import pytest
 import re
+import vega_sim.api.governance as governance
 from playwright.sync_api import Page, expect
-from vega_sim.null_service import VegaServiceNull
-from vega_sim.service import PeggedOrder, MarketStateUpdateType
+from vega_sim.service import VegaService, PeggedOrder
 import vega_sim.api.governance as governance
 from actions.vega import submit_order
 from actions.utils import next_epoch
 from wallet_config import MM_WALLET, MM_WALLET2, GOVERNANCE_WALLET
-from vega_sim.api import governance
+
 
 @pytest.mark.usefixtures("risk_accepted")
-def test_market_lifecycle(proposed_market, vega: VegaServiceNull, page: Page):
+def test_market_lifecycle(proposed_market, vega: VegaService, page: Page):
     # 7002-SORD-001
     # 7002-SORD-002
     trading_mode = page.get_by_test_id("market-trading-mode").get_by_test_id(
@@ -126,44 +126,6 @@ def test_market_lifecycle(proposed_market, vega: VegaServiceNull, page: Page):
     expect(trading_mode).to_have_text("Continuous")
     expect(market_state).to_have_text("Active")
 
-    vega.update_market_state(
-        market_id = market_id,
-        proposal_key = MM_WALLET.name,
-        market_state = MarketStateUpdateType.Suspend,
-        forward_time_to_enactment = False
-    )
-
-    expect(
-        page
-            .get_by_test_id("market-banner")
-            .get_by_test_id(f"update-state-banner-{market_id}")
-    ).to_be_visible()
-
-    vega.forward("60s")
-    vega.wait_fn(1)
-    vega.wait_for_total_catchup()
-
-    expect(
-        page.get_by_test_id("market-banner")
-    ).to_have_text("Market was suspended by governance")
-
-    # banner should not show after resume
-    vega.update_market_state(
-        market_id = market_id,
-        proposal_key = MM_WALLET.name,
-        market_state = MarketStateUpdateType.Resume,
-        forward_time_to_enactment = False
-    )
-
-    vega.forward("60s")
-    vega.wait_fn(1)
-    vega.wait_for_total_catchup()
-
-    expect(page.get_by_test_id("market-banner")).not_to_be_visible()
-
-    # TODO test update market, sim will currently auto approve and enacted
-    # a market update proposals
-
     # put invalid oracle to trigger market termination
     governance.submit_oracle_data(
         wallet=vega.wallet,
@@ -191,9 +153,6 @@ def test_market_lifecycle(proposed_market, vega: VegaServiceNull, page: Page):
     # check market state is now settled
     expect(trading_mode).to_have_text("No trading")
     expect(market_state).to_have_text("Settled")
-    expect(
-        page.get_by_test_id("market-banner")
-    ).to_have_text("This market has been settled")
 
 
 """ @pytest.mark.usefixtures("page", "risk_accepted", "continuous_market")
@@ -222,19 +181,19 @@ def test_market_closing_banners(page: Page, continuous_market, vega: VegaService
         forward_time_to_enactment = False,
         price=110,
     )
-
+    
     expect(page.locator(".grow")).to_have_text("Trading on Market BTC:DAI_2023 may stop. There are open proposals to close this marketView proposals")
 
-    governance.approve_proposal(
+    governance.approve_proposal( 
         proposal_id=proposalID,
         wallet=vega.wallet,
         key_name="market_maker"
-
+        
     )
     vega.forward("60s")
     vega.wait_fn(10)
     vega.wait_for_total_catchup()
-
+  
     will_close_pattern = r"TRADING ON MARKET BTC:DAI_2023 WILL STOP ON \d+ \w+\nYou will no longer be able to hold a position on this market when it closes in \d+ days \d+ hours\. The final price will be 107\.00 BTC\."
     match_result = re.fullmatch(will_close_pattern, page.locator(".grow").inner_text())
     assert match_result is not None

apps/trading/e2e/tests/order/test_order_details.py

@@ -1,7 +1,7 @@
 import pytest
 import re
 from playwright.sync_api import expect, Page
-from vega_sim.null_service import VegaServiceNull
+from vega_sim.service import VegaService
 from actions.vega import submit_order
 
 order_details = [
@@ -42,10 +42,6 @@ def verify_order_value(
     expect(element).to_be_visible()
     if is_regex:
         actual_text = element.text_content()
-
-        if actual_text is None:
-          raise Exception(f"no text found for test_id {test_id}")
-
         assert re.match(
             expected_text, actual_text
         ), f"Expected {expected_text}, but got {actual_text}"
@@ -56,7 +52,7 @@ def verify_order_value(
 @pytest.mark.skip("tbd")
 @pytest.mark.usefixtures("auth", "risk_accepted")
 def test_order_details_are_correctly_displayed(
-    continuous_market, vega: VegaServiceNull, page: Page
+    continuous_market, vega: VegaService, page: Page
 ):
     page.goto(f"/#/markets/{continuous_market}")
     submit_order(vega, "Key 1", vega.all_markets()[0].id, "SIDE_SELL", 102, 101, 2, 1)

apps/trading/e2e/tests/order/test_order_match.py

@@ -2,7 +2,7 @@ import pytest
 import re
 import logging
 from playwright.sync_api import expect, Page
-from vega_sim.null_service import VegaServiceNull
+from vega_sim.service import VegaService
 from playwright.sync_api import expect
 from actions.vega import submit_order
 
@@ -16,11 +16,11 @@ def verify_data_grid(page: Page, data_test_id, expected_pattern):
     expect(
         page.locator(
             f'[data-testid^="tab-{data_test_id.lower()}"] >> .ag-center-cols-container .ag-row-first'
-        ).first
+        )
     ).to_be_visible()
     actual_text = page.locator(
         f'[data-testid^="tab-{data_test_id.lower()}"] >> .ag-center-cols-container .ag-row-first'
-    ).first.text_content()
+    ).text_content()
     lines = actual_text.strip().split("\n")
     for expected, actual in zip(expected_pattern, lines):
         # We are using regex so that we can run tests in different timezones.
@@ -38,7 +38,7 @@ def verify_data_grid(page: Page, data_test_id, expected_pattern):
                 raise AssertionError(f"Pattern does not match: {expected} != {actual}")
 
 
-def submit_order(vega: VegaServiceNull, wallet_name, market_id, side, volume, price):
+def submit_order(vega: VegaService, wallet_name, market_id, side, volume, price):
     vega.submit_order(
         trading_key=wallet_name,
         market_id=market_id,
@@ -52,7 +52,7 @@ def submit_order(vega: VegaServiceNull, wallet_name, market_id, side, volume, pr
 
 @pytest.mark.usefixtures("auth", "risk_accepted")
 def test_limit_order_trade_open_order(
-    opening_auction_market, vega: VegaServiceNull, page: Page
+    opening_auction_market, vega: VegaService, page: Page
 ):
     market_id = opening_auction_market
     submit_order(vega, "Key 1", market_id, "SIDE_BUY", 1, 110)

apps/trading/e2e/tests/order/test_order_status.py

@@ -1,7 +1,6 @@
 import pytest
 from playwright.sync_api import Page, expect
-from vega_sim.service import PeggedOrder
-from vega_sim.null_service import VegaServiceNull
+from vega_sim.service import VegaService, PeggedOrder
 from conftest import auth_setup, init_page, init_vega, risk_accepted_setup
 from fixtures.market import setup_continuous_market, setup_simple_market
 from actions.utils import wait_for_toast_confirmation
@@ -16,7 +15,7 @@ def vega(request):
 
 
 @pytest.fixture(scope="module", autouse=True)
-def markets(vega: VegaServiceNull):
+def markets(vega: VegaService):
     market_1 = setup_continuous_market(
         vega,
         custom_market_name="market-1",
@@ -358,7 +357,7 @@ def test_order_status_pegged_mid(page: Page):
     )
 
 
-def test_order_amend_order(vega: VegaServiceNull, page: Page):
+def test_order_amend_order(vega: VegaService, page: Page):
     #  7002-SORD-053
     #  7003-MORD-012
     #  7003-MORD-014
@@ -378,7 +377,7 @@ def test_order_amend_order(vega: VegaServiceNull, page: Page):
     )
 
 
-def test_order_cancel_single_order(vega: VegaServiceNull, page: Page):
+def test_order_cancel_single_order(vega: VegaService, page: Page):
     #  7003-MORD-009
     #  7003-MORD-010
     #  7003-MORD-011
@@ -395,7 +394,7 @@ def test_order_cancel_single_order(vega: VegaServiceNull, page: Page):
     )
 
 
-def test_order_cancel_all_orders(vega: VegaServiceNull, page: Page):
+def test_order_cancel_all_orders(vega: VegaService, page: Page):
     #  7003-MORD-009
     #  7003-MORD-010
     #  7003-MORD-011

apps/trading/e2e/tests/perpetual_market/test_perpetuals.py

@@ -1,7 +1,7 @@
 import pytest
 import re
 from playwright.sync_api import Page, expect
-from vega_sim.null_service import VegaServiceNull
+from vega_sim.service import VegaService
 from vega_sim.service import MarketStateUpdateType
 from datetime import datetime, timedelta
 from conftest import init_vega
@@ -21,7 +21,7 @@ class TestPerpetuals:
             yield vega
 
     @pytest.fixture(scope="class")
-    def perps_market(self, vega: VegaServiceNull):
+    def perps_market(self, vega: VegaService):
         perps_market = setup_perps_market(vega)
         submit_multiple_orders(
             vega, MM_WALLET.name, perps_market, "SIDE_SELL", [[1, 110], [1, 105]]
@@ -96,7 +96,7 @@ class TestPerpetuals:
 
 
 @pytest.mark.usefixtures("risk_accepted", "auth")
-def test_perps_market_termination_proposed(page: Page, vega: VegaServiceNull):
+def test_perps_market_termination_proposed(page: Page, vega: VegaService):
     perpetual_market = setup_perps_market(vega)
     page.goto(f"/#/markets/{perpetual_market}")
     vega.update_market_state(
@@ -109,15 +109,14 @@ def test_perps_market_termination_proposed(page: Page, vega: VegaServiceNull):
         approve_proposal=True,
         forward_time_to_enactment=False,
     )
-
     vega.forward("10s")
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
     banner_text = page.get_by_test_id(
-        f"update-state-banner-{perpetual_market}"
+        f"termination-warning-banner-{perpetual_market}"
     ).text_content()
     pattern = re.compile(
-        r"Trading on market BTC:DAI_Perpetual may stop on \d{2} [A-Za-z]+\. There is an open proposal to close this market\.Proposed final price is 100\.00 BTC\. View proposal"
+        r"Trading on Market BTC:DAI_Perpetual may stop on \d{2} [A-Za-z]+\. There is open proposal to close this market\.Proposed final price is 100\.00 BTC\.View proposal"
     )
     assert pattern.search(
         banner_text
@@ -125,7 +124,7 @@ def test_perps_market_termination_proposed(page: Page, vega: VegaServiceNull):
 
 
 @pytest.mark.usefixtures("risk_accepted", "auth")
-def test_perps_market_terminated(page: Page, vega: VegaServiceNull):
+def test_perps_market_terminated(page: Page, vega: VegaService):
     perpetual_market = setup_perps_market(vega)
     vega.update_market_state(
         proposal_key=MM_WALLET.name,

apps/trading/e2e/tests/pnl/test_pnl.py

@@ -1,6 +1,6 @@
 import pytest
 from playwright.sync_api import Page
-from vega_sim.null_service import VegaServiceNull
+from vega_sim.service import VegaService
 from actions.vega import submit_order
 from actions.utils import change_keys
 
@@ -13,7 +13,7 @@ def check_pnl_color_value(element, expected_color, expected_value):
 
 
 @pytest.mark.usefixtures("auth", "risk_accepted")
-def test_pnl(continuous_market, vega: VegaServiceNull, page: Page):
+def test_pnl(continuous_market, vega: VegaService, page: Page):
     page.set_viewport_size({"width": 1748, "height": 977})
     submit_order(vega, "Key 1", continuous_market, "SIDE_BUY", 1, 104.50000)
     vega.wait_fn(1)

apps/trading/e2e/tests/positions/test_collateral.py

@@ -1,6 +1,6 @@
 import pytest
 from playwright.sync_api import Page, expect
-from vega_sim.null_service import VegaServiceNull
+from vega_sim.service import VegaService
 from conftest import init_vega
 from fixtures.market import setup_continuous_market
 
@@ -16,7 +16,7 @@ def vega(request):
 
 
 @pytest.fixture(scope="module")
-def continuous_market(vega: VegaServiceNull):
+def continuous_market(vega: VegaService):
     return setup_continuous_market(vega)
 
 

apps/trading/e2e/tests/positions/test_positions.py

@@ -1,13 +1,13 @@
 import pytest
 from playwright.sync_api import Page, expect
-from vega_sim.null_service import VegaServiceNull
+from vega_sim.service import VegaService
 from fixtures.market import (
     setup_continuous_market,
 )
 
 
 @pytest.mark.usefixtures("auth", "risk_accepted")
-def test_closed_market_position(vega: VegaServiceNull, page: Page):
+def test_closed_market_position(vega: VegaService, page: Page):
     market_id = setup_continuous_market(vega)
 
     vega.submit_termination_and_settlement_data(

apps/trading/e2e/tests/referrals/test_referrals.py

@@ -1,6 +1,6 @@
 import pytest
-from playwright.sync_api import Page
-from vega_sim.null_service import VegaServiceNull
+from playwright.sync_api import Page, expect
+from vega_sim.service import VegaService
 from conftest import init_vega
 from fixtures.market import setup_continuous_market, setup_simple_market
 from actions.utils import change_keys, create_and_faucet_wallet, forward_time, selector_contains_text
@@ -72,7 +72,7 @@ def create_staking_tier(minimum_staked_tokens, referral_reward_multiplier):
     }
 
 
-def setup_market_and_referral_scheme(vega: VegaServiceNull, continuous_market: str, page: Page):
+def setup_market_and_referral_scheme(vega: VegaService, continuous_market: str, page: Page):
     page.goto(f"/#/markets/{continuous_market}")
 
     create_and_faucet_wallet(vega=vega, wallet=PARTY_A)
@@ -118,7 +118,7 @@ def setup_market_and_referral_scheme(vega: VegaServiceNull, continuous_market: s
 
 
 @pytest.mark.usefixtures("page", "auth", "risk_accepted")
-def test_can_traverse_up_and_down_through_tiers(continuous_market, vega: VegaServiceNull, page: Page):
+def test_can_traverse_up_and_down_through_tiers(continuous_market, vega: VegaService, page: Page):
     setup_market_and_referral_scheme(vega, continuous_market, page)
     change_keys(page, vega, PARTY_B.name)
     submit_order(vega, PARTY_B.name, continuous_market, "SIDE_BUY", 1, 115)
@@ -162,7 +162,7 @@ def test_can_traverse_up_and_down_through_tiers(continuous_market, vega: VegaSer
 
 
 @pytest.mark.usefixtures("page", "auth", "risk_accepted")
-def test_does_not_move_up_tiers_when_not_enough_epochs(continuous_market, vega: VegaServiceNull, page: Page):
+def test_does_not_move_up_tiers_when_not_enough_epochs(continuous_market, vega: VegaService, page: Page):
     setup_market_and_referral_scheme(vega, continuous_market, page)
     change_keys(page, vega, PARTY_B.name)
     submit_order(vega, PARTY_B.name, continuous_market, "SIDE_BUY", 2, 115)

apps/trading/e2e/tests/settings/test_column_settings.py

@@ -1,36 +0,0 @@
-import pytest
-from playwright.sync_api import expect, Page
-
-settings_icon = "icon-cog"
-settings_column_btn = "popover-trigger"
-settings_close_btn = "settings-close"
-split_view_view = "split-view-view"
-
-@pytest.mark.usefixtures("page", "continuous_market", "auth", "risk_accepted")
-def test_column_settings_is_visible(continuous_market, page: Page):
-    page.goto(f"/#/markets/{continuous_market}")
-    expect(page.get_by_test_id(split_view_view).get_by_test_id(settings_column_btn)).to_be_visible()
-    page.goto("/#/portfolio")
-    expect(page.get_by_test_id(split_view_view).get_by_test_id(settings_column_btn).nth(0)).to_be_visible()
-    expect(page.get_by_test_id(split_view_view).get_by_test_id(settings_column_btn).nth(1)).to_be_visible()
-    page.goto(f"/#/markets/all")
-    expect(page.get_by_test_id(settings_column_btn)).to_be_visible()
-    page.click('[data-testid="Proposed markets"]')
-    expect(page.get_by_test_id(settings_column_btn)).to_be_visible()
-    page.click('[data-testid="Closed markets"]')
-    expect(page.get_by_test_id(settings_column_btn)).to_be_visible()
-
-@pytest.mark.usefixtures("page", "continuous_market", "auth", "risk_accepted")
-def test_can_reset_columns_state(continuous_market, page: Page):
-    page.goto(f"/#/markets/all")
-    col_market = page.locator('[col-id="tradableInstrument.instrument.code"]').first
-    col_settlement_asset = page.locator('[col-id="tradableInstrument.instrument.product.settlementAsset.symbol"]').first
-    col_market.drag_to(col_settlement_asset)
-
-    # Check the attribute of the dragged element
-    attribute_value = col_market.get_attribute("aria-colindex")
-    assert attribute_value != "1"
-    page.get_by_test_id(settings_column_btn).click()
-    page.get_by_role("button", name="Reset Columns").click()
-    attribute_value_after_reset = col_market.get_attribute("aria-colindex")
-    assert attribute_value_after_reset  == "1"