chore: update test

fix: clear before typing
chore: pass tpsl errors
2024-03-08 17:39:42 +01:00 · 2024-03-08 14:57:51 +01:00 · 2024-03-08 14:46:54 +01:00 · 2024-03-08 14:44:19 +01:00 · 2024-03-08 14:38:41 +01:00 · 2024-03-08 14:31:45 +01:00
170 changed files with 2101 additions and 3400 deletions
@@ -0,0 +1,28 @@
+# path to a directory with all packages
+storage: ../tmp/local-registry/storage
+
+# a list of other known repositories we can talk to
+uplinks:
+  npmjs:
+    url: https://registry.yarnpkg.com
+    maxage: 60m
+
+packages:
+  '**':
+    # give all users (including non-authenticated users) full access
+    # because it is a local registry
+    access: $all
+    publish: $all
+    unpublish: $all
+
+    # if package is not available locally, proxy requests to npm registry
+    proxy: npmjs
+
+# log settings
+logs:
+  type: stdout
+  format: pretty
+  level: warn
+
+publish:
+  allow_offline: true # set offline to true to allow publish offline
@@ -1,7 +1,9 @@
 const { join } = require('path');
 const { createGlobPatternsForDependencies } = require('@nx/react/tailwind');
-const theme = require('../../libs/tailwindcss-config/src/theme');
-const vegaCustomClasses = require('../../libs/tailwindcss-config/src/vega-custom-classes');
+const { theme } = require('../../libs/tailwindcss-config/src/theme');
+const {
+  vegaCustomClasses,
+} = require('../../libs/tailwindcss-config/src/vega-custom-classes');

 module.exports = {
  content: [
@@ -1,9 +1,11 @@
 const { join } = require('path');
 const { createGlobPatternsForDependencies } = require('@nx/react/tailwind');
-const theme = require('../../libs/tailwindcss-config/src/theme');
-const vegaCustomClasses = require('../../libs/tailwindcss-config/src/vega-custom-classes');
+const { theme } = require('../../libs/tailwindcss-config/src/theme');
+const {
+  vegaCustomClasses,
+} = require('../../libs/tailwindcss-config/src/vega-custom-classes');

-module.exports = {
+export default {
  content: [
    join(__dirname, 'src/**/*.{js,ts,jsx,tsx}'),
    'libs/ui-toolkit/src/utils/shared.ts',
@@ -1,11 +0,0 @@
-{
-  "presets": [
-    [
-      "@nx/react/babel",
-      {
-        "runtime": "automatic"
-      }
-    ]
-  ],
-  "plugins": []
-}
@@ -1,16 +0,0 @@
-# This file is used by:
-# 1. autoprefixer to adjust CSS to support the below specified browsers
-# 2. babel preset-env to adjust included polyfills
-#
-# For additional information regarding the format and rule options, please see:
-# https://github.com/browserslist/browserslist#queries
-#
-# If you need to support different browsers in production, you may tweak the list below.
-
-last 1 Chrome version
-last 1 Firefox version
-last 2 Edge major versions
-last 2 Safari major version
-last 2 iOS major versions
-Firefox ESR
-not IE 9-11 # For IE 9-11 support, remove 'not'.
@@ -1,28 +0,0 @@
-# React Environment Variables
-# https://facebook.github.io/create-react-app/docs/adding-custom-environment-variables#expanding-environment-variables-in-env
-
-# Netlify Environment Variables
-# https://www.netlify.com/docs/continuous-deployment/#environment-variables
-NX_VERSION=\$npm_package_version
-NX_REPOSITORY_URL=\$REPOSITORY_URL
-NX_BRANCH=\$BRANCH
-NX_PULL_REQUEST=\$PULL_REQUEST
-NX_HEAD=\$HEAD
-NX_COMMIT_REF=\$COMMIT_REF
-NX_CONTEXT=\$CONTEXT
-NX_REVIEW_ID=\$REVIEW_ID
-NX_INCOMING_HOOK_TITLE=\$INCOMING_HOOK_TITLE
-NX_INCOMING_HOOK_URL=\$INCOMING_HOOK_URL
-NX_INCOMING_HOOK_BODY=\$INCOMING_HOOK_BODY
-NX_URL=\$URL
-NX_DEPLOY_URL=\$DEPLOY_URL
-NX_DEPLOY_PRIME_URL=\$DEPLOY_PRIME_URL
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
-NX_VEGA_ENV = 'TESTNET'
-NX_VEGA_URL="https://api.n07.testnet.vega.xyz/graphql"
-NX_VEGA_WALLET_URL=http://localhost:1789
-NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://trading.stagnet1.vega.rocks\"}
-NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
-NX_VEGA_CONSOLE_URL=https://console.fairground.wtf
@@ -1,3 +0,0 @@
-# App configuration variables
-NX_VEGA_URL=http://localhost:3008/graphql
-NX_VEGA_ENV=LOCAL
@@ -1,8 +0,0 @@
-# App configuration variables
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml
-NX_VEGA_URL=https://api.n04.d.vega.xyz/graphql
-NX_VEGA_ENV=DEVNET
-NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://trading.stagnet1.vega.rocks\"}
-NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_VEGA_EXPLORER_URL=#
@@ -1,9 +0,0 @@
-# App configuration variables
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/mainnet1/mainnet1.toml
-NX_VEGA_URL=https://api.vega.community/graphql
-NX_VEGA_ENV=MAINNET
-NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\"}
-NX_ETHEREUM_PROVIDER_URL=https://mainnet.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://etherscan.io
-NX_VEGA_EXPLORER_URL=https://explorer.vega.xyz
-NX_VEGA_CONSOLE_URL=https://console.vega.xyz
@@ -1,9 +0,0 @@
-# App configuration variables
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
-NX_VEGA_URL=https://api.n00.stagnet1.vega.xyz/graphql
-NX_VEGA_ENV=STAGNET1
-NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_VEGA_EXPLORER_URL=https://explorer.stagnet1.vega.rocks
-NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://trading.stagnet1.vega.rocks\"}
-
@@ -1,9 +0,0 @@
-# App configuration variables
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
-NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
-NX_VEGA_ENV=TESTNET
-NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\"}
-NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
-NX_VEGA_CONSOLE_URL=https://console.fairground.wtf
@@ -1,18 +0,0 @@
-{
-  "extends": ["plugin:@nx/react", "../../.eslintrc.json"],
-  "ignorePatterns": ["!**/*", "__generated__"],
-  "overrides": [
-    {
-      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
-      "rules": {}
-    },
-    {
-      "files": ["*.ts", "*.tsx"],
-      "rules": {}
-    },
-    {
-      "files": ["*.js", "*.jsx"],
-      "rules": {}
-    }
-  ]
-}
@@ -1,11 +0,0 @@
-/* eslint-disable */
-export default {
-  displayName: 'liquidity-provision-dashboard',
-  preset: '../../jest.preset.js',
-  transform: {
-    '^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nx/react/plugins/jest',
-    '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nx/next/babel'] }],
-  },
-  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
-  coverageDirectory: '../../coverage/apps/liquidity-provision-dashboard',
-};
@@ -1,10 +0,0 @@
-const { join } = require('path');
-
-module.exports = {
-  plugins: {
-    tailwindcss: {
-      config: join(__dirname, 'tailwind.config.js'),
-    },
-    autoprefixer: {},
-  },
-};
@@ -1,94 +0,0 @@
-{
-  "name": "liquidity-provision-dashboard",
-  "$schema": "../../node_modules/nx/schemas/project-schema.json",
-  "sourceRoot": "apps/liquidity-provision-dashboard/src",
-  "projectType": "application",
-  "targets": {
-    "build": {
-      "executor": "@nx/webpack:webpack",
-      "outputs": ["{options.outputPath}"],
-      "defaultConfiguration": "production",
-      "options": {
-        "compiler": "babel",
-        "outputPath": "dist/apps/liquidity-provision-dashboard",
-        "index": "apps/liquidity-provision-dashboard/src/index.html",
-        "baseHref": "/",
-        "main": "apps/liquidity-provision-dashboard/src/main.tsx",
-        "polyfills": "apps/liquidity-provision-dashboard/src/polyfills.ts",
-        "tsConfig": "apps/liquidity-provision-dashboard/tsconfig.app.json",
-        "assets": [
-          "apps/liquidity-provision-dashboard/src/favicon.ico",
-          "apps/liquidity-provision-dashboard/src/assets"
-        ],
-        "styles": ["apps/liquidity-provision-dashboard/src/styles.scss"],
-        "scripts": [],
-        "webpackConfig": "@nx/react/plugins/webpack"
-      },
-      "configurations": {
-        "development": {
-          "extractLicenses": false,
-          "optimization": false,
-          "sourceMap": true,
-          "vendorChunk": true
-        },
-        "production": {
-          "fileReplacements": [
-            {
-              "replace": "apps/liquidity-provision-dashboard/src/environments/environment.ts",
-              "with": "apps/liquidity-provision-dashboard/src/environments/environment.prod.ts"
-            }
-          ],
-          "optimization": true,
-          "outputHashing": "all",
-          "sourceMap": false,
-          "namedChunks": false,
-          "extractLicenses": true,
-          "vendorChunk": false
-        }
-      }
-    },
-    "serve": {
-      "executor": "@nx/webpack:dev-server",
-      "options": {
-        "buildTarget": "liquidity-provision-dashboard:build",
-        "hmr": true,
-        "port": 4201
-      },
-      "configurations": {
-        "development": {
-          "buildTarget": "liquidity-provision-dashboard:build:development"
-        },
-        "production": {
-          "buildTarget": "liquidity-provision-dashboard:build:production",
-          "hmr": false
-        }
-      }
-    },
-    "lint": {
-      "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": [
-          "apps/liquidity-provision-dashboard/**/*.{ts,tsx,js,jsx}"
-        ]
-      }
-    },
-    "test": {
-      "executor": "@nx/jest:jest",
-      "outputs": [
-        "{workspaceRoot}/coverage/apps/liquidity-provision-dashboard"
-      ],
-      "options": {
-        "jestConfig": "apps/liquidity-provision-dashboard/jest.config.ts"
-      }
-    },
-    "build-spec": {
-      "executor": "nx:run-commands",
-      "outputs": [],
-      "options": {
-        "command": "yarn tsc --project ./apps/liquidity-provision-dashboard/tsconfig.spec.json"
-      }
-    }
-  },
-  "tags": []
-}
@@ -1,47 +0,0 @@
-import type { InMemoryCacheConfig } from '@apollo/client';
-import { NetworkLoader, useInitializeEnv } from '@vegaprotocol/environment';
-import { useRoutes } from 'react-router-dom';
-
-import '../styles.scss';
-import { Navbar } from './components/navbar';
-
-import { routerConfig } from './routes/router-config';
-
-const cache: InMemoryCacheConfig = {
-  typePolicies: {
-    Market: {
-      merge: true,
-    },
-    Party: {
-      merge: true,
-    },
-    Query: {},
-    Account: {
-      keyFields: false,
-      fields: {
-        balanceFormatted: {},
-      },
-    },
-    Node: {
-      keyFields: false,
-    },
-    Instrument: {
-      keyFields: false,
-    },
-  },
-};
-const AppRouter = () => useRoutes(routerConfig);
-
-export function App() {
-  useInitializeEnv();
-  return (
-    <NetworkLoader cache={cache}>
-      <div className="max-h-full min-h-full bg-white">
-        <Navbar />
-        <AppRouter />
-      </div>
-    </NetworkLoader>
-  );
-}
-
-export default App;
@@ -1,25 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-
-import { Intro } from './intro';
-import { MarketList } from './market-list';
-
-export function Dashboard() {
-  return (
-    <>
-      <div className="px-16 pt-20 pb-12 bg-greys-light-100">
-        <div className="max-w-screen-xl mx-auto">
-          <h1 className="font-alpha calt uppercase text-5xl mb-8">
-            {t('Top liquidity opportunities')}
-          </h1>
-
-          <Intro />
-        </div>
-      </div>
-      <div className="px-16 py-6">
-        <div className="max-w-screen-xl mx-auto">
-          <MarketList />
-        </div>
-      </div>
-    </>
-  );
-}
@@ -1 +0,0 @@
-export * from './dashboard';
@@ -1 +0,0 @@
-export * from './intro';
@@ -1,53 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import { ExternalLink } from '@vegaprotocol/ui-toolkit';
-
-// TODO: add mainnet links once docs have been updated
-const LINKS = {
-  testnet: [
-    {
-      label: 'Learn about liquidity fees',
-      url: 'https://docs.vega.xyz/testnet/tutorials/providing-liquidity#resources',
-    },
-    {
-      label: 'Provide liquidity',
-      url: 'https://docs.vega.xyz/testnet/tutorials/providing-liquidity#overview',
-    },
-    {
-      label: 'View your liquidity provisions',
-      url: 'https://docs.vega.xyz/testnet/tutorials/providing-liquidity#viewing-existing-liquidity-provisions',
-    },
-    {
-      label: 'Amend or remove liquidity',
-      url: 'https://docs.vega.xyz/testnet/tutorials/providing-liquidity#amending-a-liquidity-commitment',
-    },
-  ],
-  mainnet: [],
-};
-
-// TODO: update this when network switcher is added
-type Network = 'testnet' | 'mainnet';
-
-export const Intro = ({ network = 'testnet' }: { network?: Network }) => {
-  return (
-    <div>
-      <p className="font-alpha calt text-2xl font-medium mb-2">
-        {t(
-          'Become a liquidity provider and earn a cut of the fees paid during trading.'
-        )}
-      </p>
-      <div>
-        <ul className="flex flex-wrap">
-          {LINKS[network].map(
-            ({ label, url }: { label: string; url: string }) => (
-              <li key={url} className="mr-6">
-                <ExternalLink href={url} rel="noreferrer">
-                  {t(label)}
-                </ExternalLink>
-              </li>
-            )
-          )}
-        </ul>
-      </div>
-    </div>
-  );
-};
@@ -1 +0,0 @@
-export * from './market-list';
@@ -1,296 +0,0 @@
-import { DApp, useLinks } from '@vegaprotocol/environment';
-import { type Market } from '@vegaprotocol/liquidity';
-import {
-  displayChange,
-  formatWithAsset,
-  useMarketsLiquidity,
-} from '@vegaprotocol/liquidity';
-import {
-  addDecimalsFormatNumber,
-  formatNumberPercentage,
-  getExpiryDate,
-  toBigNum,
-} from '@vegaprotocol/utils';
-import { t } from '@vegaprotocol/i18n';
-import { type VegaValueFormatterParams } from '@vegaprotocol/datagrid';
-import { PriceChangeCell } from '@vegaprotocol/datagrid';
-import type * as Schema from '@vegaprotocol/types';
-import {
-  AsyncRenderer,
-  Icon,
-  HealthBar,
-  TooltipCellComponent,
-} from '@vegaprotocol/ui-toolkit';
-import {
-  type GetRowIdParams,
-  type RowClickedEvent,
-  type ColDef,
-} from 'ag-grid-community';
-import 'ag-grid-community/styles/ag-grid.css';
-import 'ag-grid-community/styles/ag-theme-alpine.css';
-import { useCallback, useState, useMemo } from 'react';
-
-import { Grid } from '../../grid';
-import { HealthDialog } from '../../health-dialog';
-import { Status } from '../../status';
-import { intentForStatus } from '../../../lib/utils';
-import { formatDistanceToNow } from 'date-fns';
-import { getAsset } from '@vegaprotocol/markets';
-
-export const MarketList = () => {
-  const { data, error, loading } = useMarketsLiquidity();
-  const [isHealthDialogOpen, setIsHealthDialogOpen] = useState(false);
-  const consoleLink = useLinks(DApp.Console);
-
-  const getRowId = useCallback(({ data }: GetRowIdParams) => data.id, []);
-  const columnDefs = useMemo<ColDef[]>(
-    () => [
-      {
-        headerName: t('Market (futures)'),
-        field: 'tradableInstrument.instrument.name',
-        cellRenderer: ({ value, data }: { value: string; data: Market }) => {
-          return (
-            <>
-              <span className="leading-3">{value}</span>
-              <span className="leading-3">{getAsset(data).symbol}</span>
-            </>
-          );
-        },
-        minWidth: 100,
-        flex: 1,
-        headerTooltip: t('The market name and settlement asset'),
-      },
-
-      {
-        headerName: t('Market Code'),
-        headerTooltip: t(
-          'The market code is a unique identifier for this market'
-        ),
-        field: 'tradableInstrument.instrument.code',
-      },
-
-      {
-        headerName: t('Type'),
-        headerTooltip: t('Type'),
-        field: 'tradableInstrument.instrument.product.__typename',
-      },
-
-      {
-        headerName: t('Last Price'),
-        headerTooltip: t('Latest price for this market'),
-        field: 'data.markPrice',
-        valueFormatter: ({
-          value,
-          data,
-        }: VegaValueFormatterParams<Market, 'data.markPrice'>) =>
-          value && data ? formatWithAsset(value, getAsset(data)) : '-',
-      },
-
-      {
-        headerName: t('Change (24h)'),
-        headerTooltip: t('Change in price over the last 24h'),
-        cellRenderer: ({
-          data,
-        }: VegaValueFormatterParams<Market, 'data.candles'>) => {
-          if (data && data.candles) {
-            const prices = data.candles.map((candle) => candle.close);
-            return (
-              <PriceChangeCell
-                candles={prices}
-                decimalPlaces={data?.decimalPlaces}
-              />
-            );
-          } else return <div>{t('-')}</div>;
-        },
-      },
-
-      {
-        headerName: t('Volume (24h)'),
-        field: 'dayVolume',
-        valueFormatter: ({
-          value,
-          data,
-        }: VegaValueFormatterParams<Market, 'dayVolume'>) =>
-          value && data
-            ? `${addDecimalsFormatNumber(
-                value,
-                getAsset(data).decimals || 0
-              )} (${displayChange(data.volumeChange)})`
-            : '-',
-        headerTooltip: t('The trade volume over the last 24h'),
-      },
-
-      {
-        headerName: t('Total staked by LPs'),
-        field: 'liquidityCommitted',
-        valueFormatter: ({
-          value,
-          data,
-        }: VegaValueFormatterParams<Market, 'liquidityCommitted'>) =>
-          data && value
-            ? formatWithAsset(value.toString(), getAsset(data))
-            : '-',
-        headerTooltip: t('The amount of funds allocated to provide liquidity'),
-      },
-
-      {
-        headerName: t('Target stake'),
-        field: 'target',
-        valueFormatter: ({
-          value,
-          data,
-        }: VegaValueFormatterParams<Market, 'target'>) =>
-          data && value ? formatWithAsset(value, getAsset(data)) : '-',
-        headerTooltip: t(
-          'The ideal committed liquidity to operate the market.  If total commitment currently below this level then LPs can set the fee level with new commitment.'
-        ),
-      },
-
-      {
-        headerName: t('% Target stake met'),
-        valueFormatter: ({ data }: VegaValueFormatterParams<Market, ''>) => {
-          if (data) {
-            const roundedPercentage =
-              parseInt(
-                (data.liquidityCommitted / parseFloat(data.target)).toFixed(0)
-              ) * 100;
-            const display = Number.isNaN(roundedPercentage)
-              ? 'N/A'
-              : formatNumberPercentage(toBigNum(roundedPercentage, 0), 0);
-            return display;
-          } else return '-';
-        },
-        headerTooltip: t('% Target stake met'),
-      },
-
-      {
-        headerName: t('Fee levels'),
-        field: 'fees',
-        valueFormatter: ({ value }: VegaValueFormatterParams<Market, 'fees'>) =>
-          value ? `${value.factors.liquidityFee}%` : '-',
-        headerTooltip: t('Fee level for this market'),
-      },
-
-      {
-        headerName: t('Status'),
-        field: 'tradingMode',
-        cellRenderer: ({
-          value,
-          data,
-        }: {
-          value: Schema.MarketTradingMode;
-          data: Market;
-        }) => {
-          return <Status trigger={data.data?.trigger} tradingMode={value} />;
-        },
-        headerTooltip: t(
-          'The current market status - those below the target stake mark are most in need of liquidity'
-        ),
-      },
-
-      {
-        headerComponent: () => {
-          return (
-            <div>
-              <span>{t('Health')}</span>{' '}
-              <button
-                onClick={() => setIsHealthDialogOpen(true)}
-                aria-label={t('open tooltip')}
-              >
-                <Icon name="info-sign" />
-              </button>
-            </div>
-          );
-        },
-        field: 'tradingMode',
-        cellRenderer: ({
-          value,
-          data,
-        }: {
-          value: Schema.MarketTradingMode;
-          data: Market;
-        }) => (
-          <HealthBar
-            target={data.target}
-            decimals={getAsset(data).decimals || 0}
-            levels={data.feeLevels}
-            intent={intentForStatus(value)}
-          />
-        ),
-        sortable: false,
-        cellStyle: { overflow: 'unset' },
-      },
-      {
-        headerName: t('Age'),
-        field: 'marketTimestamps.open',
-        headerTooltip: t('Age of the market'),
-        valueFormatter: ({
-          value,
-        }: VegaValueFormatterParams<Market, 'marketTimestamps.open'>) => {
-          return value ? formatDistanceToNow(new Date(value)) : '-';
-        },
-      },
-      {
-        headerName: t('Closing Time'),
-        field: 'tradableInstrument.instrument.metadata.tags',
-        headerTooltip: t('Closing time of the market'),
-        valueFormatter: ({ data }: VegaValueFormatterParams<Market, ''>) => {
-          let expiry;
-          if (data?.tradableInstrument.instrument.metadata.tags) {
-            expiry = getExpiryDate(
-              data?.tradableInstrument.instrument.metadata.tags,
-              data?.marketTimestamps.close,
-              data?.state
-            );
-          }
-          return expiry ? expiry : '-';
-        },
-      },
-    ],
-    []
-  );
-
-  return (
-    <AsyncRenderer loading={loading} error={error} data={data}>
-      <div
-        className="w-full grow"
-        style={{ minHeight: 500, overflow: 'hidden' }}
-      >
-        <Grid
-          gridOptions={{
-            onRowClicked: ({ data }: RowClickedEvent) => {
-              window.open(
-                liquidityDetailsConsoleLink(data.id, consoleLink),
-                '_blank',
-                'noopener,noreferrer'
-              );
-            },
-          }}
-          rowData={data}
-          defaultColDef={{
-            resizable: true,
-            sortable: true,
-            unSortIcon: true,
-            cellClass: ['flex', 'flex-col', 'justify-center'],
-            tooltipComponent: TooltipCellComponent,
-          }}
-          columnDefs={columnDefs}
-          getRowId={getRowId}
-          isRowClickable
-          tooltipShowDelay={500}
-        />
-        <HealthDialog
-          isOpen={isHealthDialogOpen}
-          onChange={() => {
-            setIsHealthDialogOpen(!isHealthDialogOpen);
-          }}
-        />
-      </div>
-    </AsyncRenderer>
-  );
-};
-
-const liquidityDetailsConsoleLink = (
-  marketId: string,
-  consoleLink: (url: string | undefined) => string
-) => consoleLink(`/#/liquidity/${marketId}`);
@@ -1,103 +0,0 @@
-import { useParams } from 'react-router-dom';
-import { makeDerivedDataProvider } from '@vegaprotocol/data-provider';
-import { t } from '@vegaprotocol/i18n';
-import { useDataProvider } from '@vegaprotocol/data-provider';
-import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
-
-import {
-  getFeeLevels,
-  sumLiquidityCommitted,
-  lpAggregatedDataProvider,
-} from '@vegaprotocol/liquidity';
-import { getAsset, marketWithDataProvider } from '@vegaprotocol/markets';
-import type { MarketWithData } from '@vegaprotocol/markets';
-
-import { Market } from './market';
-import { Header } from './header';
-import { LPProvidersGrid } from './providers';
-
-const formatMarket = (market: MarketWithData) => {
-  return {
-    name: market?.tradableInstrument.instrument.name,
-    symbol: getAsset(market).symbol,
-    settlementAsset: getAsset(market),
-    targetStake: market?.data?.targetStake,
-    tradingMode: market?.data?.marketTradingMode,
-    trigger: market?.data?.trigger,
-  };
-};
-
-export const lpDataProvider = makeDerivedDataProvider(
-  [marketWithDataProvider, lpAggregatedDataProvider],
-  ([market, lpAggregatedData]) => ({
-    market: { ...formatMarket(market) },
-    liquidityProviders: lpAggregatedData || [],
-  })
-);
-
-const useMarketDetails = (marketId: string | undefined) => {
-  const { data, loading, error } = useDataProvider({
-    dataProvider: lpDataProvider,
-    skipUpdates: true,
-    variables: { marketId: marketId || '' },
-  });
-
-  const liquidityProviders = data?.liquidityProviders || [];
-
-  return {
-    data: {
-      name: data?.market?.name,
-      symbol: data?.market?.symbol,
-      liquidityProviders: liquidityProviders,
-      feeLevels: getFeeLevels(liquidityProviders),
-      comittedLiquidity: sumLiquidityCommitted(liquidityProviders) || 0,
-      settlementAsset: data?.market?.settlementAsset || {},
-      targetStake: data?.market?.targetStake || '0',
-      tradingMode: data?.market.tradingMode,
-    },
-    error,
-    loading: loading,
-  };
-};
-
-type Params = { marketId: string };
-
-export const Detail = () => {
-  const { marketId } = useParams<Params>();
-  const { data, loading, error } = useMarketDetails(marketId);
-
-  return (
-    <AsyncRenderer loading={loading} error={error} data={data}>
-      <div className="bg-greys-light-100 px-16 pb-12 pt-14">
-        <div className="mx-auto max-w-screen-xl">
-          <Header name={data.name} symbol={data.symbol} />
-        </div>
-      </div>
-      <div className="px-16">
-        <div className="mx-auto max-w-screen-xl">
-          <div className="py-12">
-            {marketId && (
-              <Market
-                marketId={marketId}
-                feeLevels={data.feeLevels}
-                comittedLiquidity={data.comittedLiquidity}
-                settlementAsset={data.settlementAsset}
-                targetStake={data.targetStake}
-                tradingMode={data.tradingMode}
-              />
-            )}
-          </div>
-          <div>
-            <h2 className="font-alpha calt mb-4 text-2xl">
-              {t('Current Liquidity Provision')}
-            </h2>
-            <LPProvidersGrid
-              liquidityProviders={data.liquidityProviders}
-              settlementAsset={data.settlementAsset}
-            />
-          </div>
-        </div>
-      </div>
-    </AsyncRenderer>
-  );
-};
@@ -1,26 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import { Link } from 'react-router-dom';
-import { Icon } from '@vegaprotocol/ui-toolkit';
-
-export const Header = ({
-  name,
-  symbol,
-}: {
-  name?: string;
-  symbol?: string;
-}) => {
-  return (
-    <div>
-      <div className="mb-6">
-        <Link to="/">
-          <Icon name="chevron-left" className="mr-2" />
-          <span className="underline font-alpha calt text-lg font-medium">
-            {t('Liquidity opportunities')}
-          </span>
-        </Link>
-      </div>
-      <h1 className="font-alpha calt text-5xl mb-6">{name}</h1>
-      <p className="font-alpha calt text-4xl">{symbol}</p>
-    </div>
-  );
-};
@@ -1 +0,0 @@
-export * from './header';
@@ -1 +0,0 @@
-export * from './detail';
@@ -1 +0,0 @@
-export * from './last-24h-volume';
@@ -1,108 +0,0 @@
-import { useState, useMemo, useRef, useCallback } from 'react';
-import throttle from 'lodash/throttle';
-import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
-import { useYesterday } from '@vegaprotocol/react-helpers';
-import { useDataProvider } from '@vegaprotocol/data-provider';
-import * as Schema from '@vegaprotocol/types';
-import {
-  calcDayVolume,
-  getChange,
-  displayChange,
-} from '@vegaprotocol/liquidity';
-
-import type { Candle } from '@vegaprotocol/markets';
-import { marketCandlesProvider } from '@vegaprotocol/markets';
-
-const THROTTLE_UPDATE_TIME = 500;
-
-export const Last24hVolume = ({
-  marketId,
-  decimals,
-}: {
-  marketId: string;
-  decimals: number;
-}) => {
-  const [candleVolume, setCandleVolume] = useState<string>();
-  const [volumeChange, setVolumeChange] = useState<string>(' - ');
-
-  const yesterday = useYesterday();
-
-  const yTimestamp = useMemo(() => {
-    return new Date(yesterday).toISOString();
-  }, [yesterday]);
-
-  const variables = useMemo(
-    () => ({
-      marketId: marketId,
-      interval: Schema.Interval.INTERVAL_I1H,
-      since: yTimestamp,
-    }),
-    [marketId, yTimestamp]
-  );
-
-  const variables24hAgo = {
-    marketId: marketId,
-    interval: Schema.Interval.INTERVAL_I1D,
-    since: yTimestamp,
-  };
-
-  const throttledSetCandles = useRef(
-    throttle((data: Candle[]) => {
-      setCandleVolume(calcDayVolume(data));
-    }, THROTTLE_UPDATE_TIME)
-  ).current;
-
-  const update = useCallback(
-    ({ data }: { data: Candle[] | null }) => {
-      if (data) {
-        throttledSetCandles(data);
-      }
-      return true;
-    },
-    [throttledSetCandles]
-  );
-
-  const { data, error } = useDataProvider({
-    dataProvider: marketCandlesProvider,
-    variables: variables,
-    update,
-    skip: !marketId,
-  });
-
-  const throttledSetVolumeChange = useRef(
-    throttle((candles: Candle[]) => {
-      const candle24hAgo = candles?.[0];
-      setVolumeChange(getChange(data || [], candle24hAgo?.close));
-    }, THROTTLE_UPDATE_TIME)
-  ).current;
-
-  const updateCandle24hAgo = useCallback(
-    ({ data }: { data: Candle[] | null }) => {
-      if (data) {
-        throttledSetVolumeChange(data);
-      }
-      return true;
-    },
-    [throttledSetVolumeChange]
-  );
-
-  useDataProvider({
-    dataProvider: marketCandlesProvider,
-    update: updateCandle24hAgo,
-    variables: variables24hAgo,
-    skip: !marketId || !data,
-  });
-
-  return (
-    <div>
-      <span className="text-3xl">
-        {!error && candleVolume
-          ? addDecimalsFormatNumber(candleVolume, decimals)
-          : '0'}{' '}
-      </span>
-      <span className="text-lg text-greys-light-400">
-        ({displayChange(volumeChange)})
-      </span>
-    </div>
-  );
-};
@@ -1 +0,0 @@
-export * from './market';
@@ -1,118 +0,0 @@
-import { useState } from 'react';
-import { t } from '@vegaprotocol/i18n';
-import { Icon, HealthBar } from '@vegaprotocol/ui-toolkit';
-import { formatWithAsset } from '@vegaprotocol/liquidity';
-
-import type * as Schema from '@vegaprotocol/types';
-import { HealthDialog } from '../../health-dialog';
-import { Last24hVolume } from '../last-24h-volume';
-import { Status } from '../../status';
-import { intentForStatus } from '../../../lib/utils';
-
-interface Levels {
-  fee: string;
-  commitmentAmount: number;
-}
-
-interface settlementAsset {
-  symbol?: string;
-  decimals?: number;
-}
-
-export const Market = ({
-  marketId,
-  feeLevels,
-  comittedLiquidity,
-  settlementAsset,
-  targetStake,
-  tradingMode,
-  trigger,
-}: {
-  marketId: string;
-  feeLevels: Levels[];
-  comittedLiquidity: number;
-  targetStake: string;
-  settlementAsset?: settlementAsset;
-  tradingMode?: Schema.MarketTradingMode;
-  trigger?: Schema.AuctionTrigger;
-}) => {
-  const [isHealthDialogOpen, setIsHealthDialogOpen] = useState(false);
-
-  return (
-    <div>
-      <div className="border border-greys-light-200 rounded-2xl px-2 py-6">
-        <table className="w-full">
-          <thead>
-            <tr
-              className="text-sm text-greys-light-400 text-left font-alpha calt"
-              style={{ fontFeatureSettings: "'liga' off, 'calt' off" }}
-            >
-              <th className="font-medium px-4">{t('Volume (24h)')}</th>
-              <th className="font-medium px-4">{t('Commited Liquidity')}</th>
-              <th className="font-medium px-4">{t('Status')}</th>
-              <th className="font-medium flex items-center px-4">
-                <span>{t('Health')}</span>{' '}
-                <button
-                  onClick={() => setIsHealthDialogOpen(true)}
-                  aria-label={t('open tooltip')}
-                  className="flex ml-1"
-                >
-                  <Icon name="info-sign" />
-                </button>
-              </th>
-              <th className="font-medium">{t('Est. APY')}</th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr>
-              <td className="px-4">
-                <div>
-                  {marketId && settlementAsset?.decimals && (
-                    <Last24hVolume
-                      marketId={marketId}
-                      decimals={settlementAsset.decimals}
-                    />
-                  )}
-                </div>
-              </td>
-              <td className="px-4">
-                <span className="text-3xl">
-                  {comittedLiquidity && settlementAsset
-                    ? formatWithAsset(`${comittedLiquidity}`, settlementAsset)
-                    : '0'}
-                </span>
-              </td>
-              <td className="px-4">
-                <Status
-                  trigger={trigger}
-                  tradingMode={tradingMode}
-                  size="large"
-                />
-              </td>
-              <td className="px-4">
-                {tradingMode && settlementAsset?.decimals && feeLevels && (
-                  <HealthBar
-                    target={targetStake}
-                    decimals={settlementAsset.decimals}
-                    levels={feeLevels}
-                    intent={intentForStatus(tradingMode)}
-                  />
-                )}
-              </td>
-              <td className="px-4">
-                <span className="text-3xl"></span>
-              </td>
-            </tr>
-          </tbody>
-        </table>
-      </div>
-
-      <HealthDialog
-        isOpen={isHealthDialogOpen}
-        onChange={() => {
-          setIsHealthDialogOpen(!isHealthDialogOpen);
-        }}
-      />
-    </div>
-  );
-};
@@ -1 +0,0 @@
-export * from './providers';
@@ -1,125 +0,0 @@
-import { useCallback, useMemo } from 'react';
-
-import { type GetRowIdParams, type ColDef } from 'ag-grid-community';
-import { t } from '@vegaprotocol/i18n';
-
-import {
-  type LiquidityProviderFeeShareFieldsFragment,
-  type LiquidityProvisionFieldsFragment,
-} from '@vegaprotocol/liquidity';
-import { formatWithAsset } from '@vegaprotocol/liquidity';
-
-import { Grid } from '../../grid';
-import { TooltipCellComponent } from '@vegaprotocol/ui-toolkit';
-
-const formatToHours = ({ value }: { value?: string | null }) => {
-  if (!value) {
-    return '-';
-  }
-
-  const MS_IN_HOUR = 1000 * 60 * 60;
-  const created = new Date(value).getTime();
-  const now = new Date().getTime();
-  return `${Math.round(Math.abs(now - created) / MS_IN_HOUR)}h`;
-};
-
-export const LPProvidersGrid = ({
-  liquidityProviders,
-  settlementAsset,
-}: {
-  liquidityProviders: LiquidityProvisionFieldsFragment &
-    LiquidityProviderFeeShareFieldsFragment[];
-  settlementAsset: {
-    decimals?: number;
-    symbol?: string;
-  };
-}) => {
-  const getRowId = useCallback(({ data }: GetRowIdParams) => data.party.id, []);
-  const columnDefs = useMemo<ColDef[]>(
-    () => [
-      {
-        headerName: t('LPs'),
-        field: 'party.id',
-        flex: 1,
-        minWidth: 100,
-        headerTooltip: t('Liquidity providers'),
-      },
-      {
-        headerName: t('Duration'),
-        valueFormatter: formatToHours,
-        field: 'createdAt',
-        headerTooltip: t('Time in market'),
-      },
-      {
-        headerName: t('Equity-like share'),
-        field: 'equityLikeShare',
-        valueFormatter: ({ value }: { value?: string | null }) => {
-          return value
-            ? `${parseFloat(parseFloat(value).toFixed(2)) * 100}%`
-            : '';
-        },
-        headerTooltip: t(
-          'The share of the markets liquidity held - the earlier you commit liquidity the greater % fees you earn'
-        ),
-        minWidth: 140,
-      },
-      {
-        headerName: t('committed bond'),
-        field: 'commitmentAmount',
-        valueFormatter: ({ value }: { value?: string | null }) =>
-          value ? formatWithAsset(value, settlementAsset) : '0',
-        headerTooltip: t('The amount of funds allocated to provide liquidity'),
-        minWidth: 140,
-      },
-      {
-        headerName: t('Margin Req.'),
-        field: 'margin',
-        headerTooltip: t(
-          'Margin required for arising positions based on liquidity commitment'
-        ),
-      },
-      {
-        headerName: t('24h Fees'),
-        field: 'fees',
-        headerTooltip: t(
-          'Total fees earned by the liquidity provider in the last 24 hours'
-        ),
-      },
-      {
-        headerName: t('Fee level'),
-        valueFormatter: ({ value }: { value?: string | null }) => `${value}%`,
-        field: 'fee',
-        headerTooltip: t(
-          "The market's liquidity fee, or the percentage of a trade's value which is collected from the price taker for every trade"
-        ),
-      },
-
-      {
-        headerName: t('APY'),
-        field: 'apy',
-        headerTooltip: t(
-          'An annualised estimate based on the total liquidity provision fees and maker fees collected by liquidity providers, the maximum margin needed and maximum commitment (bond) over the course of 7 epochs'
-        ),
-      },
-    ],
-    [settlementAsset]
-  );
-
-  return (
-    <Grid
-      rowData={liquidityProviders}
-      tooltipShowDelay={500}
-      defaultColDef={{
-        resizable: true,
-        sortable: true,
-        unSortIcon: true,
-        cellClass: ['flex', 'flex-col', 'justify-center'],
-        tooltipComponent: TooltipCellComponent,
-        minWidth: 100,
-      }}
-      columnDefs={columnDefs}
-      getRowId={getRowId}
-      rowHeight={92}
-    />
-  );
-};
@@ -1,50 +0,0 @@
-.ag-theme-alpine {
-  --ag-line-height: 24px;
-  --ag-row-hover-color: transparent;
-  --ag-header-background-color: transparent;
-  --ag-odd-row-background-color: transparent;
-  --ag-header-foreground-color: #626262;
-  --ag-secondary-foreground-color: #626262;
-  --ag-font-size: 16px;
-  --ag-background-color: transparent;
-  --ag-range-selection-border-color: transparent;
-
-  font-family: AlphaLyrae, Helvetica Neue, -apple-system, BlinkMacSystemFont,
-    Segoe UI, Roboto, Arial, Noto Sans, sans-serif, Apple Color Emoji,
-    Segoe UI Emoji, Segoe UI Symbol, Noto Color Emoji;
-  font-feature-settings: 'liga' off, 'calt' off;
-}
-
-.ag-theme-alpine .ag-cell {
-  display: flex;
-}
-
-.ag-theme-alpine .ag-header {
-  border-bottom: 1px solid #a7a7a7;
-  font-size: 15px;
-  line-height: 1em;
-  text-transform: uppercase;
-}
-
-.ag-theme-alpine .ag-root-wrapper {
-  border: none;
-}
-
-.ag-theme-alpine .ag-header-row {
-  font-weight: 500;
-}
-
-.ag-theme-alpine .ag-row {
-  border: none;
-  border-bottom: 1px solid #bfccd6;
-  font-size: 12px;
-}
-
-.ag-theme-alpine .ag-root-wrapper-body.ag-layout-normal {
-  height: auto;
-}
-
-.ag-theme-alpine.row-hover .ag-row:hover {
-  background: #f0f0f0;
-  cursor: pointer;
-}
@@ -1,47 +0,0 @@
-import { useRef, useCallback, useEffect } from 'react';
-import { AgGridReact } from 'ag-grid-react';
-import {
-  type AgGridReactProps,
-  type AgReactUiProps,
-  type AgGridReact as AgGridReactType,
-} from 'ag-grid-react';
-import classNames from 'classnames';
-import 'ag-grid-community/styles/ag-grid.css';
-import 'ag-grid-community/styles/ag-theme-alpine.css';
-
-import './grid.scss';
-
-type Props = (AgGridReactProps | AgReactUiProps) & {
-  isRowClickable?: boolean;
-  style?: React.CSSProperties;
-};
-
-export const Grid = ({ isRowClickable, ...props }: Props) => {
-  const gridRef = useRef<AgGridReactType | null>(null);
-
-  const resizeGrid = useCallback(() => {
-    gridRef.current?.api?.sizeColumnsToFit();
-  }, [gridRef]);
-
-  const handleOnGridReady = useCallback(() => {
-    resizeGrid();
-  }, [resizeGrid]);
-
-  useEffect(() => {
-    window.addEventListener('resize', resizeGrid);
-    return () => window.removeEventListener('resize', resizeGrid);
-  }, [resizeGrid]);
-
-  return (
-    <AgGridReact
-      className={classNames('ag-theme-alpine font-alpha calt h-full', {
-        'row-hover': isRowClickable,
-      })}
-      rowHeight={92}
-      ref={gridRef}
-      onGridReady={handleOnGridReady}
-      suppressRowClickSelection
-      {...props}
-    />
-  );
-};
@@ -1 +0,0 @@
-export * from './grid';
@@ -1,110 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import { Dialog, HealthBar } from '@vegaprotocol/ui-toolkit';
-import * as Schema from '@vegaprotocol/types';
-import classNames from 'classnames';
-import { intentForStatus } from '../../lib/utils';
-
-interface HealthDialogProps {
-  isOpen: boolean;
-  onChange: (isOpen: boolean) => void;
-}
-
-const ROWS = [
-  {
-    key: '1',
-    title: 'Continuous',
-    copy: 'Markets that have committed liquidity equal or greater than the target stake are trading continuously.',
-    data: {
-      status: Schema.MarketTradingMode.TRADING_MODE_CONTINUOUS,
-      target: '171320',
-      decimals: 5,
-      levels: [
-        { fee: '0.6', commitmentAmount: 150000 },
-        { fee: '1', commitmentAmount: 150000 },
-        { fee: '2', commitmentAmount: 30000 },
-      ],
-    },
-  },
-  {
-    key: '2',
-    title: 'Monitoring auction (liquidity)',
-    copy: 'Markets below the target stake will see trading suspended and go into liquidity auction.',
-    data: {
-      status: Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
-      target: '171320',
-      decimals: 5,
-      levels: [
-        { fee: '0.6', commitmentAmount: 110000 },
-        { fee: '1', commitmentAmount: 50000 },
-      ],
-    },
-  },
-  {
-    key: '3',
-    title: 'Opening auction',
-    copy: 'A newly created market looking for a target liquidity amount to start trading.',
-    data: {
-      status: Schema.MarketTradingMode.TRADING_MODE_OPENING_AUCTION,
-      target: '171320',
-      decimals: 3,
-      levels: [
-        { fee: '0.6', commitmentAmount: 110000 },
-        { fee: '1', commitmentAmount: 50000 },
-      ],
-    },
-  },
-];
-
-export const HealthDialog = ({ onChange, isOpen }: HealthDialogProps) => {
-  return (
-    <Dialog size="large" open={isOpen} onChange={onChange}>
-      <h1 className="text-2xl mb-5 pr-2 font-medium font-alpha uppercase">
-        {t('Health')}
-      </h1>
-      <p className="text-lg font-medium font-alpha mb-8">
-        {t(
-          'Market health is a representation of market and liquidity status and how close that market is to moving from one fee level to another.'
-        )}
-      </p>
-
-      <table className="table-fixed">
-        <thead className="border-b border-greys-light-300">
-          <th className="w-1/2 text-left font-medium font-alpha text-base pb-4 uppercase">
-            {t('Market status')}
-          </th>
-          <th className="w-1/2 text-lef font-medium font-alpha text-base pb-4 uppercase">
-            {t('Liquidity status')}
-          </th>
-        </thead>
-        <tbody>
-          {ROWS.map((r, index) => {
-            const isFirstRow = index === 0;
-            return (
-              <tr key={r.key}>
-                <td
-                  className={classNames('pr-4 pb-10', { 'pt-8': isFirstRow })}
-                >
-                  <h2 className="font-medium font-alpha uppercase text-base">
-                    {t(r.title)}
-                  </h2>
-                  <p className="font-medium font-alpha text-lg">{t(r.copy)}</p>
-                </td>
-                <td
-                  className={classNames('pl-4 pb-10', { 'pt-8': isFirstRow })}
-                >
-                  <HealthBar
-                    size="large"
-                    levels={r.data.levels}
-                    target={r.data.target}
-                    decimals={r.data.decimals}
-                    intent={intentForStatus(r.data.status)}
-                  />
-                </td>
-              </tr>
-            );
-          })}
-        </tbody>
-      </table>
-    </Dialog>
-  );
-};
@@ -1 +0,0 @@
-export * from './health-dialog';
@@ -1 +0,0 @@
-export * from './indicator';
@@ -1,24 +0,0 @@
-import type * as Schema from '@vegaprotocol/types';
-
-import { getColorForStatus } from '../../lib/utils';
-
-export const Indicator = ({
-  status,
-  opacity,
-}: {
-  status?: Schema.MarketTradingMode;
-  opacity?: number;
-}) => {
-  const backgroundColor = status ? getColorForStatus(status) : undefined;
-  return (
-    <div className="inline-block w-2 h-2 mr-1 rounded-full bg-white overflow-hidden shrink-0">
-      <div
-        className="h-full bg-black"
-        style={{
-          opacity,
-          backgroundColor,
-        }}
-      />
-    </div>
-  );
-};
@@ -1,35 +0,0 @@
-.ag-theme-alpine {
-  --ag-line-height: 24px;
-  --ag-row-hover-color: transparent;
-  --ag-header-background-color: #f5f5f5;
-  --ag-odd-row-background-color: transparent;
-  --ag-header-foreground-color: #000;
-  --ag-secondary-foreground-color: #fff;
-  --ag-font-family: 'Helvetica Neue';
-  --ag-font-size: 12px;
-
-  font-family: 'Helvetica Neue', -apple-system, BlinkMacSystemFont, 'Segoe UI',
-    Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif;
-}
-
-.ag-theme-alpine .ag-cell {
-  display: flex;
-}
-
-.ag-theme-alpine .ag-header {
-  border: 1px solid #bfccd6;
-}
-
-.ag-theme-alpine .ag-root-wrapper {
-  border: none;
-}
-
-.ag-theme-alpine .ag-row {
-  border: none;
-  border-bottom: 1px solid #bfccd6;
-  font-size: 12px;
-}
-
-.ag-theme-alpine .ag-root-wrapper-body.ag-layout-normal {
-  height: auto;
-}
@@ -1 +0,0 @@
-export * from './navbar';
@@ -1,15 +0,0 @@
-import { Link } from 'react-router-dom';
-import { VegaLogo } from '@vegaprotocol/ui-toolkit';
-
-export const Navbar = () => {
-  return (
-    <div className="px-8 py-4 flex items-stretch border-b border-greys-light-200">
-      <div className="flex gap-4 mr-4 items-center h-full">
-        <Link to="/">
-          <VegaLogo />
-        </Link>
-      </div>
-      <div className="flex items-center gap-2 ml-auto"></div>
-    </div>
-  );
-};
@@ -1 +0,0 @@
-export * from './status';
@@ -1,96 +0,0 @@
-import { Lozenge, Tooltip } from '@vegaprotocol/ui-toolkit';
-import classNames from 'classnames';
-
-import * as Schema from '@vegaprotocol/types';
-import { t } from '@vegaprotocol/i18n';
-
-import { Indicator } from '../indicator';
-import type { AuctionTrigger } from '@vegaprotocol/types';
-
-export const Status = ({
-  tradingMode,
-  trigger,
-  size = 'small',
-}: {
-  tradingMode?: Schema.MarketTradingMode;
-  trigger?: Schema.AuctionTrigger;
-  size?: 'small' | 'large';
-}) => {
-  const getStatus = () => {
-    if (!tradingMode) return '';
-    if (
-      tradingMode === Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION
-    ) {
-      if (
-        trigger &&
-        trigger !== Schema.AuctionTrigger.AUCTION_TRIGGER_UNSPECIFIED
-      ) {
-        return `${Schema.MarketTradingModeMapping[tradingMode]} - ${Schema.AuctionTriggerMapping[trigger]}`;
-      }
-    }
-    return Schema.MarketTradingModeMapping[tradingMode];
-  };
-
-  const status = getStatus();
-  const tooltipDescription =
-    tradingMode && getTooltipDescription(tradingMode, trigger);
-
-  return (
-    <div>
-      <Tooltip description={tooltipDescription}>
-        <div
-          className={classNames('inline-flex whitespace-normal', {
-            'text-base': size === 'large',
-            'text-sm': size === 'small',
-          })}
-        >
-          <Lozenge className="border border-greys-light-300 bg-greys-light-100 flex items-center">
-            <Indicator status={tradingMode} />
-            {status}
-          </Lozenge>
-        </div>
-      </Tooltip>
-    </div>
-  );
-};
-
-const getTooltipDescription = (
-  status: Schema.MarketTradingMode,
-  trigger?: Schema.AuctionTrigger
-) => {
-  switch (status) {
-    case Schema.MarketTradingMode.TRADING_MODE_CONTINUOUS:
-      return t(
-        'This is the standard trading mode where trades are executed whenever orders are received'
-      );
-    case Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION:
-      return getMonitoringDescriptionTooltip(trigger);
-    case Schema.MarketTradingMode.TRADING_MODE_OPENING_AUCTION:
-      return t(
-        'This is a new market in an opening auction to determine a fair mid-price before starting continuous trading.'
-      );
-    default:
-      return '';
-  }
-};
-
-const getMonitoringDescriptionTooltip = (trigger?: AuctionTrigger) => {
-  switch (trigger) {
-    case Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET:
-      return t(
-        `This market is in auction until it reaches sufficient liquidity.`
-      );
-    case Schema.AuctionTrigger.AUCTION_TRIGGER_UNABLE_TO_DEPLOY_LP_ORDERS:
-      return t(
-        `This market may have sufficient liquidity but there are not enough priced limit orders in the order book, which are required to deploy liquidity commitment pegged orders.`
-      );
-    case Schema.AuctionTrigger.AUCTION_TRIGGER_PRICE:
-      return t(`This market is in auction due to high price volatility.`);
-    case Schema.AuctionTrigger.AUCTION_TRIGGER_OPENING:
-      return t(
-        `This is a new market in an opening auction to determine a fair mid-price before starting continuous trading`
-      );
-    default:
-      return '';
-  }
-};
@@ -1,28 +0,0 @@
-import * as Schema from '@vegaprotocol/types';
-import { Intent } from '@vegaprotocol/ui-toolkit';
-
-const marketTradingModeStyle = {
-  [Schema.MarketTradingMode.TRADING_MODE_CONTINUOUS]: '#00D46E',
-  [Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION]: '#CF0064',
-  [Schema.MarketTradingMode.TRADING_MODE_OPENING_AUCTION]: '#0046CD',
-  [Schema.MarketTradingMode.TRADING_MODE_BATCH_AUCTION]: '#CF0064',
-  [Schema.MarketTradingMode.TRADING_MODE_NO_TRADING]: '#CF0064',
-  [Schema.MarketTradingMode.TRADING_MODE_SUSPENDED_VIA_GOVERNANCE]: '#CF0064',
-};
-
-export const getColorForStatus = (status: Schema.MarketTradingMode) =>
-  marketTradingModeStyle[status];
-
-const marketTradingModeIntent = {
-  [Schema.MarketTradingMode.TRADING_MODE_CONTINUOUS]: Intent.Success,
-  [Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION]: Intent.Danger,
-  [Schema.MarketTradingMode.TRADING_MODE_OPENING_AUCTION]: Intent.Primary,
-  [Schema.MarketTradingMode.TRADING_MODE_BATCH_AUCTION]: Intent.Danger,
-  [Schema.MarketTradingMode.TRADING_MODE_NO_TRADING]: Intent.Danger,
-  [Schema.MarketTradingMode.TRADING_MODE_SUSPENDED_VIA_GOVERNANCE]:
-    Intent.Danger,
-};
-
-export const intentForStatus = (status: Schema.MarketTradingMode) => {
-  return marketTradingModeIntent[status];
-};
@@ -1 +0,0 @@
-export * from './router-config';
@@ -1,25 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-
-import { Dashboard } from '../components/dashboard';
-import { Detail } from '../components/detail';
-
-export const ROUTES = {
-  MARKETS: 'markets',
-};
-
-export const routerConfig = [
-  { path: '/', element: <Dashboard />, icon: '' },
-  {
-    path: ROUTES.MARKETS,
-    name: 'Markets',
-    text: t('Markets'),
-    children: [
-      {
-        path: ':marketId',
-        element: <Detail />,
-      },
-    ],
-    icon: 'trade',
-    isNavItem: true,
-  },
-];
@@ -1,3 +0,0 @@
-export const environment = {
-  production: true,
-};
@@ -1,6 +0,0 @@
-// This file can be replaced during build by using the `fileReplacements` array.
-// When building for production, this file is replaced with `environment.prod.ts`.
-
-export const environment = {
-  production: false,
-};
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <title>Liquidity Provision Dashboard</title>
-    <base href="/" />
-
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <link rel="icon" type="image/x-icon" href="favicon.ico" />
-    <link
-      rel="preload"
-      href="https://static.vega.xyz/AlphaLyrae-Medium.woff2"
-      as="font"
-      type="font/woff2"
-      crossorigin="anonymous"
-    />
-
-    <link rel="stylesheet" href="https://static.vega.xyz/fonts.css" />
-  </head>
-  <body>
-    <div id="root" class="h-full max-h-full min-h-full"></div>
-  </body>
-</html>
@@ -1,15 +0,0 @@
-import { StrictMode } from 'react';
-import { createRoot } from 'react-dom/client';
-import { BrowserRouter } from 'react-router-dom';
-
-import App from './app/app';
-
-const rootElement = document.getElementById('root');
-const root = rootElement && createRoot(rootElement);
-root?.render(
-  <StrictMode>
-    <BrowserRouter>
-      <App />
-    </BrowserRouter>
-  </StrictMode>
-);
@@ -1,7 +0,0 @@
-/**
- * Polyfill stable language features. These imports will be optimized by `@babel/preset-env`.
- *
- * See: https://github.com/zloirock/core-js#babel
- */
-import 'core-js/stable';
-import 'regenerator-runtime/runtime';
@@ -1,10 +0,0 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-
-html,
-body {
-  @apply h-full;
-
-  font-family: 'Helvetica Neue', Helvetica, sans-serif;
-}
@@ -1,29 +0,0 @@
-const { join } = require('path');
-const { createGlobPatternsForDependencies } = require('@nx/react/tailwind');
-const theme = require('../../libs/tailwindcss-config/src/theme-lite');
-const vegaCustomClasses = require('../../libs/tailwindcss-config/src/vega-custom-classes');
-const vegaCustomClassesLite = require('../../libs/tailwindcss-config/src/vega-custom-classes-lite');
-
-module.exports = {
-  content: [
-    join(__dirname, 'src/**/*.{js,ts,jsx,tsx}'),
-    'libs/ui-toolkit/src/utils/shared.ts',
-    ...createGlobPatternsForDependencies(__dirname),
-  ],
-  darkMode: 'class',
-  theme: {
-    ...theme,
-    colors: {
-      ...theme.colors,
-      greys: {
-        light: {
-          100: '#F0F0F0',
-          200: '#D2D2D2',
-          300: '#A7A7A7',
-          400: '#626262',
-        },
-      },
-    },
-  },
-  plugins: [vegaCustomClasses, vegaCustomClassesLite],
-};
@@ -1,27 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../../dist/out-tsc",
-    "types": [
-      "node",
-      "@nx/react/typings/cssmodule.d.ts",
-      "@nx/react/typings/image.d.ts"
-    ]
-  },
-  "files": [
-    "../../node_modules/@nx/react/typings/cssmodule.d.ts",
-    "../../node_modules/@nx/react/typings/image.d.ts"
-  ],
-  "exclude": [
-    "jest.config.ts",
-    "**/*.spec.ts",
-    "**/*.test.ts",
-    "**/*.spec.tsx",
-    "**/*.test.tsx",
-    "**/*.spec.js",
-    "**/*.test.js",
-    "**/*.spec.jsx",
-    "**/*.test.jsx"
-  ],
-  "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
-}
@@ -1,24 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "jsx": "react-jsx",
-    "allowJs": true,
-    "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true,
-    "forceConsistentCasingInFileNames": true,
-    "strict": true,
-    "noImplicitOverride": true,
-    "noPropertyAccessFromIndexSignature": false,
-    "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true
-  },
-  "include": [],
-  "references": [
-    {
-      "path": "./tsconfig.app.json"
-    },
-    {
-      "path": "./tsconfig.spec.json"
-    }
-  ]
-}
@@ -1,33 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../../dist/out-tsc",
-    "module": "commonjs",
-    "types": [
-      "jest",
-      "node",
-      "@testing-library/jest-dom",
-      "@nx/react/typings/cssmodule.d.ts",
-      "@nx/react/typings/image.d.ts"
-    ],
-    "jsx": "react",
-    "allowSyntheticDefaultImports": true,
-    "esModuleInterop": true
-  },
-  "include": [
-    "jest.config.ts",
-    "**/*.test.ts",
-    "**/*.spec.ts",
-    "**/*.test.tsx",
-    "**/*.spec.tsx",
-    "**/*.test.js",
-    "**/*.spec.js",
-    "**/*.test.jsx",
-    "**/*.spec.jsx",
-    "**/*.d.ts"
-  ],
-  "files": [
-    "../../node_modules/@nx/react/typings/cssmodule.d.ts",
-    "../../node_modules/@nx/react/typings/image.d.ts"
-  ]
-}
@@ -1,7 +1,9 @@
 const { join } = require('path');
 const { createGlobPatternsForDependencies } = require('@nx/react/tailwind');
