fix: e2e

.github/workflows/console-test-run.yml

@@ -19,7 +19,7 @@ jobs:
   create-docker-image:
     name: Create docker image for console-test
     runs-on: ubuntu-22.04
-    timeout-minutes: 90
+    timeout-minutes: 20
     steps:
       #----------------------------------------------
       #       check-out frontend-monorepo
@@ -138,7 +138,7 @@ jobs:
     name: run-tests
     runs-on: 8-cores
     needs: [create-docker-image, console-test-branch]
-    timeout-minutes: 90
+    timeout-minutes: 20
     steps:
       #----------------------------------------------
       #       load docker image
@@ -205,7 +205,7 @@ jobs:
       # run tests
       #----------------------------------------------
       - name: Run tests
-        run: CONSOLE_IMAGE_NAME=ci/trading:local poetry run pytest -v -s --numprocesses 2 --dist loadfile --durations=90
+        run: CONSOLE_IMAGE_NAME=ci/trading:local poetry run pytest -v -s --numprocesses 4 --dist loadfile --durations=15
         working-directory: apps/trading/e2e
       #----------------------------------------------
       # upload traces
@@ -227,46 +227,3 @@ jobs:
           name: worker-logs
           path: ./logs/
           retention-days: 15
-      #----------------------------------------------
-      #  -----  upload market-sim logs  -----
-      #----------------------------------------------
-      - name: Prepare and Zip market-sim-logs
-        if: always()
-        run: |
-          parent_dir="/tmp/market-sim-logs"
-          echo "Creating parent directory at $parent_dir"
-          mkdir -p "$parent_dir"
-
-          echo "Waiting for vega-sim-* folders to be created..."
-          sleep 10  # Waits 10 seconds to ensure all folders are created
-
-          echo "Before searching for vega-sim-* folders in /tmp..."
-          folders=$(find /tmp -mindepth 1 -type d -name 'vega-sim-*' -print) || echo "Find command failed with exit code $?"
-
-          echo "After searching for vega-sim-* folders in /tmp..."
-
-          if [ -z "$folders" ]; then
-            echo "No vega-sim-* folders found."
-            exit 0
-          fi
-
-          echo "Moving vega-sim-* folders to $parent_dir"
-          echo "$folders" | xargs -I {} mv {} "$parent_dir/"
-
-          echo "Checking if $parent_dir is not empty..."
-          if [ "$(ls -A $parent_dir)" ]; then
-            echo "Zipping the parent directory..."
-            zip -r market-sim-logs.zip "$parent_dir" && echo "Zip file created successfully."
-          else
-            echo "$parent_dir is empty. No zip file created."
-            exit 0
-          fi
-        shell: /usr/bin/bash -e {0}
-
-      - name: Upload market-sim-logs
-        uses: actions/upload-artifact@v3
-        if: always()
-        with:
-          name: market-sim-logs
-          path: market-sim-logs.zip
-          retention-days: 15

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

@@ -44,7 +44,7 @@ context('Proposal page', { tags: '@smoke' }, function () {
       cy.getByTestId('icon-cross').click();
     });
 
-    it('Proposal page displayed on mobile', function () {
+    it.skip('Proposal page displayed on mobile', function () {
       const proposalTitle = 'Add Lorem Ipsum market';
 
       cy.common_switch_to_mobile_and_click_toggle();
@@ -55,7 +55,7 @@ context('Proposal page', { tags: '@smoke' }, function () {
       });
     });
 
-    it.skip('Able to view new asset proposal', function () {
+    it('Able to view new asset proposal', function () {
       const proposalTitle = 'Test new asset proposal';
       const newAssetProposalBody = getNewAssetTxBody();
       cy.VegaWalletSubmitProposal(newAssetProposalBody);

apps/explorer/src/app/components/links/party-link/party-link.tsx

@@ -60,7 +60,7 @@ const PartyLink = ({ id, truncate = false, ...props }: PartyLinkProps) => {
   }
 
   return (
-    <span>
+    <span className="whitespace-nowrap">
       {useName && <Icon size={4} name="cube" className="mr-2" />}
       <Link
         className="underline font-mono"

apps/explorer/src/app/components/order-details/deterministic-order-details.tsx

@@ -60,7 +60,7 @@ const DeterministicOrderDetails = ({
   const o = data.orderByID;
   return (
     <div className={wrapperClasses}>
-      <div className="mb-0">
+      <div className="mb-12 lg:mb-0">
         <div className="relative block px-3 py-6 md:px-6 lg:-mr-7">
           <h2 className="text-3xl font-bold mb-4 display-5">
             <abbr title={tifFull[o.timeInForce]} className="bb-dotted mr-2">
@@ -89,9 +89,9 @@ const DeterministicOrderDetails = ({
               <span>{t('Reference')}</span>: {o.reference}
             </p>
           ) : null}
-          <div className="grid grid-cols-2 md:grid-cols-5 gap-x-6 mt-4">
-            <div className="mb-6 md:mb-0">
-              <h2 className="text-2xl font-bold text-dark mb-0 md:mb-4">
+          <div className="grid md:grid-cols-5 gap-x-6 mt-4">
+            <div className="mb-12 md:mb-0">
+              <h2 className="text-2xl font-bold text-dark mb-4">
                 {t('Status')}
               </h2>
               <h5 className="text-lg font-medium text-gray-500 mb-0 capitalize">
@@ -99,17 +99,15 @@ const DeterministicOrderDetails = ({
               </h5>
             </div>
 
-            <div className="mb-6 md:mb-0">
-              <h2 className="text-2xl font-bold text-dark mb-0 md:mb-4">
-                {t('Size')}
-              </h2>
+            <div className="mb-12 md:mb-0">
+              <h2 className="text-2xl font-bold text-dark mb-4">{t('Size')}</h2>
               <h5 className="text-lg font-medium text-gray-500 mb-0">
                 <SizeInMarket size={o.size} marketId={o.market.id} />
               </h5>
             </div>
 
-            <div className="mb-6 md:mb-0">
-              <h2 className="text-2xl font-bold text-dark mb-0 md:mb-4">
+            <div className="">
+              <h2 className="text-2xl font-bold text-dark mb-4">
                 {t('Version')}
               </h2>
               <h5 className="text-lg font-medium text-gray-500 mb-0">
@@ -117,8 +115,8 @@ const DeterministicOrderDetails = ({
               </h5>
             </div>
             {o.type ? (
-              <div className="mb-6 md:mb-0">
-                <h2 className="text-2xl font-bold text-dark mb-0 md:mb-4">
+              <div className="">
+                <h2 className="text-2xl font-bold text-dark mb-4">
                   {t('Type')}
                 </h2>
                 <h5 className="text-lg font-medium text-gray-500 mb-0">

apps/explorer/src/app/components/signature/signature.tsx

@@ -30,12 +30,12 @@ export const Signature = ({ signature }: SignatureProps) => {
 
   return (
     <div className="inline-flex border rounded signature-component relative pr-[20px]">
-      <div
+      <span
         className="bg-gray-100 px-2.5 py-0.5 text-xs text-gray-500 select-none cursor-default"
-        title={`${signature.algo}`}
+        title={`Version ${signature.version}`}
       >
-        <span>v{signature.version}</span>
-      </div>
+        {signature.algo}
+      </span>
       <div
         className={
           isOpen

apps/explorer/src/app/routes/layout.tsx

@@ -73,7 +73,7 @@ export const Layout = () => {
           <ProtocolUpgradeInProgressNotification />
         </div>
         <div className={fixedWidthClasses}>
-          <main className="md:p-4">
+          <main className="p-4">
             {!isHome && <BreadcrumbsContainer className="mb-4" />}
             <Outlet />
           </main>

apps/governance-e2e/src/support/proposal.functions.ts

@@ -196,7 +196,6 @@ export function createNewMarketProposalTxBody(): ProposalSubmissionBody {
                 timeWindow: '3600',
                 scalingFactor: 10,
               },
-              // FIXME: workaround because of https://github.com/vegaprotocol/vega/issues/10343
               triggeringRatio: '0.7',
               auctionExtension: '1',
             },
@@ -335,7 +334,6 @@ export function createSuccessorMarketProposalTxBody(
                 timeWindow: '3600',
                 scalingFactor: 10,
               },
-              // FIXME: workaround because of https://github.com/vegaprotocol/vega/issues/10343
               triggeringRatio: '0.7',
               auctionExtension: '1',
             },

apps/governance/src/routes/proposals/proposal/Proposal.graphql

@@ -205,6 +205,7 @@ query Proposal(
             }
           }
           liquidityMonitoringParameters {
+            triggeringRatio
             targetStakeParameters {
               timeWindow
               scalingFactor
@@ -365,6 +366,7 @@ query Proposal(
               }
             }
             liquidityMonitoringParameters {
+              triggeringRatio
               targetStakeParameters {
                 timeWindow
                 scalingFactor

apps/trading/.env.mainnet

@@ -28,6 +28,3 @@ NX_REFERRALS=true
 
 NX_TENDERMINT_URL=https://be.vega.community
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket
-
-NX_CHARTING_LIBRARY_PATH=https://assets.vega.community/trading-view-bundle/v0.0.1/
-NX_CHARTING_LIBRARY_HASH=PDjWaqPFndDp+LCvqbKvntWriaqNzNpZ5i9R/BULzCg=

apps/trading/README.md

@@ -54,5 +54,3 @@ To run the UI automation tests with a mocked API, run:
 ```bash
 yarn nx run trading-e2e:e2e
 ```
-
-To run tests with market sim please read [the readme](e2e/README.md).

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,7 +83,7 @@ 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}
@@ -84,7 +97,7 @@ const MainGrid = memo(
                     >
                       <ErrorBoundary feature="funding-payments">
                         <TradingViews.fundingPayments.component
-                          marketId={market.id}
+                          marketId={marketId}
                         />
                       </ErrorBoundary>
                     </Tab>
@@ -100,7 +113,7 @@ 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
@@ -109,7 +122,7 @@ const MainGrid = memo(
                     settings={<TradingViews.trades.settings />}
                   >
                     <ErrorBoundary feature="trades">
-                      <TradingViews.trades.component marketId={market.id} />
+                      <TradingViews.trades.component marketId={marketId} />
                     </ErrorBoundary>
                   </Tab>
                 </Tabs>
@@ -212,6 +225,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 +234,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,7 +1,6 @@
 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';
@@ -12,17 +11,23 @@ import {
   VegaIconNames,
 } 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];
 
@@ -71,7 +76,14 @@ export const TradePanels = ({ market, pinnedAsset }: TradePanelsProps) => {
   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">

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

@@ -314,7 +314,7 @@ describe('Closed', () => {
   });
 
   it('display market actions', async () => {
-    // Use market with a successor Id as the actions dropdown will optionally
+    // Use market with a succcessor Id as the actions dropdown will optionally
     // show a link to the successor market
     const marketsWithSuccessorAndParent = [
       {

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

@@ -137,8 +137,6 @@ const ClosedMarketsDataGrid = ({
         headerName: t('Market'),
         field: 'code',
         cellRenderer: 'MarketCodeCell',
-        width: 150,
-        resizable: true,
       },
       {
         headerName: t('Status'),
@@ -282,7 +280,6 @@ const ClosedMarketsDataGrid = ({
   return (
     <AgGrid
       rowData={rowData}
-      defaultColDef={COL_DEFS.default}
       columnDefs={colDefs}
       getRowId={({ data }) => data.id}
       overlayNoRowsTemplate={error ? error.message : t('No markets')}

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

@@ -17,7 +17,6 @@ const defaultColDef = {
   filter: true,
   resizable: true,
   filterParams: { buttons: ['reset'] },
-  minWidth: 120,
 };
 
 const components = {

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

@@ -53,7 +53,6 @@ export const MarketsPage = () => {
                 size="extra-small"
                 data-testid="propose-new-market"
                 href={externalLink}
-                target="_blank"
               >
                 {t('Propose a new market')}
               </TradingAnchorButton>

apps/trading/client-pages/markets/use-column-defs.tsx

@@ -29,7 +29,6 @@ export const useColumnDefs = () => {
       {
         headerName: t('Market'),
         field: 'tradableInstrument.instrument.code',
-        pinned: true,
         cellRenderer: ({
           value,
           data,

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

@@ -4,7 +4,6 @@ import { useT } from '../../lib/use-t';
 import { RewardsContainer } from '../../components/rewards-container';
 import { usePageTitleStore } from '../../stores';
 import { ErrorBoundary } from '../../components/error-boundary';
-import { TinyScroll } from '@vegaprotocol/ui-toolkit';
 
 export const Rewards = () => {
   const t = useT();
@@ -17,10 +16,10 @@ export const Rewards = () => {
   }, [updateTitle, title]);
   return (
     <ErrorBoundary feature="rewards">
-      <TinyScroll className="p-4 max-h-full overflow-auto">
+      <div className="container mx-auto p-4">
         <h1 className="px-4 pb-4 text-2xl">{title}</h1>
         <RewardsContainer />
-      </TinyScroll>
+      </div>
     </ErrorBoundary>
   );
 };

apps/trading/components/bootstrapper/bootstrapper.tsx

@@ -12,7 +12,6 @@ import { VegaWalletProvider } from '@vegaprotocol/wallet';
 import type { ReactNode } from 'react';
 import { Web3Provider } from './web3-provider';
 import { useT } from '../../lib/use-t';
-import { DataLoader } from './data-loader';
 
 export const Bootstrapper = ({ children }: { children: ReactNode }) => {
   const t = useT();
@@ -53,38 +52,28 @@ export const Bootstrapper = ({ children }: { children: ReactNode }) => {
           />
         }
       >
-        <DataLoader
+        <Web3Provider
           skeleton={<AppLoader />}
           failure={
-            <AppFailure
-              title={t('Could not load market data or asset data')}
-              error={error}
-            />
+            <AppFailure title={t('Could not configure web3 provider')} />
           }
         >
-          <Web3Provider
-            skeleton={<AppLoader />}
-            failure={
-              <AppFailure title={t('Could not configure web3 provider')} />
-            }
+          <VegaWalletProvider
+            config={{
+              network: VEGA_ENV,
+              vegaUrl: VEGA_URL,
+              vegaWalletServiceUrl: VEGA_WALLET_URL,
+              links: {
+                explorer: VEGA_EXPLORER_URL,
+                concepts: DocsLinks.VEGA_WALLET_CONCEPTS_URL,
+                chromeExtensionUrl: CHROME_EXTENSION_URL,
+                mozillaExtensionUrl: MOZILLA_EXTENSION_URL,
+              },
+            }}
           >
-            <VegaWalletProvider
-              config={{
-                network: VEGA_ENV,
-                vegaUrl: VEGA_URL,
-                vegaWalletServiceUrl: VEGA_WALLET_URL,
-                links: {
-                  explorer: VEGA_EXPLORER_URL,
-                  concepts: DocsLinks.VEGA_WALLET_CONCEPTS_URL,
-                  chromeExtensionUrl: CHROME_EXTENSION_URL,
-                  mozillaExtensionUrl: MOZILLA_EXTENSION_URL,
-                },
-              }}
-            >
-              {children}
-            </VegaWalletProvider>
-          </Web3Provider>
-        </DataLoader>
+            {children}
+          </VegaWalletProvider>
+        </Web3Provider>
       </NodeGuard>
     </NetworkLoader>
   );

apps/trading/components/bootstrapper/data-loader.tsx

@@ -1,34 +0,0 @@
-import { useAssetsMapProvider } from '@vegaprotocol/assets';
-import { useMarketsMapProvider } from '@vegaprotocol/markets';
-import type { ReactNode } from 'react';
-
-export const DataLoader = ({
-  children,
-  failure,
-  skeleton,
-}: {
-  children: ReactNode;
-  failure: ReactNode;
-  skeleton: ReactNode;
-}) => {
-  // Query all markets and assets to ensure they are cached
-  const { data: markets, error, loading } = useMarketsMapProvider();
-  const {
-    data: assets,
-    error: errorAssets,
-    loading: loadingAssets,
-  } = useAssetsMapProvider();
-
-  if (loading || loadingAssets) {
-    // eslint-disable-next-line
-    return <>{skeleton}</>;
-  }
-
-  if (error || errorAssets || !markets || !assets) {
-    // eslint-disable-next-line react/jsx-no-useless-fragment
-    return <>{failure}</>;
-  }
-
-  // eslint-disable-next-line react/jsx-no-useless-fragment
-  return <>{children}</>;
-};

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

@@ -38,11 +38,7 @@ export const FeesContainer = () => {
   const { data: markets, loading: marketsLoading } = useMarketList();
 
   const { data: programData, loading: programLoading } =
-    useDiscountProgramsQuery({
-      errorPolicy: 'ignore',
-      fetchPolicy: 'cache-and-network',
-      pollInterval: 15000,
-    });
+    useDiscountProgramsQuery({ errorPolicy: 'ignore' });
 
   const volumeDiscountWindowLength =
     programData?.currentVolumeDiscountProgram?.windowLength || 1;
@@ -53,8 +49,6 @@ export const FeesContainer = () => {
       partyId: pubKey || '',
     },
     skip: !pubKey,
-    fetchPolicy: 'cache-and-network',
-    pollInterval: 15000,
   });
 
   const previousEpoch = (Number(feesData?.epoch.id) || 0) - 1;

apps/trading/components/fees-container/use-referral-stats.ts

@@ -1,5 +1,4 @@
 import type { DiscountProgramsQuery, FeesQuery } from './__generated__/Fees';
-
 export const useReferralStats = (
   previousEpoch?: number,
   referralStats?: NonNullable<

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

@@ -42,9 +42,13 @@ export const LiquidityHeader = () => {
   const assetDecimalPlaces = asset?.decimals || 0;
   const symbol = asset?.symbol;
 
+  const triggeringRatio =
+    market?.liquidityMonitoringParameters.triggeringRatio || '1';
+
   const { percentage, status } = useCheckLiquidityStatus({
     suppliedStake: suppliedStake || 0,
     targetStake: targetStake || 0,
+    triggeringRatio,
   });
 
   const feesObject = feesPaidRes?.paidLiquidityFees?.edges?.find(

apps/trading/components/liquidity-supplied/liquidity-supplied.tsx

@@ -47,6 +47,9 @@ export const MarketLiquiditySupplied = ({
   ]);
 
   const stakeToCcyVolume = params.market_liquidity_stakeToCcyVolume;
+  const triggeringRatio = Number(
+    params.market_liquidity_targetstake_triggering_ratio
+  );
 
   const variables = useMemo(
     () => ({
@@ -91,6 +94,7 @@ export const MarketLiquiditySupplied = ({
   const { percentage, status } = useCheckLiquidityStatus({
     suppliedStake: market?.suppliedStake || 0,
     targetStake: market?.targetStake || 0,
+    triggeringRatio,
   });
 
   const showMessage =

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-selector/market-selector-item.tsx

@@ -97,9 +97,9 @@ const MarketData = ({
 
   return (
     <>
-      <div className="w-2/6" role="gridcell">
+      <div className="w-2/5" role="gridcell">
         <h3 className="flex items-baseline">
-          <span className="overflow-hidden text-xs md:text-sm lg:text-base text-ellipsis whitespace-nowrap">
+          <span className="overflow-hidden text-sm lg:text-base text-ellipsis whitespace-nowrap">
             {market.tradableInstrument.instrument.code}
           </span>
           {allProducts && productType && (
@@ -113,7 +113,7 @@ const MarketData = ({
         )}
       </div>
       <div
-        className="w-2/6 overflow-hidden text-xs lg:text-sm whitespace-nowrap text-ellipsis text-right"
+        className="w-1/5 overflow-hidden text-xs lg:text-sm whitespace-nowrap text-ellipsis"
         title={symbol}
         data-testid="market-selector-price"
         role="gridcell"
@@ -121,14 +121,14 @@ const MarketData = ({
         {price} {symbol}
       </div>
       <div
-        className="w-2/6 sm:w-1/6 overflow-hidden text-xs lg:text-sm whitespace-nowrap text-ellipsis text-right"
+        className="w-1/5 overflow-hidden text-xs text-right lg:text-sm whitespace-nowrap text-ellipsis"
         title={t('24h vol')}
         data-testid="market-selector-volume"
         role="gridcell"
       >
         {volume}
       </div>
-      <div className="hidden sm:w-1/6 sm:flex justify-end" role="gridcell">
+      <div className="flex justify-end w-1/5" role="gridcell">
         {oneDayCandles && (
           <Sparkline
             width={64}

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

@@ -64,7 +64,7 @@ export const MarketSelector = ({
             setFilter((curr) => ({ ...curr, product }));
           }}
         />
-        <div className="text-sm flex sm:grid grid-cols-[2fr_1fr_1fr] gap-1 ">
+        <div className="text-sm grid grid-cols-[2fr_1fr_1fr] gap-1 ">
           <div className="flex-1">
             <TradingInput
               onChange={(e) =>
@@ -182,16 +182,16 @@ const MarketList = ({
           'p-2 mx-2 border-b border-default text-xs text-secondary'
         )}
       >
-        <div className="w-2/6" role="columnheader">
+        <div className="w-2/5" role="columnheader">
           {t('Name')}
         </div>
-        <div className="w-2/6 text-right pr-4" role="columnheader">
+        <div className="w-1/5" role="columnheader">
           {t('Price')}
         </div>
-        <div className="w-2/6 sm:w-1/6 text-right" role="columnheader">
+        <div className="w-1/5 text-right" role="columnheader">
           {t('24h volume')}
         </div>
-        <div className="hidden sm:w-1/6" role="columnheader" />
+        <div className="w-1/5" role="columnheader" />
       </div>
       <div ref={listRef}>
         <List

apps/trading/components/navbar/nav-header.tsx

@@ -5,7 +5,6 @@ import { useParams } from 'react-router-dom';
 import * as PopoverPrimitive from '@radix-ui/react-popover';
 import { useState } from 'react';
 import { useT } from '../../lib/use-t';
-import classNames from 'classnames';
 
 /**
  * This is only rendered for the mobile navigation
@@ -31,16 +30,7 @@ export const NavHeader = () => {
       trigger={
         <h1 className="flex gap-1 sm:gap-2 md:gap-4 items-center text-default text-lg whitespace-nowrap xl:pr-4 xl:border-r border-default">
           {data ? data.tradableInstrument.instrument.code : t('Select market')}
-          <span
-            className={classNames(
-              'transition-transform ease-in-out duration-300',
-              {
-                'rotate-180': open,
-              }
-            )}
-          >
-            <VegaIcon name={VegaIconNames.CHEVRON_DOWN} size={20} />
-          </span>
+          <VegaIcon name={VegaIconNames.CHEVRON_DOWN} size={20} />
         </h1>
       }
     >

apps/trading/components/rewards-container/Rewards.graphql

@@ -2,19 +2,14 @@ query RewardsPage($partyId: ID!) {
   party(id: $partyId) {
     id
     vestingStats {
+      # AKA hoarder reward multiplier
       rewardBonusMultiplier
-      quantumBalance
-      epochSeq
     }
     activityStreak {
-      activeFor
-      isActive
-      inactiveFor
-      rewardDistributionMultiplier
+      # vesting multiplier
       rewardVestingMultiplier
-      epoch
-      tradedVolume
-      openVolume
+      # AKA streak multiplier
+      rewardDistributionMultiplier
     }
     vestingBalancesSummary {
       epoch
@@ -41,74 +36,6 @@ query RewardsPage($partyId: ID!) {
   }
 }
 
-query ActiveRewards(
-  $isReward: Boolean
-  $partyId: ID
-  $direction: TransferDirection
-  $pagination: Pagination
-) {
-  transfersConnection(
-    partyId: $partyId
-    isReward: $isReward
-    direction: $direction
-    pagination: $pagination
-  ) {
-    edges {
-      node {
-        transfer {
-          amount
-          id
-          from
-          fromAccountType
-          to
-          toAccountType
-          asset {
-            id
-            symbol
-            decimals
-            name
-            quantum
-            status
-          }
-          reference
-          status
-          timestamp
-          kind {
-            ... on RecurringTransfer {
-              startEpoch
-              endEpoch
-              dispatchStrategy {
-                dispatchMetric
-                dispatchMetricAssetId
-                marketIdsInScope
-                entityScope
-                individualScope
-                teamScope
-                nTopPerformers
-                stakingRequirement
-                notionalTimeWeightedAveragePositionRequirement
-                windowLength
-                lockPeriod
-                distributionStrategy
-                rankTable {
-                  startRank
-                  shareRatio
-                }
-              }
-            }
-          }
-          reason
-        }
-        fees {
-          transferId
-          amount
-          epoch
-        }
-      }
-    }
-  }
-}
-
 query RewardsHistory(
   $partyId: ID!
   $epochRewardSummariesPagination: Pagination
@@ -165,18 +92,3 @@ query RewardsEpoch {
     id
   }
 }
-
-query MarketForRewards($marketId: ID!) {
-  market(id: $marketId) {
-    tradableInstrument {
-      instrument {
-        id
-        name
-        code
-        metadata {
-          tags
-        }
-      }
-    }
-  }
-}

apps/trading/components/rewards-container/__generated__/Rewards.ts

@@ -8,17 +8,7 @@ export type RewardsPageQueryVariables = Types.Exact<{
 }>;
 
 
-export type RewardsPageQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, vestingStats?: { __typename?: 'PartyVestingStats', rewardBonusMultiplier: string, quantumBalance: string, epochSeq: number } | null, activityStreak?: { __typename?: 'PartyActivityStreak', activeFor: number, isActive: boolean, inactiveFor: number, rewardDistributionMultiplier: string, rewardVestingMultiplier: string, epoch: number, tradedVolume: string, openVolume: string } | null, vestingBalancesSummary: { __typename?: 'PartyVestingBalancesSummary', epoch?: number | null, vestingBalances?: Array<{ __typename?: 'PartyVestingBalance', balance: string, asset: { __typename?: 'Asset', id: string, symbol: string, decimals: number, quantum: string } }> | null, lockedBalances?: Array<{ __typename?: 'PartyLockedBalance', balance: string, untilEpoch: number, asset: { __typename?: 'Asset', id: string, symbol: string, decimals: number, quantum: string } }> | null } } | null };
-
-export type ActiveRewardsQueryVariables = Types.Exact<{
-  isReward?: Types.InputMaybe<Types.Scalars['Boolean']>;
-  partyId?: Types.InputMaybe<Types.Scalars['ID']>;
-  direction?: Types.InputMaybe<Types.TransferDirection>;
-  pagination?: Types.InputMaybe<Types.Pagination>;
-}>;
-
-
-export type ActiveRewardsQuery = { __typename?: 'Query', transfersConnection?: { __typename?: 'TransferConnection', edges?: Array<{ __typename?: 'TransferEdge', node: { __typename?: 'TransferNode', transfer: { __typename?: 'Transfer', amount: string, id: string, from: string, fromAccountType: Types.AccountType, to: string, toAccountType: Types.AccountType, reference?: string | null, status: Types.TransferStatus, timestamp: any, reason?: string | null, asset?: { __typename?: 'Asset', id: string, symbol: string, decimals: number, name: string, quantum: string, status: Types.AssetStatus } | null, kind: { __typename?: 'OneOffGovernanceTransfer' } | { __typename?: 'OneOffTransfer' } | { __typename?: 'RecurringGovernanceTransfer' } | { __typename?: 'RecurringTransfer', startEpoch: number, endEpoch?: number | null, dispatchStrategy?: { __typename?: 'DispatchStrategy', dispatchMetric: Types.DispatchMetric, dispatchMetricAssetId: string, marketIdsInScope?: Array<string> | null, entityScope: Types.EntityScope, individualScope?: Types.IndividualScope | null, teamScope?: Array<string | null> | null, nTopPerformers?: string | null, stakingRequirement: string, notionalTimeWeightedAveragePositionRequirement: string, windowLength: number, lockPeriod: number, distributionStrategy: Types.DistributionStrategy, rankTable?: Array<{ __typename?: 'RankTable', startRank: number, shareRatio: number } | null> | null } | null } }, fees?: Array<{ __typename?: 'TransferFee', transferId: string, amount: string, epoch: number } | null> | null } } | null> | null } | null };
+export type RewardsPageQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, vestingStats?: { __typename?: 'PartyVestingStats', rewardBonusMultiplier: string } | null, activityStreak?: { __typename?: 'PartyActivityStreak', rewardVestingMultiplier: string, rewardDistributionMultiplier: string } | null, vestingBalancesSummary: { __typename?: 'PartyVestingBalancesSummary', epoch?: number | null, vestingBalances?: Array<{ __typename?: 'PartyVestingBalance', balance: string, asset: { __typename?: 'Asset', id: string, symbol: string, decimals: number, quantum: string } }> | null, lockedBalances?: Array<{ __typename?: 'PartyLockedBalance', balance: string, untilEpoch: number, asset: { __typename?: 'Asset', id: string, symbol: string, decimals: number, quantum: string } }> | null } } | null };
 
 export type RewardsHistoryQueryVariables = Types.Exact<{
   partyId: Types.Scalars['ID'];
@@ -36,13 +26,6 @@ export type RewardsEpochQueryVariables = Types.Exact<{ [key: string]: never; }>;
 
 export type RewardsEpochQuery = { __typename?: 'Query', epoch: { __typename?: 'Epoch', id: string } };
 
-export type MarketForRewardsQueryVariables = Types.Exact<{
-  marketId: Types.Scalars['ID'];
-}>;
-
-
-export type MarketForRewardsQuery = { __typename?: 'Query', market?: { __typename?: 'Market', tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', id: string, name: string, code: string, metadata: { __typename?: 'InstrumentMetadata', tags?: Array<string> | null } } } } | null };
-
 
 export const RewardsPageDocument = gql`
     query RewardsPage($partyId: ID!) {
@@ -50,18 +33,10 @@ export const RewardsPageDocument = gql`
     id
     vestingStats {
       rewardBonusMultiplier
-      quantumBalance
-      epochSeq
     }
     activityStreak {
-      activeFor
-      isActive
-      inactiveFor
-      rewardDistributionMultiplier
       rewardVestingMultiplier
-      epoch
-      tradedVolume
-      openVolume
+      rewardDistributionMultiplier
     }
     vestingBalancesSummary {
       epoch
@@ -116,101 +91,6 @@ export function useRewardsPageLazyQuery(baseOptions?: Apollo.LazyQueryHookOption
 export type RewardsPageQueryHookResult = ReturnType<typeof useRewardsPageQuery>;
 export type RewardsPageLazyQueryHookResult = ReturnType<typeof useRewardsPageLazyQuery>;
 export type RewardsPageQueryResult = Apollo.QueryResult<RewardsPageQuery, RewardsPageQueryVariables>;
-export const ActiveRewardsDocument = gql`
-    query ActiveRewards($isReward: Boolean, $partyId: ID, $direction: TransferDirection, $pagination: Pagination) {
-  transfersConnection(
-    partyId: $partyId
-    isReward: $isReward
-    direction: $direction
-    pagination: $pagination
-  ) {
-    edges {
-      node {
-        transfer {
-          amount
-          id
-          from
-          fromAccountType
-          to
-          toAccountType
-          asset {
-            id
-            symbol
-            decimals
-            name
-            quantum
-            status
-          }
-          reference
-          status
-          timestamp
-          kind {
-            ... on RecurringTransfer {
-              startEpoch
-              endEpoch
-              dispatchStrategy {
-                dispatchMetric
-                dispatchMetricAssetId
-                marketIdsInScope
-                entityScope
-                individualScope
-                teamScope
-                nTopPerformers
-                stakingRequirement
-                notionalTimeWeightedAveragePositionRequirement
-                windowLength
-                lockPeriod
-                distributionStrategy
-                rankTable {
-                  startRank
-                  shareRatio
-                }
-              }
-            }
-          }
-          reason
-        }
-        fees {
-          transferId
-          amount
-          epoch
-        }
-      }
-    }
-  }
-}
-    `;
-
-/**
- * __useActiveRewardsQuery__
- *
- * To run a query within a React component, call `useActiveRewardsQuery` and pass it any options that fit your needs.
- * When your component renders, `useActiveRewardsQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useActiveRewardsQuery({
- *   variables: {
- *      isReward: // value for 'isReward'
- *      partyId: // value for 'partyId'
- *      direction: // value for 'direction'
- *      pagination: // value for 'pagination'
- *   },
- * });
- */
-export function useActiveRewardsQuery(baseOptions?: Apollo.QueryHookOptions<ActiveRewardsQuery, ActiveRewardsQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<ActiveRewardsQuery, ActiveRewardsQueryVariables>(ActiveRewardsDocument, options);
-      }
-export function useActiveRewardsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<ActiveRewardsQuery, ActiveRewardsQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<ActiveRewardsQuery, ActiveRewardsQueryVariables>(ActiveRewardsDocument, options);
-        }
-export type ActiveRewardsQueryHookResult = ReturnType<typeof useActiveRewardsQuery>;
-export type ActiveRewardsLazyQueryHookResult = ReturnType<typeof useActiveRewardsLazyQuery>;
-export type ActiveRewardsQueryResult = Apollo.QueryResult<ActiveRewardsQuery, ActiveRewardsQueryVariables>;
 export const RewardsHistoryDocument = gql`
     query RewardsHistory($partyId: ID!, $epochRewardSummariesPagination: Pagination, $partyRewardsPagination: Pagination, $fromEpoch: Int, $toEpoch: Int) {
   epochRewardSummaries(
@@ -322,48 +202,4 @@ export function useRewardsEpochLazyQuery(baseOptions?: Apollo.LazyQueryHookOptio
         }
 export type RewardsEpochQueryHookResult = ReturnType<typeof useRewardsEpochQuery>;
 export type RewardsEpochLazyQueryHookResult = ReturnType<typeof useRewardsEpochLazyQuery>;
-export type RewardsEpochQueryResult = Apollo.QueryResult<RewardsEpochQuery, RewardsEpochQueryVariables>;
-export const MarketForRewardsDocument = gql`
-    query MarketForRewards($marketId: ID!) {
-  market(id: $marketId) {
-    tradableInstrument {
-      instrument {
-        id
-        name
-        code
-        metadata {
-          tags
-        }
-      }
-    }
-  }
-}
-    `;
-
-/**
- * __useMarketForRewardsQuery__
- *
- * To run a query within a React component, call `useMarketForRewardsQuery` and pass it any options that fit your needs.
- * When your component renders, `useMarketForRewardsQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useMarketForRewardsQuery({
- *   variables: {
- *      marketId: // value for 'marketId'
- *   },
- * });
- */
-export function useMarketForRewardsQuery(baseOptions: Apollo.QueryHookOptions<MarketForRewardsQuery, MarketForRewardsQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<MarketForRewardsQuery, MarketForRewardsQueryVariables>(MarketForRewardsDocument, options);
-      }
-export function useMarketForRewardsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<MarketForRewardsQuery, MarketForRewardsQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<MarketForRewardsQuery, MarketForRewardsQueryVariables>(MarketForRewardsDocument, options);
-        }
-export type MarketForRewardsQueryHookResult = ReturnType<typeof useMarketForRewardsQuery>;
-export type MarketForRewardsLazyQueryHookResult = ReturnType<typeof useMarketForRewardsLazyQuery>;
-export type MarketForRewardsQueryResult = Apollo.QueryResult<MarketForRewardsQuery, MarketForRewardsQueryVariables>;
+export type RewardsEpochQueryResult = Apollo.QueryResult<RewardsEpochQuery, RewardsEpochQueryVariables>;

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

@@ -1,174 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import {
-  ActiveRewardCard,
-  applyFilter,
-  isActiveReward,
-} from './active-rewards';
-import {
-  AccountType,
-  AssetStatus,
-  DispatchMetric,
-  DistributionStrategy,
-  EntityScope,
-  IndividualScope,
-  type RecurringTransfer,
-  type TransferNode,
-  TransferStatus,
-  type Transfer,
-} from '@vegaprotocol/types';
-
-jest.mock('./__generated__/Rewards', () => ({
-  useMarketForRewardsQuery: () => ({
-    data: undefined,
-  }),
-}));
-
-jest.mock('@vegaprotocol/assets', () => ({
-  useAssetDataProvider: () => {
-    return {
-      data: {
-        assetId: 'asset-1',
-      },
-    };
-  },
-}));
-
-describe('ActiveRewards', () => {
-  const mockRecurringTransfer: RecurringTransfer = {
-    __typename: 'RecurringTransfer',
-    startEpoch: 115332,
-    endEpoch: 115432,
-    factor: '1',
-    dispatchStrategy: {
-      __typename: 'DispatchStrategy',
-      dispatchMetric: DispatchMetric.DISPATCH_METRIC_LP_FEES_RECEIVED,
-      dispatchMetricAssetId:
-        'c9fe6fc24fce121b2cc72680543a886055abb560043fda394ba5376203b7527d',
-      marketIdsInScope: null,
-      entityScope: EntityScope.ENTITY_SCOPE_INDIVIDUALS,
-      individualScope: IndividualScope.INDIVIDUAL_SCOPE_ALL,
-      teamScope: null,
-      nTopPerformers: '',
-      stakingRequirement: '',
-      notionalTimeWeightedAveragePositionRequirement: '',
-      windowLength: 1,
-      lockPeriod: 0,
-      distributionStrategy: DistributionStrategy.DISTRIBUTION_STRATEGY_PRO_RATA,
-      rankTable: null,
-    },
-  };
-
-  const mockTransferNode: TransferNode = {
-    __typename: 'TransferNode',
-    transfer: {
-      __typename: 'Transfer',
-      amount: '1613000000',
-      id: 'c4e59bd389c8098e6c7669f2d3e1613b9f42d30b1c4c3793ac44380f4c522835',
-      from: '69464e35bcb8e8a2900ca0f87acaf252d50cf2ab2fc73694845a16b7c8a0dc6f',
-      fromAccountType: AccountType.ACCOUNT_TYPE_GENERAL,
-      to: 'network',
-      toAccountType: AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
-      asset: {
-        __typename: 'Asset',
-        id: 'c9fe6fc24fce121b2cc72680543a886055abb560043fda394ba5376203b7527d',
-        symbol: 'tUSDC',
-        decimals: 5,
-        name: 'tUSDC TEST',
-        quantum: '1',
-        status: AssetStatus.STATUS_ENABLED,
-        source: {
-          __typename: 'ERC20' as const,
-          contractAddress: '0x123',
-          lifetimeLimit: '100',
-          withdrawThreshold: '100',
-        },
-      },
-      reference: 'reward',
-      status: TransferStatus.STATUS_PENDING,
-      timestamp: '2023-12-18T13:05:35.948706Z',
-      kind: mockRecurringTransfer,
-      reason: null,
-    },
-    fees: [],
-  };
-
-  it('renders with valid props', () => {
-    render(
-      <ActiveRewardCard
-        transferNode={mockTransferNode}
-        currentEpoch={1}
-        kind={mockRecurringTransfer}
-      />
-    );
-
-    expect(
-      screen.getByText(/Liquidity provision fees received/i)
-    ).toBeInTheDocument();
-    expect(screen.getByText('Entity scope')).toBeInTheDocument();
-    expect(screen.getByText('Average position')).toBeInTheDocument();
-    expect(screen.getByText('Ends in')).toBeInTheDocument();
-    expect(screen.getByText('115431 epochs')).toBeInTheDocument();
-    expect(screen.getByText('Assessed over')).toBeInTheDocument();
-    expect(screen.getByText('1 epoch')).toBeInTheDocument();
-  });
-
-  describe('isActiveReward', () => {
-    it('returns true for valid active reward', () => {
-      const node = {
-        transfer: {
-          kind: {
-            __typename: 'RecurringTransfer',
-            dispatchStrategy: {},
-            endEpoch: 10,
-          },
-          status: TransferStatus.STATUS_PENDING,
-        },
-      } as TransferNode;
-      expect(isActiveReward(node, 5)).toBeTruthy();
-    });
-
-    it('returns false for invalid active reward', () => {
-      const node = {
-        transfer: {
-          kind: {
-            __typename: 'RecurringTransfer',
-            dispatchStrategy: {},
-            endEpoch: 10,
-          },
-          status: TransferStatus.STATUS_PENDING,
-        },
-      } as TransferNode;
-      expect(isActiveReward(node, 15)).toBeFalsy();
-    });
-  });
-
-  describe('applyFilter', () => {
-    it('returns true when filter matches dispatch metric label', () => {
-      const transfer = {
-        kind: {
-          __typename: 'RecurringTransfer',
-          dispatchStrategy: {
-            dispatchMetric: DispatchMetric.DISPATCH_METRIC_AVERAGE_POSITION,
-          },
-        },
-        asset: { symbol: 'XYZ' },
-      } as Transfer;
-      const filter = { searchTerm: 'average position' };
-      expect(applyFilter({ transfer }, filter)).toBeTruthy();
-    });
-
-    it('returns true when filter matches asset symbol', () => {
-      const transfer = {
-        kind: {
-          __typename: 'RecurringTransfer',
-          dispatchStrategy: {
-            dispatchMetric: DispatchMetric.DISPATCH_METRIC_AVERAGE_POSITION,
-          },
-        },
-        asset: { symbol: 'XYZ' },
-      } as Transfer;
-      const filter = { searchTerm: 'average position' };
-      expect(applyFilter({ transfer }, filter)).toBeTruthy();
-    });
-  });
-});

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

@@ -1,568 +0,0 @@
-import {
-  useActiveRewardsQuery,
-  useMarketForRewardsQuery,
-} from './__generated__/Rewards';
-import { useT } from '../../lib/use-t';
-import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
-import classNames from 'classnames';
-import {
-  Icon,
-  type IconName,
-  Intent,
-  Tooltip,
-  VegaIcon,
-  VegaIconNames,
-  type VegaIconSize,
-  TradingInput,
-  TinyScroll,
-} from '@vegaprotocol/ui-toolkit';
-import { IconNames } from '@blueprintjs/icons';
-import {
-  DistributionStrategyDescriptionMapping,
-  DistributionStrategyMapping,
-  EntityScope,
-  EntityScopeMapping,
-  type Maybe,
-  type Transfer,
-  type TransferNode,
-  TransferStatus,
-  TransferStatusMapping,
-  DispatchMetric,
-  DispatchMetricDescription,
-  DispatchMetricLabels,
-  type RecurringTransfer,
-  EntityScopeLabelMapping,
-} from '@vegaprotocol/types';
-import { Card } from '../card/card';
-import { useMemo, useState } from 'react';
-import {
-  type AssetFieldsFragment,
-  useAssetDataProvider,
-  useAssetsMapProvider,
-} from '@vegaprotocol/assets';
-import {
-  type MarketFieldsFragment,
-  useMarketsMapProvider,
-} from '@vegaprotocol/markets';
-
-export type Filter = {
-  searchTerm: string;
-};
-
-export const isActiveReward = (node: TransferNode, currentEpoch: number) => {
-  const { transfer } = node;
-  if (transfer.kind.__typename !== 'RecurringTransfer') {
-    return false;
-  }
-  const { dispatchStrategy } = transfer.kind;
-
-  if (!dispatchStrategy) {
-    return false;
-  }
-
-  if (transfer.kind.endEpoch && transfer.kind.endEpoch < currentEpoch) {
-    return false;
-  }
-
-  if (transfer.status !== TransferStatus.STATUS_PENDING) {
-    return false;
-  }
-
-  return true;
-};
-
-export const applyFilter = (
-  node: TransferNode & {
-    asset?: AssetFieldsFragment | null;
-    marketIds?: (MarketFieldsFragment | null)[];
-  },
-  filter: Filter
-) => {
-  const { transfer } = node;
-  if (
-    transfer.kind.__typename !== 'RecurringTransfer' ||
-    !transfer.kind.dispatchStrategy?.dispatchMetric
-  ) {
-    return false;
-  }
-  if (
-    DispatchMetricLabels[transfer.kind.dispatchStrategy.dispatchMetric]
-      .toLowerCase()
-      .includes(filter.searchTerm.toLowerCase()) ||
-    transfer.asset?.symbol
-      .toLowerCase()
-      .includes(filter.searchTerm.toLowerCase()) ||
-    EntityScopeLabelMapping[transfer.kind.dispatchStrategy.entityScope]
-      .toLowerCase()
-      .includes(filter.searchTerm.toLowerCase()) ||
-    node.asset?.name
-      .toLocaleLowerCase()
-      .includes(filter.searchTerm.toLowerCase()) ||
-    node.marketIds?.some((m) =>
-      m?.tradableInstrument?.instrument?.name
-        .toLocaleLowerCase()
-        .includes(filter.searchTerm.toLowerCase())
-    )
-  ) {
-    return true;
-  }
-  return false;
-};
-
-export const ActiveRewards = ({ currentEpoch }: { currentEpoch: number }) => {
-  const t = useT();
-  const { data: activeRewardsData } = useActiveRewardsQuery({
-    variables: {
-      isReward: true,
-    },
-  });
-
-  const [filter, setFilter] = useState<Filter>({
-    searchTerm: '',
-  });
-
-  const { data: assets } = useAssetsMapProvider();
-  const { data: markets } = useMarketsMapProvider();
-
-  const transfers = activeRewardsData?.transfersConnection?.edges
-    ?.map((e) => e?.node as TransferNode)
-    .filter((node) => isActiveReward(node, currentEpoch))
-    .map((node) => {
-      if (node.transfer.kind.__typename !== 'RecurringTransfer') {
-        return node;
-      }
-
-      const asset =
-        assets &&
-        assets[
-          node.transfer.kind.dispatchStrategy?.dispatchMetricAssetId || ''
-        ];
-
-      const marketIds =
-        node.transfer.kind.dispatchStrategy?.marketIdsInScope?.map(
-          (id) => markets && markets[id]
-        );
-
-      return { ...node, asset, marketIds };
-    });
-
-  if (!transfers || !transfers.length) return null;
-
-  return (
-    <Card title={t('Active rewards')} className="lg:col-span-full">
-      {transfers.length > 1 && (
-        <TradingInput
-          onChange={(e) =>
-            setFilter((curr) => ({ ...curr, searchTerm: e.target.value }))
-          }
-          value={filter.searchTerm}
-          type="text"
-          placeholder={t(
-            'Search by reward dispatch metric, entity scope or asset name'
-          )}
-          data-testid="search-term"
-          className="mb-4 w-20 mr-2"
-          prependElement={<VegaIcon name={VegaIconNames.SEARCH} />}
-        />
-      )}
-      <TinyScroll className="grid gap-x-8 gap-y-10 h-fit grid-cols-[repeat(auto-fill,_minmax(230px,_1fr))] md:grid-cols-[repeat(auto-fill,_minmax(230px,_1fr))] lg:grid-cols-[repeat(auto-fill,_minmax(320px,_1fr))] xl:grid-cols-[repeat(auto-fill,_minmax(335px,_1fr))] max-h-[40rem] overflow-auto pr-2">
-        {transfers
-          .filter((n) => applyFilter(n, filter))
-          .map((node, i) => {
-            const { transfer } = node;
-            if (
-              transfer.kind.__typename !== 'RecurringTransfer' ||
-              !transfer.kind.dispatchStrategy?.dispatchMetric
-            ) {
-              return null;
-            }
-
-            return (
-              node && (
-                <ActiveRewardCard
-                  key={i}
-                  transferNode={node}
-                  kind={transfer.kind}
-                  currentEpoch={currentEpoch}
-                />
-              )
-            );
-          })}
-      </TinyScroll>
-    </Card>
-  );
-};
-
-// This was built to be a status indicator for the rewards based on the transfer status
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const StatusIndicator = ({
-  status,
-  reason,
-}: {
-  status: TransferStatus;
-  reason?: Maybe<string> | undefined;
-}) => {
-  const t = useT();
-  const getIconIntent = (status: string) => {
-    switch (status) {
-      case TransferStatus.STATUS_DONE:
-        return { icon: IconNames.TICK_CIRCLE, intent: Intent.Success };
-      case TransferStatus.STATUS_CANCELLED:
-        return { icon: IconNames.MOON, intent: Intent.None };
-      case TransferStatus.STATUS_PENDING:
-        return { icon: IconNames.HELP, intent: Intent.Primary };
-      case TransferStatus.STATUS_REJECTED:
-        return { icon: IconNames.ERROR, intent: Intent.Danger };
-      case TransferStatus.STATUS_STOPPED:
-        return { icon: IconNames.ERROR, intent: Intent.Danger };
-      default:
-        return { icon: IconNames.HELP, intent: Intent.Primary };
-    }
-  };
-  const { icon, intent } = getIconIntent(status);
-  return (
-    <Tooltip
-      description={
-        <span>
-          {t('Transfer status: {{status}} {{reason}}', {
-            status: TransferStatusMapping[status],
-            reason: reason ? `(${reason})` : '',
-          })}
-        </span>
-      }
-    >
-      <span
-        className={classNames(
-          {
-            'text-gray-700 dark:text-gray-300': intent === Intent.None,
-            'text-vega-blue': intent === Intent.Primary,
-            'text-vega-green dark:text-vega-green': intent === Intent.Success,
-            'dark:text-yellow text-yellow-600': intent === Intent.Warning,
-            'text-vega-red': intent === Intent.Danger,
-          },
-          'flex items-start p-1 align-text-bottom'
-        )}
-      >
-        <Icon size={3} name={icon as IconName} />
-      </span>
-    </Tooltip>
-  );
-};
-
-export const ActiveRewardCard = ({
-  transferNode,
-  currentEpoch,
-  kind,
-}: {
-  transferNode: TransferNode;
-  currentEpoch: number;
-  kind: RecurringTransfer;
-}) => {
-  const t = useT();
-
-  const { transfer } = transferNode;
-  const { dispatchStrategy } = kind;
-  const marketIds = dispatchStrategy?.marketIdsInScope;
-
-  const { data: marketNameData } = useMarketForRewardsQuery({
-    variables: {
-      marketId: marketIds ? marketIds[0] : '',
-    },
-  });
-
-  const marketName = useMemo(() => {
-    if (marketNameData && marketIds && marketIds.length > 1) {
-      return 'Specific markets';
-    } else if (
-      marketNameData &&
-      marketIds &&
-      marketNameData &&
-      marketIds.length === 1
-    ) {
-      return marketNameData?.market?.tradableInstrument?.instrument?.name || '';
-    }
-    return '';
-  }, [marketIds, marketNameData]);
-
-  const { data: dispatchAsset } = useAssetDataProvider(
-    dispatchStrategy?.dispatchMetricAssetId || ''
-  );
-
-  if (!dispatchStrategy) {
-    return null;
-  }
-
-  const { gradientClassName, mainClassName } = getGradientClasses(
-    dispatchStrategy.dispatchMetric
-  );
-
-  const entityScope = dispatchStrategy.entityScope;
-  return (
-    <div>
-      <div
-        className={classNames(
-          'bg-gradient-to-r col-span-full p-0.5 lg:col-auto h-full',
-          'rounded-lg',
-          gradientClassName
-        )}
-      >
-        <div
-          className={classNames(
-            mainClassName,
-            'bg-gradient-to-b bg-vega-clight-800 dark:bg-vega-cdark-800 h-full w-full rounded p-4 flex flex-col gap-4'
-          )}
-        >
-          <div className="flex justify-between gap-4">
-            <div className="flex flex-col gap-2 items-center text-center">
-              <EntityIcon transfer={transfer} />
-              {entityScope && (
-                <span className="text-muted text-xs">
-                  {EntityScopeLabelMapping[entityScope] || t('Unspecified')}
-                </span>
-              )}
-            </div>
-
-            <div className="flex flex-col gap-2 items-center text-center">
-              <h3 className="flex flex-col gap-1 text-2xl shrink-1 text-center">
-                <span className="font-glitch">
-                  {addDecimalsFormatNumber(
-                    transferNode.transfer.amount,
-                    transferNode.transfer.asset?.decimals || 0,
-                    6
-                  )}
-                </span>
-
-                <span className="font-alpha">
-                  {transferNode.transfer.asset?.symbol}
-                </span>
-              </h3>
-              {
-                <Tooltip
-                  description={t(
-                    DistributionStrategyDescriptionMapping[
-                      dispatchStrategy.distributionStrategy
-                    ]
-                  )}
-                  underline={true}
-                >
-                  <span className="text-xs">
-                    {
-                      DistributionStrategyMapping[
-                        dispatchStrategy.distributionStrategy
-                      ]
-                    }
-                  </span>
-                </Tooltip>
-              }
-            </div>
-
-            <div className="flex flex-col gap-2 items-center text-center">
-              <CardIcon
-                iconName={VegaIconNames.LOCK}
-                tooltip={t(
-                  'Number of epochs after distribution to delay vesting of rewards by'
-                )}
-              />
-              <span className="text-muted text-xs whitespace-nowrap">
-                {t('numberEpochs', '{{count}} epochs', {
-                  count: kind.dispatchStrategy?.lockPeriod,
-                })}
-              </span>
-            </div>
-          </div>
-
-          <span className="border-[0.5px] border-gray-700" />
-          <span>
-            {DispatchMetricLabels[dispatchStrategy.dispatchMetric]}
-            {marketName ? ` • ${marketName}` : ` • ${dispatchAsset?.name}`}
-          </span>
-
-          <div className="flex items-center gap-8 flex-wrap">
-            {kind.endEpoch && (
-              <span className="flex flex-col">
-                <span className="text-muted text-xs">{t('Ends in')}</span>
-                <span>
-                  {t('numberEpochs', '{{count}} epochs', {
-                    count: kind.endEpoch - currentEpoch,
-                  })}
-                </span>
-              </span>
-            )}
-
-            {
-              <span className="flex flex-col">
-                <span className="text-muted text-xs">{t('Assessed over')}</span>
-                <span>
-                  {t('numberEpochs', '{{count}} epochs', {
-                    count: dispatchStrategy.windowLength,
-                  })}
-                </span>
-              </span>
-            }
-          </div>
-
-          {dispatchStrategy?.dispatchMetric && (
-            <span className="text-muted text-sm h-[2rem]">
-              {t(DispatchMetricDescription[dispatchStrategy?.dispatchMetric])}
-            </span>
-          )}
-
-          <span className="border-[0.5px] border-gray-700" />
-
-          <div className="flex justify-between flex-wrap items-center gap-3 text-xs">
-            <span className="flex flex-col gap-1">
-              <span className="flex items-center gap-1 text-muted">
-                {t('Entity scope')}{' '}
-              </span>
-
-              <span className="flex items-center gap-1">
-                {kind.dispatchStrategy?.teamScope && (
-                  <Tooltip
-                    description={
-                      <span>{kind.dispatchStrategy?.teamScope}</span>
-                    }
-                  >
-                    <span className="flex items-center p-1 rounded-full border border-gray-600">
-                      {<VegaIcon name={VegaIconNames.TEAM} size={16} />}
-                    </span>
-                  </Tooltip>
-                )}
-                {kind.dispatchStrategy?.individualScope && (
-                  <Tooltip
-                    description={
-                      <span>{kind.dispatchStrategy?.individualScope}</span>
-                    }
-                  >
-                    <span className="flex items-center p-1 rounded-full border border-gray-600">
-                      {<VegaIcon name={VegaIconNames.MAN} size={16} />}
-                    </span>
-                  </Tooltip>
-                )}
-                {/* Shows transfer status */}
-                {/* <StatusIndicator
-                  status={transfer.status}
-                  reason={transfer.reason}
-                /> */}
-              </span>
-            </span>
-
-            <span className="flex flex-col gap-1">
-              <span className="flex items-center gap-1 text-muted">
-                {t('Staked VEGA')}{' '}
-              </span>
-              <span className="flex items-center gap-1">
-                {addDecimalsFormatNumber(
-                  kind.dispatchStrategy?.stakingRequirement || 0,
-                  transfer.asset?.decimals || 0
-                )}
-              </span>
-            </span>
-
-            <span className="flex flex-col gap-1">
-              <span className="flex items-center gap-1 text-muted">
-                {t('Average position')}{' '}
-              </span>
-              <span className="flex items-center gap-1">
-                {addDecimalsFormatNumber(
-                  kind.dispatchStrategy
-                    ?.notionalTimeWeightedAveragePositionRequirement || 0,
-                  transfer.asset?.decimals || 0
-                )}
-              </span>
-            </span>
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-};
-
-const getGradientClasses = (d: DispatchMetric | undefined) => {
-  switch (d) {
-    case DispatchMetric.DISPATCH_METRIC_AVERAGE_POSITION:
-      return {
-        gradientClassName: 'from-vega-pink-500 to-vega-purple-400',
-        mainClassName: 'from-vega-pink-400 dark:from-vega-pink-600 to-20%',
-      };
-    case DispatchMetric.DISPATCH_METRIC_LP_FEES_RECEIVED:
-      return {
-        gradientClassName: 'from-vega-green-500 to-vega-yellow-500',
-        mainClassName: 'from-vega-green-400 dark:from-vega-green-600 to-20%',
-      };
-    case DispatchMetric.DISPATCH_METRIC_MAKER_FEES_PAID:
-      return {
-        gradientClassName: 'from-vega-orange-500 to-vega-pink-400',
-        mainClassName: 'from-vega-orange-400 dark:from-vega-orange-600 to-20%',
-      };
-    case DispatchMetric.DISPATCH_METRIC_MARKET_VALUE:
-    case DispatchMetric.DISPATCH_METRIC_RELATIVE_RETURN:
-      return {
-        gradientClassName: 'from-vega-purple-500 to-vega-blue-400',
-        mainClassName: 'from-vega-purple-400 dark:from-vega-purple-600 to-20%',
-      };
-    case DispatchMetric.DISPATCH_METRIC_RETURN_VOLATILITY:
-      return {
-        gradientClassName: 'from-vega-blue-500 to-vega-green-400',
-        mainClassName: 'from-vega-blue-400 dark:from-vega-blue-600 to-20%',
-      };
-    case DispatchMetric.DISPATCH_METRIC_VALIDATOR_RANKING:
-    default:
-      return {
-        gradientClassName: 'from-vega-pink-500 to-vega-purple-400',
-        mainClassName: 'from-vega-pink-400 dark:from-vega-pink-600 to-20%',
-      };
-  }
-};
-
-const CardIcon = ({
-  size = 18,
-  iconName,
-  tooltip,
-}: {
-  size?: VegaIconSize;
-  iconName: VegaIconNames;
-  tooltip: string;
-}) => {
-  return (
-    <Tooltip description={<span>{tooltip}</span>}>
-      <span className="flex items-center p-2 rounded-full border border-gray-600">
-        <VegaIcon name={iconName} size={size} />
-      </span>
-    </Tooltip>
-  );
-};
-
-const EntityIcon = ({
-  transfer,
-  size = 18,
-}: {
-  transfer: Transfer;
-  size?: VegaIconSize;
-}) => {
-  if (transfer.kind.__typename !== 'RecurringTransfer') {
-    return null;
-  }
-  const entityScope = transfer.kind.dispatchStrategy?.entityScope;
-  const getIconName = () => {
-    switch (entityScope) {
-      case EntityScope.ENTITY_SCOPE_TEAMS:
-        return VegaIconNames.TEAM;
-      case EntityScope.ENTITY_SCOPE_INDIVIDUALS:
-        return VegaIconNames.MAN;
-      default:
-        return VegaIconNames.QUESTION_MARK;
-    }
-  };
-  const iconName = getIconName();
-  return (
-    <Tooltip
-      description={
-        <span>{entityScope ? EntityScopeMapping[entityScope] : ''}</span>
-      }
-    >
-      <span className="flex items-center p-2 rounded-full border border-gray-600">
-        {iconName && <VegaIcon name={iconName} size={size} />}
-      </span>
-    </Tooltip>
-  );
-};

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

@@ -33,10 +33,6 @@ import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';
 import { RewardsHistoryContainer } from './rewards-history';
 import { useT } from '../../lib/use-t';
 import { useAssetsMapProvider } from '@vegaprotocol/assets';
-import { ActiveRewards } from './active-rewards';
-import { ActivityStreak } from './streaks/activity-streaks';
-import { RewardHoarderBonus } from './streaks/reward-hoarder-bonus';
-import classNames from 'classnames';
 
 const ASSETS_WITH_INCORRECT_VESTING_REWARD_DATA = [
   'bf1e88d19db4b3ca0d1d5bdb73718a01686b18cf731ca26adedf3c8b83802bba', // USDT mainnet
@@ -49,7 +45,6 @@ export const RewardsContainer = () => {
   const { params, loading: paramsLoading } = useNetworkParams([
     NetworkParams.reward_asset,
     NetworkParams.rewards_activityStreak_benefitTiers,
-    NetworkParams.rewards_vesting_benefitTiers,
     NetworkParams.rewards_vesting_baseRate,
   ]);
 
@@ -59,14 +54,6 @@ export const RewardsContainer = () => {
 
   const { data: epochData } = useRewardsEpochQuery();
 
-  const { rewards_activityStreak_benefitTiers, rewards_vesting_benefitTiers } =
-    params || {};
-
-  const activityStreakBenefitTiers = JSON.parse(
-    rewards_activityStreak_benefitTiers
-  );
-  const vestingBenefitTiers = JSON.parse(rewards_vesting_benefitTiers);
-
   // No need to specify the fromEpoch as it will by default give you the last
   // Note activityStreak in query will fail
   const { data: rewardsData, loading: rewardsLoading } = useRewardsPageQuery({
@@ -81,9 +68,6 @@ export const RewardsContainer = () => {
     pollInterval: 10000,
   });
 
-  const partyActivityStreak = rewardsData?.party?.activityStreak;
-  const vestingDetails = rewardsData?.party?.vestingStats;
-
   if (!epochData?.epoch || !assetMap) return null;
 
   const loading = paramsLoading || accountsLoading || rewardsLoading;
@@ -130,98 +114,74 @@ export const RewardsContainer = () => {
   ]);
 
   return (
-    <div className="flex flex-col w-full gap-3">
-      <div className="grid auto-rows-min grid-cols-6 gap-3">
-        {/* Always show reward information for vega */}
-        <Card
-          key={params.reward_asset}
-          title={t('Vega Reward pot')}
-          className="lg:col-span-3 xl:col-span-2"
-          loading={loading}
-          highlight={true}
-        >
-          <RewardPot
-            pubKey={pubKey}
-            accounts={accounts}
-            assetId={params.reward_asset}
-            vestingBalancesSummary={rewardsData?.party?.vestingBalancesSummary}
-          />
-        </Card>
-        <Card
-          title={t('Vesting')}
-          className="lg:col-span-3 xl:col-span-2"
-          loading={loading}
-        >
-          <Vesting
-            pubKey={pubKey}
-            baseRate={params.rewards_vesting_baseRate}
-            multiplier={
-              rewardsData?.party?.activityStreak?.rewardVestingMultiplier
-            }
-          />
-        </Card>
-        <Card
-          title={t('Rewards multipliers')}
-          className="lg:col-span-3 xl:col-span-2"
-          loading={loading}
-          highlight={true}
-        >
-          <Multipliers
-            pubKey={pubKey}
-            hoarderMultiplier={
-              rewardsData?.party?.vestingStats?.rewardBonusMultiplier
-            }
-            streakMultiplier={
-              rewardsData?.party?.activityStreak?.rewardDistributionMultiplier
-            }
-          />
-        </Card>
+    <div className="grid auto-rows-min grid-cols-6 gap-3">
+      {/* Always show reward information for vega */}
+      <Card
+        key={params.reward_asset}
+        title={t('Vega Reward pot')}
+        className="lg:col-span-3 xl:col-span-2"
+        loading={loading}
+        highlight={true}
+      >
+        <RewardPot
+          pubKey={pubKey}
+          accounts={accounts}
+          assetId={params.reward_asset}
+          vestingBalancesSummary={rewardsData?.party?.vestingBalancesSummary}
+        />
+      </Card>
+      <Card
+        title={t('Vesting')}
+        className="lg:col-span-3 xl:col-span-2"
+        loading={loading}
+      >
+        <Vesting
+          pubKey={pubKey}
+          baseRate={params.rewards_vesting_baseRate}
+          multiplier={
+            rewardsData?.party?.activityStreak?.rewardVestingMultiplier
+          }
+        />
+      </Card>
+      <Card
+        title={t('Rewards multipliers')}
+        className="lg:col-span-3 xl:col-span-2"
+        loading={loading}
+        highlight={true}
+      >
+        <Multipliers
+          pubKey={pubKey}
+          hoarderMultiplier={
+            rewardsData?.party?.vestingStats?.rewardBonusMultiplier
+          }
+          streakMultiplier={
+            rewardsData?.party?.activityStreak?.rewardDistributionMultiplier
+          }
+        />
+      </Card>
 
-        {/* Show all other reward pots, most of the time users will not have other rewards */}
-        {assets
-          .filter((assetId) => assetId !== params.reward_asset)
-          .map((assetId) => {
-            const asset = assetMap ? assetMap[assetId] : null;
+      {/* Show all other reward pots, most of the time users will not have other rewards */}
+      {assets
+        .filter((assetId) => assetId !== params.reward_asset)
+        .map((assetId) => {
+          const asset = assetMap ? assetMap[assetId] : null;
 
-            if (!asset) return null;
+          if (!asset) return null;
 
-            // Following code is for mitigating an issue due to a core bug where locked and vesting
-            // balances were incorrectly increased for infrastructure rewards for USDT on mainnet
-            //
-            // We don't want to incorrectly show the wring locked/vesting values, but we DO want to
-            // show the user that they have rewards available to withdraw
-            if (ASSETS_WITH_INCORRECT_VESTING_REWARD_DATA.includes(asset.id)) {
-              const accountsForAsset = rewardAccountsAssetMap[asset.id];
-              const vestedAccount = accountsForAsset?.find(
-                (a) => a.type === AccountType.ACCOUNT_TYPE_VESTED_REWARDS
-              );
+          // Following code is for mitigating an issue due to a core bug where locked and vesting
+          // balances were incorrectly increased for infrastructure rewards for USDT on mainnet
+          //
+          // We don't want to incorrectly show the wring locked/vesting values, but we DO want to
+          // show the user that they have rewards available to withdraw
+          if (ASSETS_WITH_INCORRECT_VESTING_REWARD_DATA.includes(asset.id)) {
+            const accountsForAsset = rewardAccountsAssetMap[asset.id];
+            const vestedAccount = accountsForAsset?.find(
+              (a) => a.type === AccountType.ACCOUNT_TYPE_VESTED_REWARDS
+            );
 
-              // No vested rewards available to withdraw, so skip over USDT
-              if (!vestedAccount || Number(vestedAccount.balance) <= 0) {
-                return null;
-              }
-
-              return (
-                <Card
-                  key={assetId}
-                  title={t('{{assetSymbol}} Reward pot', {
-                    assetSymbol: asset.symbol,
-                  })}
-                  className="lg:col-span-3 xl:col-span-2"
-                  loading={loading}
-                >
-                  <RewardPot
-                    pubKey={pubKey}
-                    accounts={accounts}
-                    assetId={assetId}
-                    // Ensure that these values are shown as 0
-                    vestingBalancesSummary={{
-                      lockedBalances: [],
-                      vestingBalances: [],
-                    }}
-                  />
-                </Card>
-              );
+            // No vested rewards available to withdraw, so skip over USDT
+            if (!vestedAccount || Number(vestedAccount.balance) <= 0) {
+              return null;
             }
 
             return (
@@ -237,69 +197,48 @@ export const RewardsContainer = () => {
                   pubKey={pubKey}
                   accounts={accounts}
                   assetId={assetId}
-                  vestingBalancesSummary={
-                    rewardsData?.party?.vestingBalancesSummary
-                  }
+                  // Ensure that these values are shown as 0
+                  vestingBalancesSummary={{
+                    lockedBalances: [],
+                    vestingBalances: [],
+                  }}
                 />
               </Card>
             );
-          })}
-      </div>
-      <div className="grid auto-rows-min grid-cols-6 gap-3">
-        {pubKey && activityStreakBenefitTiers.tiers?.length > 0 && (
-          <Card
-            title={t('Activity Streak')}
-            className={classNames(
-              {
-                'lg:col-span-6 xl:col-span-3':
-                  activityStreakBenefitTiers.tiers.length <= 4,
-                'xl:col-span-6': activityStreakBenefitTiers.tiers.length > 4,
-              },
-              'hidden md:block'
-            )}
-          >
-            <span className="flex flex-col mr-8 pr-4">
-              <ActivityStreak
-                tiers={activityStreakBenefitTiers.tiers}
-                streak={partyActivityStreak}
+          }
+
+          return (
+            <Card
+              key={assetId}
+              title={t('{{assetSymbol}} Reward pot', {
+                assetSymbol: asset.symbol,
+              })}
+              className="lg:col-span-3 xl:col-span-2"
+              loading={loading}
+            >
+              <RewardPot
+                pubKey={pubKey}
+                accounts={accounts}
+                assetId={assetId}
+                vestingBalancesSummary={
+                  rewardsData?.party?.vestingBalancesSummary
+                }
               />
-            </span>
-          </Card>
-        )}
-        {pubKey && vestingBenefitTiers.tiers?.length > 0 && (
-          <Card
-            title={t('Reward Hoarder Bonus')}
-            className={classNames(
-              {
-                'lg:col-span-6 xl:col-span-3':
-                  vestingBenefitTiers.tiers.length <= 4,
-                'xl:col-span-6': vestingBenefitTiers.tiers.length > 4,
-              },
-              'hidden md:block'
-            )}
-          >
-            <span className="flex flex-col mr-8 pr-4">
-              <RewardHoarderBonus
-                tiers={vestingBenefitTiers.tiers}
-                vestingDetails={vestingDetails}
-              />
-            </span>
-          </Card>
-        )}
-        <ActiveRewards currentEpoch={Number(epochData?.epoch.id)} />
-        <Card
-          title={t('Rewards history')}
-          className="lg:col-span-full hidden md:block"
-          loading={rewardsLoading}
-          noBackgroundOnMobile={true}
-        >
-          <RewardsHistoryContainer
-            epoch={Number(epochData?.epoch.id)}
-            pubKey={pubKey}
-            assets={assetMap}
-          />
-        </Card>
-      </div>
+            </Card>
+          );
+        })}
+      <Card
+        title={t('Rewards history')}
+        className="lg:col-span-full"
+        loading={rewardsLoading}
+        noBackgroundOnMobile={true}
+      >
+        <RewardsHistoryContainer
+          epoch={Number(epochData?.epoch.id)}
+          pubKey={pubKey}
+          assets={assetMap}
+        />
+      </Card>
     </div>
   );
 };
@@ -404,7 +343,7 @@ export const RewardPot = ({
                   })}
                   <VegaIcon name={VegaIconNames.LOCK} size={12} />
                 </CardTableTH>
-                <CardTableTD data-testid="locked-value">
+                <CardTableTD>
                   {addDecimalsFormatNumberQuantum(
                     totalLocked.toString(),
                     rewardAsset.decimals,
@@ -418,7 +357,7 @@ export const RewardPot = ({
                     assetSymbol: rewardAsset.symbol,
                   })}
                 </CardTableTH>
-                <CardTableTD data-testid="vesting-value">
+                <CardTableTD>
                   {addDecimalsFormatNumberQuantum(
                     totalVesting.toString(),
                     rewardAsset.decimals,
@@ -430,7 +369,7 @@ export const RewardPot = ({
                 <CardTableTH>
                   {t('Available to withdraw this epoch')}
                 </CardTableTH>
-                <CardTableTD data-testid="available-to-withdraw-value">
+                <CardTableTD>
                   {addDecimalsFormatNumberQuantum(
                     totalVestedRewardsByRewardAsset.toString(),
                     rewardAsset.decimals,
@@ -449,7 +388,6 @@ export const RewardPot = ({
                     )
                   }
                   size="small"
-                  data-testid="redeem-rewards-button"
                 >
                   {t('Redeem rewards')}
                 </TradingButton>
@@ -484,16 +422,12 @@ export const Vesting = ({
       <CardTable>
         <tr>
           <CardTableTH>{t('Base rate')}</CardTableTH>
-          <CardTableTD data-testid="base-rate-value">
-            {baseRateFormatted}%
-          </CardTableTD>
+          <CardTableTD>{baseRateFormatted}%</CardTableTD>
         </tr>
         {pubKey && (
           <tr>
             <CardTableTH>{t('Vesting multiplier')}</CardTableTH>
-            <CardTableTD data-testid="vesting multiplier-value">
-              {multiplier ? `${multiplier}x` : '-'}
-            </CardTableTD>
+            <CardTableTD>{multiplier ? `${multiplier}x` : '-'}</CardTableTD>
           </tr>
         )}
       </CardTable>
@@ -533,13 +467,13 @@ export const Multipliers = ({
       <CardTable>
         <tr>
           <CardTableTH>{t('Streak reward multiplier')}</CardTableTH>
-          <CardTableTD data-testid="streak-reward-multiplier-value">
+          <CardTableTD>
             {streakMultiplier ? `${streakMultiplier}x` : '-'}
           </CardTableTD>
         </tr>
         <tr>
           <CardTableTH>{t('Hoarder reward multiplier')}</CardTableTH>
-          <CardTableTD data-testid="hoarder-reward-multiplier-value">
+          <CardTableTD>
             {hoarderMultiplier ? `${hoarderMultiplier}x` : '-'}
           </CardTableTD>
         </tr>

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

@@ -319,7 +319,6 @@ export const RewardHistoryTable = ({
             onClick={() => setIsParty(false)}
             size="extra-small"
             minimal={isParty}
-            data-testid="total-distributed-button"
           >
             {t('Total distributed')}
           </TradingButton>
@@ -328,7 +327,6 @@ export const RewardHistoryTable = ({
             size="extra-small"
             disabled={!pubKey}
             minimal={!isParty}
-            data-testid="earned-by-me-button"
           >
             {t('Earned by me')}
           </TradingButton>

apps/trading/components/rewards-container/streaks/activity-streaks.spec.tsx

@@ -1,66 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import { ActivityStreak } from './activity-streaks';
-
-describe('ActivityStreak', () => {
-  it('renders null when streak is not active', () => {
-    const tiers: {
-      minimum_activity_streak: number;
-      reward_multiplier: string;
-      vesting_multiplier: string;
-    }[] = [];
-    const streak = null;
-    render(<ActivityStreak tiers={tiers} streak={streak} />);
-    const component = screen.queryByText(/epochs streak/i);
-    expect(component).toBeNull();
-  });
-
-  it('renders null when tiers are empty', () => {
-    const tiers: {
-      minimum_activity_streak: number;
-      reward_multiplier: string;
-      vesting_multiplier: string;
-    }[] = [];
-    const streak = {
-      activeFor: 10,
-      isActive: true,
-      inactiveFor: 10,
-      rewardDistributionMultiplier: '45678',
-      rewardVestingMultiplier: '45678',
-      epoch: 10,
-      tradedVolume: '45678',
-      openVolume: '45678',
-    };
-    render(<ActivityStreak tiers={tiers} streak={streak} />);
-    const component = screen.queryByText(/epochs streak/i);
-    expect(component).toBeNull();
-  });
-
-  it('renders the component with tiers and active streak', () => {
-    const tiers = [
-      {
-        minimum_activity_streak: 5,
-        reward_multiplier: '1.5x',
-        vesting_multiplier: '2x',
-      },
-      {
-        minimum_activity_streak: 10,
-        reward_multiplier: '2x',
-        vesting_multiplier: '3x',
-      },
-    ];
-    const streak = {
-      activeFor: 7,
-      isActive: true,
-      inactiveFor: 10,
-      rewardDistributionMultiplier: '45678',
-      rewardVestingMultiplier: '45678',
-      epoch: 10,
-      tradedVolume: '45678',
-      openVolume: '45678',
-    };
-    render(<ActivityStreak tiers={tiers} streak={streak} />);
-
-    const tierLabels = screen.getAllByText(/Tier/i);
-    expect(tierLabels.length).toBe(3); // 2 tiers + 1 label
-  });
-});

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

@@ -1,226 +0,0 @@
-import { VegaIcon, VegaIconNames } from '@vegaprotocol/ui-toolkit';
-import { useT } from '../../../lib/use-t';
-import classNames from 'classnames';
-import BigNumber from 'bignumber.js';
-import type { PartyActivityStreak } from '@vegaprotocol/types';
-
-export const safeProgress = (
-  i: number,
-  userTierIndex: number,
-  total: number | string,
-  progress?: number | string
-) => {
-  if (i < userTierIndex) return 100;
-  if (i > userTierIndex) return 0;
-
-  if (!progress || !total) return 0;
-  if (new BigNumber(progress).isGreaterThan(total)) return 100;
-  return new BigNumber(progress)
-    .multipliedBy(100)
-    .dividedBy(total || 1)
-    .toNumber();
-};
-
-export const useGetUserTier = (
-  tiers: {
-    minimum_activity_streak: number;
-    reward_multiplier: string;
-    vesting_multiplier: string;
-  }[],
-  progress?: number
-) => {
-  if (!progress) return 0;
-  if (!tiers || tiers.length === 0) return 0;
-
-  let userTier = 0;
-  let i = 0;
-  while (
-    i < tiers.length &&
-    tiers[userTier].minimum_activity_streak < progress
-  ) {
-    userTier = i;
-    i++;
-  }
-
-  if (
-    i === tiers.length &&
-    tiers[userTier].minimum_activity_streak <= progress
-  ) {
-    userTier = i;
-  }
-
-  if (userTier > tiers.length) {
-    userTier--;
-  }
-
-  return userTier;
-};
-
-export const ActivityStreak = ({
-  tiers,
-  streak,
-}: {
-  tiers: {
-    minimum_activity_streak: number;
-    reward_multiplier: string;
-    vesting_multiplier: string;
-  }[];
-  streak?: PartyActivityStreak | null;
-}) => {
-  const t = useT();
-  const userTierIndex = useGetUserTier(tiers, streak?.activeFor);
-
-  if (!tiers || tiers.length === 0) return null;
-
-  const progressBarHeight = 'h-10';
-
-  return (
-    <>
-      <div className="flex flex-col gap-1 w-full">
-        <div className="flex flex-col gap-1">
-          <div
-            className="grid"
-            style={{
-              gridTemplateColumns:
-                'repeat(' + tiers.length + ', minmax(0, 1fr))',
-            }}
-          >
-            {tiers.map((tier, index) => {
-              return (
-                <div key={index} className="flex justify-end -mr-[2.85rem]">
-                  <span className="flex flex-col items-center gap-4 justify-between">
-                    <span className="flex flex-col items-center gap-1">
-                      <span className="flex flex-col items-center font-medium">
-                        <span className="text-sm">
-                          {t('Tier {{tier}}', {
-                            tier: index + 1,
-                          })}
-                        </span>
-                        <span className="text-muted text-xs">
-                          {t('numberEpochs', '{{count}} epochs', {
-                            count: tier.minimum_activity_streak,
-                          })}
-                        </span>
-                      </span>
-
-                      <span
-                        className={classNames(
-                          'text-xs flex flex-col items-center justify-center px-2 py-1 rounded-lg text-white border',
-                          {
-                            'border-pink-600 bg-pink-900': index % 6 === 0,
-                            'border-purple-600 bg-purple-900': index % 6 === 1,
-                            'border-blue-600 bg-blue-900': index % 6 === 2,
-                            'border-orange-600 bg-orange-900': index % 6 === 3,
-                            'border-green-600 bg-green-900': index % 6 === 4,
-                            'border-yellow-600 bg-yellow-900': index % 6 === 5,
-                          }
-                        )}
-                      >
-                        <span>
-                          {t('Reward {{reward}}x', {
-                            reward: tier.reward_multiplier,
-                          })}
-                        </span>
-                        <span>
-                          {t('Vesting {{vesting}}x', {
-                            vesting: tier.vesting_multiplier,
-                          })}
-                        </span>
-                      </span>
-                    </span>
-                    <span
-                      className={classNames(
-                        {
-                          'text-pink-500': index % 6 === 0,
-                          'text-purple-500': index % 6 === 1,
-                          'text-blue-500': index % 6 === 2,
-                          'text-orange-500': index % 6 === 3,
-                          'text-green-500': index % 6 === 4,
-                          'text-yellow-500': index % 6 === 5,
-                        },
-                        'leading-[0] font-sans text-[48px]'
-                      )}
-                    >
-                      •
-                    </span>
-                  </span>
-                </div>
-              );
-            })}
-          </div>
-        </div>
-
-        <div className="flex items-center gap-1">
-          {tiers.map((_tier, index) => {
-            return (
-              <div
-                key={index}
-                className="bg-white dark:bg-gray-800 shadow-card rounded-[100px] grow"
-              >
-                <div
-                  className={classNames(
-                    'relative w-full rounded-[100px] bg-gray-200 dark:bg-gray-800',
-                    progressBarHeight
-                  )}
-                >
-                  <div
-                    className={classNames(
-                      'absolute left-0 top-0 h-full rounded-[100px] bg-gradient-to-r',
-                      {
-                        'from-vega-dark-400 to-vega-dark-200':
-                          userTierIndex === 0 || streak?.isActive === false,
-                        'from-vega-pink-600 to-vega-pink-500':
-                          userTierIndex % 6 === 1,
-                        'from-vega-purple-600 to-vega-purple-500':
-                          userTierIndex % 6 === 2,
-                        'from-vega-blue-600 to-vega-blue-500':
-                          userTierIndex % 6 === 3,
-                        'from-vega-orange-600 to-vega-orange-500':
-                          userTierIndex % 6 === 4,
-                        'from-vega-green-600 to-vega-green-500':
-                          userTierIndex % 6 === 5,
-                        'from-vega-yellow-600 to-vega-yellow-500':
-                          userTierIndex % 6 === 0,
-                      }
-                    )}
-                    style={{
-                      width:
-                        safeProgress(
-                          index,
-                          userTierIndex,
-                          tiers[index].minimum_activity_streak,
-                          streak?.activeFor
-                        ) + '%',
-                    }}
-                  ></div>
-                </div>
-              </div>
-            );
-          })}
-        </div>
-
-        <div className="flex items-center gap-1">
-          <VegaIcon name={VegaIconNames.STREAK} />
-
-          <span className="flex flex-col">
-            {streak?.isActive && (
-              <span data-testid="epoch-streak">
-                {t('userActive', '{{active}} trader: {{count}} epochs so far', {
-                  active: streak?.isActive ? 'Active' : 'Inactive',
-                  count: streak?.activeFor || 0,
-                })}{' '}
-                {userTierIndex > 0 &&
-                  new BigNumber(
-                    tiers[0].minimum_activity_streak
-                  ).isLessThanOrEqualTo(streak?.activeFor || 0) &&
-                  t('(Tier {{tier}} as of last epoch)', {
-                    tier: userTierIndex,
-                  })}
-              </span>
-            )}
-          </span>
-        </div>
-      </div>
-    </>
-  );
-};

apps/trading/components/rewards-container/streaks/reward-hoarder-bonus.spec.tsx

@@ -1,58 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import { RewardHoarderBonus } from './reward-hoarder-bonus';
-import type { PartyVestingStats } from '@vegaprotocol/types';
-
-describe('RewardHoarderBonus', () => {
-  it('renders null when vestingDetails is not provided', () => {
-    const tiers: {
-      minimum_quantum_balance: string;
-      reward_multiplier: string;
-    }[] = [];
-    const vestingDetails = null;
-    render(
-      <RewardHoarderBonus tiers={tiers} vestingDetails={vestingDetails} />
-    );
-    const component = screen.queryByText(/Reward bonus/i);
-    expect(component).toBeNull();
-  });
-
-  it('renders null when tiers are empty', () => {
-    const tiers: {
-      minimum_quantum_balance: string;
-      reward_multiplier: string;
-    }[] = [];
-    const vestingDetails: PartyVestingStats = {
-      epochSeq: 0,
-      rewardBonusMultiplier: '1.5',
-      quantumBalance: '100',
-    };
-    render(
-      <RewardHoarderBonus tiers={tiers} vestingDetails={vestingDetails} />
-    );
-    const component = screen.queryByText(/Reward bonus/i);
-    expect(component).toBeNull();
-  });
-
-  it('renders the component with tiers and vestingDetails', () => {
-    const tiers = [
-      {
-        minimum_quantum_balance: '50',
-        reward_multiplier: '1.5x',
-      },
-      {
-        minimum_quantum_balance: '100',
-        reward_multiplier: '2x',
-      },
-    ];
-    const vestingDetails = {
-      epochSeq: 0,
-      rewardBonusMultiplier: '1.5',
-      quantumBalance: '75',
-    };
-    render(
-      <RewardHoarderBonus tiers={tiers} vestingDetails={vestingDetails} />
-    );
-    const tierLabels = screen.getAllByText(/Tier/i);
-    expect(tierLabels.length).toBe(3); // 2 tiers + 1 label
-  });
-});

apps/trading/components/rewards-container/streaks/reward-hoarder-bonus.tsx

@@ -1,197 +0,0 @@
-import { VegaIcon, VegaIconNames } from '@vegaprotocol/ui-toolkit';
-import { useT } from '../../../lib/use-t';
-import classNames from 'classnames';
-import type { PartyVestingStats } from '@vegaprotocol/types';
-import BigNumber from 'bignumber.js';
-import { formatNumber } from '@vegaprotocol/utils';
-import { safeProgress } from './activity-streaks';
-
-export const useGetUserTier = (
-  tiers: {
-    minimum_quantum_balance: string;
-    reward_multiplier: string;
-  }[],
-  progress?: number | string
-) => {
-  if (!progress) return 0;
-  if (!tiers || tiers.length === 0) return 0;
-
-  let userTier = 0;
-  let i = 0;
-  let minProgress = '0';
-  while (i < tiers.length && new BigNumber(minProgress).isLessThan(progress)) {
-    userTier = i;
-    i++;
-    minProgress = tiers[userTier].minimum_quantum_balance;
-  }
-
-  if (
-    i === tiers.length &&
-    new BigNumber(minProgress).isLessThanOrEqualTo(progress)
-  ) {
-    userTier = i;
-  }
-
-  if (userTier > tiers.length) {
-    userTier--;
-  }
-
-  return userTier;
-};
-
-export const RewardHoarderBonus = ({
-  tiers,
-  vestingDetails,
-}: {
-  tiers: {
-    minimum_quantum_balance: string;
-    reward_multiplier: string;
-  }[];
-  vestingDetails?: PartyVestingStats | null;
-}) => {
-  const t = useT();
-
-  const userTierIndex = useGetUserTier(tiers, vestingDetails?.quantumBalance);
-
-  if (!tiers || tiers.length === 0) return null;
-
-  // There is only value to compare to the tiers that covers all the user' rewards across all assets
-  const qUSD = 'qUSD';
-
-  const progressBarHeight = 'h-10';
-
-  return (
-    <>
-      <div className="flex flex-col gap-1 w-full">
-        <div className="flex flex-col gap-1">
-          <div
-            className="grid"
-            style={{
-              gridTemplateColumns:
-                'repeat(' + tiers.length + ', minmax(0, 1fr))',
-            }}
-          >
-            {tiers.map((tier, index) => {
-              return (
-                <div key={index} className="flex justify-end -mr-[2.95rem]">
-                  <span className="flex flex-col items-center gap-4 justify-between">
-                    <span className="flex flex-col items-center gap-1">
-                      <span className="flex flex-col items-center font-medium">
-                        <span className="text-sm">
-                          {t('Tier {{tier}}', {
-                            tier: index + 1,
-                          })}
-                        </span>
-                        <span className="text-muted text-xs">
-                          {formatNumber(tier.minimum_quantum_balance)} {qUSD}
-                        </span>
-                      </span>
-
-                      <span
-                        className={classNames(
-                          'text-xs flex flex-col items-center justify-center px-2 py-1 rounded-lg text-white border',
-                          {
-                            'border-pink-600 bg-pink-900': index % 6 === 0,
-                            'border-purple-600 bg-purple-900': index % 6 === 1,
-                            'border-blue-600 bg-blue-900': index % 6 === 2,
-                            'border-orange-600 bg-orange-900': index % 6 === 3,
-                            'border-green-600 bg-green-900': index % 6 === 4,
-                            'border-yellow-600 bg-yellow-900': index % 6 === 5,
-                          }
-                        )}
-                      >
-                        <span>{t('Reward bonus')}</span>
-                        <span>
-                          {t('{{reward}}x', {
-                            reward: tier.reward_multiplier,
-                          })}
-                        </span>
-                      </span>
-                    </span>
-
-                    <span
-                      className={classNames(
-                        {
-                          'text-pink-500': index % 6 === 0,
-                          'text-purple-500': index % 6 === 1,
-                          'text-blue-500': index % 6 === 2,
-                          'text-orange-500': index % 6 === 3,
-                          'text-green-500': index % 6 === 4,
-                          'text-yellow-500': index % 6 === 5,
-                        },
-                        'leading-[0] font-sans text-[48px]'
-                      )}
-                    >
-                      •
-                    </span>
-                  </span>
-                </div>
-              );
-            })}
-          </div>
-        </div>
-
-        <div className="flex items-center gap-1">
-          {tiers.map((_tier, index) => {
-            return (
-              <div
-                key={index}
-                className="bg-white dark:bg-gray-800 shadow-card rounded-[100px] grow"
-              >
-                <div
-                  className={classNames(
-                    'relative w-full rounded-[100px] bg-gray-200 dark:bg-gray-800',
-                    progressBarHeight
-                  )}
-                >
-                  <div
-                    className={classNames(
-                      'absolute left-0 top-0 h-full rounded-[100px] bg-gradient-to-r',
-                      {
-                        'from-vega-dark-400 to-vega-dark-200':
-                          userTierIndex === 0,
-                        'from-vega-pink-600 to-vega-pink-500':
-                          userTierIndex % 6 === 1,
-                        'from-vega-purple-600 to-vega-purple-500':
-                          userTierIndex % 6 === 2,
-                        'from-vega-blue-600 to-vega-blue-500':
-                          userTierIndex % 6 === 3,
-                        'from-vega-orange-600 to-vega-orange-500':
-                          userTierIndex % 6 === 4,
-                        'from-vega-green-600 to-vega-green-500':
-                          userTierIndex % 6 === 5,
-                        'from-vega-yellow-600 to-vega-yellow-500':
-                          userTierIndex % 6 === 0,
-                      }
-                    )}
-                    style={{
-                      width:
-                        safeProgress(
-                          index,
-                          userTierIndex,
-                          tiers[index].minimum_quantum_balance,
-                          vestingDetails?.quantumBalance
-                        ) + '%',
-                    }}
-                  ></div>
-                </div>
-              </div>
-            );
-          })}
-        </div>
-
-        <div className="flex items-center gap-1">
-          <VegaIcon name={VegaIconNames.STREAK} />
-          <span data-testid="hoarder-bonus-total-hoarded">
-            {formatNumber(vestingDetails?.quantumBalance || 0)} {qUSD}{' '}
-            {userTierIndex > 0 &&
-              new BigNumber(
-                tiers[0].minimum_quantum_balance
-              ).isLessThanOrEqualTo(vestingDetails?.quantumBalance || 0) &&
-              t('(Tier {{tier}} as of last epoch)', { tier: userTierIndex })}
-          </span>
-        </div>
-      </div>
-    </>
-  );
-};

apps/trading/e2e/.env

@@ -1,3 +1,3 @@
 CONSOLE_IMAGE_NAME=vegaprotocol/trading:latest
-VEGA_VERSION=v0.74.0-preview.2
+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.74.0-preview.2
-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 playwright.sync_api import Error as PlaywrightError
-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
@@ -274,18 +267,3 @@ def perps_market(vega, request):
     if hasattr(request, "param"):
         kwargs.update(request.param)
     return setup_perps_market(vega, **kwargs)
-
-
-@pytest.fixture(autouse=True)
-def retry_on_http_error(request):
-    retry_count = 3 
-    for i in range(retry_count):
-        try:
-            yield
-            return 
-        except requests.exceptions.HTTPError:
-            if i < retry_count - 1:
-                print(f"Retrying due to HTTPError (attempt {i+1}/{retry_count})")
-            else:
-                raise 
-

apps/trading/e2e/fixtures/market.py

@@ -18,14 +18,14 @@ def setup_simple_market(
     custom_market_name=market_name,
     custom_asset_name="tDAI",
     custom_asset_symbol="tDAI",
-    custom_quantum=1,
+    custom_quantum=1
 ):
     for wallet in wallets:
         vega.create_key(wallet.name)
 
     vega.mint(
         MM_WALLET.name,
-        asset=vega.find_asset_id(symbol="VOTE", enabled=True),
+        asset="VOTE",
         amount=mint_amount,
     )
 
@@ -117,30 +117,18 @@ def setup_simple_successor_market(
     return market_id
 
 
-def setup_opening_auction_market(
-    vega: VegaService,
-    market_id: str = None,
-    buy_orders=default_buy_orders,
-    sell_orders=default_sell_orders,
-    add_liquidity=True,
-    custom_market_name="BTC:DAI_2023",
-    custom_asset_name="tDAI",
-    custom_asset_symbol="tDAI",
-    **kwargs,
-):
+def setup_opening_auction_market(vega: VegaService, market_id: str = None, buy_orders=default_buy_orders, sell_orders=default_sell_orders, add_liquidity=True, **kwargs):
     if not market_exists(vega, market_id):
-        market_id = setup_simple_market(
-            vega,
-            custom_market_name=custom_market_name,
-            custom_asset_name=custom_asset_name,
-            custom_asset_symbol=custom_asset_symbol,
-            **kwargs,
-        )
+        market_id = setup_simple_market(vega, **kwargs)
 
     if add_liquidity:
         submit_liquidity(vega, MM_WALLET.name, market_id)
-    submit_multiple_orders(vega, MM_WALLET.name, market_id, "SIDE_SELL", sell_orders)
-    submit_multiple_orders(vega, MM_WALLET2.name, market_id, "SIDE_BUY", buy_orders)
+    submit_multiple_orders(
+        vega, MM_WALLET.name, market_id, "SIDE_SELL", sell_orders
+    )
+    submit_multiple_orders(
+        vega, MM_WALLET2.name, market_id, "SIDE_BUY", buy_orders
+    )
 
     vega.forward("10s")
     vega.wait_fn(1)
@@ -158,37 +146,13 @@ def market_exists(vega: VegaService, market_id: str):
 
 
 # Add sell orders and buy orders to put on the book
-def setup_continuous_market(
-    vega: VegaService,
-    market_id: str = None,
-    buy_orders=default_buy_orders,
-    sell_orders=default_sell_orders,
-    add_liquidity=True,
-    custom_market_name="BTC:DAI_2023",
-    custom_asset_name="tDAI",
-    custom_asset_symbol="tDAI",
-    **kwargs,
-):
-    if (
-        not market_exists(vega, market_id)
-        or buy_orders != default_buy_orders
-        or sell_orders != default_sell_orders
-    ):
+def setup_continuous_market(vega: VegaService, market_id: str = None, buy_orders=default_buy_orders, sell_orders=default_sell_orders, add_liquidity=True, **kwargs):
+    if not market_exists(vega, market_id) or buy_orders != default_buy_orders or sell_orders != default_sell_orders:
         market_id = setup_opening_auction_market(
-            vega,
-            market_id,
-            buy_orders,
-            sell_orders,
-            add_liquidity,
-            custom_market_name=custom_market_name,
-            custom_asset_name=custom_asset_name,
-            custom_asset_symbol=custom_asset_symbol,
-            **kwargs,
-        )
+            vega, market_id, buy_orders, sell_orders, add_liquidity, **kwargs)
 
-    submit_order(
-        vega, "Key 1", market_id, "SIDE_BUY", sell_orders[0][0], sell_orders[0][1]
-    )
+    submit_order(vega, "Key 1", market_id, "SIDE_BUY",
+                 sell_orders[0][0], sell_orders[0][1])
 
     vega.forward("10s")
     vega.wait_fn(1)
@@ -207,7 +171,7 @@ def setup_perps_market(
 
     vega.mint(
         MM_WALLET.name,
-        asset=vega.find_asset_id(symbol="VOTE", enabled=True),
+        asset="VOTE",
         amount=mint_amount,
     )
 
@@ -286,8 +250,6 @@ def setup_perps_market(
 def market_exists(vega: VegaService, market_id: str):
     if market_id is None:
         return False
-    all_markets = vega.all_markets()
+    all_markets = vega.all_markets() 
     market_ids = [market.id for market in all_markets]
-    print("Checking for market ID:", market_id)
-    print("Available market IDs:", market_ids)
-    return market_id in market_ids
+    return market_id in market_ids

apps/trading/e2e/poetry.lock

@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 1.6.1 and should not be changed by hand.
+# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand.
 
 [[package]]
 name = "certifi"
@@ -1160,8 +1160,8 @@ profile = ["pytest-profiling", "snakeviz"]
 [package.source]
 type = "git"
 url = "https://github.com/vegaprotocol/vega-market-sim.git/"
-reference = "HEAD"
-resolved_reference = "2aed8c94b25d8fa2e376d3b63ca1f9193d28cdfd"
+reference = "fix/genesis_panic"
+resolved_reference = "de30d2d4c7a1b81a830527ca76473e23ef59de12"
 
 [[package]]
 name = "websocket-client"
@@ -1342,4 +1342,4 @@ files = [
 [metadata]
 lock-version = "2.0"
 python-versions = ">=3.9,<3.11"
-content-hash = "39ce8400de7bf060857447281ef27bd78c9b1d9639da063b051e3ae6e7887a67"
+content-hash = "68ed0de55290a3b929d47eb7f7b031fb7e172261c7bbeb4f554b7c27a4462754"

apps/trading/e2e/pyproject.toml

@@ -9,7 +9,7 @@ packages = [{include = "trading market-sim e2e"}]
 [tool.poetry.dependencies]
 python = ">=3.9,<3.11"
 psutil = "^5.9.5"
-vega-sim = {git = "https://github.com/vegaprotocol/vega-market-sim.git/"}
+vega-sim = {git = "https://github.com/vegaprotocol/vega-market-sim.git/", branch = "fix/genesis_panic"}
 pytest-playwright = "^0.4.2"
 docker = "^6.1.3"
 pytest-xdist = "^3.3.1"

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

@@ -14,18 +14,15 @@ market_order = "order-type-Market"
 tif = "order-tif"
 expire = "expire"
 
-
 @pytest.fixture(scope="module")
 def vega(request):
     with init_vega(request) as vega:
         yield vega
 
-
 @pytest.fixture(scope="module")
 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):
     page.goto(f"/#/markets/{continuous_market}")
@@ -45,26 +42,31 @@ def test_limit_buy_order_GTT(continuous_market, vega: VegaServiceNull, page: Pag
     )
     page.get_by_test_id(place_order).click()
     wait_for_toast_confirmation(page)
+    vega.forward("10s")
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
     page.get_by_test_id("All").click()
     # 7002-SORD-017
-    expect(page.get_by_role("row").nth(5)).to_contain_text("10+10LimitFilled120.00GTT:")
-
+    expect(page.get_by_role("row").nth(2)).to_contain_text(
+        "BTC:DAI_2023Futr10+10LimitFilled120.00GTT:"
+    )
 
 @pytest.mark.usefixtures("auth", "risk_accepted")
 def test_limit_buy_order(continuous_market, vega: VegaServiceNull, 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("120")
     page.get_by_test_id(place_order).click()
     wait_for_toast_confirmation(page)
-    vega.wait_fn(2)
+    vega.forward("10s")
+    vega.wait_fn(1)
     vega.wait_for_total_catchup()
     page.get_by_test_id("All").click()
     # 7002-SORD-017
-    expect(page.get_by_role("row").nth(6)).to_contain_text("10+10LimitFilled120.00GTC")
-
+    expect(page.get_by_role("row").nth(2)).to_contain_text(
+        "BTC:DAI_2023Futr10+10LimitFilled120.00GTC"
+    )
 
 @pytest.mark.usefixtures("auth", "risk_accepted")
 def test_limit_sell_order(continuous_market, vega: VegaServiceNull, page: Page):
@@ -82,11 +84,13 @@ def test_limit_sell_order(continuous_market, vega: VegaServiceNull, page: Page):
     )
     page.get_by_test_id(place_order).click()
     wait_for_toast_confirmation(page)
+    vega.forward("10s")
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
     page.get_by_test_id("All").click()
-    expect(page.get_by_role("row").nth(7)).to_contain_text("10-10LimitFilled100.00GFN")
-
+    expect(page.get_by_role("row").nth(2)).to_contain_text(
+        "BTC:DAI_2023Futr10-10LimitFilled100.00GFN"
+    )
 
 @pytest.mark.usefixtures("auth", "risk_accepted")
 def test_market_sell_order(continuous_market, vega: VegaServiceNull, page: Page):
@@ -103,12 +107,14 @@ def test_market_sell_order(continuous_market, vega: VegaServiceNull, page: Page)
     )
     page.get_by_test_id(place_order).click()
     wait_for_toast_confirmation(page)
+    vega.forward("10s")
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
-
+    
     page.get_by_test_id("All").click()
-    expect(page.get_by_role("row").nth(8)).to_contain_text("10-10MarketFilled-IOC")
-
+    expect(page.get_by_role("row").nth(2)).to_contain_text(
+        "BTC:DAI_2023Futr10-10MarketFilled-IOC"
+    )
 
 @pytest.mark.usefixtures("auth", "risk_accepted")
 def test_market_buy_order(continuous_market, vega: VegaServiceNull, page: Page):
@@ -118,32 +124,13 @@ def test_market_buy_order(continuous_market, vega: VegaServiceNull, page: Page):
     page.get_by_test_id(tif).select_option("Fill or Kill (FOK)")
     page.get_by_test_id(place_order).click()
     wait_for_toast_confirmation(page)
+    vega.forward("10s")
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
     page.get_by_test_id("All").click()
     # 7002-SORD-010
     # 0003-WTXN-012
     # 0003-WTXN-003
-    expect(page.get_by_role("row").nth(9)).to_contain_text("10+10MarketFilled-FOK")
-
-@pytest.mark.usefixtures("risk_accepted")
-def test_sidebar_should_be_open_after_reload(continuous_market, page: Page):
-    page.goto(f"/#/markets/{continuous_market}")
-    expect(page.get_by_test_id("deal-ticket-form")).to_be_visible()
-    page.get_by_test_id("Order").click()
-    expect(page.get_by_test_id("deal-ticket-form")).not_to_be_visible()
-    page.reload()
-    expect(page.get_by_test_id("deal-ticket-form")).to_be_visible()
-
-@pytest.mark.skip("We currently can't approve wallet connection through Sim")
-@pytest.mark.usefixtures("risk_accepted")
-def test_connect_vega_wallet(continuous_market, page: Page):
-    page.goto(f"/#/markets/{continuous_market}")
-    page.get_by_test_id("order-price").fill("101")
-    page.get_by_test_id("order-connect-wallet").click()
-    expect(page.locator('[role="dialog"]')).to_be_visible()
-    page.get_by_test_id("connector-jsonRpc").click()
-    expect(page.get_by_test_id("wallet-dialog-title")).to_be_visible()
-    # TODO: accept wallet connection and assert wallet is connected.
-    expect(page.get_by_test_id("order-type-Limit")).to_be_checked()
-    expect(page.get_by_test_id("order-price")).to_have_value("101")
+    expect(page.get_by_role("row").nth(2)).to_contain_text(
+        "BTC:DAI_2023Futr10+10MarketFilled-FOK"
+    )

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

@@ -0,0 +1,35 @@
+import pytest
+from playwright.sync_api import Page, expect
+from conftest import init_vega
+from fixtures.market import setup_continuous_market
+
+@pytest.fixture(scope="module")
+def vega(request):
+    with init_vega(request) as vega:
+        yield vega
+
+@pytest.fixture(scope="module")
+def continuous_market(vega):
+    return setup_continuous_market(vega)
+
+@pytest.mark.skip("We currently can't approve wallet connection through Sim")
+@pytest.mark.usefixtures("risk_accepted")
+def test_connect_vega_wallet(continuous_market, page: Page):
+    page.goto(f"/#/markets/{continuous_market}")
+    page.get_by_test_id("order-price").fill("101")
+    page.get_by_test_id("order-connect-wallet").click()
+    expect(page.locator('[role="dialog"]')).to_be_visible()
+    page.get_by_test_id("connector-jsonRpc").click()
+    expect(page.get_by_test_id("wallet-dialog-title")).to_be_visible()
+    # TODO: accept wallet connection and assert wallet is connected.
+    expect(page.get_by_test_id("order-type-Limit")).to_be_checked()
+    expect(page.get_by_test_id("order-price")).to_have_value("101")
+
+@pytest.mark.usefixtures("risk_accepted")
+def test_sidebar_should_be_open_after_reload(continuous_market, page: Page):
+    page.goto(f"/#/markets/{continuous_market}")
+    expect(page.get_by_test_id("deal-ticket-form")).to_be_visible()
+    page.get_by_test_id("Order").click()
+    expect(page.get_by_test_id("deal-ticket-form")).not_to_be_visible()
+    page.reload()
+    expect(page.get_by_test_id("deal-ticket-form")).to_be_visible()

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

@@ -27,7 +27,7 @@ submit_stop_order = "place-order"
 stop_orders_tab = "Stop orders"
 row_table = "row"
 cancel = "cancel"
-market_name_col = '[data-testid="market-code"]'
+market_name_col = '[col-id="market.tradableInstrument.instrument.code"]'
 trigger_col = '[col-id="trigger"]'
 expiresAt_col = '[col-id="expiresAt"]'
 size_col = '[col-id="submission.size"]'
@@ -41,6 +41,7 @@ close_toast = "toast-close"
 def create_position(vega: VegaServiceNull, 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")
     vega.wait_fn(1)
     vega.wait_for_total_catchup
 
@@ -77,6 +78,7 @@ def test_submit_stop_order_rejected(continuous_market, vega: VegaServiceNull, pa
     page.get_by_test_id(trigger_price).fill("103")
     page.get_by_test_id(order_size).fill("3")
     page.get_by_test_id(submit_stop_order).click()
+    vega.forward("10s")
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
     page.get_by_test_id(close_toast).click()
@@ -267,6 +269,82 @@ class TestStopOcoValidation:
     def continuous_market(self, vega):
         return setup_continuous_market(vega)
 
+    @pytest.mark.usefixtures("auth", "risk_accepted")
+    def test_stop_market_order_form_validation(self, continuous_market, page: Page):
+        # 7002-SORD-052
+        # 7002-SORD-055
+        # 7002-SORD-056
+        # 7002-SORD-057
+        # 7002-SORD-058
+        # 7002-SORD-064
+        # 7002-SORD-065
+        page.goto(f"/#/markets/{continuous_market}")
+        page.get_by_test_id(stop_order_btn).click()
+        page.get_by_test_id(stop_market_order_btn).is_visible()
+        page.get_by_test_id(stop_market_order_btn).click()
+        expect(
+            page.get_by_test_id("sidebar-content").get_by_text("Trigger").first
+        ).to_be_visible()
+        expect(page.locator('[for="triggerDirection-risesAbove"]')).to_have_text(
+            "Rises above"
+        )
+        expect(page.locator('[for="triggerDirection-fallsBelow"]')).to_have_text(
+            "Falls below"
+        )
+        page.get_by_test_id(trigger_price).click()
+        expect(page.get_by_test_id(trigger_price)).to_be_empty
+        expect(page.locator('[for="triggerType-price"]')).to_have_text("Price")
+        expect(page.locator('[for="triggerType-trailingPercentOffset"]')).to_have_text(
+            "Trailing Percent Offset"
+        )
+        expect(page.locator('[for="order-size"]')).to_have_text("Size")
+        page.get_by_test_id(order_size).click()
+        expect(page.get_by_test_id(order_size)).to_be_empty
+        expect(page.get_by_test_id(order_price)).not_to_be_visible()
+
+    @pytest.mark.usefixtures("auth", "risk_accepted")
+    def test_stop_limit_order_form_validation(self, continuous_market, page: Page):
+        # 7002-SORD-020
+        # 7002-SORD-021
+        # 7002-SORD-022
+        # 7002-SORD-033
+        # 7002-SORD-034
+        # 7002-SORD-035
+        # 7002-SORD-036
+        # 7002-SORD-037
+        # 7002-SORD-038
+        # 7002-SORD-049
+        # 7002-SORD-050
+        # 7002-SORD-051
+
+        page.goto(f"/#/markets/{continuous_market}")
+        page.get_by_test_id(stop_order_btn).click()
+        page.get_by_test_id(stop_limit_order_btn).is_visible()
+        page.get_by_test_id(stop_limit_order_btn).click()
+        expect(
+            page.get_by_test_id("sidebar-content").get_by_text("Trigger").first
+        ).to_be_visible()
+        expect(page.locator('[for="triggerDirection-risesAbove"]')).to_have_text(
+            "Rises above"
+        )
+        expect(page.locator('[for="triggerDirection-risesAbove"]')).to_be_checked
+        expect(page.locator('[for="triggerDirection-fallsBelow"]')).to_have_text(
+            "Falls below"
+        )
+        page.get_by_test_id(trigger_price).click()
+        expect(page.get_by_test_id(trigger_price)).to_be_empty
+        expect(page.locator('[for="triggerType-price"]')).to_have_text("Price")
+        expect(page.locator('[for="triggerType-price"]')).to_be_checked
+        expect(page.locator('[for="triggerType-trailingPercentOffset"]')).to_have_text(
+            "Trailing Percent Offset"
+        )
+        expect(page.locator('[for="order-size"]').first).to_have_text("Size")
+        expect(page.locator('[for="order-price"]').last).to_have_text("Price")
+        page.get_by_test_id(order_size).click()
+        expect(page.get_by_test_id(order_size)).to_be_empty
+        page.get_by_test_id(order_price).click()
+        expect(page.get_by_test_id(order_price)).to_be_empty()
+
     @pytest.mark.skip("core issue")
     @pytest.mark.usefixtures("auth", "risk_accepted")
     def test_maximum_number_of_active_stop_orders(

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

@@ -53,7 +53,7 @@ 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 = '[data-testid="market-code"]'
+COL_INSTRUMENT_CODE = '[col-id="market.tradableInstrument.instrument.code"]'
 COL_CODE = '[col-id="code"]'
 COL_SIZE = '[col-id="size"]'
 COL_PRICE = '[col-id="price"]'
@@ -563,6 +563,7 @@ def test_fills_taker_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
+    expect(row.locator(COL_INSTRUMENT_CODE)).to_have_text("BTC:DAI_2023Futr")
     expect(row.locator(COL_SIZE)).to_have_text(size)
     expect(row.locator(COL_PRICE)).to_have_text("103.50 tDAI")
     expect(row.locator(COL_PRICE_1)).to_have_text(price_1)
@@ -604,6 +605,7 @@ def test_fills_maker_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
+    expect(row.locator(COL_INSTRUMENT_CODE)).to_have_text("BTC:DAI_2023Futr")
     expect(row.locator(COL_SIZE)).to_have_text(size)
     expect(row.locator(COL_PRICE)).to_have_text("103.50 tDAI")
     expect(row.locator(COL_PRICE_1)).to_have_text(price_1)

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

@@ -77,7 +77,7 @@ class TestGetStarted:
 
         vega.mint(
             MM_WALLET.name,
-            asset=vega.find_asset_id(symbol="VOTE", enabled=True),
+            asset="VOTE",
             amount=mint_amount,
         )
 
@@ -105,8 +105,6 @@ class TestGetStarted:
 
         vega.wait_fn(1)
         vega.wait_for_total_catchup()
-        page.reload()
-
         # Assert step 2 complete
         expect(page.get_by_test_id("icon-tick")).to_have_count(2)
 
@@ -131,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}")
@@ -180,10 +177,10 @@ class TestGetStarted:
         # 0007-FUGS-018
         expect(page.get_by_test_id("welcome-dialog")).not_to_be_visible()
 
-class TestBrowseAll:
+class TestBrowseAll: 
     def test_get_started_browse_all(self, simple_market, vega: VegaServiceNull, 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

@@ -35,6 +35,7 @@ class TestIcebergOrdersValidations:
             "Awaiting confirmationPlease wait for your transaction to be confirmedView in block explorer"
         )
 
+        vega.forward("10s")
         vega.wait_fn(1)
         vega.wait_for_total_catchup()
         expect(page.get_by_test_id("toast-content")).to_have_text(
@@ -50,6 +51,7 @@ def test_iceberg_open_order(continuous_market, vega: VegaServiceNull, page: Page
     page.goto(f"/#/markets/{continuous_market}")
 
     submit_order(vega, "Key 1", continuous_market, "SIDE_SELL", 102, 101, 2, 1)
+    vega.forward("10s")
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
 
@@ -68,6 +70,7 @@ def test_iceberg_open_order(continuous_market, vega: VegaServiceNull, page: Page
     expect(
         page.locator(".ag-center-cols-container .ag-row [col-id='size']").first
     ).to_have_text("-102")
+    page.pause()
     expect(
         page.locator(".ag-center-cols-container .ag-row [col-id='type'] ").first
     ).to_have_text("Limit (Iceberg)")
@@ -82,6 +85,7 @@ def test_iceberg_open_order(continuous_market, vega: VegaServiceNull, page: Page
 
     submit_order(vega, MM_WALLET2.name, continuous_market, "SIDE_BUY", 103, 101)
 
+    vega.forward("10s")
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
     expect(

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

@@ -16,6 +16,7 @@ def vega(request):
 def continuous_market(vega):
     return setup_continuous_market(vega)
 
+
 @pytest.mark.usefixtures("auth", "risk_accepted")
 def test_liquidity_provision_amendment(continuous_market, vega: VegaServiceNull, page: Page):
     # TODO Refactor asserting the grid

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

@@ -5,7 +5,6 @@ from vega_sim.null_service import VegaServiceNull
 from playwright.sync_api import Page, expect
 from fixtures.market import setup_continuous_market
 from conftest import init_vega
-from actions.utils import next_epoch
 
 
 @pytest.fixture(scope="class")
@@ -22,7 +21,9 @@ def create_settled_market(vega: VegaServiceNull):
         settlement_price=110,
         market_id=market_id,
     )
-    next_epoch(vega=vega)
+    vega.forward("10s")
+    vega.wait_fn(10)
+    vega.wait_for_total_catchup()
 
 
 class TestSettledMarket:
@@ -122,7 +123,9 @@ def test_terminated_market_no_settlement_date(page: Page, vega: VegaServiceNull)
         payload={"trading.terminated": "true"},
         key_name="FJMKnwfZdd48C8NqvYrG",
     )
-    next_epoch(vega=vega)
+    vega.forward("60s")
+    vega.wait_fn(10)
+    vega.wait_for_total_catchup()
     page.goto(f"/#/markets/all")
     page.get_by_test_id("Closed markets").click()
     row_selector = page.locator(

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

@@ -15,13 +15,72 @@ def test_market_selector(continuous_market, page: Page):
     # 6001-MARK-025
     btc_market = page.locator('[data-testid="market-selector-list"] a')
     expect(btc_market.locator("h3")).to_have_text("BTC:DAI_2023Futr")
-    # tbd - 5465
-    # expect(btc_market.locator('[data-testid="market-selector-volume"]')).to_have_text(
-    #     "1"
-    # )
+    expect(btc_market.locator('[data-testid="market-selector-volume"]')).to_have_text(
+        "0.00"
+    )
     expect(btc_market.locator('[data-testid="market-selector-price"]')).to_have_text(
         "107.50 tDAI"
     )
     expect(btc_market.locator("span.rounded-md.leading-none")).to_be_visible()
     expect(btc_market.locator("span.rounded-md.leading-none")).to_have_text("Futr")
     expect(btc_market.locator('[data-testid="sparkline-svg"]')).not_to_be_visible
+
+
+@pytest.mark.usefixtures("simple_market", "auth", "risk_accepted")
+@pytest.mark.parametrize(
+    "simple_market",
+    [
+        {
+            "custom_market_name": "APPL.MF21",
+            "custom_asset_name": "tUSDC",
+            "custom_asset_symbol": "tUSDC",
+        }
+    ],
+    indirect=True,
+)
+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."
+    )
+    page.get_by_test_id("product-Perpetual").click()
+    expect(page.get_by_test_id("market-selector-list")).to_contain_text(
+        "No perpetual markets."
+    )
+    page.get_by_test_id("product-Future").click()
+    expect(page.locator('[data-testid="market-selector-list"] a')).to_have_count(2)
+
+    # 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)
+    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()
+    expect(page.locator('[data-testid="market-selector-list"] a')).to_have_count(2)
+
+    # 6001-MARK-030
+    # 6001-MARK-031
+    # 6001-MARK-032
+    # 6001-MARK-033
+    page.get_by_test_id("sort-trigger").click()
+
+    expect(page.get_by_test_id("sort-item-Gained")).to_have_text("Top gaining")
+    expect(page.get_by_test_id("sort-item-Gained")).to_be_visible()
+    expect(page.get_by_test_id("sort-item-Lost")).to_have_text("Top losing")
+    expect(page.get_by_test_id("sort-item-Lost")).to_be_visible()
+    expect(page.get_by_test_id("sort-item-New")).to_have_text("New markets")
+    expect(page.get_by_test_id("sort-item-New")).to_be_visible()
+
+    # 6001-MARK-028
+    page.get_by_test_id("sort-trigger").click(force=True)
+    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)
+    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_no_markets.py

@@ -0,0 +1,35 @@
+import pytest
+from playwright.sync_api import Page, expect
+
+from conftest import init_page, init_vega, risk_accepted_setup
+
+
+@pytest.fixture(scope="module")
+def vega(request):
+    with init_vega(request) as vega:
+        yield vega
+
+
+@pytest.fixture(scope="module")
+def page(vega, browser, request):
+    with init_page(vega, browser, request) as page:
+        risk_accepted_setup(page)
+        page.goto("/#/markets/all")
+        yield page
+
+
+def test_no_open_markets(page: Page):
+    # 6001-MARK-034
+    page.get_by_test_id("Open markets").click()
+    expect(page.locator(".ag-overlay-wrapper")).to_have_text("No markets")
+
+
+def test_no_closed_markets(page: Page):
+    page.get_by_test_id("Closed markets").click()
+    expect(page.locator(".ag-overlay-wrapper")).to_have_text("No markets")
+
+
+def test_no_proposed_markets(page: Page):
+    # 6001-MARK-061
+    page.get_by_test_id("Proposed markets").click()
+    expect(page.locator(".ag-overlay-wrapper")).to_have_text("No proposed markets")

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

@@ -56,6 +56,9 @@ def test_renders_markets_correctly(proposed_market, page: Page):
     page.goto(f"/#/markets/all")
     page.click('[data-testid="Proposed markets"]')
     row = page.locator(row_selector)
+    # 6001-MARK-049
+    expect(row.locator(col_market_id)).to_have_text("BTC:DAI_2023")
+
     # 6001-MARK-051
     expect(row.locator('[col-id="asset"]')).to_have_text("tDAI")
 

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

@@ -64,16 +64,18 @@ def setup_market_monitoring_auction(vega: VegaServiceNull, simple_market):
     submit_order(vega, MM_WALLET.name, simple_market, "SIDE_SELL", 1, 1 + 0.1 / 2)
     submit_order(vega, MM_WALLET2.name, simple_market, "SIDE_SELL", 1, 1)
 
+    vega.forward("10s")
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
 
     # add orders that change the price so that it goes beyond the limits of price monitoring
-    submit_order(vega, MM_WALLET.name, simple_market, "SIDE_SELL", 100, 300)
-    submit_order(vega, MM_WALLET2.name, simple_market, "SIDE_BUY", 100, 290)
-    submit_order(vega, MM_WALLET.name, simple_market, "SIDE_SELL", 100, 305)
-    submit_order(vega, MM_WALLET2.name, simple_market, "SIDE_BUY", 100, 295)
-    submit_order(vega, MM_WALLET2.name, simple_market, "SIDE_BUY", 1, 305)
+    submit_order(vega, MM_WALLET.name, simple_market, "SIDE_SELL", 100, 110)
+    submit_order(vega, MM_WALLET2.name, simple_market, "SIDE_BUY", 100, 90)
+    submit_order(vega, MM_WALLET.name, simple_market, "SIDE_SELL", 100, 105)
+    submit_order(vega, MM_WALLET2.name, simple_market, "SIDE_BUY", 100, 95)
+    submit_order(vega, MM_WALLET2.name, simple_market, "SIDE_BUY", 1, 105)
 
+    vega.forward("10s")
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
 
@@ -89,6 +91,7 @@ def test_market_monitoring_auction_price_volatility_limit_order(
     page.get_by_test_id("order-price").type("110")
     page.get_by_test_id("order-tif").select_option("Fill or Kill (FOK)")
     page.get_by_test_id("place-order").click()
+
     expect(page.get_by_test_id("deal-ticket-error-message-tif")).to_have_text(
         "This market is in auction due to high price volatility. Until the auction ends, you can only place GFA, GTT, or GTC limit orders."
     )
@@ -106,11 +109,12 @@ def test_market_monitoring_auction_price_volatility_limit_order(
     page.get_by_test_id("place-order").click()
 
     wait_for_toast_confirmation(page)
+    vega.forward("10s")
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
     page.get_by_test_id("All").click()
-    expect(page.get_by_role("row").nth(4)).to_contain_text(
-        "0+1LimitActive110.00GTC"
+    expect(page.get_by_role("row").nth(2)).to_contain_text(
+        "BTC:DAI_2023Futr0+1LimitActive110.00GTC"
     )
 
 
@@ -124,6 +128,7 @@ def test_market_monitoring_auction_price_volatility_market_order(
     page.get_by_test_id("order-size").type("1")
     # 7002-SORD-060
     page.get_by_test_id("place-order").click()
+
     expect(page.get_by_test_id("deal-ticket-error-message-tif")).to_have_text(
         "This market is in auction due to high price volatility. Until the auction ends, you can only place GFA, GTT, or GTC limit orders."
     )

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

@@ -1,13 +1,14 @@
 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 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):
@@ -73,6 +74,9 @@ def test_market_lifecycle(proposed_market, vega: VegaServiceNull, page: Page):
     )
 
     # "wait" for market to be approved and enacted
+    vega.forward("60s")
+    vega.wait_fn(10)
+    vega.wait_for_total_catchup()
     next_epoch(vega=vega)
     # check that market is in pending state
     expect(trading_mode).to_have_text("Opening auction")
@@ -115,56 +119,25 @@ def test_market_lifecycle(proposed_market, vega: VegaServiceNull, page: Page):
     submit_order(vega, MM_WALLET.name, market_id, "SIDE_SELL", 1, 100)
     submit_order(vega, MM_WALLET2.name, market_id, "SIDE_BUY", 1, 100)
 
-    vega.wait_fn(2)
+    vega.forward("10s")
+    vega.wait_fn(1)
     vega.wait_for_total_catchup()
 
     # check market state is now active and trading mode is continuous
     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()
-
-    next_epoch(vega=vega)
-
-    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
-    )
-
-    next_epoch(vega=vega)
-
-    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,
         payload={"trading.terminated": "true"},
         key_name=GOVERNANCE_WALLET.name,
     )
-    next_epoch(vega=vega)
+    vega.forward("60s")
+    vega.wait_fn(1)
+    vega.wait_for_total_catchup()
 
-    # market state should be changed to "No trading" because of the invalid oracle
+    # market state should be changed to "Trading Terminated" because of the invalid oracle
     expect(trading_mode).to_have_text("No trading")
     expect(market_state).to_have_text("Trading Terminated")
 
@@ -174,14 +147,13 @@ def test_market_lifecycle(proposed_market, vega: VegaServiceNull, page: Page):
         settlement_price=100,
         market_id=market_id,
     )
-    next_epoch(vega=vega)
+    vega.forward("10s")
+    vega.wait_fn(1)
+    vega.wait_for_total_catchup()
 
     # 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")
@@ -210,19 +182,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

@@ -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}"

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

@@ -65,6 +65,7 @@ def test_limit_order_trade_open_order(
     expect(orderbook_trade).to_be_visible()
 
     expected_open_order = [
+        "BTC:DAI_2023",
         "+1",
         "Limit",
         "Active",
@@ -86,6 +87,9 @@ def test_limit_order_trade_open_position(continuous_market, page: Page):
     secondary_id = "stack-cell-secondary"
 
     position = {
+        "market_code": "BTC:DAI_2023",
+        "settlement_asset": "tDAI",
+        "product_type": "Futr",
         "size": "+1",
         "notional": "107.50",
         "average_entry_price": "107.50",
@@ -103,6 +107,12 @@ def test_limit_order_trade_open_position(continuous_market, page: Page):
     # 7004-POSI-001
     # 7004-POSI-002
 
+    market = table.locator("[col-id='marketCode']")
+    expect(market.get_by_test_id(primary_id)).to_have_text(position["market_code"])
+    expect(market.get_by_test_id(secondary_id)).to_have_text(
+        position["settlement_asset"] + position["product_type"]
+    )
+
     size_and_notional = table.locator("[col-id='openVolume']")
     expect(size_and_notional.get_by_test_id(primary_id)).to_have_text(position["size"])
     expect(size_and_notional.get_by_test_id(secondary_id)).to_have_text(
@@ -144,4 +154,5 @@ def test_limit_order_trade_order_trade_away(continuous_market, page: Page):
     page.get_by_test_id("Orderbook").click()
     price_element = page.get_by_test_id("price-11000000").nth(1)
     # 6003-ORDB-010
+    print(price_element)
     expect(price_element).to_be_hidden()

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

@@ -257,63 +257,46 @@ def test_order_sorted(page: Page):
 
 def test_order_status_active(page: Page):
     # 7002-SORD-041
-    expect(page.locator('[row-index="2"]').first).to_contain_text(
-        "market-2Futr"
-    )
-    expect(page.locator('[row-index="2"]').nth(1)).to_contain_text(
-        "0" + "-10" + "Limit" + "Active" + "150.00" + "GTC"
+    expect(page.get_by_test_id(order_tab)).to_contain_text(
+        "market-2Futr" + "0" + "-10" + "Limit" + "Active" + "150.00" + "GTC"
     )
 
 
 def test_status_expired(page: Page):
     # 7002-SORD-042
-    expect(page.locator('[row-index="7"]').first).to_contain_text(
-        "market-3Futr"
-    )
-    expect(page.locator('[row-index="7"]').nth(1)).to_contain_text(
-        "0" + "-10" + "Limit" + "Expired" + "120.00" + "GTT:"
+    expect(page.get_by_test_id(order_tab)).to_contain_text(
+        "market-3Futr" + "0" + "-10" + "Limit" + "Expired" + "120.00" + "GTT:"
     )
 
 
 def test_order_status_Stopped(page: Page):
     # 7002-SORD-044
-    expect(page.locator('[row-index="12"]').first).to_contain_text(
-        "market-1Futr"
-    )
-    expect(page.locator('[row-index="12"]').nth(1)).to_contain_text(
-        "0" + "-100" + "Limit" + "Stopped" + "130.00" + "IOC"
+    expect(page.get_by_test_id(order_tab)).to_contain_text(
+        "market-1Futr" + "0" + "-100" + "Limit" + "Stopped" + "130.00" + "IOC"
     )
 
 
 def test_order_status_partially_filled(page: Page):
     # 7002-SORD-045
-    expect(page.locator('[row-index="8"]').first).to_contain_text(
-        "market-2Futr"
-    )
-    expect(page.locator('[row-index="8"]').nth(1)).to_contain_text(
-        "99" + "+100" + "Limit" + "Partially Filled" + "104.00" + "IOC"
+    expect(page.get_by_test_id(order_tab)).to_contain_text(
+        "market-2Futr" + "99" + "+100" + "Limit" + "Partially Filled" + "104.00" + "IOC"
     )
 
 
 def test_order_status_filled(page: Page):
     # 7002-SORD-046
     # 7003-MORD-020
-    expect(page.locator('[row-index="11"]').first).to_contain_text(
-        "market-1Futr"
-    )
-    expect(page.locator('[row-index="11"]').nth(1)).to_contain_text(
-        "100" + "-100" + "Limit" + "Filled" + "88.00" + "GTC"
+    expect(page.get_by_test_id(order_tab)).to_contain_text(
+        "market-1Futr" + "100" + "-100" + "Limit" + "Filled" + "88.00" + "GTC"
     )
 
 
 def test_order_status_rejected(page: Page):
     # 7002-SORD-047
     # 7003-MORD-018
-    expect(page.locator('[row-index="9"]').first).to_contain_text(
+    expect(page.get_by_test_id(order_tab)).to_contain_text(
         "market-1Futr"
-    )
-    expect(page.locator('[row-index="9"]').nth(1)).to_contain_text(
-        "0"
+        + "0"
         + "-10,000,000,000"
         + "Limit"
         + "Rejected: Margin check failed"
@@ -325,11 +308,9 @@ def test_order_status_rejected(page: Page):
 def test_order_status_parked(page: Page):
     #  7002-SORD-048
     #  7003-MORD-016
-    expect(page.locator('[row-index="3"]').first).to_contain_text(
+    expect(page.get_by_test_id(order_tab)).to_contain_text(
         "market-5Futr"
-    )
-    expect(page.locator('[row-index="3"]').nth(1)).to_contain_text(
-        "0"
+        + "0"
         + "-60"
         + "Ask + 15.00 Peg limit"
         + "Parked"
@@ -340,11 +321,9 @@ def test_order_status_parked(page: Page):
 
 def test_order_status_pegged_ask(page: Page):
     #  7003-MORD-016
-    expect(page.locator('[row-index="4"]').first).to_contain_text(
+    expect(page.get_by_test_id(order_tab)).to_contain_text(
         "market-4Futr"
-    )
-    expect(page.locator('[row-index="4"]').nth(1)).to_contain_text(
-        "0"
+        + "0"
         + "-60"
         + "Ask + 15.00 Peg limit"
         + "Active"
@@ -355,11 +334,9 @@ def test_order_status_pegged_ask(page: Page):
 
 def test_order_status_pegged_bid(page: Page):
     #  7003-MORD-016
-    expect(page.locator('[row-index="5"]').first).to_contain_text(
+    expect(page.get_by_test_id(order_tab)).to_contain_text(
         "market-4Futr"
-    )
-    expect(page.locator('[row-index="5"]').nth(1)).to_contain_text(
-        "0"
+        + "0"
         + "+40"
         + "Bid - 10.00 Peg limit"
         + "Active"
@@ -370,11 +347,9 @@ def test_order_status_pegged_bid(page: Page):
 
 def test_order_status_pegged_mid(page: Page):
     #  7003-MORD-016
-    expect(page.locator('[row-index="6"]').first).to_contain_text(
+    expect(page.get_by_test_id(order_tab)).to_contain_text(
         "market-4Futr"
-    )
-    expect(page.locator('[row-index="6"]').nth(1)).to_contain_text(
-        "0"
+        + "0"
         + "+20"
         + "Mid - 5.00 Peg limit"
         + "Active"
@@ -397,11 +372,9 @@ def test_order_amend_order(vega: VegaServiceNull, page: Page):
     vega.forward("10s")
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
-    expect(page.locator('[row-index="1"]').first).to_contain_text(
-        "market-2Futr"
-    )
-    expect(page.locator('[row-index="1"]').nth(1)).to_contain_text(
-        "0" + "-15" + "Limit" + "Active" + "170.00" + "GTC"
+
+    expect(page.get_by_test_id(order_tab)).to_contain_text(
+        "market-2Futr" + "0" + "-15" + "Limit" + "Active" + "170.00" + "GTC"
     )
 
 
@@ -416,11 +389,9 @@ def test_order_cancel_single_order(vega: VegaServiceNull, page: Page):
     vega.forward("10s")
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
-    expect(page.locator('[row-index="0"]').first).to_contain_text(
-        "market-3Futr"
-    )
-    expect(page.locator('[row-index="0"]').nth(1)).to_contain_text(
-        "0" + "+10" + "Limit" + "Cancelled" + "60.00" + "GTC"
+
+    expect(page.get_by_test_id(order_tab)).to_contain_text(
+        "market-3Futr" + "0" + "+10" + "Limit" + "Cancelled" + "60.00" + "GTC"
     )
 
 

apps/trading/e2e/tests/orderbook/test_orderbook.py

@@ -106,6 +106,7 @@ def test_orderbook_grid_content(setup_market, page: Page):
         matching_order[1],
     )
 
+    vega.forward("10s")
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
 
@@ -232,6 +233,7 @@ def test_orderbook_price_movement(setup_market, page: Page):
         matching_order_1[1],
     )
 
+    vega.forward("10s")
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
 
@@ -252,6 +254,7 @@ def test_orderbook_price_movement(setup_market, page: Page):
         matching_order_2[1],
     )
 
+    vega.forward("10s")
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
 

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

@@ -34,6 +34,7 @@ class TestPerpetuals:
             settlement_price=110,
             market_id=perps_market,
         )
+        vega.forward("10s")
         vega.wait_fn(1)
         vega.wait_for_total_catchup()
         submit_multiple_orders(
@@ -47,7 +48,8 @@ class TestPerpetuals:
             settlement_price=110,
             market_id=perps_market,
         )
-        vega.wait_fn(10)
+        vega.forward("10s")
+        vega.wait_fn(1)
         vega.wait_for_total_catchup()
         return perps_market
 
@@ -107,14 +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
@@ -132,6 +134,7 @@ def test_perps_market_terminated(page: Page, vega: VegaServiceNull):
         approve_proposal=True,
         forward_time_to_enactment=True,
     )
+    vega.forward("10s")
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
 

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

@@ -11,7 +11,7 @@ def check_pnl_color_value(element, expected_color, expected_value):
     assert color == expected_color, f"Unexpected color: {color}"
     assert value == expected_value, f"Unexpected value: {value}"
 
-#TODO move this test to jest
+
 @pytest.mark.usefixtures("auth", "risk_accepted")
 def test_pnl(continuous_market, vega: VegaServiceNull, page: Page):
     page.set_viewport_size({"width": 1748, "height": 977})

apps/trading/e2e/tests/portfolio/test_ledger_entries.py

@@ -0,0 +1,32 @@
+import os
+import pytest
+from playwright.sync_api import Page, expect
+
+#TODO migrate to jest
+@pytest.mark.usefixtures("auth", "risk_accepted", "continuous_market")
+def test_ledger_entries_downloads(page: Page):
+    page.goto("/#/portfolio")
+    page.get_by_test_id("Ledger entries").click()
+    expect(page.get_by_test_id("ledger-download-button")).to_be_enabled()
+    # 7007-LEEN-001
+    page.get_by_test_id("ledger-download-button").click()
+    # 7007-LEEN-009
+    expect(page.get_by_test_id("toast-content")).to_contain_text(("Your file is ready"))
+    # Get the user's Downloads directory
+    downloads_directory = os.path.expanduser("~") + "/Downloads/"
+    # Start waiting for the download
+    with page.expect_download() as download_info:
+        # Perform the action that initiates download
+        page.get_by_role("link", name="Get file here").click()
+
+    download = download_info.value
+    # Wait for the download process to complete and save the downloaded file in the Downloads directory
+    download.save_as(os.path.join(downloads_directory, download.suggested_filename))
+
+    # Verify the download by asserting that the file exists
+    downloaded_file_path = os.path.join(
+        downloads_directory, download.suggested_filename
+    )
+    assert os.path.exists(
+        downloaded_file_path
+    ), f"Download failed! File not found at: {downloaded_file_path}"

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

@@ -15,13 +15,14 @@ def test_closed_market_position(vega: VegaServiceNull, page: Page):
         settlement_price=110,
         market_id=market_id,
     )
+    vega.forward("10s")
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
     page.goto(f"/#/markets/{market_id}")
     expect(page.locator(".ag-overlay-panel")).to_have_text("No positions")
     page.get_by_test_id("open-transfer").click()
     tab = page.get_by_test_id("tab-positions")
-    table = tab.locator('[class="ag-body ag-layout-normal"]')
+    table = tab.locator(".ag-center-cols-container")
     market = table.locator("[col-id='marketCode']")
     expect(market.get_by_test_id("stack-cell-primary")).to_have_text("BTC:DAI_2023")
     page.get_by_test_id("open-transfer").click()

apps/trading/e2e/tests/rewards/test_rewards.py

@@ -1,469 +0,0 @@
-import pytest
-
-import vega_sim.proto.vega as vega_protos
-from playwright.sync_api import Page, expect
-from conftest import init_vega, init_page, auth_setup
-from fixtures.market import setup_continuous_market, market_exists
-from actions.utils import next_epoch, change_keys
-from wallet_config import MM_WALLET, PARTY_A, PARTY_B, PARTY_C, PARTY_D
-from vega_sim.null_service import VegaServiceNull
-
-# region Constants
-ACTIVITY = "activity"
-HOARDER = "hoarder"
-COMBO = "combo"
-
-REWARDS_URL = "/#/rewards"
-
-# test IDs
-COMBINED_MULTIPLIERS = "combined-multipliers"
-TOTAL_REWARDS = "total-rewards"
-PRICE_TAKING_COL_ID = '[col-id="priceTaking"]'
-TOTAL_COL_ID = '[col-id="total"]'
-ROW = "row"
-STREAK_REWARD_MULTIPLIER_VALUE = "streak-reward-multiplier-value"
-HOARDER_REWARD_MULTIPLIER_VALUE = "hoarder-reward-multiplier-value"
-HOARDER_BONUS_TOTAL_HOARDED = "hoarder-bonus-total-hoarded"
-EARNED_BY_ME_BUTTON = "earned-by-me-button"
-TRANSFER_AMOUNT = "transfer-amount"
-EPOCH_STREAK = "epoch-streak"
-
-# endregion
-
-
-@pytest.fixture(scope="module")
-def market_ids():
-    return {
-        "vega_activity_tier_0": "default_id",
-        "vega_hoarder_tier_0": "default_id",
-        "vega_combo_tier_0": "default_id",
-        "vega_activity_tier_1": "default_id",
-        "vega_hoarder_tier_1": "default_id",
-        "vega_combo_tier_1": "default_id",
-    }
-
-
-@pytest.fixture(scope="module")
-def vega_activity_tier_0(request):
-    with init_vega(request) as vega_activity_tier_0:
-        yield vega_activity_tier_0
-
-
-@pytest.fixture(scope="module")
-def vega_hoarder_tier_0(request):
-    with init_vega(request) as vega_hoarder_tier_0:
-        yield vega_hoarder_tier_0
-
-
-@pytest.fixture(scope="module")
-def vega_combo_tier_0(request):
-    with init_vega(request) as vega_combo_tier_0:
-        yield vega_combo_tier_0
-
-
-@pytest.fixture(scope="module")
-def vega_activity_tier_1(request):
-    with init_vega(request) as vega_activity_tier_1:
-        yield vega_activity_tier_1
-
-
-@pytest.fixture(scope="module")
-def vega_hoarder_tier_1(request):
-    with init_vega(request) as vega_hoarder_tier_1:
-        yield vega_hoarder_tier_1
-
-
-@pytest.fixture(scope="module")
-def vega_combo_tier_1(request):
-    with init_vega(request) as vega_combo_tier_1:
-        yield vega_combo_tier_1
-
-
-@pytest.fixture
-def auth(vega_instance, page):
-    return auth_setup(vega_instance, page)
-
-
-@pytest.fixture
-def page(vega_instance, browser, request):
-    with init_page(vega_instance, browser, request) as page_instance:
-        yield page_instance
-
-
-@pytest.fixture
-def vega_instance(
-    reward_program,
-    vega_activity_tier_0,
-    vega_hoarder_tier_0,
-    vega_combo_tier_0,
-    vega_activity_tier_1,
-    vega_hoarder_tier_1,
-    vega_combo_tier_1,
-    tier,
-):
-    if reward_program == "activity":
-        return vega_activity_tier_0 if tier == 1 else vega_activity_tier_1
-    elif reward_program == "hoarder":
-        return vega_hoarder_tier_0 if tier == 1 else vega_hoarder_tier_1
-    elif reward_program == "combo":
-        return vega_combo_tier_0 if tier == 1 else vega_combo_tier_1
-
-
-def setup_market_with_reward_program(vega: VegaServiceNull, reward_programs, tier):
-    print(f"Started setup_market_with_{reward_programs}_{tier}")
-    tDAI_market = setup_continuous_market(vega)
-    tDAI_asset_id = vega.find_asset_id(symbol="tDAI")
-    vega.mint(key_name=PARTY_B.name, asset=tDAI_asset_id, amount=100000)
-    vega.mint(key_name=PARTY_C.name, asset=tDAI_asset_id, amount=100000)
-    vega.mint(key_name=PARTY_A.name, asset=tDAI_asset_id, amount=100000)
-    vega.mint(key_name=PARTY_D.name, asset=tDAI_asset_id, amount=100000)
-    next_epoch(vega=vega)
-    if ACTIVITY in reward_programs:
-        vega.update_network_parameter(
-            proposal_key=MM_WALLET.name,
-            parameter="rewards.activityStreak.benefitTiers",
-            new_value=ACTIVITY_STREAKS,
-        )
-        print("update_network_parameter activity done")
-        next_epoch(vega=vega)
-
-    if HOARDER in reward_programs:
-        vega.update_network_parameter(
-            proposal_key=MM_WALLET.name,
-            parameter="rewards.vesting.benefitTiers",
-            new_value=VESTING,
-        )
-        next_epoch(vega=vega)
-
-    tDAI_asset_id = vega.find_asset_id(symbol="tDAI")
-    vega.update_network_parameter(
-        MM_WALLET.name, parameter="reward.asset", new_value=tDAI_asset_id
-    )
-
-    next_epoch(vega=vega)
-    vega.recurring_transfer(
-        from_key_name=PARTY_A.name,
-        from_account_type=vega_protos.vega.ACCOUNT_TYPE_GENERAL,
-        to_account_type=vega_protos.vega.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-        asset=tDAI_asset_id,
-        reference="reward",
-        asset_for_metric=tDAI_asset_id,
-        metric=vega_protos.vega.DISPATCH_METRIC_MAKER_FEES_PAID,
-        # lock_period= 5,
-        # TODO test lock period
-        amount=100,
-        factor=1.0,
-    )
-    vega.submit_order(
-        trading_key=PARTY_B.name,
-        market_id=tDAI_market,
-        order_type="TYPE_MARKET",
-        time_in_force="TIME_IN_FORCE_IOC",
-        side="SIDE_BUY",
-        volume=1,
-    )
-    vega.submit_order(
-        trading_key=PARTY_A.name,
-        market_id=tDAI_market,
-        order_type="TYPE_MARKET",
-        time_in_force="TIME_IN_FORCE_IOC",
-        side="SIDE_BUY",
-        volume=1,
-    )
-
-    vega.wait_for_total_catchup()
-    if tier == 1:
-        next_epoch(vega=vega)
-        vega.submit_order(
-            trading_key=PARTY_B.name,
-            market_id=tDAI_market,
-            order_type="TYPE_LIMIT",
-            time_in_force="TIME_IN_FORCE_GTC",
-            side="SIDE_BUY",
-            price=1,
-            volume=1,
-        )
-        next_epoch(vega=vega)
-        vega.submit_order(
-            trading_key=PARTY_B.name,
-            market_id=tDAI_market,
-            order_type="TYPE_MARKET",
-            time_in_force="TIME_IN_FORCE_IOC",
-            side="SIDE_BUY",
-            volume=1,
-        )
-        vega.submit_order(
-            trading_key=PARTY_D.name,
-            market_id=tDAI_market,
-            order_type="TYPE_MARKET",
-            time_in_force="TIME_IN_FORCE_IOC",
-            side="SIDE_BUY",
-            volume=1,
-        )
-        vega.wait_for_total_catchup()
-        next_epoch(vega=vega)
-        next_epoch(vega=vega)
-        if HOARDER in reward_programs:
-            vega.submit_order(
-            trading_key=PARTY_B.name,
-            market_id=tDAI_market,
-            order_type="TYPE_MARKET",
-            time_in_force="TIME_IN_FORCE_IOC",
-            side="SIDE_BUY",
-            volume=1,
-        )
-        vega.submit_order(
-            trading_key=PARTY_D.name,
-            market_id=tDAI_market,
-            order_type="TYPE_MARKET",
-            time_in_force="TIME_IN_FORCE_IOC",
-            side="SIDE_BUY",
-            volume=1,
-        )
-        vega.wait_for_total_catchup()
-        next_epoch(vega=vega)
-        next_epoch(vega=vega)
-    next_epoch(vega=vega)
-    return tDAI_market, tDAI_asset_id
-
-
-def set_market_reward_program(vega, reward_program, market_ids, tier):
-    market_id_key = f"vega_{reward_program}_tier_{tier}"
-    if reward_program == COMBO:
-        market_id_key = COMBO
-    market_id = market_ids.get(market_id_key, "default_id")
-
-    print(f"Checking if market exists: {market_id}")
-    if not market_exists(vega, market_id):
-        print(
-            f"Market doesn't exist for {reward_program} {tier}. Setting up new market."
-        )
-
-        reward_programs = [reward_program]
-        if reward_program == COMBO:
-            reward_programs = [ACTIVITY, HOARDER]
-
-        market_id, _ = setup_market_with_reward_program(vega, reward_programs, tier)
-        market_ids[market_id_key] = market_id
-
-    return market_id, market_ids
-
-
-ACTIVITY_STREAKS = """
-{
-    "tiers": [
-        {
-            "minimum_activity_streak": 2, 
-            "reward_multiplier": "2.0", 
-            "vesting_multiplier": "1.1"
-        }
-    ]
-}
-"""
-VESTING = """
-{
-    "tiers": [
-        {
-            "minimum_quantum_balance": "10000000",
-            "reward_multiplier": "2"
-        }
-    ]
-}
-"""
-
-
-@pytest.mark.parametrize(
-    "reward_program, tier, total_rewards",
-    [
-        (ACTIVITY, 0, "50.00 tDAI"),
-        (HOARDER, 0, "50.00 tDAI"),
-        (COMBO, 0, "50.00 tDAI"),
-        (ACTIVITY, 1, "116.66666 tDAI"),
-        (HOARDER, 1, "166.66666 tDAI "),
-        (COMBO, 1, "183.33333 tDAI"),
-    ],
-)
-@pytest.mark.usefixtures("auth", "risk_accepted", "market_ids")
-def test_network_reward_pot(
-    reward_program,
-    vega_instance: VegaServiceNull,
-    page: Page,
-    total_rewards,
-    tier,
-    market_ids,
-):
-    print("reward program: " + reward_program, " tier:", tier)
-    market_id, market_ids = set_market_reward_program(
-        vega_instance, reward_program, market_ids, tier
-    )
-    page.goto(REWARDS_URL)
-    
-    change_keys(page, vega_instance, PARTY_B.name)
-    expect(page.get_by_test_id(TOTAL_REWARDS)).to_have_text(total_rewards)
-
-
-@pytest.mark.parametrize(
-    "reward_program, tier, reward_multiplier, streak_multiplier, hoarder_multiplier",
-    [
-        (ACTIVITY, 0, "1x", "1x", "1x"),
-        (HOARDER, 0, "1x", "1x", "1x"),
-        (COMBO, 0, "1x", "1x", "1x"),
-        (ACTIVITY, 1, "2x", "2x", "1x"),
-        (HOARDER, 1, "2x", "1x", "2x"),
-        (COMBO, 1, "4x", "2x", "2x"),
-    ],
-)
-@pytest.mark.usefixtures("auth", "risk_accepted", "market_ids")
-def test_reward_multiplier(
-    reward_program,
-    vega_instance: VegaServiceNull,
-    page: Page,
-    reward_multiplier,
-    streak_multiplier,
-    hoarder_multiplier,
-    tier,
-    market_ids,
-):
-    print("reward program: " + reward_program, " tier:", tier)
-    market_id, market_ids = set_market_reward_program(
-        vega_instance, reward_program, market_ids, tier
-    )
-    page.goto(REWARDS_URL)
-    change_keys(page, vega_instance, PARTY_B.name)
-    expect(page.get_by_test_id(COMBINED_MULTIPLIERS)).to_have_text(reward_multiplier)
-    expect(page.get_by_test_id(STREAK_REWARD_MULTIPLIER_VALUE)).to_have_text(
-        streak_multiplier
-    )
-    expect(page.get_by_test_id(HOARDER_REWARD_MULTIPLIER_VALUE)).to_have_text(
-        hoarder_multiplier
-    )
-
-
-@pytest.mark.parametrize(
-    "reward_program, tier, epoch_streak",
-    [
-        (ACTIVITY, 0, "1"),
-        (ACTIVITY, 1, "7"),
-    ],
-)
-@pytest.mark.usefixtures("auth", "risk_accepted", "market_ids")
-def test_activity_streak(
-    reward_program,
-    vega_instance: VegaServiceNull,
-    page: Page,
-    epoch_streak,
-    tier,
-    market_ids,
-):
-    print("reward program: " + reward_program, " tier:", tier)
-    market_id, market_ids = set_market_reward_program(
-        vega_instance, reward_program, market_ids, tier
-    )
-    page.goto(REWARDS_URL)
-    change_keys(page, vega_instance, PARTY_B.name)
-    if tier == 1:
-        expect(page.get_by_test_id(EPOCH_STREAK)).to_have_text(
-            "Active trader: " + epoch_streak + " epochs so far (Tier 1 as of last epoch)"
-        )
-    else:
-        expect(page.get_by_test_id(EPOCH_STREAK)).to_have_text(
-            "Active trader: " + epoch_streak + " epochs so far "
-        )
-
-
-@pytest.mark.parametrize(
-    "reward_program, tier, rewards_hoarded",
-    [
-        (HOARDER, 0, "5,000,000"),
-        (HOARDER, 1, "16,666,666"),
-    ],
-)
-@pytest.mark.usefixtures("auth", "risk_accepted", "market_ids")
-def test_hoarder_bonus(
-    reward_program,
-    vega_instance: VegaServiceNull,
-    page: Page,
-    rewards_hoarded,
-    tier,
-    market_ids,
-):
-    print("reward program: " + reward_program, " tier:", tier)
-    market_id, market_ids = set_market_reward_program(
-        vega_instance, reward_program, market_ids, tier
-    )
-    page.goto(REWARDS_URL)
-    change_keys(page, vega_instance, PARTY_B.name)
-    expect(page.get_by_test_id(HOARDER_BONUS_TOTAL_HOARDED)).to_contain_text(
-        rewards_hoarded
-    )
-
-
-@pytest.mark.parametrize(
-    "reward_program, tier, price_taking, total, earned_by_me",
-    [
-        (ACTIVITY, 0, "100.00100.00%", "100.00", "50.00"),
-        (HOARDER, 0, "100.00100.00%", "100.00", "50.00"),
-        (COMBO, 0, "100.00100.00%", "100.00", "50.00"),
-        (ACTIVITY, 1, "300.00100.00%", "300.00", "116.66666"),
-        (HOARDER, 1, "299.99999100.00%", "299.99999", "166.66666"),
-        (COMBO, 1, "299.99999100.00%", "299.99999", "183.33333"),
-    ],
-)
-@pytest.mark.usefixtures("auth", "risk_accepted", "market_ids")
-def test_reward_history(
-    reward_program,
-    vega_instance: VegaServiceNull,
-    page: Page,
-    price_taking,
-    total,
-    earned_by_me,
-    tier,
-    market_ids,
-):
-    print("reward program: " + reward_program, " tier:", tier)
-    market_id, market_ids = set_market_reward_program(
-        vega_instance, reward_program, market_ids, tier
-    )
-    page.goto(REWARDS_URL)
-    change_keys(page, vega_instance, PARTY_B.name)
-    page.locator('[name="fromEpoch"]').fill("1")
-    expect((page.get_by_role(ROW).locator(PRICE_TAKING_COL_ID)).nth(1)).to_have_text(
-        price_taking
-    )
-    expect((page.get_by_role(ROW).locator(TOTAL_COL_ID)).nth(1)).to_have_text(total)
-    page.get_by_test_id(EARNED_BY_ME_BUTTON).click()
-    expect((page.get_by_role(ROW).locator(TOTAL_COL_ID)).nth(1)).to_have_text(
-        earned_by_me
-    )
-
-
-@pytest.mark.parametrize(
-    "reward_program, tier",
-    [
-        (ACTIVITY, 1),
-    ],
-)
-@pytest.mark.usefixtures("auth", "risk_accepted", "market_ids")
-def test_redeem(
-    reward_program, vega_instance: VegaServiceNull, page: Page, tier, market_ids
-):
-    print("reward program: " + reward_program, " tier:", tier)
-    market_id, market_ids = set_market_reward_program(
-        vega_instance, reward_program, market_ids, tier
-    )
-    page.goto(REWARDS_URL)
-    change_keys(page, vega_instance, PARTY_B.name)
-    page.get_by_test_id("redeem-rewards-button").click()
-    available_to_withdraw = page.get_by_test_id(
-        "available-to-withdraw-value"
-    ).text_content()
-    option_value = page.locator(
-        '[data-testid="transfer-form"] [name="fromAccount"] option[value^="ACCOUNT_TYPE_VESTED_REWARDS"]'
-    ).first.get_attribute("value")
-
-    page.select_option(
-        '[data-testid="transfer-form"] [name="fromAccount"]', option_value
-    )
-    
-    page.get_by_test_id("use-max-button").first.click()
-    expect(page.get_by_test_id(TRANSFER_AMOUNT)).to_have_text(available_to_withdraw)

apps/trading/e2e/tests/rewards/test_vesting.py

@@ -1,65 +0,0 @@
-import pytest
-import vega_sim.proto.vega as vega_protos
-from playwright.sync_api import Page, expect
-from vega_sim.null_service import VegaServiceNull
-from actions.utils import next_epoch, change_keys
-from wallet_config import MM_WALLET, PARTY_A, PARTY_B
-
-
-@pytest.mark.usefixtures("risk_accepted", "auth")
-def test_vesting(continuous_market, vega: VegaServiceNull, page: Page):
-    tDAI_asset_id = vega.find_asset_id(symbol="tDAI")
-    vega.update_network_parameter(
-        MM_WALLET.name, parameter="reward.asset", new_value=tDAI_asset_id
-    )
-    vega.mint(key_name=PARTY_B.name, asset=tDAI_asset_id, amount=100000)
-    vega.mint(key_name=PARTY_A.name, asset=tDAI_asset_id, amount=100000)
-    next_epoch(vega=vega)
-    vega.recurring_transfer(
-        from_key_name=PARTY_A.name,
-        from_account_type=vega_protos.vega.ACCOUNT_TYPE_GENERAL,
-        to_account_type=vega_protos.vega.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-        asset=tDAI_asset_id,
-        reference="reward",
-        asset_for_metric=tDAI_asset_id,
-        metric=vega_protos.vega.DISPATCH_METRIC_MAKER_FEES_PAID,
-        lock_period=5,
-        amount=100,
-        factor=1.0,
-    )
-    vega.submit_order(
-        trading_key=PARTY_B.name,
-        market_id=continuous_market,
-        order_type="TYPE_MARKET",
-        time_in_force="TIME_IN_FORCE_IOC",
-        side="SIDE_BUY",
-        volume=1,
-    )
-    vega.submit_order(
-        trading_key=PARTY_A.name,
-        market_id=continuous_market,
-        order_type="TYPE_MARKET",
-        time_in_force="TIME_IN_FORCE_IOC",
-        side="SIDE_BUY",
-        volume=1,
-    )
-    vega.wait_for_total_catchup()
-
-    page.goto("/#/rewards")
-    change_keys(page, vega, PARTY_B.name)
-    next_epoch(vega=vega)
-    page.reload()
-
-    expect(page.get_by_test_id("locked-value")).to_have_text("50.00")
-    
-    # Proceed through the 5 epoch lock period
-    next_epoch(vega=vega)
-    next_epoch(vega=vega)
-    next_epoch(vega=vega)
-    next_epoch(vega=vega)
-    next_epoch(vega=vega)
-    page.reload()
-
-    expect(page.get_by_test_id("locked-value")).to_have_text("0.00")
-    expect(page.get_by_test_id("vesting-value")).to_have_text("37.50")
-    expect(page.get_by_test_id("available-to-withdraw-value")).to_have_text("12.50")

apps/trading/e2e/tests/successor_market/test_succession_line.py

@@ -1,153 +1,46 @@
 import pytest
 from playwright.sync_api import Page, expect
 from vega_sim.null_service import VegaServiceNull
-from fixtures.market import setup_continuous_market
-from wallet_config import MM_WALLET, MM_WALLET2, GOVERNANCE_WALLET
-from actions.vega import submit_multiple_orders, submit_order, submit_liquidity
-from actions.utils import next_epoch
+from fixtures.market import setup_continuous_market, setup_simple_successor_market
 
-market_banner = "market-banner"
+
+@pytest.fixture
+@pytest.mark.usefixtures()
+def successor_market(vega: VegaServiceNull):
+    parent_market_id = setup_continuous_market(vega)
+    tdai_id = vega.find_asset_id(symbol="tDAI")
+    successor_market_id = setup_simple_successor_market(
+        vega, parent_market_id, tdai_id, "successor_market"
+    )
+    vega.submit_termination_and_settlement_data(
+        settlement_key="FJMKnwfZdd48C8NqvYrG",
+        settlement_price=110,
+        market_id=parent_market_id,
+    )
+    vega.forward("10s")
+    vega.wait_fn(1)
+    vega.wait_for_total_catchup()
+    return successor_market_id
 
 @pytest.mark.skip("tbd")
 @pytest.mark.usefixtures("risk_accepted")
-def test_succession_line(vega: VegaServiceNull, page: Page):
-    parent_market_id = setup_continuous_market(vega)
-    tdai_id = vega.find_asset_id(symbol="tDAI")
-
-    page.goto(f"/#/markets/{parent_market_id}")
-
-    # market in normal state no banner shown
-    expect(page.get_by_test_id(market_banner)).not_to_be_attached()
-
-    successor_name = "successor market name"
-    successor_id = propose_successor(vega, parent_market_id, tdai_id, successor_name)
-
-    # Check that the banner notifying about the successor proposal is shown
-    banner = page.get_by_test_id(market_banner)
-    expect(banner).to_be_attached()
-    expect(banner.get_by_text("A successor to this market has been proposed")).to_be_visible()
-
-    next_epoch(vega)
-
-    # Banner should not show after market has enacted
-    expect(page.get_by_test_id(market_banner)).not_to_be_attached()
-
-    # Check that the newly created market has the correct succession line
-    # shown in market info
-    provide_successor_liquidity(vega, successor_id)
-
-    next_epoch(vega)
-
-    page.goto(f"/#/markets/{successor_id}")
-
-    # Page reload required as the data provider doesnt receive the new market
-    # This also clears any toasts which can block the market info panel containing
-    # the succession line
-    page.reload()
-
-    #tbd issue - 5546
+def test_succession_line(page: Page, successor_market):
+    page.goto(f"/#/markets/{successor_market}")
     page.get_by_test_id("Info").click()
+    page.get_by_text("Succession line").click()
 
-    page.get_by_role("button", name="Succession line").click()
-
-    succession_item = page.get_by_test_id("succession-line-item")
-
-    expect(succession_item.nth(1)).to_contain_text(
-        "successor market name"
+    expect(page.get_by_test_id("succession-line-item").first).to_contain_text(
+        "BTC:DAI_2023BTC:DAI_2023"
     )
     expect(
-        succession_item.first.get_by_role("link")
+        page.get_by_test_id("succession-line-item").first.get_by_role("link")
+    ).to_be_attached
+    expect(page.get_by_test_id("succession-line-item").last).to_contain_text(
+        "successor_marketsuccessor_market"
+    )
+    expect(
+        page.get_by_test_id("succession-line-item").last.get_by_role("link")
     ).to_be_attached
     expect(
-        succession_item.last.get_by_role("link")
-    ).to_be_attached
-    expect(
-        succession_item.last.get_by_test_id("icon-bullet")
+        page.get_by_test_id("succession-line-item").last.get_by_test_id("icon-bullet")
     ).to_be_visible
-
-    page.goto(f"/#/markets/{parent_market_id}")
-    # Settle parent market and check that successor banner is showing
-    vega.submit_termination_and_settlement_data(
-        settlement_key=GOVERNANCE_WALLET.name,
-        settlement_price=100,
-        market_id=parent_market_id,
-    )
-    next_epoch(vega=vega)
-
-    banner = page.get_by_test_id(market_banner)
-    page.wait_for_selector('[data-testid="market-banner"]', state="attached")
-    expect(banner.get_by_text("This market has been succeeded")).to_be_visible()
-
-@pytest.mark.usefixtures("risk_accepted")
-def test_banners(vega: VegaServiceNull, page: Page):
-
-    banner_successor_text = "A successor to this market has been proposed"
-    parent_market_id = setup_continuous_market(vega)
-    tdai_id = vega.find_asset_id(symbol="tDAI")
-
-    page.goto(f"/#/markets/{parent_market_id}")
-
-    # market in normal state no banner shown
-    expect(page.get_by_test_id(market_banner)).not_to_be_attached()
-
-    vega.submit_termination_and_settlement_data(
-    settlement_key=GOVERNANCE_WALLET.name,
-    settlement_price=100,
-    market_id=parent_market_id,
-    )
-
-    successor_name = "successor market name"
-    propose_successor(vega, parent_market_id, tdai_id, successor_name)
-
-    # Check that the banners notifying about the successor proposal and market has been settled are shown
-    banner = page.get_by_test_id(market_banner)
-    expect(banner).to_be_attached()
-    expect(banner.get_by_text(banner_successor_text)).to_be_visible()
-    expect(banner.get_by_text("1/2")).to_be_visible()
-
-    # Check that the banner notifying about the successor proposal and market has been settled are shown still after reload
-    page.reload()
-    expect(banner.get_by_text(banner_successor_text)).to_be_visible()
-    expect(banner.get_by_text("1/2")).to_be_visible() 
-    # Check that the banner notifying about the successor proposal is not visible after close those banners
-    banner.get_by_test_id("icon-cross").click()
-    expect(banner.get_by_text("This market has been settled")).to_be_visible()
-    expect(banner.get_by_text("2/2")).to_be_visible()
-
-    # Check that the banners notifying are visible after reload
-    banner.get_by_test_id("icon-cross").click()
-    expect(page.get_by_test_id(market_banner)).not_to_be_attached()
-    page.reload()
-    expect(banner).to_be_attached()
-    expect(banner.get_by_text(banner_successor_text)).to_be_visible() 
-
-def propose_successor(
-    vega: VegaServiceNull, parent_market_id, tdai_id, market_name
-):
-    market_id = vega.create_simple_market(
-        market_name,
-        proposal_key=MM_WALLET.name,
-        settlement_asset_id=tdai_id,
-        termination_key=MM_WALLET2.name,
-        market_decimals=5,
-        approve_proposal=True,
-        forward_time_to_enactment=False,
-        parent_market_id=parent_market_id,
-        parent_market_insurance_pool_fraction=0.5,
-    )
-    return market_id
-
-def provide_successor_liquidity(
-    vega: VegaServiceNull, market_id
-):
-    submit_liquidity(vega, MM_WALLET.name, market_id)
-    submit_multiple_orders(
-        vega, MM_WALLET.name, market_id, "SIDE_SELL", [[1, 110], [1, 105]]
-    )
-    submit_multiple_orders(
-        vega, MM_WALLET2.name, market_id, "SIDE_BUY", [[1, 90], [1, 95]]
-    )
-
-    submit_order(vega, "Key 1", market_id, "SIDE_BUY", 1, 110)
-    vega.wait_fn(1)
-    vega.wait_for_total_catchup()

apps/trading/e2e/tests/trade_history/test_trade_history.py

@@ -73,6 +73,6 @@ def test_limit_order_new_trade_top_of_list(
 def test_price_copied_to_deal_ticket(continuous_market, page: Page):
     page.goto(f"/#/markets/{continuous_market}")
     page.get_by_test_id("Trades").click()
-    page.locator("[col-id=price]").nth(1).click()
+    page.locator("[col-id=price]").last.click()
     # 6005-THIS-007
     expect(page.get_by_test_id("order-price")).to_have_value("107.50000")

apps/trading/e2e/tests/trade_match/test_trade_match.py

@@ -22,6 +22,8 @@ def test_trade_match_table(opening_auction_market: str, vega: VegaServiceNull, p
         price=10e15,
         wait=False,
     )
+
+    vega.forward("10s")
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
 
@@ -32,6 +34,7 @@ def test_trade_match_table(opening_auction_market: str, vega: VegaServiceNull, p
         "SIDE_BUY",
         [[5, 110], [5, 105], [1, 50]],
     )
+    vega.forward("10s")
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
 
@@ -42,6 +45,7 @@ def test_trade_match_table(opening_auction_market: str, vega: VegaServiceNull, p
         "SIDE_SELL",
         [[5, 90], [5, 95], [1, 150]],
     )
+    vega.forward("60s")
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
 

apps/trading/e2e/tests/transfer/test_transfer_key_to_key.py

@@ -50,6 +50,7 @@ def test_transfer_submit(continuous_market, vega: VegaServiceNull, page: Page):
 
     page.locator('[data-testid=transfer-form] [type="submit"]').click()
     wait_for_toast_confirmation(page)
+    vega.forward("10s")
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
     expected_confirmation_text = re.compile(
@@ -141,12 +142,14 @@ def test_transfer_vesting_below_minimum(
         asset=asset_id,
         amount=24.999999,
     )
+    vega.forward("10s")
     vega.wait_fn(10)
     vega.wait_for_total_catchup()
 
-    page.get_by_test_id("use-max-button").first.click()
+    page.get_by_text("Use max").first.click()
     page.locator('[data-testid=transfer-form] [type="submit"]').click()
     wait_for_toast_confirmation(page)
+    vega.forward("10s")
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
     expected_confirmation_text = re.compile(

apps/trading/e2e/tests/wallet/test_wallet.py

@@ -116,7 +116,7 @@ def test_wallet_transaction_rejected(continuous_market, page: Page):
     page.get_by_test_id(order_price).fill("120")
     page.route("**/*", handle_route_connection_rejected)
     page.get_by_test_id(place_order).click()
-    expect(page.get_by_test_id("toast-content").nth(0)).to_have_text(
+    expect(page.get_by_test_id("toast-content")).to_have_text(
         "Error occurredthe user rejected the wallet connection"
     )
 

apps/trading/e2e/wallet_config.py

@@ -11,7 +11,5 @@ GOVERNANCE_WALLET = WalletConfig(
     "FJMKnwfZdd48C8NqvYrG", "bY3DxwtsCstMIIZdNpKs")
 PARTY_A = WalletConfig("party_a", "party_a")
 PARTY_B = WalletConfig("party_b", "party_b")
-PARTY_C = WalletConfig("party_c", "party_c")
-PARTY_D = WalletConfig("party_d", "party_d")
 
-wallets = [MM_WALLET, MM_WALLET2, TERMINATE_WALLET, GOVERNANCE_WALLET, PARTY_A, PARTY_B, PARTY_C, PARTY_D]
+wallets = [MM_WALLET, MM_WALLET2, TERMINATE_WALLET, GOVERNANCE_WALLET]

apps/trading/pages/_document.page.tsx

@@ -13,9 +13,9 @@ export default function Document() {
         {/* preload fonts */}
         <link
           rel="preload"
-          href="/AlphaLyrae.woff"
+          href="/AlphaLyrae.woff2"
           as="font"
-          type="font/woff"
+          type="font/woff2"
         />
 
         {/* icons */}

libs/accounts/src/lib/accounts-table.tsx

@@ -67,7 +67,6 @@ const defaultColDef = {
   sortable: true,
   tooltipComponent: TooltipCellComponent,
   comparator: accountValuesComparator,
-  minWidth: 150,
 };
 export interface GetRowsParams extends Omit<IGetRowsParams, 'successCallback'> {
   successCallback(rowsThisBlock: AccountFields[], lastRow?: number): void;
@@ -140,8 +139,6 @@ export const AccountTable = ({
       {
         headerName: t('Asset'),
         field: 'asset.symbol',
-        pinned: true,
-        minWidth: 75,
         headerTooltip: t(
           'Asset is the collateral that is deposited into the Vega protocol.'
         ),
@@ -256,8 +253,8 @@ export const AccountTable = ({
         colId: 'accounts-actions',
         field: 'asset.id',
         ...COL_DEFS.actions,
-        minWidth: showDepositButton ? 110 : COL_DEFS.actions.minWidth,
-        maxWidth: showDepositButton ? 110 : COL_DEFS.actions.maxWidth,
+        minWidth: showDepositButton ? 105 : COL_DEFS.actions.minWidth,
+        maxWidth: showDepositButton ? 105 : COL_DEFS.actions.maxWidth,
         cellRenderer: ({
           value: assetId,
           node,

libs/accounts/src/lib/breakdown-table.tsx

@@ -23,9 +23,7 @@ import { AccountType } from '@vegaprotocol/types';
 const defaultColDef = {
   resizable: true,
   sortable: true,
-  minWidth: 100,
 };
-
 interface BreakdownTableProps extends AgGridReactProps {
   data: AccountFields[] | null;
   onMarketClick?: (marketId: string, metaKey?: boolean) => void;
@@ -34,13 +32,12 @@ interface BreakdownTableProps extends AgGridReactProps {
 const BreakdownTable = forwardRef<AgGridReact, BreakdownTableProps>(
   ({ data }, ref) => {
     const t = useT();
-    const colDefs = useMemo(() => {
+    const coldefs = useMemo(() => {
       const defs: ColDef[] = [
         {
           headerName: t('Market'),
           field: 'market.tradableInstrument.instrument.code',
-          width: 90,
-          pinned: true,
+          minWidth: 200,
           sort: 'desc',
           cellRenderer: ({
             value,
@@ -144,7 +141,7 @@ const BreakdownTable = forwardRef<AgGridReact, BreakdownTableProps>(
         components={{ PriceCell, ProgressBarCell }}
         tooltipShowDelay={500}
         defaultColDef={defaultColDef}
-        columnDefs={colDefs}
+        columnDefs={coldefs}
         domLayout="autoHeight"
       />
     );

libs/accounts/src/lib/transfer-form.tsx

@@ -438,7 +438,6 @@ export const TransferForm = ({
                 shouldValidate: true,
               })
             }
-            data-testid="use-max-button"
           >
             {t('Use max')}
           </button>

libs/cypress/src/lib/capsule/propose-market.ts

@@ -15,6 +15,7 @@ export async function proposeMarket(publicKey: string) {
   log('sending proposal tx');
   const proposalTx = createNewMarketProposal();
   const result = await sendVegaTx(publicKey, proposalTx);
+
   return result.result;
 }
 
@@ -118,7 +119,6 @@ function createNewMarketProposal(): ProposalSubmissionBody {
                 timeWindow: '3600',
                 scalingFactor: 10,
               },
-              // FIXME: workaround because of https://github.com/vegaprotocol/vega/issues/10343
               triggeringRatio: '0.7',
               auctionExtension: '1',
             },

libs/datagrid/src/lib/column-definitions.ts

@@ -9,7 +9,4 @@ export const COL_DEFS = {
     type: 'rightAligned',
     pinned: 'right' as const,
   },
-  default: {
-    minWidth: 100,
-  },
 };

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

@@ -329,9 +329,8 @@ export const DealTicket = ({
 
     const marketTradingModeError = validateMarketTradingMode(
       marketTradingMode,
-      t('No trading')
+      t('Trading terminated')
     );
-
     if (marketTradingModeError !== true) {
       return {
         message: marketTradingModeError,

libs/deal-ticket/src/test-helpers.ts

@@ -11,6 +11,9 @@ export function generateMarket(override?: PartialDeep<Market>): Market {
     positionDecimalPlaces: 1,
     tradingMode: Schema.MarketTradingMode.TRADING_MODE_CONTINUOUS,
     state: Schema.MarketState.STATE_ACTIVE,
+    liquidityMonitoringParameters: {
+      triggeringRatio: '1',
+    },
     marketTimestamps: {
       __typename: 'MarketTimestamps',
       close: '',
@@ -72,6 +75,7 @@ export function generateMarket(override?: PartialDeep<Market>): Market {
         __typename: 'Instrument',
       },
     },
+
     fees: {
       factors: {
         makerFee: '0.001',