-const theme = require('../../libs/tailwindcss-config/src/theme');
-const vegaCustomClasses = require('../../libs/tailwindcss-config/src/vega-custom-classes');
+const { theme } = require('../../libs/tailwindcss-config/src/theme');
+const {
+  vegaCustomClasses,
+} = require('../../libs/tailwindcss-config/src/vega-custom-classes');

 module.exports = {
  content: [
@@ -339,4 +339,3 @@ def retry_on_http_error(request):
                print(f"Retrying due to HTTPError (attempt {i+1}/{retry_count})")
            else:
                raise
-
@@ -18,7 +18,7 @@ expire = "expire"
@pytest.fixture(scope="module")
 def vega(request):
    with init_vega(request) as vega_instance:
-        request.addfinalizer(lambda: cleanup_container(vega_instance))  # Register the cleanup function
+        request.addfinalizer(lambda: cleanup_container(vega_instance))
        yield vega_instance


@@ -261,7 +261,7 @@ class TestStopOcoValidation:
    @pytest.fixture(scope="class")
    def vega(request):
        with init_vega(request) as vega_instance:
-            request.addfinalizer(lambda: cleanup_container(vega_instance))  # Register the cleanup function
+            request.addfinalizer(lambda: cleanup_container(vega_instance))
            yield vega_instance

    @pytest.fixture(scope="class")
@@ -1,6 +1,7 @@
 import pytest
+from typing import Tuple, Generator
 from fees_test_ids import *
-from playwright.sync_api import Page, expect
+from playwright.sync_api import expect, Page
 from vega_sim.null_service import VegaServiceNull
 from actions.vega import submit_order
 from wallet_config import MM_WALLET
@@ -16,77 +17,70 @@ from fixtures.market import setup_continuous_market


@pytest.fixture(scope="module")
-def vega(request):
+def setup_environment(
+    request, browser
+) -> Generator[Tuple[VegaServiceNull, str, Page], None, None]:
    with init_vega(request) as vega_instance:
-        request.addfinalizer(
-            lambda: cleanup_container(vega_instance)
+        request.addfinalizer(lambda: cleanup_container(vega_instance))
+        market = setup_continuous_market(vega_instance, custom_quantum=100000)
+        vega_instance.update_volume_discount_program(
+            proposal_key=MM_WALLET.name,
+            benefit_tiers=[
+                {
+                    "minimum_running_notional_taker_volume": 100,
+                    "volume_discount_factor": 0.1,
+                },
+                {
+                    "minimum_running_notional_taker_volume": 200,
+                    "volume_discount_factor": 0.2,
+                },
+            ],
+            window_length=7,
        )
-        yield vega_instance
+        next_epoch(vega_instance)
+
+        vega_instance.update_referral_program(
+            proposal_key=MM_WALLET.name,
+            benefit_tiers=[
+                {
+                    "minimum_running_notional_taker_volume": 100,
+                    "minimum_epochs": 1,
+                    "referral_reward_factor": 0.1,
+                    "referral_discount_factor": 0.1,
+                },
+                {
+                    "minimum_running_notional_taker_volume": 200,
+                    "minimum_epochs": 2,
+                    "referral_reward_factor": 0.2,
+                    "referral_discount_factor": 0.2,
+                },
+            ],
+            staking_tiers=[
+                {"minimum_staked_tokens": 100, "referral_reward_multiplier": 1.1},
+                {"minimum_staked_tokens": 200, "referral_reward_multiplier": 1.2},
+            ],
+            window_length=1,
+        )
+        vega_instance.create_referral_set(key_name=MM_WALLET.name)
+        next_epoch(vega_instance)
+        referral_set_id = list(vega_instance.list_referral_sets().keys())[0]
+        vega_instance.apply_referral_code(key_name="Key 1", id=referral_set_id)
+        next_epoch(vega_instance)
+
+        for _ in range(2):
+            submit_order(vega_instance, "Key 1", market, "SIDE_BUY", 2, 110)
+            forward_time(vega_instance, True if _ < 2 - 1 else False)
+
+        with init_page(vega_instance, browser, request) as page_instance:
+            risk_accepted_setup(page_instance)
+            auth_setup(vega_instance, page_instance)
+            yield vega_instance, market, page_instance


-@pytest.fixture(scope="module")
-def page(vega, browser, request):
-    with init_page(vega, browser, request) as page:
-        risk_accepted_setup(page)
-        auth_setup(vega, page)
-        yield page
-
-
-@pytest.fixture(scope="module", autouse=True)
-def setup_combined_market(vega: VegaServiceNull):
-    market = setup_continuous_market(vega, custom_quantum=100000)
-    vega.update_volume_discount_program(
-        proposal_key=MM_WALLET.name,
-        benefit_tiers=[
-            {
-                "minimum_running_notional_taker_volume": 100,
-                "volume_discount_factor": 0.1,
-            },
-            {
-                "minimum_running_notional_taker_volume": 200,
-                "volume_discount_factor": 0.2,
-            },
-        ],
-        window_length=7,
-    )
-    next_epoch(vega=vega)
-
-    vega.update_referral_program(
-        proposal_key=MM_WALLET.name,
-        benefit_tiers=[
-            {
-                "minimum_running_notional_taker_volume": 100,
-                "minimum_epochs": 1,
-                "referral_reward_factor": 0.1,
-                "referral_discount_factor": 0.1,
-            },
-            {
-                "minimum_running_notional_taker_volume": 200,
-                "minimum_epochs": 2,
-                "referral_reward_factor": 0.2,
-                "referral_discount_factor": 0.2,
-            },
-        ],
-        staking_tiers=[
-            {"minimum_staked_tokens": 100, "referral_reward_multiplier": 1.1},
-            {"minimum_staked_tokens": 200, "referral_reward_multiplier": 1.2},
-        ],
-        window_length=1,
-    )
-    vega.create_referral_set(key_name=MM_WALLET.name)
-    next_epoch(vega=vega)
-    referral_set_id = list(vega.list_referral_sets().keys())[0]
-    vega.apply_referral_code(key_name="Key 1", id=referral_set_id)
-    next_epoch(vega=vega)
-
-    for _ in range(2):
-        submit_order(vega, "Key 1", market, "SIDE_BUY", 2, 110)
-        forward_time(vega, True if _ < 2 - 1 else False)
-    return market
-
-
-@pytest.mark.xdist_group(name="test_fees_combo_tier_2")
-def test_fees_page_discount_program_my_trading_fees(page: Page):
+def test_fees_page_discount_program_my_trading_fees(
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
    page.goto("/#/fees")
    expect(page.get_by_test_id(ADJUSTED_FEES)).to_have_text("6.432%-6.432%")
    expect(page.get_by_test_id(TOTAL_FEE_BEFORE_DISCOUNT)).to_have_text(
@@ -97,10 +91,10 @@ def test_fees_page_discount_program_my_trading_fees(page: Page):
    expect(page.get_by_test_id(LIQUIDITY_FEES)).to_have_text("Liquidity0%-0%")


-@pytest.mark.xdist_group(name="test_fees_combo_tier_2")
 def test_fees_page_discount_program_total_discount(
-    page: Page,
-):
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
    page.goto("/#/fees")
    expect(page.get_by_test_id(TOTAL_DISCOUNT)).to_have_text("36%")
    expect(page.get_by_test_id(VOLUME_DISCOUNT_ROW)).to_have_text("Volume discount20%")
@@ -113,8 +107,10 @@ def test_fees_page_discount_program_total_discount(
    )


-@pytest.mark.xdist_group(name="test_fees_combo_tier_2")
-def test_fees_page_discount_program_fees_by_market(page: Page):
+def test_fees_page_discount_program_fees_by_market(
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
    page.goto("/#/fees")
    pinned = page.locator(PINNED_ROW_LOCATOR)
    row = page.locator(ROW_LOCATOR)
@@ -126,12 +122,11 @@ def test_fees_page_discount_program_fees_by_market(page: Page):
    expect(row.locator(COL_TOTAL_FEE)).to_have_text("10.05%")


-@pytest.mark.xdist_group(name="test_fees_combo_tier_2")
 def test_deal_ticket_discount_program(
-    page: Page,
-    setup_combined_market,
-):
-    page.goto(f"/#/markets/{setup_combined_market}")
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
+    page.goto(f"/#/markets/{market}")
    page.get_by_test_id(ORDER_SIZE).fill("1")
    page.get_by_test_id(ORDER_PRICE).fill("1")
    expect(page.get_by_test_id(DISCOUNT_PILL)).to_have_text("-36%")
@@ -150,12 +145,9 @@ def test_deal_ticket_discount_program(
    expect(tooltip.get_by_test_id(TOTAL_FEE_VALUE)).to_have_text("0.06432 tDAI")


-@pytest.mark.xdist_group(name="test_fees_combo_tier_2")
-def test_fills_taker_discount_program(
-    page: Page,
-    setup_combined_market,
-):
-    page.goto(f"/#/markets/{setup_combined_market}")
+def test_fills_taker_discount_program(setup_environment):
+    vega, market, page = setup_environment
+    page.goto(f"/#/markets/{market}")
    page.get_by_test_id(FILLS).click()
    row = page.get_by_test_id(TAB_FILLS).locator(ROW_LOCATOR).first
    expect(row.locator(COL_SIZE)).to_have_text("+2")
@@ -166,13 +158,11 @@ def test_fills_taker_discount_program(
    expect(row.locator(COL_FEE_DISCOUNT)).to_have_text("7.48926 tDAI")


-@pytest.mark.xdist_group(name="test_fees_combo_tier_2")
 def test_fills_maker_discount_program(
-    vega: VegaServiceNull,
-    page: Page,
-    setup_combined_market,
-):
-    page.goto(f"/#/markets/{setup_combined_market}")
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
+    page.goto(f"/#/markets/{market}")
    change_keys(page, vega, MM_WALLET.name)
    page.get_by_test_id(FILLS).click()
    row = page.get_by_test_id(TAB_FILLS).locator(ROW_LOCATOR).first
@@ -184,11 +174,11 @@ def test_fills_maker_discount_program(
    expect(row.locator(COL_FEE_DISCOUNT)).to_have_text("7.452 tDAI")


-@pytest.mark.xdist_group(name="test_fees_combo_tier_2")
 def test_fills_maker_fee_tooltip_discount_program(
-    vega: VegaServiceNull, page: Page, setup_combined_market
-):
-    page.goto(f"/#/markets/{setup_combined_market}")
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
+    page.goto(f"/#/markets/{market}")
    change_keys(page, vega, MM_WALLET.name)
    page.get_by_test_id(FILLS).click()
    row = page.get_by_test_id(TAB_FILLS).locator(ROW_LOCATOR).first
@@ -200,12 +190,11 @@ def test_fills_maker_fee_tooltip_discount_program(
    )


-@pytest.mark.xdist_group(name="test_fees_combo_tier_2")
 def test_fills_taker_fee_tooltip_discount_program(
-    page: Page,
-    setup_combined_market,
-):
-    page.goto(f"/#/markets/{setup_combined_market}")
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
+    page.goto(f"/#/markets/{market}")
    page.get_by_test_id(FILLS).click()
    row = page.get_by_test_id(TAB_FILLS).locator(ROW_LOCATOR).first
    # tbd - tooltip is not visible without this wait
@@ -1,4 +1,5 @@
 import pytest
+from typing import Tuple, Generator
 from fees_test_ids import *
 from playwright.sync_api import Page, expect
 from vega_sim.null_service import VegaServiceNull
@@ -14,63 +15,58 @@ from conftest import (
 from actions.utils import next_epoch, change_keys, forward_time
 from fixtures.market import setup_continuous_market

+
@pytest.fixture(scope="module")
-def vega(request):
+def setup_environment(
+    request, browser
+) -> Generator[Tuple[VegaServiceNull, str, Page], None, None]:
    with init_vega(request) as vega_instance:
-        request.addfinalizer(
-            lambda: cleanup_container(vega_instance)
+        request.addfinalizer(lambda: cleanup_container(vega_instance))
+
+        # Setup the market with the referral discount program
+        market = setup_continuous_market(vega_instance, custom_quantum=100000)
+        vega_instance.update_referral_program(
+            proposal_key=MM_WALLET.name,
+            benefit_tiers=[
+                {
+                    "minimum_running_notional_taker_volume": 100,
+                    "minimum_epochs": 1,
+                    "referral_reward_factor": 0.1,
+                    "referral_discount_factor": 0.1,
+                },
+                {
+                    "minimum_running_notional_taker_volume": 200,
+                    "minimum_epochs": 2,
+                    "referral_reward_factor": 0.2,
+                    "referral_discount_factor": 0.2,
+                },
+            ],
+            staking_tiers=[
+                {"minimum_staked_tokens": 100, "referral_reward_multiplier": 1.1},
+                {"minimum_staked_tokens": 200, "referral_reward_multiplier": 1.2},
+            ],
+            window_length=1,
        )
-        yield vega_instance
+        vega_instance.create_referral_set(key_name=MM_WALLET.name)
+        next_epoch(vega_instance)
+        referral_set_id = list(vega_instance.list_referral_sets().keys())[0]
+        vega_instance.apply_referral_code(key_name="Key 1", id=referral_set_id)
+        next_epoch(vega_instance)
+
+        for _ in range(2):
+            submit_order(vega_instance, "Key 1", market, "SIDE_BUY", 1, 110)
+            forward_time(vega_instance, True if _ < 2 - 1 else False)
+
+        with init_page(vega_instance, browser, request) as page_instance:
+            risk_accepted_setup(page_instance)
+            auth_setup(vega_instance, page_instance)
+            yield vega_instance, market, page_instance


-@pytest.fixture(scope="module")
-def page(vega, browser, request):
-    with init_page(vega, browser, request) as page:
-        risk_accepted_setup(page)
-        auth_setup(vega, page)
-        yield page
-
-
-@pytest.fixture(scope="module", autouse=True)
-def setup_market_with_referral_discount_program(vega: VegaServiceNull):
-    market = setup_continuous_market(vega, custom_quantum=100000)
-    vega.update_referral_program(
-        proposal_key=MM_WALLET.name,
-        benefit_tiers=[
-            {
-                "minimum_running_notional_taker_volume": 100,
-                "minimum_epochs": 1,
-                "referral_reward_factor": 0.1,
-                "referral_discount_factor": 0.1,
-            },
-            {
-                "minimum_running_notional_taker_volume": 200,
-                "minimum_epochs": 2,
-                "referral_reward_factor": 0.2,
-                "referral_discount_factor": 0.2,
-            },
-        ],
-        staking_tiers=[
-            {"minimum_staked_tokens": 100, "referral_reward_multiplier": 1.1},
-            {"minimum_staked_tokens": 200, "referral_reward_multiplier": 1.2},
-        ],
-        window_length=1,
-    )
-    vega.create_referral_set(key_name=MM_WALLET.name)
-    next_epoch(vega=vega)
-    referral_set_id = list(vega.list_referral_sets().keys())[0]
-    vega.apply_referral_code(key_name="Key 1", id=referral_set_id)
-    next_epoch(vega=vega)
-
-    for _ in range(2):
-        submit_order(vega, "Key 1", market, "SIDE_BUY", 1, 110)
-        forward_time(vega, True if _ < 2 - 1 else False)
-
-    return market
-
-
-@pytest.mark.xdist_group(name="test_fees_referral_tier_1")
-def test_fees_page_discount_program_my_trading_fees(page: Page):
+def test_fees_page_discount_program_my_trading_fees(
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
    page.goto("/#/fees")
    expect(page.get_by_test_id(ADJUSTED_FEES)).to_have_text("9.045%-9.045%")
    expect(page.get_by_test_id(TOTAL_FEE_BEFORE_DISCOUNT)).to_have_text(
@@ -81,8 +77,10 @@ def test_fees_page_discount_program_my_trading_fees(page: Page):
    expect(page.get_by_test_id(LIQUIDITY_FEES)).to_have_text("Liquidity0%-0%")


-@pytest.mark.xdist_group(name="test_fees_referral_tier_1")
-def test_fees_page_discount_program_total_discount(page: Page):
+def test_fees_page_discount_program_total_discount(
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
    page.goto("/#/fees")
    expect(page.get_by_test_id(TOTAL_DISCOUNT)).to_have_text("10%")
    expect(page.get_by_test_id(VOLUME_DISCOUNT_ROW)).to_have_text("Volume discount0%")
@@ -95,15 +93,19 @@ def test_fees_page_discount_program_total_discount(page: Page):
    )


-@pytest.mark.xdist_group(name="test_fees_referral_tier_1")
-def test_fees_page_referral_discount_program_referral_benefits(page: Page):
+def test_fees_page_referral_discount_program_referral_benefits(
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
    page.goto("/#/fees")
    expect(page.get_by_test_id(RUNNING_NOTIONAL_TAKER_VOLUME)).to_have_text("103")
    expect(page.get_by_test_id(EPOCHS_IN_REFERRAL_SET)).to_have_text("1")


-@pytest.mark.xdist_group(name="test_fees_referral_tier_1")
-def test_fees_page_discount_program_discount(page: Page):
+def test_fees_page_discount_program_discount(
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
    page.goto("/#/fees")
    expect(page.get_by_test_id(TIER_VALUE_0)).to_have_text("1")
    expect(page.get_by_test_id(TIER_VALUE_1)).to_have_text("2")
@@ -119,8 +121,10 @@ def test_fees_page_discount_program_discount(page: Page):
    expect(page.get_by_test_id("your-referral-tier-0").nth(1)).to_have_text("Your tier")


-@pytest.mark.xdist_group(name="test_fees_referral_tier_1")
-def test_fees_page_discount_program_fees_by_market(page: Page):
+def test_fees_page_discount_program_fees_by_market(
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
    page.goto("/#/fees")
    pinned = page.locator(PINNED_ROW_LOCATOR)
    row = page.locator(ROW_LOCATOR)
@@ -132,11 +136,11 @@ def test_fees_page_discount_program_fees_by_market(page: Page):
    expect(row.locator(COL_TOTAL_FEE)).to_have_text("10.05%")


-@pytest.mark.xdist_group(name="test_fees_referral_tier_1")
 def test_deal_ticket_discount_program(
-    page: Page, setup_market_with_referral_discount_program
-):
-    page.goto(f"/#/markets/{setup_market_with_referral_discount_program}")
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
+    page.goto(f"/#/markets/{market}")
    page.get_by_test_id(ORDER_SIZE).fill("1")
    page.get_by_test_id(ORDER_PRICE).fill("1")
    expect(page.get_by_test_id(DISCOUNT_PILL)).to_have_text("-10%")
@@ -155,12 +159,11 @@ def test_deal_ticket_discount_program(
    expect(tooltip.get_by_test_id(TOTAL_FEE_VALUE)).to_have_text("0.09045 tDAI")


-@pytest.mark.xdist_group(name="test_fees_referral_tier_1")
 def test_fills_taker_discount_program(
-    page: Page,
-    setup_market_with_referral_discount_program,
-):
-    page.goto(f"/#/markets/{setup_market_with_referral_discount_program}")
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
+    page.goto(f"/#/markets/{market}")
    page.get_by_test_id(FILLS).click()
    row = page.get_by_test_id(TAB_FILLS).locator(ROW_LOCATOR).first
    expect(row.locator(COL_SIZE)).to_have_text("+1")
@@ -171,13 +174,11 @@ def test_fills_taker_discount_program(
    expect(row.locator(COL_FEE_DISCOUNT)).to_have_text("1.04017 tDAI")


-@pytest.mark.xdist_group(name="test_fees_referral_tier_1")
 def test_fills_maker_discount_program(
-    vega: VegaServiceNull,
-    page: Page,
-    setup_market_with_referral_discount_program,
-):
-    page.goto(f"/#/markets/{setup_market_with_referral_discount_program}")
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
+    page.goto(f"/#/markets/{market}")
    change_keys(page, vega, MM_WALLET.name)
    page.get_by_test_id(FILLS).click()
    row = page.get_by_test_id(TAB_FILLS).locator(ROW_LOCATOR).first
@@ -189,11 +190,11 @@ def test_fills_maker_discount_program(
    expect(row.locator(COL_FEE_DISCOUNT)).to_have_text("1.035 tDAI")


-@pytest.mark.xdist_group(name="test_fees_referral_tier_1")
 def test_fills_maker_fee_tooltip_discount_program(
-    vega: VegaServiceNull, page: Page, setup_market_with_referral_discount_program
-):
-    page.goto(f"/#/markets/{setup_market_with_referral_discount_program}")
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
+    page.goto(f"/#/markets/{market}")
    change_keys(page, vega, MM_WALLET.name)
    page.get_by_test_id(FILLS).click()
    row = page.get_by_test_id(TAB_FILLS).locator(ROW_LOCATOR).first
@@ -205,12 +206,11 @@ def test_fills_maker_fee_tooltip_discount_program(
    )


-@pytest.mark.xdist_group(name="test_fees_referral_tier_1")
 def test_fills_taker_fee_tooltip_discount_program(
-    page: Page,
-    setup_market_with_referral_discount_program,
-):
-    page.goto(f"/#/markets/{setup_market_with_referral_discount_program}")
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
+    page.goto(f"/#/markets/{market}")
    page.get_by_test_id(FILLS).click()
    row = page.get_by_test_id(TAB_FILLS).locator(ROW_LOCATOR).first
    # tbd - tooltip is not visible without this wait
@@ -1,5 +1,6 @@
 import pytest
 from fees_test_ids import *
+from typing import Tuple, Generator
 from playwright.sync_api import Page, expect
 from vega_sim.null_service import VegaServiceNull
 from actions.vega import submit_order
@@ -16,62 +17,56 @@ from fixtures.market import setup_continuous_market


@pytest.fixture(scope="module")
-def vega(request):
+def setup_environment(
+    request, browser
+) -> Generator[Tuple[VegaServiceNull, str, Page], None, None]:
    with init_vega(request) as vega_instance:
-        request.addfinalizer(
-            lambda: cleanup_container(vega_instance)
+        request.addfinalizer(lambda: cleanup_container(vega_instance))
+
+        # Setup market with referral discount program
+        market = setup_continuous_market(vega_instance, custom_quantum=100000)
+        vega_instance.update_referral_program(
+            proposal_key=MM_WALLET.name,
+            benefit_tiers=[
+                {
+                    "minimum_running_notional_taker_volume": 100,
+                    "minimum_epochs": 1,
+                    "referral_reward_factor": 0.1,
+                    "referral_discount_factor": 0.1,
+                },
+                {
+                    "minimum_running_notional_taker_volume": 200,
+                    "minimum_epochs": 2,
+                    "referral_reward_factor": 0.2,
+                    "referral_discount_factor": 0.2,
+                },
+            ],
+            staking_tiers=[
+                {"minimum_staked_tokens": 100, "referral_reward_multiplier": 1.1},
+                {"minimum_staked_tokens": 200, "referral_reward_multiplier": 1.2},
+            ],
+            window_length=1,
        )
-        yield vega_instance
+        vega_instance.create_referral_set(key_name=MM_WALLET.name)
+        next_epoch(vega_instance)
+        referral_set_id = list(vega_instance.list_referral_sets().keys())[0]
+        vega_instance.apply_referral_code(key_name="Key 1", id=referral_set_id)
+        next_epoch(vega_instance)
+
+        for _ in range(2):
+            submit_order(vega_instance, "Key 1", market, "SIDE_BUY", 2, 110)
+            forward_time(vega_instance, True if _ < 2 - 1 else False)
+
+        with init_page(vega_instance, browser, request) as page_instance:
+            risk_accepted_setup(page_instance)
+            auth_setup(vega_instance, page_instance)
+            yield vega_instance, market, page_instance


-@pytest.fixture(scope="module")
-def page(vega, browser, request):
-    with init_page(vega, browser, request) as page:
-        risk_accepted_setup(page)
-        auth_setup(vega, page)
-        yield page
-
-
-@pytest.fixture(scope="module", autouse=True)
-def setup_market_with_referral_discount_program(vega: VegaServiceNull):
-    market = setup_continuous_market(vega, custom_quantum=100000)
-    vega.update_referral_program(
-        proposal_key=MM_WALLET.name,
-        benefit_tiers=[
-            {
-                "minimum_running_notional_taker_volume": 100,
-                "minimum_epochs": 1,
-                "referral_reward_factor": 0.1,
-                "referral_discount_factor": 0.1,
-            },
-            {
-                "minimum_running_notional_taker_volume": 200,
-                "minimum_epochs": 2,
-                "referral_reward_factor": 0.2,
-                "referral_discount_factor": 0.2,
-            },
-        ],
-        staking_tiers=[
-            {"minimum_staked_tokens": 100, "referral_reward_multiplier": 1.1},
-            {"minimum_staked_tokens": 200, "referral_reward_multiplier": 1.2},
-        ],
-        window_length=1,
-    )
-    vega.create_referral_set(key_name=MM_WALLET.name)
-    next_epoch(vega=vega)
-    referral_set_id = list(vega.list_referral_sets().keys())[0]
-    vega.apply_referral_code(key_name="Key 1", id=referral_set_id)
-    next_epoch(vega=vega)
-
-    for _ in range(2):
-        submit_order(vega, "Key 1", market, "SIDE_BUY", 2, 110)
-        forward_time(vega, True if _ < 2 - 1 else False)
-
-    return market
-
-
-@pytest.mark.xdist_group(name="test_fees_referral_tier_2")
-def test_fees_page_discount_program_my_trading_fees(page: Page):
+def test_fees_page_discount_program_my_trading_fees(
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
    page.goto("/#/fees")
    expect(page.get_by_test_id(ADJUSTED_FEES)).to_have_text("8.04%-8.04%")
    expect(page.get_by_test_id(TOTAL_FEE_BEFORE_DISCOUNT)).to_have_text(
@@ -82,8 +77,10 @@ def test_fees_page_discount_program_my_trading_fees(page: Page):
    expect(page.get_by_test_id(LIQUIDITY_FEES)).to_have_text("Liquidity0%-0%")


-@pytest.mark.xdist_group(name="test_fees_referral_tier_2")
-def test_fees_page_discount_program_total_discount(page: Page):
+def test_fees_page_discount_program_total_discount(
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
    page.goto("/#/fees")
    expect(page.get_by_test_id(TOTAL_DISCOUNT)).to_have_text("20%")
    expect(page.get_by_test_id(VOLUME_DISCOUNT_ROW)).to_have_text("Volume discount0%")
@@ -96,15 +93,19 @@ def test_fees_page_discount_program_total_discount(page: Page):
    )


-@pytest.mark.xdist_group(name="test_fees_referral_tier_2")
-def test_fees_page_referral_discount_program_referral_benefits(page: Page):
+def test_fees_page_referral_discount_program_referral_benefits(
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
    page.goto("/#/fees")
    expect(page.get_by_test_id(RUNNING_NOTIONAL_TAKER_VOLUME)).to_have_text("207")
    expect(page.get_by_test_id(REQUIRED_FOR_NEXT_TIER)).not_to_be_visible()


-@pytest.mark.xdist_group(name="test_fees_referral_tier_2")
-def test_fees_page_discount_program_discount(page: Page):
+def test_fees_page_discount_program_discount(
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
    page.goto("/#/fees")
    expect(page.get_by_test_id(TIER_VALUE_0)).to_have_text("1")
    expect(page.get_by_test_id(TIER_VALUE_1)).to_have_text("2")
@@ -120,8 +121,10 @@ def test_fees_page_discount_program_discount(page: Page):
    expect(page.get_by_test_id("your-referral-tier-1").nth(1)).to_have_text("Your tier")


-@pytest.mark.xdist_group(name="test_fees_referral_tier_2")
-def test_fees_page_discount_program_fees_by_market(page: Page):
+def test_fees_page_discount_program_fees_by_market(
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
    page.goto("/#/fees")
    pinned = page.locator(PINNED_ROW_LOCATOR)
    row = page.locator(ROW_LOCATOR)
@@ -133,11 +136,11 @@ def test_fees_page_discount_program_fees_by_market(page: Page):
    expect(row.locator(COL_TOTAL_FEE)).to_have_text("10.05%")


-@pytest.mark.xdist_group(name="test_fees_referral_tier_2")
 def test_deal_ticket_discount_program(
-    page: Page, setup_market_with_referral_discount_program
-):
-    page.goto(f"/#/markets/{setup_market_with_referral_discount_program}")
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
+    page.goto(f"/#/markets/{market}")
    page.get_by_test_id(ORDER_SIZE).fill("1")
    page.get_by_test_id(ORDER_PRICE).fill("1")
    expect(page.get_by_test_id(DISCOUNT_PILL)).to_have_text("-20%")
@@ -156,12 +159,11 @@ def test_deal_ticket_discount_program(
    expect(tooltip.get_by_test_id(TOTAL_FEE_VALUE)).to_have_text("0.0804 tDAI")


-@pytest.mark.xdist_group(name="test_fees_referral_tier_2")
 def test_fills_taker_discount_program(
-    page: Page,
-    setup_market_with_referral_discount_program,
-):
-    page.goto(f"/#/markets/{setup_market_with_referral_discount_program}")
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
+    page.goto(f"/#/markets/{market}")
    page.get_by_test_id(FILLS).click()
    row = page.get_by_test_id(TAB_FILLS).locator(ROW_LOCATOR).first
    expect(row.locator(COL_SIZE)).to_have_text("+2")
@@ -172,13 +174,11 @@ def test_fills_taker_discount_program(
    expect(row.locator(COL_FEE_DISCOUNT)).to_have_text("4.1607 tDAI")


-@pytest.mark.xdist_group(name="test_fees_referral_tier_2")
 def test_fills_maker_discount_program(
-    vega: VegaServiceNull,
-    page: Page,
-    setup_market_with_referral_discount_program,
-):
-    page.goto(f"/#/markets/{setup_market_with_referral_discount_program}")
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
+    page.goto(f"/#/markets/{market}")
    change_keys(page, vega, MM_WALLET.name)
    page.get_by_test_id(FILLS).click()
    row = page.get_by_test_id(TAB_FILLS).locator(ROW_LOCATOR).first
@@ -190,11 +190,11 @@ def test_fills_maker_discount_program(
    expect(row.locator(COL_FEE_DISCOUNT)).to_have_text("4.14 tDAI")


-@pytest.mark.xdist_group(name="test_fees_referral_tier_2")
 def test_fills_maker_fee_tooltip_discount_program(
-    vega: VegaServiceNull, page: Page, setup_market_with_referral_discount_program
-):
-    page.goto(f"/#/markets/{setup_market_with_referral_discount_program}")
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
+    page.goto(f"/#/markets/{market}")
    change_keys(page, vega, MM_WALLET.name)
    page.get_by_test_id(FILLS).click()
    row = page.get_by_test_id(TAB_FILLS).locator(ROW_LOCATOR).first
@@ -206,12 +206,11 @@ def test_fills_maker_fee_tooltip_discount_program(
    )


-@pytest.mark.xdist_group(name="test_fees_referral_tier_2")
 def test_fills_taker_fee_tooltip_discount_program(
-    page: Page,
-    setup_market_with_referral_discount_program,
-):
-    page.goto(f"/#/markets/{setup_market_with_referral_discount_program}")
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
+    page.goto(f"/#/markets/{market}")
    page.get_by_test_id(FILLS).click()
    row = page.get_by_test_id(TAB_FILLS).locator(ROW_LOCATOR).first
    # tbd - tooltip is not visible without this wait
@@ -1,5 +1,6 @@
 import pytest
 from fees_test_ids import *
+from typing import Tuple, Generator
 from playwright.sync_api import Page, expect
 from vega_sim.null_service import VegaServiceNull
 from actions.vega import submit_order
@@ -16,49 +17,45 @@ from fixtures.market import setup_continuous_market


@pytest.fixture(scope="module")
-def vega(request):
+def setup_environment(
+    request, browser
+) -> Generator[Tuple[VegaServiceNull, str, Page], None, None]:
    with init_vega(request) as vega_instance:
-        request.addfinalizer(
-            lambda: cleanup_container(vega_instance)
+        request.addfinalizer(lambda: cleanup_container(vega_instance))
+
+        # Setup the market with volume discount program
+        market = setup_continuous_market(vega_instance, custom_quantum=100000)
+        vega_instance.update_volume_discount_program(
+            proposal_key=MM_WALLET.name,
+            benefit_tiers=[
+                {
+                    "minimum_running_notional_taker_volume": 100,
+                    "volume_discount_factor": 0.1,
+                },
+                {
+                    "minimum_running_notional_taker_volume": 200,
+                    "volume_discount_factor": 0.2,
+                },
+            ],
+            window_length=7,
        )
-        yield vega_instance
+        next_epoch(vega=vega_instance)
+
+        for _ in range(2):
+            submit_order(vega_instance, "Key 1", market, "SIDE_BUY", 1, 110)
+            forward_time(vega_instance, True if _ < 2 - 1 else False)
+
+        # Initialize and setup page
+        with init_page(vega_instance, browser, request) as page:
+            risk_accepted_setup(page)
+            auth_setup(vega_instance, page)
+            yield vega_instance, market, page


-@pytest.fixture(scope="module")
-def page(vega, browser, request):
-    with init_page(vega, browser, request) as page:
-        risk_accepted_setup(page)
-        auth_setup(vega, page)
-        yield page
-
-
-@pytest.fixture(scope="module", autouse=True)
-def setup_market_with_volume_discount_program(vega: VegaServiceNull):
-    market = setup_continuous_market(vega, custom_quantum=100000)
-    vega.update_volume_discount_program(
-        proposal_key=MM_WALLET.name,
-        benefit_tiers=[
-            {
-                "minimum_running_notional_taker_volume": 100,
-                "volume_discount_factor": 0.1,
-            },
-            {
-                "minimum_running_notional_taker_volume": 200,
-                "volume_discount_factor": 0.2,
-            },
-        ],
-        window_length=7,
-    )
-    next_epoch(vega=vega)
-
-    for _ in range(2):
-        submit_order(vega, "Key 1", market, "SIDE_BUY", 1, 110)
-        forward_time(vega, True if _ < 2 - 1 else False)
-    return market
-
-
-@pytest.mark.xdist_group(name="test_fees_volume_tier_1")
-def test_fees_page_discount_program_my_trading_fees(page: Page):
+def test_fees_page_discount_program_my_trading_fees(
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
    page.goto("/#/fees")
    expect(page.get_by_test_id(ADJUSTED_FEES)).to_have_text("9.045%-9.045%")
    expect(page.get_by_test_id(TOTAL_FEE_BEFORE_DISCOUNT)).to_have_text(
@@ -69,10 +66,10 @@ def test_fees_page_discount_program_my_trading_fees(page: Page):
    expect(page.get_by_test_id(LIQUIDITY_FEES)).to_have_text("Liquidity0%-0%")


-@pytest.mark.xdist_group(name="test_fees_volume_tier_1")
 def test_fees_page_discount_program_total_discount(
-    page: Page,
-):
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
    page.goto("/#/fees")
    expect(page.get_by_test_id(TOTAL_DISCOUNT)).to_have_text("10%")
    expect(page.get_by_test_id(VOLUME_DISCOUNT_ROW)).to_have_text("Volume discount10%")
@@ -85,20 +82,20 @@ def test_fees_page_discount_program_total_discount(
    )


-@pytest.mark.xdist_group(name="test_fees_volume_tier_1")
 def test_fees_page_volume_discount_program_my_current_volume(
-    page: Page,
-):
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
    page.goto("/#/fees")
    expect(page.get_by_test_id(PAST_EPOCHS_VOLUME)).to_have_text("103")

    expect(page.get_by_test_id(REQUIRED_FOR_NEXT_TIER)).to_have_text("97")


-@pytest.mark.xdist_group(name="test_fees_volume_tier_1")
 def test_fees_page_discount_program_discount(
-    page: Page,
-):
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
    page.goto("/#/fees")
    expect(page.get_by_test_id(TIER_VALUE_0)).to_have_text("1")
    expect(page.get_by_test_id(TIER_VALUE_1)).to_have_text("2")
@@ -111,8 +108,10 @@ def test_fees_page_discount_program_discount(
    expect(page.get_by_test_id("your-volume-tier-0").nth(1)).to_have_text("Your tier")


-@pytest.mark.xdist_group(name="test_fees_volume_tier_1")
-def test_fees_page_discount_program_fees_by_market(page: Page):
+def test_fees_page_discount_program_fees_by_market(
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
    page.goto("/#/fees")
    pinned = page.locator(PINNED_ROW_LOCATOR)
    row = page.locator(ROW_LOCATOR)
@@ -124,11 +123,11 @@ def test_fees_page_discount_program_fees_by_market(page: Page):
    expect(row.locator(COL_TOTAL_FEE)).to_have_text("10.05%")


-@pytest.mark.xdist_group(name="test_fees_volume_tier_1")
 def test_deal_ticket_discount_program_testing(
-    page: Page, setup_market_with_volume_discount_program
-):
-    page.goto(f"/#/markets/{setup_market_with_volume_discount_program}")
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
+    page.goto(f"/#/markets/{market}")
    page.get_by_test_id(ORDER_SIZE).fill("1")
    page.get_by_test_id(ORDER_PRICE).fill("1")
    expect(page.get_by_test_id(DISCOUNT_PILL)).to_have_text("-10%")
@@ -149,9 +148,10 @@ def test_deal_ticket_discount_program_testing(

@pytest.mark.xdist_group(name="test_fees_volume_tier_1")
 def test_fills_taker_discount_program(
-    page: Page, setup_market_with_volume_discount_program
-):
-    page.goto(f"/#/markets/{setup_market_with_volume_discount_program}")
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
+    page.goto(f"/#/markets/{market}")
    page.get_by_test_id(FILLS).click()
    row = page.get_by_test_id(TAB_FILLS).locator(ROW_LOCATOR).first
    expect(row.locator(COL_SIZE)).to_have_text("+1")
@@ -164,9 +164,10 @@ def test_fills_taker_discount_program(

@pytest.mark.xdist_group(name="test_fees_volume_tier_1")
 def test_fills_maker_discount_program(
-    page: Page, setup_market_with_volume_discount_program, vega: VegaServiceNull
-):
-    page.goto(f"/#/markets/{setup_market_with_volume_discount_program}")
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
+    page.goto(f"/#/markets/{market}")
    change_keys(page, vega, MM_WALLET.name)
    page.get_by_test_id(FILLS).click()
    row = page.get_by_test_id(TAB_FILLS).locator(ROW_LOCATOR).first
@@ -178,11 +179,11 @@ def test_fills_maker_discount_program(
    expect(row.locator(COL_FEE_DISCOUNT)).to_have_text("1.035 tDAI")


-@pytest.mark.xdist_group(name="test_fees_volume_tier_1")
 def test_fills_maker_fee_tooltip_discount_program(
-    vega: VegaServiceNull, page: Page, setup_market_with_volume_discount_program
-):
-    page.goto(f"/#/markets/{setup_market_with_volume_discount_program}")
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
+    page.goto(f"/#/markets/{market}")
    change_keys(page, vega, MM_WALLET.name)
    page.get_by_test_id(FILLS).click()
    row = page.get_by_test_id(TAB_FILLS).locator(ROW_LOCATOR).first
@@ -194,12 +195,11 @@ def test_fills_maker_fee_tooltip_discount_program(
    )


-@pytest.mark.xdist_group(name="test_fees_volume_tier_1")
 def test_fills_taker_fee_tooltip_discount_program(
-    page: Page,
-    setup_market_with_volume_discount_program,
-):
-    page.goto(f"/#/markets/{setup_market_with_volume_discount_program}")
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
+    page.goto(f"/#/markets/{market}")
    page.get_by_test_id(FILLS).click()
    row = page.get_by_test_id(TAB_FILLS).locator(ROW_LOCATOR).first
    # tbd - tooltip is not visible without this wait
@@ -1,5 +1,6 @@
 import pytest
 from fees_test_ids import *
+from typing import Tuple, Generator
 from playwright.sync_api import Page, expect
 from vega_sim.null_service import VegaServiceNull
 from actions.vega import submit_order
@@ -14,51 +15,47 @@ from conftest import (
 from actions.utils import next_epoch, change_keys, forward_time
 from fixtures.market import setup_continuous_market

+
@pytest.fixture(scope="module")
-def vega(request):
+def setup_environment(
+    request, browser
+) -> Generator[Tuple[VegaServiceNull, str, Page], None, None]:
    with init_vega(request) as vega_instance:
-        request.addfinalizer(
-            lambda: cleanup_container(vega_instance)
+        request.addfinalizer(lambda: cleanup_container(vega_instance))
+
+        # Setup the market with volume discount program
+        market = setup_continuous_market(vega_instance, custom_quantum=100000)
+        vega_instance.update_volume_discount_program(
+            proposal_key=MM_WALLET.name,
+            benefit_tiers=[
+                {
+                    "minimum_running_notional_taker_volume": 100,
+                    "volume_discount_factor": 0.1,
+                },
+                {
+                    "minimum_running_notional_taker_volume": 200,
+                    "volume_discount_factor": 0.2,
+                },
+            ],
+            window_length=7,
        )
-        yield vega_instance
+        next_epoch(vega=vega_instance)
+
+        for _ in range(3):
+            submit_order(vega_instance, "Key 1", market, "SIDE_BUY", 1, 110)
+            forward_time(vega_instance, True if _ < 3 - 1 else False)
+
+        # Initialize page and apply setups
+        with init_page(vega_instance, browser, request) as page_instance:
+            risk_accepted_setup(page_instance)
+            auth_setup(vega_instance, page_instance)
+            yield vega_instance, market, page_instance


-@pytest.fixture(scope="module")
-def page(vega, browser, request):
-    with init_page(vega, browser, request) as page:
-        risk_accepted_setup(page)
-        auth_setup(vega, page)
-        yield page
-
-
-@pytest.fixture(scope="module", autouse=True)
-def setup_market_with_volume_discount_program(vega: VegaServiceNull):
-    market = setup_continuous_market(vega, custom_quantum=100000)
-    vega.update_volume_discount_program(
-        proposal_key=MM_WALLET.name,
-        benefit_tiers=[
-            {
-                "minimum_running_notional_taker_volume": 100,
-                "volume_discount_factor": 0.1,
-            },
-            {
-                "minimum_running_notional_taker_volume": 200,
-                "volume_discount_factor": 0.2,
-            },
-        ],
-        window_length=7,
-    )
-    next_epoch(vega=vega)
-
-    for _ in range(3):
-        submit_order(vega, "Key 1", market, "SIDE_BUY", 1, 110)
-        forward_time(vega, True if _ < 3 - 1 else False)
-
-    return market
-
-
-@pytest.mark.xdist_group(name="test_fees_volume_tier_2")
-def test_fees_page_discount_program_my_trading_fees(page: Page):
+def test_fees_page_discount_program_my_trading_fees(
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
    page.goto("/#/fees")
    expect(page.get_by_test_id(ADJUSTED_FEES)).to_have_text("8.04%-8.04%")
    expect(page.get_by_test_id(TOTAL_FEE_BEFORE_DISCOUNT)).to_have_text(
@@ -69,8 +66,10 @@ def test_fees_page_discount_program_my_trading_fees(page: Page):
    expect(page.get_by_test_id(LIQUIDITY_FEES)).to_have_text("Liquidity0%-0%")


-@pytest.mark.xdist_group(name="test_fees_volume_tier_2")
-def test_fees_page_discount_program_total_discount(page: Page):
+def test_fees_page_discount_program_total_discount(
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
    page.goto("/#/fees")
    expect(page.get_by_test_id(TOTAL_DISCOUNT)).to_have_text("20%")
    expect(page.get_by_test_id(VOLUME_DISCOUNT_ROW)).to_have_text("Volume discount20%")
@@ -83,15 +82,19 @@ def test_fees_page_discount_program_total_discount(page: Page):
    )


-@pytest.mark.xdist_group(name="test_fees_volume_tier_2")
-def test_fees_page_volume_discount_program_my_current_volume(page: Page):
+def test_fees_page_volume_discount_program_my_current_volume(
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
    page.goto("/#/fees")
    expect(page.get_by_test_id(PAST_EPOCHS_VOLUME)).to_have_text("206")
    expect(page.get_by_test_id(REQUIRED_FOR_NEXT_TIER)).not_to_be_visible()


-@pytest.mark.xdist_group(name="test_fees_volume_tier_2")
-def test_fees_page_discount_program_discount(page: Page):
+def test_fees_page_discount_program_discount(
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
    page.goto("/#/fees")
    expect(page.get_by_test_id(TIER_VALUE_0)).to_have_text("1")
    expect(page.get_by_test_id(TIER_VALUE_1)).to_have_text("2")
@@ -104,8 +107,8 @@ def test_fees_page_discount_program_discount(page: Page):
    expect(page.get_by_test_id("your-volume-tier-1").nth(1)).to_have_text("Your tier")


-@pytest.mark.xdist_group(name="test_fees_volume_tier_2")
-def test_fees_page_discount_program_fees_by_market(page: Page):
+def test_fees_page_discount_program_fees_by_market(setup_environment):
+    vega, market, page = setup_environment
    page.goto("/#/fees")
    pinned = page.locator(PINNED_ROW_LOCATOR)
    row = page.locator(ROW_LOCATOR)
@@ -117,12 +120,11 @@ def test_fees_page_discount_program_fees_by_market(page: Page):
    expect(row.locator(COL_TOTAL_FEE)).to_have_text("10.05%")


-@pytest.mark.xdist_group(name="test_fees_volume_tier_2")
 def test_deal_ticket_discount_program(
-    page: Page,
-    setup_market_with_volume_discount_program,
-):
-    page.goto(f"/#/markets/{setup_market_with_volume_discount_program}")
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
+    page.goto(f"/#/markets/{market}")
    page.get_by_test_id(ORDER_SIZE).fill("1")
    page.get_by_test_id(ORDER_PRICE).fill("1")
    expect(page.get_by_test_id(DISCOUNT_PILL)).to_have_text("-20%")
@@ -141,12 +143,11 @@ def test_deal_ticket_discount_program(
    expect(tooltip.get_by_test_id(TOTAL_FEE_VALUE)).to_have_text("0.0804 tDAI")


-@pytest.mark.xdist_group(name="test_fees_volume_tier_2")
 def test_fills_taker_discount_program(
-    page: Page,
-    setup_market_with_volume_discount_program,
-):
-    page.goto(f"/#/markets/{setup_market_with_volume_discount_program}")
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
+    page.goto(f"/#/markets/{market}")
    page.get_by_test_id(FILLS).click()
    row = page.get_by_test_id(TAB_FILLS).locator(ROW_LOCATOR).first
    expect(row.locator(COL_SIZE)).to_have_text("+1")
@@ -159,13 +160,11 @@ def test_fills_taker_discount_program(
    expect(row.locator(COL_FEE_DISCOUNT)).to_have_text("2.08035 tDAI")


-@pytest.mark.xdist_group(name="test_fees_volume_tier_2")
 def test_fills_maker_discount_program(
-    vega: VegaServiceNull,
-    page: Page,
-    setup_market_with_volume_discount_program,
-):
-    page.goto(f"/#/markets/{setup_market_with_volume_discount_program}")
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
+    page.goto(f"/#/markets/{market}")
    change_keys(page, vega, MM_WALLET.name)
    page.get_by_test_id(FILLS).click()
    row = page.get_by_test_id(TAB_FILLS).locator(ROW_LOCATOR).first
@@ -177,11 +176,11 @@ def test_fills_maker_discount_program(
    expect(row.locator(COL_FEE_DISCOUNT)).to_have_text("2.07 tDAI")


-@pytest.mark.xdist_group(name="test_fees_volume_tier_2")
 def test_fills_maker_fee_tooltip_discount_program(
-    vega, page: Page, setup_market_with_volume_discount_program
-):
-    page.goto(f"/#/markets/{setup_market_with_volume_discount_program}")
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
+    page.goto(f"/#/markets/{market}")
    change_keys(page, vega, MM_WALLET.name)
    page.get_by_test_id(FILLS).click()
    row = page.get_by_test_id(TAB_FILLS).locator(ROW_LOCATOR).first
@@ -193,12 +192,11 @@ def test_fills_maker_fee_tooltip_discount_program(
    )


-@pytest.mark.xdist_group(name="test_fees_volume_tier_2")
 def test_fills_taker_fee_tooltip_discount_program(
-    page: Page,
-    setup_market_with_volume_discount_program,
-):
-    page.goto(f"/#/markets/{setup_market_with_volume_discount_program}")
+    setup_environment: Tuple[VegaServiceNull, str, Page],
+) -> None:
+    vega, market, page = setup_environment
+    page.goto(f"/#/markets/{market}")
    page.get_by_test_id(FILLS).click()
    row = page.get_by_test_id(TAB_FILLS).locator(ROW_LOCATOR).first
    # tbd - tooltip is not visible without this wait
@@ -10,228 +10,218 @@ order_tab = "tab-orders"


@pytest.fixture(scope="module")
-def vega(request):
+def setup_environment(request, browser):
+    # Initialize Vega with cleanup
    with init_vega(request) as vega_instance:
-        request.addfinalizer(lambda: cleanup_container(vega_instance))  # Register the cleanup function
-        yield vega_instance
+        request.addfinalizer(lambda: cleanup_container(vega_instance))

+        # Setup multiple markets
+        markets = {
+            "market_1": setup_continuous_market(vega_instance, custom_market_name="market-1"),
+            "market_2": setup_continuous_market(vega_instance, custom_market_name="market-2"),
+            "market_3": setup_continuous_market(vega_instance, custom_market_name="market-3"),
+            "market_4": setup_continuous_market(vega_instance, custom_market_name="market-4"),
+            "market_5": setup_simple_market(vega_instance, custom_market_name="market-5"),
+        }

-@pytest.fixture(scope="module", autouse=True)
-def markets(vega: VegaServiceNull):
-    market_1 = setup_continuous_market(
-        vega,
-        custom_market_name="market-1",
-    )
-    market_2 = setup_continuous_market(
-        vega,
-        custom_market_name="market-2",
-    )
-    market_3 = setup_continuous_market(
-        vega,
-        custom_market_name="market-3",
-    )
-    market_4 = setup_continuous_market(
-        vega,
-        custom_market_name="market-4",
-    )
-    market_5 = setup_simple_market(
-        vega,
-        custom_market_name="market-5",
-    )
+        # Execute a series of orders across different markets
+        # Example for market_1 orders, adjust as necessary for your test scenario
+        vega_instance.submit_order(
+            trading_key="Key 1",
+            market_id=markets["market_1"],
+            time_in_force="TIME_IN_FORCE_IOC",
+            order_type="TYPE_LIMIT",
+            side="SIDE_SELL",
+            volume=100,
+            price=130,
+        )
+        
+        vega_instance.forward("2s")
+        vega_instance.wait_fn(1)
+        vega_instance.wait_for_total_catchup()

-    vega.submit_order(
-        trading_key="Key 1",
-        market_id=market_1,
-        time_in_force="TIME_IN_FORCE_IOC",
-        order_type="TYPE_LIMIT",
-        side="SIDE_SELL",
-        volume=100,
-        price=130,
-    )
+        vega_instance.submit_order(
+            trading_key="Key 1",
+            market_id=markets["market_1"],
+            time_in_force="TIME_IN_FORCE_GTC",
+            order_type="TYPE_LIMIT",
+            side="SIDE_SELL",
+            volume=100,
+            price=88,
+        )

-    vega.forward("2s")
-    vega.wait_fn(1)
-    vega.wait_for_total_catchup()
+        vega_instance.forward("2s")
+        vega_instance.wait_fn(1)
+        vega_instance.wait_for_total_catchup()

-    vega.submit_order(
-        trading_key="Key 1",
-        market_id=market_1,
-        time_in_force="TIME_IN_FORCE_GTC",
-        order_type="TYPE_LIMIT",
-        side="SIDE_SELL",
-        volume=100,
-        price=88,
-    )
+        vega_instance.submit_order(
+            trading_key="Key 1",
+            market_id=markets["market_1"],
+            time_in_force="TIME_IN_FORCE_IOC",
+            order_type="TYPE_LIMIT",
+            side="SIDE_SELL",
+            volume=100,
+            price=88,
+        )

-    vega.forward("2s")
-    vega.wait_fn(1)
-    vega.wait_for_total_catchup()
+        vega_instance.forward("2s")
+        vega_instance.wait_fn(1)
+        vega_instance.wait_for_total_catchup()

-    vega.submit_order(
-        trading_key="Key 1",
-        market_id=market_1,
-        time_in_force="TIME_IN_FORCE_IOC",
-        order_type="TYPE_LIMIT",
-        side="SIDE_SELL",
-        volume=100,
-        price=88,
-    )
+        vega_instance.submit_order(
+            trading_key="Key 1",
+            market_id=markets["market_1"],
+            time_in_force="TIME_IN_FORCE_GTC",
+            order_type="TYPE_LIMIT",
+            side="SIDE_SELL",
+            volume=1e10,
+            price=130,
+            wait=False,
+        )

-    vega.forward("2s")
-    vega.wait_fn(1)
-    vega.wait_for_total_catchup()
+        vega_instance.forward("2s")
+        vega_instance.wait_fn(1)
+        vega_instance.wait_for_total_catchup()

-    vega.submit_order(
-        trading_key="Key 1",
-        market_id=market_1,
-        time_in_force="TIME_IN_FORCE_GTC",
-        order_type="TYPE_LIMIT",
-        side="SIDE_SELL",
-        volume=1e10,
-        price=130,
-        wait=False,
-    )
+        vega_instance.submit_order(
+            trading_key="Key 1",
+            market_id=markets["market_2"],
+            time_in_force="TIME_IN_FORCE_IOC",
+            order_type="TYPE_LIMIT",
+            side="SIDE_BUY",
+            volume=100,
+            price=104,
+        )
+        vega_instance.forward("2s")
+        vega_instance.wait_fn(1)
+        vega_instance.wait_for_total_catchup()

-    vega.forward("2s")
-    vega.wait_fn(1)
-    vega.wait_for_total_catchup()
+        vega_instance.submit_order(
+            trading_key="Key 1",
+            market_id=markets["market_3"],
+            time_in_force="TIME_IN_FORCE_GTT",
+            order_type="TYPE_LIMIT",
+            side="SIDE_SELL",
+            volume=10,
+            price=120,
+            expires_at=vega_instance.get_blockchain_time() + 5 * 1e9,
+        )

-    vega.submit_order(
-        trading_key="Key 1",
-        market_id=market_2,
-        time_in_force="TIME_IN_FORCE_IOC",
-        order_type="TYPE_LIMIT",
-        side="SIDE_BUY",
-        volume=100,
-        price=104,
-    )
-    vega.forward("2s")
-    vega.wait_fn(1)
-    vega.wait_for_total_catchup()
+        vega_instance.forward("2s")
+        vega_instance.wait_fn(1)
+        vega_instance.wait_for_total_catchup()

-    vega.submit_order(
-        trading_key="Key 1",
-        market_id=market_3,
-        time_in_force="TIME_IN_FORCE_GTT",
-        order_type="TYPE_LIMIT",
-        side="SIDE_SELL",
-        volume=10,
-        price=120,
-        expires_at=vega.get_blockchain_time() + 5 * 1e9,
-    )
+        vega_instance.submit_order(
+            market_id=markets["market_4"],
+            trading_key="Key 1",
+            side="SIDE_BUY",
+            order_type="TYPE_LIMIT",
+            pegged_order=PeggedOrder(reference="PEGGED_REFERENCE_MID", offset=5),
+            time_in_force="TIME_IN_FORCE_GTC",
+            volume=20,
+        )

-    vega.forward("2s")
-    vega.wait_fn(1)
-    vega.wait_for_total_catchup()
+        vega_instance.forward("2s")
+        vega_instance.wait_fn(1)
+        vega_instance.wait_for_total_catchup()

-    vega.submit_order(
-        market_id=market_4,
-        trading_key="Key 1",
-        side="SIDE_BUY",
-        order_type="TYPE_LIMIT",
-        pegged_order=PeggedOrder(reference="PEGGED_REFERENCE_MID", offset=5),
-        time_in_force="TIME_IN_FORCE_GTC",
-        volume=20,
-    )
+        vega_instance.submit_order(
+            market_id=markets["market_4"],
+            trading_key="Key 1",
+            side="SIDE_BUY",
+            order_type="TYPE_LIMIT",
+            pegged_order=PeggedOrder(reference="PEGGED_REFERENCE_BEST_BID", offset=10),
+            time_in_force="TIME_IN_FORCE_GTC",
+            volume=40,
+        )

-    vega.forward("2s")
-    vega.wait_fn(1)
-    vega.wait_for_total_catchup()
+        vega_instance.forward("2s")
+        vega_instance.wait_fn(1)
+        vega_instance.wait_for_total_catchup()

-    vega.submit_order(
-        market_id=market_4,
-        trading_key="Key 1",
-        side="SIDE_BUY",
-        order_type="TYPE_LIMIT",
-        pegged_order=PeggedOrder(reference="PEGGED_REFERENCE_BEST_BID", offset=10),
-        time_in_force="TIME_IN_FORCE_GTC",
-        volume=40,
-    )
+        vega_instance.submit_order(
+            market_id=markets["market_4"],
+            trading_key="Key 1",
+            side="SIDE_SELL",
+            order_type="TYPE_LIMIT",
+            pegged_order=PeggedOrder(reference="PEGGED_REFERENCE_BEST_ASK", offset=15),
+            time_in_force="TIME_IN_FORCE_GTC",
+            volume=60,
+        )

-    vega.forward("2s")
-    vega.wait_fn(1)
-    vega.wait_for_total_catchup()
+        vega_instance.forward("2s")
+        vega_instance.wait_fn(1)
+        vega_instance.wait_for_total_catchup()

-    vega.submit_order(
-        market_id=market_4,
-        trading_key="Key 1",
-        side="SIDE_SELL",
-        order_type="TYPE_LIMIT",
-        pegged_order=PeggedOrder(reference="PEGGED_REFERENCE_BEST_ASK", offset=15),
-        time_in_force="TIME_IN_FORCE_GTC",
-        volume=60,
-    )
+        vega_instance.submit_order(
+            market_id=markets["market_5"],
+            trading_key="Key 1",
+            side="SIDE_SELL",
+            order_type="TYPE_LIMIT",
+            pegged_order=PeggedOrder(reference="PEGGED_REFERENCE_BEST_ASK", offset=15),
+            wait=False,
+            time_in_force="TIME_IN_FORCE_GTC",
+            volume=60,
+        )

-    vega.forward("2s")
-    vega.wait_fn(1)
-    vega.wait_for_total_catchup()
+        vega_instance.forward("2s")
+        vega_instance.wait_fn(1)
+        vega_instance.wait_for_total_catchup()

-    vega.submit_order(
-        market_id=market_5,
-        trading_key="Key 1",
-        side="SIDE_SELL",
-        order_type="TYPE_LIMIT",
-        pegged_order=PeggedOrder(reference="PEGGED_REFERENCE_BEST_ASK", offset=15),
-        wait=False,
-        time_in_force="TIME_IN_FORCE_GTC",
-        volume=60,
-    )
+        vega_instance.submit_order(
+            trading_key="Key 1",
+            market_id=markets["market_2"],
+            time_in_force="TIME_IN_FORCE_GTC",
+            order_type="TYPE_LIMIT",
+            side="SIDE_SELL",
+            volume=10,
+            price=150,
+        )
+        
+        vega_instance.wait_fn(1)
+        vega_instance.wait_for_total_catchup()

-    vega.forward("2s")
-    vega.wait_fn(1)
-    vega.wait_for_total_catchup()
+        vega_instance.submit_order(
+            trading_key="Key 1",
+            market_id=markets["market_2"],
+            time_in_force="TIME_IN_FORCE_GTC",
+            order_type="TYPE_LIMIT",
+            side="SIDE_SELL",
+            volume=10,
+            price=160,
+        )

-    vega.submit_order(
-        trading_key="Key 1",
-        market_id=market_2,
-        time_in_force="TIME_IN_FORCE_GTC",
-        order_type="TYPE_LIMIT",
-        side="SIDE_SELL",
-        volume=10,
-        price=150,
-    )
-    
-    vega.wait_fn(1)
-    vega.wait_for_total_catchup()
+        vega_instance.wait_fn(1)
+        vega_instance.wait_for_total_catchup()

-    vega.submit_order(
-        trading_key="Key 1",
-        market_id=market_2,
-        time_in_force="TIME_IN_FORCE_GTC",
-        order_type="TYPE_LIMIT",
-        side="SIDE_SELL",
-        volume=10,
-        price=160,
-    )
+        vega_instance.submit_order(
+            trading_key="Key 1",
+            market_id=markets["market_3"],
+            time_in_force="TIME_IN_FORCE_GTC",
+            order_type="TYPE_LIMIT",
+            side="SIDE_BUY",
+            volume=10,
+            price=60,
+        )

-    vega.wait_fn(1)
-    vega.wait_for_total_catchup()
-
-    vega.submit_order(
-        trading_key="Key 1",
-        market_id=market_3,
-        time_in_force="TIME_IN_FORCE_GTC",
-        order_type="TYPE_LIMIT",
-        side="SIDE_BUY",
-        volume=10,
-        price=60,
-    )
-
-    vega.wait_fn(1)
-    vega.wait_for_total_catchup()
+        vega_instance.wait_fn(1)
+        vega_instance.wait_for_total_catchup()
+        # Initialize page and setup
+        
+        yield vega_instance, markets


@pytest.fixture(scope="module")
-def page(vega, browser, request):
-    with init_page(vega, browser, request) as page:
+def page(setup_environment, browser, request):
+    vega_instance, markets = setup_environment
+    with init_page(vega_instance, browser, request) as page:
        risk_accepted_setup(page)
-        auth_setup(vega, page)
+        auth_setup(vega_instance, page)
        page.goto("/")
        page.get_by_test_id("All").click()
        yield page


-# close toast that is still opened after test
@pytest.fixture(autouse=True)
 def after_each(page: Page):
    yield
@@ -381,7 +371,8 @@ def test_order_status_pegged_mid(page: Page):
    )


-def test_order_amend_order(vega: VegaServiceNull, page: Page):
+def test_order_amend_order(setup_environment, page:Page):
+    vega, markets = setup_environment
    #  7002-SORD-053
    #  7003-MORD-012
    #  7003-MORD-014
@@ -402,13 +393,13 @@ def test_order_amend_order(vega: VegaServiceNull, page: Page):
    )


-def test_order_cancel_single_order(vega: VegaServiceNull, page: Page):
+def test_order_cancel_single_order(setup_environment, page:Page):
+    vega, markets = setup_environment
    #  7003-MORD-009
    #  7003-MORD-010
    #  7003-MORD-011
    #  7002-SORD-043
    page.get_by_test_id("cancel").first.click()
-
    wait_for_toast_confirmation(page, timeout=5000)
    vega.wait_fn(1)
    vega.wait_for_total_catchup()
@@ -420,7 +411,8 @@ def test_order_cancel_single_order(vega: VegaServiceNull, page: Page):
    )


-def test_order_cancel_all_orders(vega: VegaServiceNull, page: Page):
+def test_order_cancel_all_orders(setup_environment, page:Page):
+    vega, markets = setup_environment
    #  7003-MORD-009
    #  7003-MORD-010
    #  7003-MORD-011
@@ -1,8 +1,15 @@
 import pytest
 import vega_sim.proto.vega as vega_protos
+from typing import Tuple, Generator
 from rewards_test_ids import *
 from playwright.sync_api import Page, expect
-from conftest import init_vega, init_page, auth_setup, risk_accepted_setup, cleanup_container
+from conftest import (
+    init_vega,
+    init_page,
+    auth_setup,
+    risk_accepted_setup,
+    cleanup_container,
+)
 from fixtures.market import setup_continuous_market
 from actions.utils import next_epoch, change_keys
 from wallet_config import MM_WALLET
@@ -10,22 +17,20 @@ from vega_sim.null_service import VegaServiceNull


@pytest.fixture(scope="module")
-def vega(request):
+def setup_environment(request, browser) -> Generator[Tuple[Page, str, str], None, None]:
    with init_vega(request) as vega_instance:
        request.addfinalizer(lambda: cleanup_container(vega_instance))
-        yield vega_instance

-@pytest.fixture(scope="module")
-def page(vega, browser, request):
-    with init_page(vega, browser, request) as page:
-        risk_accepted_setup(page)
-        auth_setup(vega, page)
-        page.goto(REWARDS_URL)
-        change_keys(page, vega, PARTY_B)
-        yield page
+        tDAI_market, tDAI_asset_id = setup_market_with_reward_program(vega_instance)
+
+        with init_page(vega_instance, browser, request) as page:
+            risk_accepted_setup(page)
+            auth_setup(vega_instance, page)
+            page.goto(REWARDS_URL)
+            change_keys(page, vega_instance, PARTY_B)
+            yield page, tDAI_market, tDAI_asset_id


-@pytest.fixture(scope="module", autouse=True)
 def setup_market_with_reward_program(vega: VegaServiceNull):
    tDAI_market = setup_continuous_market(vega)
    PARTY_A, PARTY_B, PARTY_C, PARTY_D = keys(vega)
@@ -83,39 +88,39 @@ def setup_market_with_reward_program(vega: VegaServiceNull):
    return tDAI_market, tDAI_asset_id


-@pytest.mark.xdist_group(name="test_rewards_hoarder_tier_0")
 def test_network_reward_pot(
-    page: Page,
-):
+    setup_environment: Tuple[Page, str, str],
+) -> None:
+    page, tDAI_market, tDAI_asset_id = setup_environment
    expect(page.get_by_test_id(TOTAL_REWARDS)).to_have_text("50.00 tDAI")


-@pytest.mark.xdist_group(name="test_rewards_hoarder_tier_0")
 def test_reward_multiplier(
-    page: Page,
-):
+    setup_environment: Tuple[Page, str, str],
+) -> None:
+    page, tDAI_market, tDAI_asset_id = setup_environment
    expect(page.get_by_test_id(COMBINED_MULTIPLIERS)).to_have_text("1x")
    expect(page.get_by_test_id(STREAK_REWARD_MULTIPLIER_VALUE)).to_have_text("1x")
    expect(page.get_by_test_id(HOARDER_REWARD_MULTIPLIER_VALUE)).to_have_text("1x")


-@pytest.mark.xdist_group(name="test_rewards_hoarder_tier_0")
 def test_hoarder_bonus(
-    page: Page,
-):
+    setup_environment: Tuple[Page, str, str],
+) -> None:
+    page, tDAI_market, tDAI_asset_id = setup_environment
    expect(page.get_by_test_id(HOARDER_BONUS_TOTAL_HOARDED)).to_contain_text(
        "5,000,000"
    )


-@pytest.mark.xdist_group(name="test_rewards_hoarder_tier_0")
 def test_reward_history(
-    page: Page,
-):
+    setup_environment: Tuple[Page, str, str],
+) -> None:
+    page, tDAI_market, tDAI_asset_id = setup_environment
    page.locator('[name="fromEpoch"]').fill("1")
    expect((page.get_by_role(ROW).locator(PRICE_TAKING_COL_ID)).nth(1)).to_have_text(
        "100.00100.00%"
    )
    expect((page.get_by_role(ROW).locator(TOTAL_COL_ID)).nth(1)).to_have_text("100.00")
    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("50.00")
+    expect((page.get_by_role(ROW).locator(TOTAL_COL_ID)).nth(1)).to_have_text("50.00")
@@ -1,8 +1,15 @@
 import pytest
 from rewards_test_ids import *
+from typing import Tuple, Generator
 import vega_sim.proto.vega as vega_protos
 from playwright.sync_api import Page, expect
-from conftest import init_vega, init_page, auth_setup, risk_accepted_setup, cleanup_container
+from conftest import (
+    init_vega,
+    init_page,
+    auth_setup,
+    risk_accepted_setup,
+    cleanup_container,
+)
 from fixtures.market import setup_continuous_market
 from actions.utils import next_epoch, change_keys
 from wallet_config import MM_WALLET
@@ -10,23 +17,21 @@ from vega_sim.null_service import VegaServiceNull


@pytest.fixture(scope="module")
-def vega(request):
+def setup_environment(request, browser) -> Generator[Tuple[Page, str, str], None, None]:
+
    with init_vega(request) as vega_instance:
-        request.addfinalizer(lambda: cleanup_container(vega_instance)) 
-        yield vega_instance
+        request.addfinalizer(lambda: cleanup_container(vega_instance))
+
+        tDAI_market, tDAI_asset_id = setup_market_with_reward_program(vega_instance)
+
+        with init_page(vega_instance, browser, request) as page:
+            risk_accepted_setup(page)
+            auth_setup(vega_instance, page)
+            page.goto(REWARDS_URL)
+            change_keys(page, vega_instance, PARTY_B)
+            yield page, tDAI_market, tDAI_asset_id


-@pytest.fixture(scope="module")
-def page(vega, browser, request):
-    with init_page(vega, browser, request) as page:
-        risk_accepted_setup(page)
-        auth_setup(vega, page)
-        page.goto(REWARDS_URL)
-        change_keys(page, vega, PARTY_B)
-        yield page
-
-
-@pytest.fixture(scope="module", autouse=True)
 def setup_market_with_reward_program(vega: VegaServiceNull):
    tDAI_market = setup_continuous_market(vega)
    PARTY_A, PARTY_B, PARTY_C, PARTY_D = keys(vega)
@@ -135,31 +140,35 @@ def setup_market_with_reward_program(vega: VegaServiceNull):
    return tDAI_market, tDAI_asset_id


-@pytest.mark.xdist_group(name="test_rewards_hoarder_tier_1")
 def test_network_reward_pot(
-    page: Page,
-):
+    setup_environment: Tuple[Page, str, str],
+) -> None:
+    page, tDAI_market, tDAI_asset_id = setup_environment
    expect(page.get_by_test_id(TOTAL_REWARDS)).to_have_text("166.66666 tDAI")


-@pytest.mark.xdist_group(name="test_rewards_hoarder_tier_1")
 def test_reward_multiplier(
-    page: Page,
-):
+    setup_environment: Tuple[Page, str, str],
+) -> None:
+    page, tDAI_market, tDAI_asset_id = setup_environment
    expect(page.get_by_test_id(COMBINED_MULTIPLIERS)).to_have_text("2x")
    expect(page.get_by_test_id(STREAK_REWARD_MULTIPLIER_VALUE)).to_have_text("1x")
    expect(page.get_by_test_id(HOARDER_REWARD_MULTIPLIER_VALUE)).to_have_text("2x")


-@pytest.mark.xdist_group(name="test_rewards_hoarder_tier_1")
-def test_hoarder_bonus(page: Page):
+def test_hoarder_bonus(
+    setup_environment: Tuple[Page, str, str],
+) -> None:
+    page, tDAI_market, tDAI_asset_id = setup_environment
    expect(page.get_by_test_id(HOARDER_BONUS_TOTAL_HOARDED)).to_contain_text(
        "16,666,666"
    )


-@pytest.mark.xdist_group(name="test_rewards_hoarder_tier_1")
-def test_reward_history(page: Page):
+def test_reward_history(
+    setup_environment: Tuple[Page, str, str],
+) -> None:
+    page, tDAI_market, tDAI_asset_id = setup_environment
    page.locator('[name="fromEpoch"]').fill("1")
    expect((page.get_by_role(ROW).locator(PRICE_TAKING_COL_ID)).nth(1)).to_have_text(
        "299.99999100.00%"
@@ -170,4 +179,4 @@ def test_reward_history(page: Page):
    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(
        "166.66666"
-    )
+    )
@@ -1,5 +1,6 @@
 import pytest
 from rewards_test_ids import *
+from typing import Tuple, Generator
 import vega_sim.proto.vega as vega_protos
 from playwright.sync_api import Page, expect
 from conftest import (
@@ -16,23 +17,23 @@ from vega_sim.null_service import VegaServiceNull


@pytest.fixture(scope="module")
-def vega(request):
+def setup_environment(request, browser) -> Generator[Tuple[Page, str, str], None, None]:
+
    with init_vega(request) as vega_instance:
        request.addfinalizer(lambda: cleanup_container(vega_instance))
-        yield vega_instance
+
+        tDAI_market, tDAI_asset_id = setup_market_with_reward_program(vega_instance)
+
+        with init_page(vega_instance, browser, request) as page:
+            risk_accepted_setup(page)
+            auth_setup(vega_instance, page)
+            page.goto(REWARDS_URL)
+            change_keys(page, vega_instance, PARTY_B)
+            yield page, tDAI_market, tDAI_asset_id


-@pytest.fixture(scope="module")
-def page(vega, browser, request):
-    with init_page(vega, browser, request) as page:
-        risk_accepted_setup(page)
-        auth_setup(vega, page)
-        page.goto(REWARDS_URL)
-        change_keys(page, vega, PARTY_B)
-        yield page


-@pytest.fixture(scope="module", autouse=True)
 def setup_market_with_reward_program(vega: VegaServiceNull):
    tDAI_market = setup_continuous_market(vega)
    PARTY_A, PARTY_B, PARTY_C, PARTY_D = keys(vega)
@@ -90,25 +91,23 @@ def setup_market_with_reward_program(vega: VegaServiceNull):
    return tDAI_market, tDAI_asset_id


-@pytest.mark.xdist_group(name="test_rewards_activity_tier_0")
 def test_network_reward_pot(
-    page: Page,
-):
+    setup_environment: Tuple[Page, str, str],
+) -> None:
+    page, tDAI_market, tDAI_asset_id = setup_environment
    expect(page.get_by_test_id(TOTAL_REWARDS)).to_have_text("50.00 tDAI")
-    page.pause()


-@pytest.mark.xdist_group(name="test_rewards_activity_tier_0")
 def test_reward_multiplier(
-    page: Page,
-):
-    page.pause()
+    setup_environment: Tuple[Page, str, str],
+) -> None:
+    page, tDAI_market, tDAI_asset_id = setup_environment
    expect(page.get_by_test_id(COMBINED_MULTIPLIERS)).to_have_text("1x")
    expect(page.get_by_test_id(STREAK_REWARD_MULTIPLIER_VALUE)).to_have_text("1x")
    expect(page.get_by_test_id(HOARDER_REWARD_MULTIPLIER_VALUE)).to_have_text("1x")


-""" @pytest.mark.xdist_group(name="test_rewards_activity_tier_0")
+"""
 def test_activity_streak(
    page: Page,
 ):
@@ -117,7 +116,6 @@ def test_activity_streak(
    )


-@pytest.mark.xdist_group(name="test_rewards_activity_tier_0")
 def test_reward_history(
    page: Page,
 ):
@@ -1,8 +1,15 @@
 import pytest
 from rewards_test_ids import *
+from typing import Tuple, Generator
 import vega_sim.proto.vega as vega_protos
 from playwright.sync_api import Page, expect
-from conftest import init_vega, init_page, auth_setup, risk_accepted_setup, cleanup_container
+from conftest import (
+    init_vega,
+    init_page,
+    auth_setup,
+    risk_accepted_setup,
+    cleanup_container,
+)
 from fixtures.market import setup_continuous_market
 from actions.utils import next_epoch, change_keys
 from wallet_config import MM_WALLET
@@ -10,22 +17,21 @@ from vega_sim.null_service import VegaServiceNull


@pytest.fixture(scope="module")
-def vega(request):
+def setup_environment(request, browser) -> Generator[Tuple[Page, str, str], None, None]:
+
    with init_vega(request) as vega_instance:
        request.addfinalizer(lambda: cleanup_container(vega_instance))
-        yield vega_instance
+
+        tDAI_market, tDAI_asset_id = setup_market_with_reward_program(vega_instance)
+
+        with init_page(vega_instance, browser, request) as page:
+            risk_accepted_setup(page)
+            auth_setup(vega_instance, page)
+            page.goto(REWARDS_URL)
+            change_keys(page, vega_instance, PARTY_B)
+            yield page, tDAI_market, tDAI_asset_id


-@pytest.fixture(scope="module")
-def page(vega, browser, request):
-    with init_page(vega, browser, request) as page:
-        risk_accepted_setup(page)
-        auth_setup(vega, page)
-        page.goto(REWARDS_URL)
-        change_keys(page, vega, PARTY_B)
-        yield page
-
-@pytest.fixture(scope="module", autouse=True)
 def setup_market_with_reward_program(vega: VegaServiceNull):
    tDAI_market = setup_continuous_market(vega)
    PARTY_A, PARTY_B, PARTY_C, PARTY_D = keys(vega)
@@ -128,34 +134,35 @@ def setup_market_with_reward_program(vega: VegaServiceNull):
    return tDAI_market, tDAI_asset_id


-@pytest.mark.xdist_group(name="test_rewards_activity_tier_1")
-def test_network_reward_pot(page: Page):
-    
+def test_network_reward_pot(
+    setup_environment: Tuple[Page, str, str],
+) -> None:
+    page, tDAI_market, tDAI_asset_id = setup_environment
    expect(page.get_by_test_id(TOTAL_REWARDS)).to_have_text("116.66666 tDAI")


-@pytest.mark.xdist_group(name="test_rewards_activity_tier_1")
 def test_reward_multiplier(
-    page: Page,
-):
+    setup_environment: Tuple[Page, str, str],
+) -> None:
+    page, tDAI_market, tDAI_asset_id = setup_environment
    expect(page.get_by_test_id(COMBINED_MULTIPLIERS)).to_have_text("2x")
    expect(page.get_by_test_id(STREAK_REWARD_MULTIPLIER_VALUE)).to_have_text("2x")
    expect(page.get_by_test_id(HOARDER_REWARD_MULTIPLIER_VALUE)).to_have_text("1x")


-@pytest.mark.xdist_group(name="test_rewards_activity_tier_1")
 def test_activity_streak(
-    page: Page,
-):
+    setup_environment: Tuple[Page, str, str],
+) -> None:
+    page, tDAI_market, tDAI_asset_id = setup_environment
    expect(page.get_by_test_id(EPOCH_STREAK)).to_have_text(
        "Active trader: 7 epochs so far (Tier 1 as of last epoch)"
    )


-@pytest.mark.xdist_group(name="test_rewards_activity_tier_1")
 def test_reward_history(
-    page: Page,
-):
+    setup_environment: Tuple[Page, str, str],
+) -> None:
+    page, tDAI_market, tDAI_asset_id = setup_environment
    page.locator('[name="fromEpoch"]').fill("1")
    expect((page.get_by_role(ROW).locator(PRICE_TAKING_COL_ID)).nth(1)).to_have_text(
        "300.00100.00%"
@@ -167,10 +174,10 @@ def test_reward_history(
    )


-@pytest.mark.xdist_group(name="test_rewards_activity_tier_1")
 def test_redeem(
-    page: Page,
-):
+    setup_environment: Tuple[Page, str, str],
+) -> None:
+    page, tDAI_market, tDAI_asset_id = setup_environment
    page.get_by_test_id("redeem-rewards-button").click()
    available_to_withdraw = page.get_by_test_id(
        "available-to-withdraw-value"
@@ -184,4 +191,4 @@ def test_redeem(
    )

    page.get_by_test_id("use-max-button").first.click()
-    expect(page.get_by_test_id(TRANSFER_AMOUNT)).to_have_text(available_to_withdraw)
+    expect(page.get_by_test_id(TRANSFER_AMOUNT)).to_have_text(available_to_withdraw)
@@ -1,5 +1,6 @@
 import pytest
 from rewards_test_ids import *
+from typing import Tuple, Generator
 import vega_sim.proto.vega as vega_protos
 from playwright.sync_api import Page, expect
 from conftest import init_vega, init_page, auth_setup, risk_accepted_setup, cleanup_container
@@ -8,25 +9,23 @@ from actions.utils import next_epoch, change_keys
 from wallet_config import MM_WALLET
 from vega_sim.null_service import VegaServiceNull

+
@pytest.fixture(scope="module")
-def vega(request):
+def setup_environment(request, browser) -> Generator[Tuple[Page, str, str], None, None]:
    with init_vega(request) as vega_instance:
        request.addfinalizer(lambda: cleanup_container(vega_instance))
-        yield vega_instance
+
+        tDAI_market, tDAI_asset_id = setup_market_with_reward_program(
+            vega_instance)
+
+        with init_page(vega_instance, browser, request) as page:
+            risk_accepted_setup(page)
+            auth_setup(vega_instance, page)
+            page.goto(REWARDS_URL)
+            change_keys(page, vega_instance, PARTY_B)
+            yield page, tDAI_market, tDAI_asset_id


-
-@pytest.fixture(scope="module")
-def page(vega, browser, request):
-    with init_page(vega, browser, request) as page:
-        risk_accepted_setup(page)
-        auth_setup(vega, page)
-        page.goto(REWARDS_URL)
-        change_keys(page, vega, PARTY_B)
-        yield page
-
-
-@pytest.fixture(scope="module", autouse=True)
 def setup_market_with_reward_program(vega: VegaServiceNull):
    tDAI_market = setup_continuous_market(vega)
    PARTY_A, PARTY_B, PARTY_C, PARTY_D = keys(vega)
@@ -150,16 +149,16 @@ def setup_market_with_reward_program(vega: VegaServiceNull):
    return tDAI_market, tDAI_asset_id


-@pytest.mark.xdist_group(name="test_rewards_combo_tier_1")
-def test_network_reward_pot( page: Page
-):
+def test_network_reward_pot(setup_environment: Tuple[Page, str, str],
+                            ) -> None:
+    page, tDAI_market, tDAI_asset_id = setup_environment
    expect(page.get_by_test_id(TOTAL_REWARDS)).to_have_text("183.33333 tDAI")


-@pytest.mark.xdist_group(name="test_rewards_combo_tier_1")
 def test_reward_multiplier(
-    page: Page,
-):
+    setup_environment: Tuple[Page, str, str],
+) -> None:
+    page, tDAI_market, tDAI_asset_id = setup_environment
    expect(page.get_by_test_id(COMBINED_MULTIPLIERS)).to_have_text("4x")
    expect(page.get_by_test_id(STREAK_REWARD_MULTIPLIER_VALUE)).to_have_text(
        "2x"
@@ -169,34 +168,45 @@ def test_reward_multiplier(
    )


-@pytest.mark.xdist_group(name="test_rewards_combo_tier_1")
 def test_reward_history(
-    page: Page,
-):
+    setup_environment: Tuple[Page, str, str],
+) -> None:
+    page, tDAI_market, tDAI_asset_id = setup_environment
    page.locator('[name="fromEpoch"]').fill("1")
    expect((page.get_by_role(ROW).locator(PRICE_TAKING_COL_ID)).nth(1)).to_have_text(
        "299.99999100.00%"
    )
-    expect((page.get_by_role(ROW).locator(TOTAL_COL_ID)).nth(1)).to_have_text("299.99999")
+    expect((page.get_by_role(ROW).locator(TOTAL_COL_ID)).nth(
+        1)).to_have_text("299.99999")
    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(
        "183.33333"
    )

+
 def test_staking_reward(
-    page: Page,
-):
+    setup_environment: Tuple[Page, str, str],
+) -> None:
+    page, tDAI_market, tDAI_asset_id = setup_environment
    expect(page.get_by_test_id("active-rewards-card")).to_have_count(2)
    staking_reward_card = page.get_by_test_id("active-rewards-card").nth(1)
    expect(staking_reward_card).to_be_visible()
-    expect(staking_reward_card.get_by_test_id("entity-scope")).to_have_text("Individual")
-    expect(staking_reward_card.get_by_test_id("locked-for")).to_have_text("0 epochs")
-    expect(staking_reward_card.get_by_test_id("reward-value")).to_have_text("100.00")
-    expect(staking_reward_card.get_by_test_id("distribution-strategy")).to_have_text("Pro rata")
+    expect(staking_reward_card.get_by_test_id(
+        "entity-scope")).to_have_text("Individual")
+    expect(staking_reward_card.get_by_test_id(
+        "locked-for")).to_have_text("0 epochs")
+    expect(staking_reward_card.get_by_test_id(
+        "reward-value")).to_have_text("100.00")
+    expect(staking_reward_card.get_by_test_id(
+        "distribution-strategy")).to_have_text("Pro rata")
    expect(staking_reward_card.get_by_test_id("dispatch-metric-info")).to_have_text(
        "Staking rewards"
    )
-    expect(staking_reward_card.get_by_test_id("assessed-over")).to_have_text("1 epoch")
-    expect(staking_reward_card.get_by_test_id("scope")).to_have_text("Individual")
-    expect(staking_reward_card.get_by_test_id("staking-requirement")).to_have_text("1.00")
-    expect(staking_reward_card.get_by_test_id("average-position")).to_have_text("0.00")
+    expect(staking_reward_card.get_by_test_id(
+        "assessed-over")).to_have_text("1 epoch")
+    expect(staking_reward_card.get_by_test_id(
+        "scope")).to_have_text("Individual")
+    expect(staking_reward_card.get_by_test_id(
+        "staking-requirement")).to_have_text("1.00")
+    expect(staking_reward_card.get_by_test_id(
+        "average-position")).to_have_text("0.00")
@@ -1,7 +1,9 @@
 const { join } = require('path');
 const { createGlobPatternsForDependencies } = require('@nx/next/tailwind');
-const theme = require('../../libs/tailwindcss-config/src/theme');
-const vegaCustomClasses = require('../../libs/tailwindcss-config/src/vega-custom-classes');
+const { theme } = require('../../libs/tailwindcss-config/src/theme');
+const {
+  vegaCustomClasses,
+} = require('../../libs/tailwindcss-config/src/vega-custom-classes');

 module.exports = {
  content: [
@@ -1,4 +1,4 @@
-const { getJestProjects } = require('@nx/jest');
+import { getJestProjects } from '@nx/jest';

 export default {
  projects: getJestProjects(),
@@ -19,7 +19,6 @@ import {
  TradingButton,
 } from '@vegaprotocol/ui-toolkit';
 import type { Transfer } from '@vegaprotocol/wallet';
-import { normalizeTransfer } from '@vegaprotocol/wallet';
 import BigNumber from 'bignumber.js';
 import type { ReactNode } from 'react';
 import { useCallback, useEffect, useState } from 'react';
@@ -27,6 +26,7 @@ import { Controller, useForm } from 'react-hook-form';
 import { AssetOption, Balance } from '@vegaprotocol/assets';
 import { AccountType, AccountTypeMapping } from '@vegaprotocol/types';
 import { useTransferFeeQuery } from './__generated__/TransferFee';
+import { normalizeTransfer } from './utils';

 interface FormFields {
  toVegaKey: string;
@@ -0,0 +1,26 @@
+import type { Exact } from 'type-fest';
+import { type Transfer } from '@vegaprotocol/wallet';
+import { removeDecimal } from '@vegaprotocol/utils';
+import { type AccountType } from '@vegaprotocol/types';
+
+export const normalizeTransfer = <T extends Exact<Transfer, T>>(
+  address: string,
+  amount: string,
+  fromAccountType: AccountType,
+  toAccountType: AccountType,
+  asset: {
+    id: string;
+    decimals: number;
+  }
+): Transfer => {
+  return {
+    to: address,
+    fromAccountType,
+    toAccountType,
+    asset: asset.id,
+    amount: removeDecimal(amount, asset.decimals),
+    // oneOff or recurring required otherwise wallet will error
+    // default oneOff is immediate transfer
+    oneOff: {},
+  };
+};
@@ -1,10 +1,9 @@
 import { Controller, type Control } from 'react-hook-form';
 import type { Market } from '@vegaprotocol/markets';
 import type { OrderFormValues } from '../../hooks/use-form-values';
-import { toDecimal, useValidateAmount } from '@vegaprotocol/utils';
+import { determinePriceStep, useValidateAmount } from '@vegaprotocol/utils';
 import {
  TradingFormGroup,
-  TradingInputError,
  Tooltip,
  FormGroup,
  Input,
@@ -30,31 +29,7 @@ export const DealTicketPriceTakeProfitStopLoss = ({
 }: DealTicketPriceTakeProfitStopLossProps) => {
  const t = useT();
  const validateAmount = useValidateAmount();
-  const priceStep = toDecimal(market?.decimalPlaces);
-
-  const renderTakeProfitError = () => {
-    if (takeProfitError) {
-      return (
-        <TradingInputError testId="deal-ticket-take-profit-error-message">
-          {takeProfitError}
-        </TradingInputError>
-      );
-    }
-
-    return null;
-  };
-
-  const renderStopLossError = () => {
-    if (stopLossError) {
-      return (
-        <TradingInputError testId="deal-stop-loss-error-message">
-          {stopLossError}
-        </TradingInputError>
-      );
-    }
-
-    return null;
-  };
+  const priceStep = determinePriceStep(market);

  return (
    <div className="mb-2">
@@ -104,9 +79,9 @@ export const DealTicketPriceTakeProfitStopLoss = ({
                      {...field}
                    />
                  </FormGroup>
-                  {fieldState.error && (
+                  {(fieldState.error || takeProfitError) && (
                    <InputError testId="deal-ticket-error-message-price-take-profit">
-                      {fieldState.error.message}
+                      {fieldState.error?.message || takeProfitError}
                    </InputError>
                  )}
                </div>
@@ -154,9 +129,9 @@ export const DealTicketPriceTakeProfitStopLoss = ({
                      {...field}
                    />
                  </FormGroup>
-                  {fieldState.error && (
+                  {(fieldState.error || stopLossError) && (
                    <InputError testId="deal-ticket-error-message-price-stop-loss">
-                      {fieldState.error.message}
+                      {fieldState.error?.message || stopLossError}
                    </InputError>
                  )}
                </div>
@@ -165,8 +140,6 @@ export const DealTicketPriceTakeProfitStopLoss = ({
          </TradingFormGroup>
        </div>
      </div>
-      {renderTakeProfitError()}
-      {renderStopLossError()}
    </div>
  );
 };
@@ -1,7 +1,7 @@
 import { Controller, type Control } from 'react-hook-form';
 import type { Market } from '@vegaprotocol/markets';
 import type { OrderFormValues } from '../../hooks/use-form-values';
-import { toDecimal, useValidateAmount } from '@vegaprotocol/utils';
+import { useValidateAmount } from '@vegaprotocol/utils';
 import {
  TradingFormGroup,
  TradingInput,
@@ -9,6 +9,7 @@ import {
  Tooltip,
 } from '@vegaprotocol/ui-toolkit';
 import { useT } from '../../use-t';
+import { determineSizeStep } from '@vegaprotocol/utils';

 export interface DealTicketSizeIcebergProps {
  control: Control<OrderFormValues>;
@@ -29,7 +30,7 @@ export const DealTicketSizeIceberg = ({
 }: DealTicketSizeIcebergProps) => {
  const t = useT();
  const validateAmount = useValidateAmount();
-  const sizeStep = toDecimal(market?.positionDecimalPlaces);
+  const sizeStep = determineSizeStep(market);

  const renderPeakSizeError = () => {
    if (peakSizeError) {
@@ -8,7 +8,6 @@ import {
  formatForInput,
  formatValue,
  removeDecimal,
-  toDecimal,
  useValidateAmount,
 } from '@vegaprotocol/utils';
 import { type Control, type UseFormWatch } from 'react-hook-form';
@@ -59,6 +58,7 @@ import { KeyValue } from './key-value';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import { stopOrdersProvider } from '@vegaprotocol/orders';
 import { useT } from '../../use-t';
+import { determinePriceStep, determineSizeStep } from '@vegaprotocol/utils';

 export interface StopOrderProps {
  market: Market;
@@ -904,8 +904,8 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
    market.tradableInstrument.instrument.metadata.tags
  );

-  const sizeStep = toDecimal(market?.positionDecimalPlaces);
-  const priceStep = toDecimal(market?.decimalPlaces);
+  const sizeStep = determineSizeStep(market);
+  const priceStep = determinePriceStep(market);

  useController({
    name: 'type',
@@ -883,7 +883,7 @@ describe('DealTicket', () => {
        'deal-ticket-error-message-price'
      );
      expect(errorMessage).toHaveTextContent(
-        'Price accepts up to 2 decimal places'
+        'Price must be a multiple of 0.01 for this market'
      );
    });
  });
@@ -32,7 +32,6 @@ import {
  toBigNum,
  removeDecimal,
  useValidateAmount,
-  toDecimal,
  formatForInput,
  formatValue,
 } from '@vegaprotocol/utils';
@@ -82,6 +81,7 @@ import { DocsLinks } from '@vegaprotocol/environment';
 import { useT } from '../../use-t';
 import { DealTicketPriceTakeProfitStopLoss } from './deal-ticket-price-tp-sl';
 import uniqueId from 'lodash/uniqueId';
+import { determinePriceStep, determineSizeStep } from '@vegaprotocol/utils';

 export const REDUCE_ONLY_TOOLTIP =
  '"Reduce only" will ensure that this order will not increase the size of an open position. When the order is matched, it will only trade enough volume to bring your open volume towards 0 but never change the direction of your position. If applied to a limit order that is not instantly filled, the order will be stopped.';
@@ -419,11 +419,12 @@ export const DealTicket = ({
    },
  });

-  const priceStep = toDecimal(market?.decimalPlaces);
-  const sizeStep = toDecimal(market?.positionDecimalPlaces);
+  const sizeStep = determineSizeStep(market);
  const quoteName = getQuoteName(market);
  const isLimitType = type === Schema.OrderType.TYPE_LIMIT;

+  const priceStep = determinePriceStep(market);
+
  return (
    <form
      onSubmit={
@@ -11,6 +11,7 @@ export function generateMarket(override?: PartialDeep<Market>): Market {
    positionDecimalPlaces: 1,
    tradingMode: Schema.MarketTradingMode.TRADING_MODE_CONTINUOUS,
    state: Schema.MarketState.STATE_ACTIVE,
+    tickSize: '1',
    marketTimestamps: {
      __typename: 'MarketTimestamps',
      close: '',
@@ -20,5 +20,11 @@
    "jest.config.ts",
    "__mocks__"
  ],
-  "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
+  "include": [
+    "**/*.js",
+    "**/*.jsx",
+    "**/*.ts",
+    "**/*.tsx",
+    "../utils/src/lib/step.ts"
+  ]
 }
@@ -54,6 +54,7 @@ export const generateFill = (override?: PartialDeep<Trade>) => {
      decimalPlaces: 5,
      state: MarketState.STATE_ACTIVE,
      tradingMode: MarketTradingMode.TRADING_MODE_CONTINUOUS,
+      tickSize: '1',
      fees: {
        __typename: 'Fees',
        factors: {
@@ -1,7 +1,9 @@
 const { join } = require('path');
 const { createGlobPatternsForDependencies } = require('@nx/react/tailwind');
-const theme = require('../tailwindcss-config/src/theme');
-const vegaCustomClasses = require('../tailwindcss-config/src/vega-custom-classes');
+const { theme } = require('../tailwindcss-config/src/theme');
+const {
+  vegaCustomClasses,
+} = require('../tailwindcss-config/src/vega-custom-classes');

 module.exports = {
  content: [
@@ -22,7 +22,7 @@ export const generateFundingPayment = (
      decimalPlaces: 5,
      state: MarketState.STATE_ACTIVE,
      tradingMode: MarketTradingMode.TRADING_MODE_CONTINUOUS,
-
+      tickSize: '1',
      fees: {
        __typename: 'Fees',
        factors: {
@@ -1,7 +1,9 @@
 const { join } = require('path');
 const { createGlobPatternsForDependencies } = require('@nx/react/tailwind');
-const theme = require('../tailwindcss-config/src/theme');
-const vegaCustomClasses = require('../tailwindcss-config/src/vega-custom-classes');
+const { theme } = require('../tailwindcss-config/src/theme');
+const {
+  vegaCustomClasses,
+} = require('../tailwindcss-config/src/vega-custom-classes');

 module.exports = {
  content: [
@@ -2,7 +2,6 @@ import { renderHook } from '@testing-library/react';
 import { Intent } from '@vegaprotocol/ui-toolkit';
 import BigNumber from 'bignumber.js';
 import {
-  formatWithAsset,
  sumLiquidityCommitted,
  getFeeLevels,
  calcDayVolume,
@@ -23,17 +22,6 @@ const CANDLES_2 = [
  { volume: '10', open: '21', close: '21' },
 ];

-describe('formatWithAsset', () => {
-  it('should return formatted string', () => {
-    const result = formatWithAsset('103926176181', {
-      decimals: 5,
-      symbol: 'tEURO',
-    });
-
-    expect(result).toEqual('1,039,261.76181 tEURO');
-  });
-});
-
 describe('sumLiquidityCommitted', () => {
  it('should return the total sum', () => {
    const provider1 = 10;
@@ -1,5 +1,4 @@
 import BigNumber from 'bignumber.js';
-import { addDecimalsFormatNumber } from '@vegaprotocol/utils';

 import type { MarketNodeFragment } from './../__generated__/MarketsLiquidity';
 import { Intent } from '@vegaprotocol/ui-toolkit';
@@ -21,20 +20,6 @@ export const sumLiquidityCommitted = (
    : 0;
 };

-export const formatWithAsset = (
-  value: string,
-  settlementAsset: {
-    decimals?: number;
-    symbol?: string;
-  }
-) => {
-  const { decimals, symbol } = settlementAsset;
-  const formattedValue = decimals
-    ? addDecimalsFormatNumber(value, decimals)
-    : value;
-  return `${formattedValue} ${symbol}`;
-};
-
 interface Candle {
  open: string;
  close: string;
@@ -48,10 +33,6 @@ export const getCandle24hAgo = (
  return candles24hAgo.find((c) => c.marketId === marketId)?.candles?.[0];
 };

-export const displayChange = (value: string) => {
-  return parseFloat(value) > 0 ? `+${value}` : value;
-};
-
 export const EMPTY_VALUE = ' - ';
 export const getChange = (candles: (Candle | null)[], lastClose?: string) => {
  const firstCandle = candles.find((item) => item?.open);
@@ -1,7 +1,9 @@
 const { join } = require('path');
 const { createGlobPatternsForDependencies } = require('@nx/react/tailwind');
-const theme = require('../tailwindcss-config/src/theme');
-const vegaCustomClasses = require('../tailwindcss-config/src/vega-custom-classes');
+const { theme } = require('../tailwindcss-config/src/theme');
+const {
+  vegaCustomClasses,
+} = require('../tailwindcss-config/src/vega-custom-classes');

 module.exports = {
  content: [
@@ -139,6 +139,7 @@ query MarketInfo($marketId: ID!) {
    id
    decimalPlaces
    positionDecimalPlaces
+    tickSize
    state
    tradingMode
    linearSlippageFactor
@@ -23,6 +23,7 @@ import {
 } from '@vegaprotocol/ui-toolkit';
 import {
  addDecimalsFormatNumber,
+  determinePriceStep,
  formatNumber,
  formatNumberPercentage,
  getDateTimeFormat,
@@ -320,6 +321,7 @@ export const KeyDetailsInfoPanel = ({
                marketDecimalPlaces: market.decimalPlaces,
                positionDecimalPlaces: market.positionDecimalPlaces,
                settlementAssetDecimalPlaces: assetDecimals,
+                tickSize: determinePriceStep(market),
              }
            : {
                name: market.tradableInstrument.instrument.name,
@@ -330,6 +332,7 @@ export const KeyDetailsInfoPanel = ({
                marketDecimalPlaces: market.decimalPlaces,
                positionDecimalPlaces: market.positionDecimalPlaces,
                settlementAssetDecimalPlaces: assetDecimals,
+                tickSize: determinePriceStep(market),
              }
        }
        parentData={
@@ -14,6 +14,7 @@ export const marketInfoQuery = (
      positionDecimalPlaces: 0,
      state: Schema.MarketState.STATE_ACTIVE,
      tradingMode: Schema.MarketTradingMode.TRADING_MODE_CONTINUOUS,
+      tickSize: '1',
      proposal: {
        __typename: 'Proposal',
        id: 'market-0',
@@ -2,6 +2,7 @@ fragment MarketFields on Market {
  id
  decimalPlaces
  positionDecimalPlaces
+  tickSize
  state
  tradingMode
  parentMarketID
@@ -37,6 +37,7 @@ export const createMarketFragment = (
    positionDecimalPlaces: 0,
    tradingMode: Schema.MarketTradingMode.TRADING_MODE_CONTINUOUS,
    state: Schema.MarketState.STATE_ACTIVE,
+    tickSize: '1',
    marketTimestamps: {
      __typename: 'MarketTimestamps',
      close: null,
@@ -1,7 +1,9 @@
 const { join } = require('path');
 const { createGlobPatternsForDependencies } = require('@nx/react/tailwind');
-const theme = require('../tailwindcss-config/src/theme');
-const vegaCustomClasses = require('../tailwindcss-config/src/vega-custom-classes');
+const { theme } = require('../tailwindcss-config/src/theme');
+const {
+  vegaCustomClasses,
+} = require('../tailwindcss-config/src/vega-custom-classes');

 module.exports = {
  content: [
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dariusz Majcherczyk	2fb068540e	chore: update test	2024-03-08 17:39:42 +01:00
asiaznik	36bd0d84e6	fix: clear before typing	2024-03-08 14:57:51 +01:00
asiaznik	b26c1bac7a	chore: pass tpsl errors	2024-03-08 14:46:54 +01:00
asiaznik	dbe31e6a67	chore: remove redundant error placeholders	2024-03-08 14:44:19 +01:00
asiaznik	a12bf26cb4	chore: translate replacement keys	2024-03-08 14:38:41 +01:00
asiaznik	c7e79aa196	fix: edit order dialog	2024-03-08 14:31:45 +01:00
asiaznik	8f334f42ad	chore: mocks	2024-03-08 14:31:45 +01:00
asiaznik	968ec4f3f8	fix: unit tests	2024-03-08 14:31:45 +01:00
asiaznik	08b31ea43e	chore: add tick size to info panel, move determine func to utils	2024-03-08 14:31:45 +01:00
asiaznik	513cebbcfc	chore(trading): market's tick size	2024-03-08 14:30:29 +01:00
Matthew Russell	bcb5351dfc	chore(types,utils,wallet): prep for publish, remove lp dashboard (#5948 )	2024-03-08 13:20:03 +00:00
Ben	177e72dd16	chore(trading): Refactor test fixtures (#5913 )	2024-03-07 23:08:31 +01:00