fix(trading): market into tab 24hr vol and price fix (#5910 )

Co-authored-by: bwallacee <ben@vega.xyz>
fix(governance): rewards moved to console notification (#5904 )
2024-03-04 19:08:42 +00:00 · 2024-03-04 18:09:52 +00:00 · 2024-03-04 18:00:54 +00:00 · 2024-03-01 22:22:17 +00:00 · 2024-02-29 14:57:07 +00:00 · 2024-02-29 10:25:56 +00:00
156 changed files with 4870 additions and 3743 deletions
@@ -25,7 +25,7 @@ jobs:
      - name: Install dependencies
        run: |
          rm package.json
-          npm install --no-save @commitlint/cli @commitlint/config-conventional @commitlint/config-nx-scopes nx
+          npm install --no-save @commitlint/cli@16.3.0 @commitlint/config-conventional@18.6.1 @commitlint/config-nx-scopes@18.6.1 nx@17.1.2

      - name: Check PR title
-        run: echo "${{ github.event.pull_request.title }}" | npx commitlint --config ./commitlint.config-ci.js
+        run: echo "${{ github.event.pull_request.title }}" | npx @commitlint/cli@16.3.0 --config ./commitlint.config-ci.js
@@ -1,7 +1,7 @@
 import { getNewAssetTxBody } from '../support/governance.functions';

 context('Proposal page', { tags: '@smoke' }, function () {
-  describe('Verify elements on page', function () {
+  describe.skip('Verify elements on page', function () {
    const proposalHeading = 'proposals-heading';
    const dateTimeRegex =
      /(\d{1,2})\/(\d{1,2})\/(\d{4}), (\d{1,2}):(\d{1,2}):(\d{1,2})/gm;
@@ -175,6 +175,7 @@ describe('Amend order details', () => {

    const res = renderExistingAmend('123', 1, amend);
    expect(await res.findByText('New size')).toBeInTheDocument();
+    expect(await res.findByText('Size ±')).toBeInTheDocument();
  });

  it('Renders Reference if provided', async () => {
@@ -82,7 +82,7 @@ const AmendOrderDetails = ({ id, version, amend }: AmendOrderDetailsProps) => {
            {amend.sizeDelta && amend.sizeDelta !== '0' ? (
              <div className="mb-12 md:mb-0">
                <h2 className="text-dark mb-4 text-2xl font-bold">
-                  {t('New size')}
+                  {t('Size ±')}
                </h2>
                <h5
                  className={`mb-0 text-lg font-medium capitalize text-gray-500 ${getSideDeltaColour(
@@ -93,6 +93,16 @@ const AmendOrderDetails = ({ id, version, amend }: AmendOrderDetailsProps) => {
                </h5>
              </div>
            ) : null}
+            {o && (
+              <div className="">
+                <h2 className="text-dark mb-4 text-2xl font-bold">
+                  {t('New size')}
+                </h2>
+                <h5 className="mb-0 text-lg font-medium text-gray-500">
+                  {o ? o.size : null}
+                </h5>
+              </div>
+            )}

            {amend.price && amend.price !== '0' ? (
              <div className="">
@@ -7,7 +7,7 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
  });

  describe('Links and buttons', function () {
-    it.skip('should have link for proposal page', function () {
+    it('should have link for proposal page', function () {
      cy.getByTestId('home-proposals').within(() => {
        cy.get('[href="/proposals"]')
          .should('exist')
@@ -51,7 +51,7 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
        });
    });

-    it.skip('should have external link for governance', function () {
+    it('should have external link for governance', function () {
      cy.getByTestId('home-proposals').within(() => {
        cy.getByTestId('external-link')
          .should('have.attr', 'href')
@@ -59,7 +59,7 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
      });
    });

-    it.skip('should have link for validator page', function () {
+    it('should have link for validator page', function () {
      cy.getByTestId('home-validators').within(() => {
        cy.get('[href="/validators"]')
          .first()
@@ -68,7 +68,7 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
      });
    });

-    it.skip('should have external link for validators', function () {
+    it('should have external link for validators', function () {
      cy.getByTestId('home-validators').within(() => {
        cy.getByTestId('external-link')
          .should('have.attr', 'href')
@@ -79,29 +79,29 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
      });
    });

-    it.skip('should have information on active nodes', function () {
+    it('should have information on active nodes', function () {
      cy.getByTestId('node-information')
        .first()
-        .should('contain.text', '2')
+        .should('contain.text', '1')
        .and('contain.text', 'active nodes');
    });

-    it.skip('should have information on consensus nodes', function () {
+    it('should have information on consensus nodes', function () {
      cy.getByTestId('node-information')
        .last()
-        .should('contain.text', '2')
+        .should('contain.text', '1')
        .and('contain.text', 'consensus nodes');
    });

-    it.skip('should contain link to specific validators', function () {
+    it('should contain link to specific validators', function () {
      cy.getByTestId('validators')
-        .should('have.length', '2')
+        .should('have.length', '1')
        .each(($validator) => {
          cy.wrap($validator).find('a').should('have.attr', 'href');
        });
    });

-    it.skip('should have link for rewards page', function () {
+    it('should have link for rewards page', function () {
      cy.getByTestId('home-rewards').within(() => {
        cy.get('[href="/rewards"]')
          .first()
@@ -110,7 +110,7 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
      });
    });

-    it.skip('should have link for withdrawal page', function () {
+    it('should have link for withdrawal page', function () {
      cy.getByTestId('home-vega-token').within(() => {
        cy.get('[href="/token/withdraw"]')
          .first()
@@ -132,7 +132,7 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
    });

    // 0006-NETW-003 0006-NETW-008 0006-NETW-009 0006-NETW-010 0006-NETW-012 0006-NETW-013 0006-NETW-017 0006-NETW-018 0006-NETW-019 0006-NETW-020
-    it.skip('should have option to switch to different network node', function () {
+    it('should have option to switch to different network node', function () {
      cy.getByTestId('git-network-data').within(() => {
        cy.getByTestId('link').click();
      });
@@ -159,7 +159,7 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
      cy.getByTestId('node-url-custom').click({ force: true });
      cy.get('input').should('exist');
      cy.getByTestId('connect').should('be.disabled');
-      cy.getByTestId('icon-cross').click();
+      cy.getByTestId('dialog-close').click();
    });

    it('should display eth data', function () {
@@ -33,12 +33,12 @@ context(
      verifyTabHighlighted(navigation.proposals);
    });

-    it.skip('should have GOVERNANCE header visible', function () {
+    it('should have GOVERNANCE header visible', function () {
      verifyPageHeader('Proposals');
    });

    // 3002-PROP-023 3004-PMAC-002 3005-PASN-002 3006-PASC-002 3007-PNEC-002 3008-PFRO-003
-    it.skip('new proposal page should have button for link to more information on proposals', function () {
+    it('new proposal page should have button for link to more information on proposals', function () {
      cy.getByTestId('new-proposal-link').click();
      cy.url().should('include', '/proposals/propose/raw');
      cy.contains('To see Explorer data on proposals visit').within(() => {
@@ -73,7 +73,7 @@ context(
      navigateTo(navigation.proposals);
    });

-    it.skip('should be able to see a working link for - find out more about Vega governance', function () {
+    it('should be able to see a working link for - find out more about Vega governance', function () {
      // 3001-VOTE-001  // 3002-PROP-001
      cy.getByTestId(proposalDocumentationLink)
        .should('be.visible')
@@ -40,10 +40,10 @@ context('View functionality with public key', { tags: '@smoke' }, function () {
    verifyConnectedToPubKey();
  });

-  it('Able to connect public key via wallet and view assets in wallet', function () {
+  it.skip('Able to connect public key via wallet and view assets in wallet', function () {
    verifyConnectedToPubKey();
    cy.getByTestId('currency-title', { timeout: 10000 })
-      .should('have.length.at.least', 4)
+      .should('have.length.at.least', 2)
      .and('contain.text', 'USDC (fake)');
  });

@@ -46,11 +46,11 @@ context('Validators Page - verify elements on page', function () {

  // @ts-ignore clash between jest and cypress
  describe('with wallets disconnected', { tags: '@smoke' }, function () {
-    it.skip('Should have validators tab highlighted', function () {
+    it('Should have validators tab highlighted', function () {
      verifyTabHighlighted(navigation.validators);
    });

-    it.skip('Should have validators ON VEGA header visible', function () {
+    it('Should have validators ON VEGA header visible', function () {
      verifyPageHeader('Validators');
    });

@@ -192,7 +192,7 @@ context('Validators Page - verify elements on page', function () {
      });

      // 1002-STKE-006
-      it.skip('Should be able to see validator name', function () {
+      it('Should be able to see validator name', function () {
        cy.getByTestId(validatorTitle).should('not.be.empty');
      });

@@ -14,7 +14,6 @@ NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/m

 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
-NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/main/announcements.json
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
@@ -24,7 +23,7 @@ NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket

 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
+NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/en-GB/firefox/addon/vega-wallet-beta/

 #Test configuration variables
 CYPRESS_FAIRGROUND=false
@@ -33,7 +32,7 @@ LC_ALL="en_US.UTF-8"
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
 NX_METAMASK_SNAPS=true
-NX_PRODUCT_PERPETUALS=false
-NX_UPDATE_MARKET_STATE=false
+NX_PRODUCT_PERPETUALS=true
+NX_UPDATE_MARKET_STATE=true
 NX_REFERRALS=true
-NX_GOVERNANCE_TRANSFERS=false
+NX_GOVERNANCE_TRANSFERS=true
@@ -15,12 +15,11 @@ NX_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit suppl
 NX_LOCAL_PROVIDER_URL=http://localhost:8545/
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
-NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
 NX_VEGA_REST_URL=http://localhost:3008/api/v2/

 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
+NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/en-GB/firefox/addon/vega-wallet-beta/

 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json

@@ -8,14 +8,13 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_EXPLORER_URL=#
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
-NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-devnet1-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_REST_URL=https://api.n00.devnet1.vega.xyz/api/v2/
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996

 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
+NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/en-GB/firefox/addon/vega-wallet-beta/

 NX_TENDERMINT_URL=https://tm.be.devnet1.vega.xyz/
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.devnet1.vega.xyz/websocket
@@ -10,7 +10,6 @@ NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/
 NX_VEGA_EXPLORER_URL=https://explorer.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40:87edc2605e544f888305d7fc4a9141bd@o286262.ingest.sentry.io/5882996
-NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-mainnet-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
 NX_VEGA_REST_URL=https://api.vega.community/api/v2/
@@ -9,7 +9,6 @@ NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996
 NX_VEGA_EXPLORER_URL=https://explorer.mainnet-mirror.vega.rocks
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
-NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-mainnet-mirror-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
 NX_VEGA_REST_URL=https://api.mainnet-mirror.vega.rocks/api/v2/
@@ -5,7 +5,6 @@ NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","STAGNET1":"https:
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
 NX_VEGA_EXPLORER_URL=https://explorer.stagnet1.vega.rocks
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
-NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_REST_URL=https://api.n00.stagnet1.vega.xyz/api/v2/
@@ -13,7 +12,7 @@ NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/m
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72

 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
+NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/en-GB/firefox/addon/vega-wallet-beta/

 NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket
@@ -9,7 +9,6 @@ NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
-NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-testnet-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_REST_URL=https://api.n07.testnet.vega.xyz/api/v2/
@@ -18,7 +17,7 @@ NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/m
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72

 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
+NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/en-GB/firefox/addon/vega-wallet-beta/

 NX_TENDERMINT_URL=https://tm.be.testnet.vega.xyz
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.testnet.vega.xyz/websocket
@@ -14,7 +14,7 @@ NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json

 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
+NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/en-GB/firefox/addon/vega-wallet-beta/

 NX_TENDERMINT_URL=https://tm.be.validators-testnet.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.
@@ -62,6 +62,9 @@ const cache: InMemoryCacheConfig = {
    Account: {
      keyFields: false,
    },
+    Instrument: {
+      keyFields: ['code'],
+    },
    Delegation: {
      keyFields: false,
      // Only get full updates
@@ -15,19 +15,16 @@ export const CollapsibleToggle = ({
  dataTestId,
  children,
 }: CollapsibleToggleProps) => {
-  const classes = classnames(
-    'mb-4 transition-transform ease-in-out duration-300',
-    {
-      'rotate-180': toggleState,
-    }
-  );
+  const classes = classnames('transition-transform ease-in-out duration-300', {
+    'rotate-180': toggleState,
+  });

  return (
    <button
      onClick={() => setToggleState(!toggleState)}
      data-testid={dataTestId}
    >
-      <div className="flex items-center gap-3">
+      <div className="flex items-baseline gap-3">
        {children}
        <div className={classes} data-testid="toggle-icon-wrapper">
          <VegaIcon name={VegaIconNames.CHEVRON_DOWN} size={20} />
@@ -1,7 +1,8 @@
 import classNames from 'classnames';
+import { type ReactNode } from 'react';

 interface HeadingProps {
-  title?: string;
+  title?: ReactNode;
  centerContent?: boolean;
  marginTop?: boolean;
  marginBottom?: boolean;
@@ -0,0 +1,44 @@
+import {
+  useLinks,
+  DApp,
+  CONSOLE_REWARDS_PAGE,
+} from '@vegaprotocol/environment';
+import {
+  ExternalLink,
+  Intent,
+  NotificationBanner,
+  VegaIcon,
+  VegaIconNames,
+} from '@vegaprotocol/ui-toolkit';
+import { Trans } from 'react-i18next';
+import { useMatch } from 'react-router-dom';
+import Routes from '../../routes/routes';
+import { type ReactNode } from 'react';
+
+const ConsoleRewardsLink = ({ children }: { children: ReactNode }) => {
+  const consoleLink = useLinks(DApp.Console);
+  return (
+    <ExternalLink
+      href={consoleLink(CONSOLE_REWARDS_PAGE)}
+      className="underline inline-flex gap-1 items-center"
+      title="Rewards in Console"
+    >
+      <span>{children}</span>
+      <VegaIcon size={12} name={VegaIconNames.OPEN_EXTERNAL} />
+    </ExternalLink>
+  );
+};
+
+export const RewardsMovedNotification = () => {
+  const onRewardsPage = useMatch(Routes.REWARDS);
+  if (!onRewardsPage) return null;
+
+  return (
+    <NotificationBanner intent={Intent.Warning}>
+      <Trans
+        i18nKey="rewardsMovedNotification"
+        components={[<ConsoleRewardsLink>Console</ConsoleRewardsLink>]}
+      />
+    </NotificationBanner>
+  );
+};
@@ -10,6 +10,7 @@ import {
  ProtocolUpgradeProposalNotification,
 } from '@vegaprotocol/proposals';
 import { ViewingAsBanner } from '@vegaprotocol/ui-toolkit';
+import { RewardsMovedNotification } from '../notifications/rewards-moved-notification';

 interface AppLayoutProps {
  children: ReactNode;
@@ -45,8 +46,10 @@ export const AppLayout = ({ children }: AppLayoutProps) => {

 const NotificationsContainer = () => {
  const { isReadOnly, pubKey, disconnect } = useVegaWallet();
+
  return (
    <div data-testid="banners">
+      <RewardsMovedNotification />
      <ProtocolUpgradeProposalNotification
        mode={ProtocolUpgradeCountdownMode.IN_ESTIMATED_TIME_REMAINING}
      />
@@ -4,7 +4,6 @@ import keyBy from 'lodash/keyBy';
 import uniq from 'lodash/uniq';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { ENV } from '../../config';

 import noIcon from '../../images/token-no-icon.png';
 import vegaBlack from '../../images/vega_black.png';
@@ -37,7 +36,6 @@ export const usePollForDelegations = () => {
  const { t } = useTranslation();
  const { pubKey } = useVegaWallet();
  const client = useApolloClient();
-  const { delegationsPagination } = ENV;
  const [delegations, setDelegations] = React.useState<
    WalletDelegationFieldsFragment[]
  >([]);
@@ -68,11 +66,9 @@ export const usePollForDelegations = () => {
            query: DelegationsDocument,
            variables: {
              partyId: pubKey,
-              delegationsPagination: delegationsPagination
-                ? {
-                    first: Number(delegationsPagination),
-                  }
-                : undefined,
+              delegationsPagination: {
+                first: 50,
+              },
            },
            fetchPolicy: 'network-only',
          })
@@ -236,14 +232,14 @@ export const usePollForDelegations = () => {
            // will just continue to fail
            clearInterval(interval);
          });
-      }, 1000);
+      }, 20000);
    }

    return () => {
      clearInterval(interval);
      mounted = false;
    };
-  }, [delegationsPagination, client, decimals, pubKey, t, vegaToken.address]);
+  }, [client, decimals, pubKey, t, vegaToken.address]);

  return { delegations, currentStakeAvailable, delegatedNodes, accounts };
 };
@@ -65,7 +65,6 @@ export const ENV = {
  docsUrl: windowOrDefault('NX_VEGA_DOCS_URL'),
  ethWalletMnemonic: windowOrDefault('NX_ETH_WALLET_MNEMONIC'),
  localProviderUrl: windowOrDefault('NX_LOCAL_PROVIDER_URL'),
-  delegationsPagination: windowOrDefault('NX_DELEGATIONS_PAGINATION'),
  rest: windowOrDefault('NX_VEGA_REST_URL'),
  addresses:
    ContractAddresses[(envName === 'local' ? 'CUSTOM' : envName) as Networks],
@@ -20,6 +20,7 @@ describe('getMultisigStatus', () => {
    expect(result).toEqual({
      multisigStatus: MultisigStatus.noNodes,
      showMultisigStatusError: true,
+      zeroScoreNodes: [],
    });
  });

@@ -35,6 +36,7 @@ describe('getMultisigStatus', () => {
    expect(result).toEqual({
      multisigStatus: MultisigStatus.correct,
      showMultisigStatusError: false,
+      zeroScoreNodes: [],
    });
  });

@@ -50,6 +52,22 @@ describe('getMultisigStatus', () => {
    expect(result).toEqual({
      multisigStatus: MultisigStatus.nodeNeedsRemoving,
      showMultisigStatusError: true,
+      zeroScoreNodes: [
+        {
+          id: '1',
+          rewardScore: {
+            multisigScore: '0',
+          },
+          stakedTotal: '1000',
+        },
+        {
+          id: '2',
+          rewardScore: {
+            multisigScore: '0',
+          },
+          stakedTotal: '1000',
+        },
+      ],
    });
  });

@@ -65,6 +83,15 @@ describe('getMultisigStatus', () => {
    expect(result).toEqual({
      multisigStatus: MultisigStatus.nodeNeedsAdding,
      showMultisigStatusError: true,
+      zeroScoreNodes: [
+        {
+          id: '1',
+          rewardScore: {
+            multisigScore: '0',
+          },
+          stakedTotal: '1000',
+        },
+      ],
    });
  });
 });
@@ -1,5 +1,8 @@
 import { removePaginationWrapper } from '@vegaprotocol/utils';
-import type { PreviousEpochQuery } from '../routes/staking/__generated__/PreviousEpoch';
+import type {
+  PreviousEpochQuery,
+  ValidatorNodeFragment,
+} from '../routes/staking/__generated__/PreviousEpoch';

 export enum MultisigStatus {
  'correct' = 'correct',
@@ -17,12 +20,15 @@ export const getMultisigStatusInfo = (
    previousEpochData?.epoch.validatorsConnection?.edges
  );

-  const hasZero = allNodesInPreviousEpoch.some(
-    (node) => Number(node?.rewardScore?.multisigScore) === 0
-  );
-  const hasOne = allNodesInPreviousEpoch.some(
-    (node) => Number(node?.rewardScore?.multisigScore) === 1
-  );
+  const zeroScore = (node: ValidatorNodeFragment) =>
+    Number(node.rewardScore?.multisigScore) === 0;
+  const oneScore = (node: ValidatorNodeFragment) =>
+    Number(node.rewardScore?.multisigScore) === 1;
+
+  const hasZero = allNodesInPreviousEpoch.some(zeroScore);
+  const hasOne = allNodesInPreviousEpoch.some(oneScore);
+
+  const zeroScoreNodes = allNodesInPreviousEpoch.filter(zeroScore);

  if (hasZero && hasOne) {
    // If any individual node has 0 it means that node is missing from the multisig and needs to be added
@@ -38,5 +44,6 @@ export const getMultisigStatusInfo = (
  return {
    showMultisigStatusError: status !== MultisigStatus.correct,
    multisigStatus: status,
+    zeroScoreNodes,
  };
 };
@@ -160,7 +160,7 @@ describe('Proposal header', () => {
      screen.queryByTestId('proposal-description')
    ).not.toBeInTheDocument();
    expect(screen.getByTestId('proposal-details')).toHaveTextContent(
-      'Update to market ID: MarketId'
+      'Update to market: MarketId'
    );
  });

@@ -36,6 +36,8 @@ import { type Proposal, type BatchProposal } from '../../types';
 import { type ProposalTermsFieldsFragment } from '../../__generated__/Proposals';
 import { differenceInHours, format, formatDistanceToNowStrict } from 'date-fns';
 import { DATE_FORMAT_DETAILED } from '../../../../lib/date-formats';
+import { MarketName } from '../proposal/market-name';
+import { Indicator } from '../proposal/indicator';

 const ProposalTypeTags = ({
  proposal,
@@ -52,11 +54,8 @@ const ProposalTypeTags = ({

  if (proposal.__typename === 'BatchProposal') {
    return (
-      <div data-testid="proposal-type" className="flex gap-1">
-        {proposal.subProposals?.map((subProposal, i) => {
-          if (!subProposal?.terms) return null;
-          return <ProposalTypeTag key={i} terms={subProposal.terms} />;
-        })}
+      <div data-testid="proposal-type">
+        <ProposalInfoLabel variant="secondary">BatchProposal</ProposalInfoLabel>
      </div>
    );
  }
@@ -138,50 +137,77 @@ const ProposalDetails = ({
        );
      }
      case 'UpdateMarketState': {
+        const marketPageLink = consoleLink(
+          CONSOLE_MARKET_PAGE.replace(':marketId', terms.change.market.id)
+        );
        return (
          <span>
            {featureFlags.UPDATE_MARKET_STATE &&
            terms.change?.market?.id &&
            terms.change.updateType ? (
              <>
-                {t(terms.change.updateType)}:{' '}
-                {truncateMiddle(terms.change.market.id)}
+                <span>{t(terms.change.updateType)}: </span>
+                <span className="inline-flex gap-2">
+                  <span className="break-all">
+                    <MarketName marketId={terms.change.market.id} />
+                  </span>
+                  <span className="inline-flex items-end gap-0">
+                    <CopyWithTooltip
+                      text={terms.change.market.id}
+                      description={t('copyId')}
+                    >
+                      <button className="inline-block px-1">
+                        <VegaIcon size={20} name={VegaIconNames.COPY} />
+                      </button>
+                    </CopyWithTooltip>
+                    <Tooltip description={t('OpenInConsole')} align="center">
+                      <Link
+                        className="inline-block px-1"
+                        to={marketPageLink}
+                        target="_blank"
+                      >
+                        <VegaIcon
+                          size={20}
+                          name={VegaIconNames.OPEN_EXTERNAL}
+                        />
+                      </Link>
+                    </Tooltip>
+                  </span>
+                </span>
              </>
            ) : null}
          </span>
        );
      }
      case 'UpdateMarket': {
+        const marketPageLink = consoleLink(
+          CONSOLE_MARKET_PAGE.replace(':marketId', terms.change.marketId)
+        );
+
        return (
          <>
-            <span>{t('UpdateToMarket')}:</span>{' '}
+            <span>{t('UpdateToMarket')}: </span>
            <span className="inline-flex items-start gap-2">
-              <span className="break-all">{terms.change.marketId} </span>
+              <span className="break-all">
+                <MarketName marketId={terms.change.marketId} />
+              </span>
              <span className="inline-flex items-end gap-0">
                <CopyWithTooltip
                  text={terms.change.marketId}
-                  description={t('copyToClipboard')}
+                  description={t('copyId')}
                >
                  <button className="inline-block px-1">
                    <VegaIcon size={20} name={VegaIconNames.COPY} />
                  </button>
                </CopyWithTooltip>
                <Tooltip description={t('OpenInConsole')} align="center">
-                  <button
+                  <Link
                    className="inline-block px-1"
-                    onClick={() => {
-                      const marketPageLink = consoleLink(
-                        CONSOLE_MARKET_PAGE.replace(
-                          ':marketId',
-                          // @ts-ignore ts doesn't like this field even though its already a string above???
-                          terms.change.marketId
-                        )
-                      );
-                      window.open(marketPageLink, '_blank');
-                    }}
+                    target="_blank"
+                    to={marketPageLink}
                  >
                    <VegaIcon size={20} name={VegaIconNames.OPEN_EXTERNAL} />
-                  </button>
+                  </Link>
                </Tooltip>
              </span>
            </span>
@@ -224,7 +250,7 @@ const ProposalDetails = ({
            }}
            components={{
              // @ts-ignore children passed by i18next
-              lozenge: <Lozenge />,
+              lozenge: <Lozenge className="text-xs" />,
            }}
          />
        );
@@ -286,12 +312,18 @@ const ProposalDetails = ({
          {proposal.subProposals.map((p, i) => {
            if (!p?.terms) return null;
            return (
-              <li key={i}>
-                <div>{renderDetails(p.terms)}</div>
-                <SubProposalStateText
-                  state={proposal.state}
-                  enactmentDatetime={p.terms.enactmentDatetime}
-                />
+              <li
+                key={i}
+                className="grid grid-cols-[40px_minmax(0,1fr)] grid-rows-1 gap-3 items-center"
+              >
+                <Indicator indicator={i + 1} />
+                <span>
+                  <div>{renderDetails(p.terms)}</div>
+                  <SubProposalStateText
+                    state={proposal.state}
+                    enactmentDatetime={p.terms.enactmentDatetime}
+                  />
+                </span>
              </li>
            );
          })}
@@ -3,16 +3,8 @@ import { useTranslation } from 'react-i18next';
 import { SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
 import { SubHeading } from '../../../../components/heading';
 import { CollapsibleToggle } from '../../../../components/collapsible-toggle';
-import {
-  type BatchProposalFieldsFragment,
-  type ProposalFieldsFragment,
-} from '../../__generated__/Proposals';

-export const ProposalJson = ({
-  proposal,
-}: {
-  proposal: ProposalFieldsFragment | BatchProposalFieldsFragment;
-}) => {
+export const ProposalJson = ({ proposal }: { proposal?: unknown }) => {
  const { t } = useTranslation();
  const [showDetails, setShowDetails] = useState(false);

@@ -26,7 +18,7 @@ export const ProposalJson = ({
        <SubHeading title={t('proposalJson')} />
      </CollapsibleToggle>

-      {showDetails && <SyntaxHighlighter data={proposal} />}
+      {showDetails && <SyntaxHighlighter size="smaller" data={proposal} />}
    </section>
  );
 };
@@ -5,6 +5,11 @@ import {
 } from './proposal-market-changes';
 import type { JsonValue } from '../../../../components/json-diff';

+jest.mock('../proposal/market-name.tsx', () => ({
+  ...jest.requireActual('../proposal/market-name.tsx'),
+  MarketName: jest.fn(),
+}));
+
 describe('applyImmutableKeysFromEarlierVersion', () => {
  it('returns an empty object if any argument is not an object or null', () => {
    const earlierVersion: JsonValue = null;
@@ -57,21 +62,21 @@ describe('applyImmutableKeysFromEarlierVersion', () => {
 describe('ProposalMarketChanges', () => {
  it('renders correctly', () => {
    const { getByTestId } = render(
-      <ProposalMarketChanges marketId="market-id" updatedProposal={{}} />
+      <ProposalMarketChanges marketId="market-id" updateProposalNode={null} />
    );
    expect(getByTestId('proposal-market-changes')).toBeInTheDocument();
  });

  it('JsonDiff is not visible when showChanges is false', () => {
    const { queryByTestId } = render(
-      <ProposalMarketChanges marketId="market-id" updatedProposal={{}} />
+      <ProposalMarketChanges marketId="market-id" updateProposalNode={null} />
    );
    expect(queryByTestId('json-diff')).not.toBeInTheDocument();
  });

  it('JsonDiff is visible when showChanges is true', async () => {
    const { getByTestId } = render(
-      <ProposalMarketChanges marketId="market-id" updatedProposal={{}} />
+      <ProposalMarketChanges marketId="market-id" updateProposalNode={null} />
    );
    fireEvent.click(getByTestId('proposal-market-changes-toggle'));
    expect(getByTestId('json-diff')).toBeInTheDocument();
@@ -1,14 +1,24 @@
 import cloneDeep from 'lodash/cloneDeep';
 import set from 'lodash/set';
 import get from 'lodash/get';
-import { JsonDiff } from '../../../../components/json-diff';
+import compact from 'lodash/compact';
+import orderBy from 'lodash/orderBy';
+import { JsonDiff, type JsonValue } from '../../../../components/json-diff';
 import { useTranslation } from 'react-i18next';
 import { useState } from 'react';
 import { CollapsibleToggle } from '../../../../components/collapsible-toggle';
 import { SubHeading } from '../../../../components/heading';
-import type { JsonValue } from '../../../../components/json-diff';
-import { useFetch } from '@vegaprotocol/react-helpers';
-import { ENV } from '../../../../config';
+import {
+  useFetchProposal,
+  useFetchProposals,
+  flatten,
+  isBatchProposalNode,
+  isSingleProposalNode,
+  type ProposalNode,
+  type SingleProposalData,
+  type SubProposalData,
+} from '../proposal/proposal-utils';
+import { MarketName } from '../proposal/market-name';

 const immutableKeys = [
  'decimalPlaces',
@@ -18,8 +28,8 @@ const immutableKeys = [
 ];

 export const applyImmutableKeysFromEarlierVersion = (
-  earlierVersion: JsonValue,
-  updatedVersion: JsonValue
+  earlierVersion: unknown,
+  updatedVersion: unknown
 ) => {
  if (
    typeof earlierVersion !== 'object' ||
@@ -35,7 +45,8 @@ export const applyImmutableKeysFromEarlierVersion = (

  // Overwrite the immutable keys in the updatedVersionCopy with the earlier values
  immutableKeys.forEach((key) => {
-    set(updatedVersionCopy, key, get(earlierVersion, key));
+    const earlier = get(earlierVersion, key);
+    if (earlier) set(updatedVersionCopy, key, earlier);
  });

  return updatedVersionCopy;
@@ -43,49 +54,84 @@ export const applyImmutableKeysFromEarlierVersion = (

 interface ProposalMarketChangesProps {
  marketId: string;
-  updatedProposal: JsonValue;
+  /** This are the changes from proposal */
+  updateProposalNode: ProposalNode | null;
+  indicator?: number;
 }

 export const ProposalMarketChanges = ({
  marketId,
-  updatedProposal,
+  updateProposalNode,
+  indicator,
 }: ProposalMarketChangesProps) => {
  const { t } = useTranslation();
  const [showChanges, setShowChanges] = useState(false);

-  const {
-    state: { data },
-  } = useFetch(`${ENV.rest}governance?proposalId=${marketId}`, undefined, true);
+  const { data: originalProposalData } = useFetchProposal({
+    proposalId: marketId,
+  });

-  const {
-    state: { data: enactedProposalData },
-  } = useFetch(
-    `${ENV.rest}governances?proposalState=STATE_ENACTED&proposalType=TYPE_UPDATE_MARKET`,
-    undefined,
-    true
+  const { data: enactedProposalsData } = useFetchProposals({
+    proposalState: 'STATE_ENACTED',
+    proposalType: 'TYPE_UPDATE_MARKET',
+  });
+
+  let updateProposal: SingleProposalData | SubProposalData | undefined;
+  if (isBatchProposalNode(updateProposalNode)) {
+    updateProposal = updateProposalNode.proposals.find(
+      (p, i) =>
+        p.terms.updateMarket?.marketId === marketId &&
+        (indicator != null ? i === indicator - 1 : true)
+    );
+  }
+  if (isSingleProposalNode(updateProposalNode)) {
+    updateProposal = updateProposalNode.proposal;
+  }
+
+  // this should get the proposal before the current one
+  const enactedUpdateMarketProposals = orderBy(
+    compact(
+      flatten(enactedProposalsData).filter((enacted) => {
+        const related = enacted.terms.updateMarket?.marketId === marketId;
+        const notCurrent =
+          enacted.id !== updateProposal?.id ||
+          ('batchId' in enacted && enacted.batchId !== updateProposal.id);
+        const beforeCurrent =
+          Number(enacted.terms.enactmentTimestamp) <
+          Number(updateProposal?.terms.enactmentTimestamp);
+        return related && notCurrent && beforeCurrent;
+      })
+    ),
+    [(proposal) => Number(proposal.terms.enactmentTimestamp)],
+    'desc'
  );

-  // @ts-ignore no types here :-/
-  const enacted = enactedProposalData?.connection?.edges
-    .filter(
-      // @ts-ignore no type here
-      ({ node }) => node?.proposal?.terms?.updateMarket?.marketId === marketId
-    )
-    // @ts-ignore no type here
-    .sort((a, b) => {
-      return (
-        new Date(a?.node?.terms?.enactmentTimestamp).getTime() -
-        new Date(b?.node?.terms?.enactmentTimestamp).getTime()
-      );
-    });
+  const latestEnactedProposal =
+    enactedUpdateMarketProposals.length > 0
+      ? enactedUpdateMarketProposals[0]
+      : undefined;

-  const latestEnactedProposal = enacted?.length
-    ? enacted[enacted.length - 1]
-    : undefined;
+  let originalProposal;
+  if (isBatchProposalNode(originalProposalData)) {
+    originalProposal = originalProposalData.proposals.find(
+      (proposal) => proposal.id === marketId && proposal.terms.newMarket != null
+    );
+  }
+  if (isSingleProposalNode(originalProposalData)) {
+    originalProposal = originalProposalData.proposal;
+  }

-  const originalProposal =
-    // @ts-ignore no types with useFetch TODO: check this is good
-    data?.data?.proposal?.terms?.newMarket?.changes;
+  // LEFT SIDE: update market proposal enacted just before this one
+  // or original new market proposal
+  const left =
+    latestEnactedProposal?.terms.updateMarket?.changes ||
+    originalProposal?.terms.newMarket?.changes;
+
+  // RIGHT SIDE: this update market proposal
+  const right = applyImmutableKeysFromEarlierVersion(
+    left,
+    updateProposal?.terms.updateMarket?.changes
+  );

  return (
    <section data-testid="proposal-market-changes">
@@ -94,25 +140,18 @@ export const ProposalMarketChanges = ({
        setToggleState={setShowChanges}
        dataTestId={'proposal-market-changes-toggle'}
      >
-        <SubHeading title={t('updatesToMarket')} />
+        <SubHeading
+          title={
+            <>
+              {t('UpdateToMarket')}: <MarketName marketId={marketId} truncate />
+            </>
+          }
+        />
      </CollapsibleToggle>

      {showChanges && (
-        <div className="mb-6">
-          <JsonDiff
-            left={latestEnactedProposal || originalProposal}
-            right={
-              latestEnactedProposal
-                ? applyImmutableKeysFromEarlierVersion(
-                    latestEnactedProposal,
-                    updatedProposal
-                  )
-                : applyImmutableKeysFromEarlierVersion(
-                    originalProposal,
-                    updatedProposal
-                  )
-            }
-          />
+        <div className="mb-6 bg-vega-cdark-900 p-2 rounded-lg">
+          <JsonDiff left={left as JsonValue} right={right as JsonValue} />
        </div>
      )}
    </section>
@@ -2,6 +2,11 @@ import { fireEvent, render, screen } from '@testing-library/react';
 import { ProposalUpdateMarketState } from './proposal-update-market-state';
 import { MarketUpdateType } from '@vegaprotocol/types';

+jest.mock('../proposal/market-name.tsx', () => ({
+  ...jest.requireActual('../proposal/market-name.tsx'),
+  MarketName: jest.fn(),
+}));
+
 describe('<ProposalUpdateMarketState />', () => {
  const suspendProposal = {
    __typename: 'UpdateMarketState' as const,
@@ -9,6 +9,8 @@ import { useState } from 'react';
 import { CollapsibleToggle } from '../../../../components/collapsible-toggle';
 import { SubHeading } from '../../../../components/heading';
 import { type UpdateMarketStatesFragment } from '../../__generated__/Proposals';
+import { MarketUpdateTypeMapping } from '@vegaprotocol/types';
+import { MarketName } from '../proposal/market-name';

 interface ProposalUpdateMarketStateProps {
  change: UpdateMarketStatesFragment | null;
@@ -19,16 +21,18 @@ export const ProposalUpdateMarketState = ({
 }: ProposalUpdateMarketStateProps) => {
  const { t } = useTranslation();
  const [showDetails, setShowDetails] = useState(false);
-  let market;
-  let isTerminate = false;

-  if (!change) {
+  if (!change || change.__typename !== 'UpdateMarketState') {
    return null;
  }

-  if (change.__typename === 'UpdateMarketState') {
-    market = change?.market;
-    isTerminate = change?.updateType === 'MARKET_STATE_UPDATE_TYPE_TERMINATE';
+  const market = change?.market;
+  const isTerminate =
+    change?.updateType === 'MARKET_STATE_UPDATE_TYPE_TERMINATE';
+
+  let toggleTitle = t(change.updateType);
+  if (toggleTitle.length === 0) {
+    toggleTitle = t('MarketDetails');
  }

  return (
@@ -38,7 +42,13 @@ export const ProposalUpdateMarketState = ({
        setToggleState={setShowDetails}
        dataTestId="proposal-market-data-toggle"
      >
-        <SubHeading title={t('MarketDetails')} />
+        <SubHeading
+          title={
+            <>
+              {toggleTitle}: <MarketName marketId={market?.id} />
+            </>
+          }
+        />
      </CollapsibleToggle>

      {showDetails && (
@@ -49,6 +59,12 @@ export const ProposalUpdateMarketState = ({
                {t('marketId')}
                {market?.id}
              </KeyValueTableRow>
+              <KeyValueTableRow>
+                {t('State')}
+                <span className="bg-vega-green-650 px-1">
+                  {MarketUpdateTypeMapping[change.updateType]}
+                </span>
+              </KeyValueTableRow>
              <KeyValueTableRow>
                {t('marketName')}
                {market?.tradableInstrument?.instrument?.name}
@@ -0,0 +1,46 @@
+import classNames from 'classnames';
+
+// rainbow-ish order
+const COLOURS = ['red', 'pink', 'orange', 'yellow', 'green', 'blue', 'purple'];
+
+const getColour = (indicator: number, max = COLOURS.length) => {
+  const available =
+    max < COLOURS.length ? COLOURS.slice(COLOURS.length - max) : COLOURS;
+  const tiers = Object.keys(available).length;
+  let index = Math.abs(indicator - 1);
+  if (indicator >= tiers) {
+    index = index % tiers;
+  }
+  return available[index];
+};
+
+export const getStyle = (indicator: number, max = COLOURS.length) =>
+  classNames({
+    'bg-vega-yellow-400 before:bg-vega-yellow-400':
+      'yellow' === getColour(indicator, max),
+    'bg-vega-green-400 before:bg-vega-green-400':
+      'green' === getColour(indicator, max),
+    'bg-vega-blue-400 before:bg-vega-blue-400':
+      'blue' === getColour(indicator, max),
+    'bg-vega-purple-400 before:bg-vega-purple-400':
+      'purple' === getColour(indicator, max),
+    'bg-vega-pink-400 before:bg-vega-pink-400':
+      'pink' === getColour(indicator, max),
+    'bg-vega-orange-400 before:bg-vega-orange-400':
+      'orange' === getColour(indicator, max),
+    'bg-vega-red-400 before:bg-vega-red-400':
+      'red' === getColour(indicator, max),
+    'bg-vega-clight-600 before:bg-vega-clight-600':
+      'none' === getColour(indicator, max),
+  });
+
+export const getIndicatorStyle = (indicator: number) =>
+  classNames(
+    'rounded-sm text-black inline-block px-1 py-1 font-alpha calt h-8 w-7 text-center',
+    'text-border-1',
+    getStyle(indicator),
+    // Comment below if you want to remove the "chevron"
+    'relative mr-[11px] z-1',
+    'before:absolute before:z-0 before:top-1 before:right-[-11px] before:rounded-sm',
+    "before:w-[22.62px] before:h-[22.62px] before:rotate-45 before:content-['']"
+  );
@@ -0,0 +1,9 @@
+import { getIndicatorStyle } from './colours';
+
+export const Indicator = ({ indicator }: { indicator: number }) => (
+  <div className={getIndicatorStyle(indicator)}>
+    <span className="absolute top-0 left-0 p-1 w-full text-center z-1">
+      {indicator}
+    </span>
+  </div>
+);
@@ -0,0 +1,21 @@
+import { useMarketInfoQuery } from '@vegaprotocol/markets';
+import { truncateMiddle } from '@vegaprotocol/ui-toolkit';
+
+export const MarketName = ({
+  marketId,
+  truncate,
+}: {
+  marketId?: string;
+  truncate?: boolean;
+}) => {
+  const { data } = useMarketInfoQuery({
+    variables: {
+      marketId: marketId || '',
+    },
+    skip: !marketId,
+  });
+
+  const id = truncate ? truncateMiddle(marketId || '') : marketId;
+
+  return <span>{data?.market?.tradableInstrument.instrument.code || id}</span>;
+};
@@ -1,3 +1,4 @@
+import { Trans, useTranslation } from 'react-i18next';
 import { type ProposalTermsFieldsFragment } from '../../__generated__/Proposals';
 import { type Proposal, type BatchProposal } from '../../types';
 import { ListAsset } from '../list-asset';
@@ -12,21 +13,29 @@ import {
 import { ProposalUpdateBenefitTiers } from '../proposal-update-benefit-tiers';
 import { ProposalUpdateMarketState } from '../proposal-update-market-state';
 import { ProposalVolumeDiscountProgramDetails } from '../proposal-volume-discount-program-details';
+import { type ProposalNode } from './proposal-utils';
+import { Lozenge } from '@vegaprotocol/ui-toolkit';
+import { Indicator } from './indicator';
+import { SubHeading } from '../../../../components/heading';

 export const ProposalChangeDetails = ({
  proposal,
  terms,
  restData,
+  indicator,
 }: {
  proposal: Proposal | BatchProposal;
  terms: ProposalTermsFieldsFragment;
-  // eslint-disable-next-line
-  restData: any;
+  restData: ProposalNode | null;
+  indicator?: number;
 }) => {
+  const { t } = useTranslation();
+  let details = null;
+
  switch (terms.change.__typename) {
    case 'NewAsset': {
      if (proposal.id && terms.change.source.__typename === 'ERC20') {
-        return (
+        details = (
          <div>
            <ListAsset
              assetId={proposal.id}
@@ -37,62 +46,64 @@ export const ProposalChangeDetails = ({
          </div>
        );
      }
-      return null;
+      break;
    }
    case 'UpdateAsset': {
      if (proposal.id) {
-        return (
+        details = (
          <ProposalAssetDetails
            change={terms.change}
            assetId={terms.change.assetId}
          />
        );
      }
-      return null;
+      break;
    }
    case 'NewMarket': {
      if (proposal.id) {
-        return <ProposalMarketData proposalId={proposal.id} />;
+        details = <ProposalMarketData proposalId={proposal.id} />;
      }
-      return null;
+      break;
    }
    case 'UpdateMarket': {
      if (proposal.id) {
-        return (
+        details = (
          <div className="flex flex-col gap-4">
            <ProposalMarketData proposalId={proposal.id} />
            <ProposalMarketChanges
+              indicator={indicator}
              marketId={terms.change.marketId}
-              updatedProposal={
-                restData?.data?.proposal?.terms?.updateMarket?.changes
-              }
+              updateProposalNode={restData}
            />
          </div>
        );
      }

-      return null;
+      break;
    }
    case 'NewTransfer': {
      if (proposal.id) {
-        return <ProposalTransferDetails proposalId={proposal.id} />;
+        details = <ProposalTransferDetails proposalId={proposal.id} />;
      }
-      return null;
+      break;
    }
    case 'CancelTransfer': {
      if (proposal.id) {
-        return <ProposalCancelTransferDetails proposalId={proposal.id} />;
+        details = <ProposalCancelTransferDetails proposalId={proposal.id} />;
      }
-      return null;
+      break;
    }
    case 'UpdateMarketState': {
-      return <ProposalUpdateMarketState change={terms.change} />;
+      details = <ProposalUpdateMarketState change={terms.change} />;
+      break;
    }
    case 'UpdateReferralProgram': {
-      return <ProposalReferralProgramDetails change={terms.change} />;
+      details = <ProposalReferralProgramDetails change={terms.change} />;
+      break;
    }
    case 'UpdateVolumeDiscountProgram': {
-      return <ProposalVolumeDiscountProgramDetails change={terms.change} />;
+      details = <ProposalVolumeDiscountProgramDetails change={terms.change} />;
+      break;
    }
    case 'UpdateNetworkParameter': {
      if (
@@ -100,18 +111,48 @@ export const ProposalChangeDetails = ({
        terms.change.networkParameter.key ===
          'rewards.activityStreak.benefitTiers'
      ) {
-        return <ProposalUpdateBenefitTiers change={terms.change} />;
+        details = <ProposalUpdateBenefitTiers change={terms.change} />;
+      } else {
+        details = (
+          <div className="mb-4">
+            <SubHeading title={t(terms.change.__typename as string)} />
+            <span>
+              <Trans
+                i18nKey="Change <lozenge>{{key}}</lozenge> to <lozenge>{{value}}</lozenge>"
+                values={{
+                  key: terms.change.networkParameter.key,
+                  value: terms.change.networkParameter.value,
+                }}
+                components={{
+                  // @ts-ignore children passed by i18next
+                  lozenge: <Lozenge />,
+                }}
+              />
+            </span>
+          </div>
+        );
      }

-      return null;
+      break;
    }
    case 'NewFreeform':
    case 'NewSpotMarket':
-    case 'UpdateSpotMarket': {
-      return null;
-    }
+    case 'UpdateSpotMarket':
    default: {
-      return null;
+      break;
    }
  }
+
+  if (indicator != null && details != null) {
+    details = (
+      <div className="grid grid-cols-[40px_minmax(0,1fr)] grid-rows-1 gap-3 mb-3">
+        <div className="w-10">
+          <Indicator indicator={indicator} />
+        </div>
+        <div>{details}</div>
+      </div>
+    );
+  }
+
+  return details;
 };
@@ -0,0 +1,261 @@
+import compact from 'lodash/compact';
+import { ENV } from '../../../../config';
+import { useEffect, useState } from 'react';
+
+type Maybe<T> = T | null | undefined;
+
+type ProposalState =
+  | 'STATE_UNSPECIFIED'
+  | 'STATE_FAILED'
+  | 'STATE_OPEN'
+  | 'STATE_PASSED'
+  | 'STATE_REJECTED'
+  | 'STATE_DECLINED'
+  | 'STATE_ENACTED'
+  | 'STATE_WAITING_FOR_NODE_VOTE';
+
+type ProposalType =
+  | 'TYPE_UNSPECIFIED'
+  | 'TYPE_ALL'
+  | 'TYPE_NEW_MARKET'
+  | 'TYPE_UPDATE_MARKET'
+  | 'TYPE_NETWORK_PARAMETERS'
+  | 'TYPE_NEW_ASSET'
+  | 'TYPE_NEW_FREE_FORM'
+  | 'TYPE_UPDATE_ASSET'
+  | 'TYPE_NEW_SPOT_MARKET'
+  | 'TYPE_UPDATE_SPOT_MARKET'
+  | 'TYPE_NEW_TRANSFER'
+  | 'TYPE_CANCEL_TRANSFER'
+  | 'TYPE_UPDATE_MARKET_STATE'
+  | 'TYPE_UPDATE_REFERRAL_PROGRAM'
+  | 'TYPE_UPDATE_VOLUME_DISCOUNT_PROGRAM';
+
+type ProposalNodeType = 'TYPE_SINGLE_OR_UNSPECIFIED' | 'TYPE_BATCH';
+
+type ProposalData = {
+  id: string;
+  rationale: {
+    description: string;
+    title: string;
+  };
+  state: ProposalState;
+  timestamp: string;
+};
+
+type Terms = {
+  cancelTransfer?: { changes: unknown };
+  enactmentTimestamp: string;
+  newAsset?: { changes: unknown };
+  newFreeform: object;
+  newMarket?: { changes: unknown };
+  newSpotMarket?: { changes: unknown };
+  newTransfer?: { changes: unknown };
+  updateAsset?: { assetId: string; changes: unknown };
+  updateMarket?: { marketId: string; changes: unknown };
+  updateMarketState?: {
+    changes: {
+      marketId: string;
+      price: string;
+      updateType:
+        | 'MARKET_STATE_UPDATE_TYPE_UNSPECIFIED'
+        | 'MARKET_STATE_UPDATE_TYPE_TERMINATE'
+        | 'MARKET_STATE_UPDATE_TYPE_SUSPEND'
+        | 'MARKET_STATE_UPDATE_TYPE_RESUME';
+    };
+  };
+  updateNetworkParameter?: { changes: unknown };
+  updateReferralProgram?: { changes: unknown };
+  updateSpotMarket?: { marketId: string; changes: unknown };
+  updateVolumeDiscountProgram?: { changes: unknown };
+};
+
+export type SingleProposalData = ProposalData & {
+  terms: Terms & {
+    closingTimestamp: string;
+    validationTimestamp: string;
+  };
+};
+
+type BatchProposalData = ProposalData & {
+  batchTerms: {
+    changes: Terms[];
+  };
+};
+
+export type SubProposalData = SingleProposalData & {
+  batchId: string;
+};
+
+export type ProposalNode = {
+  proposal: ProposalData;
+  proposalType: ProposalNodeType;
+  proposals: SubProposalData[];
+};
+
+type SingleProposalNode = ProposalNode & {
+  proposal: SingleProposalData;
+  proposalType: 'TYPE_SINGLE_OR_UNSPECIFIED';
+  proposals: [];
+};
+
+type BatchProposalNode = ProposalNode & {
+  proposal: BatchProposalData;
+  proposalType: 'TYPE_BATCH';
+};
+
+export const isProposalNode = (node: unknown): node is ProposalNode =>
+  Boolean(
+    typeof node === 'object' &&
+      node &&
+      'proposal' in node &&
+      typeof node.proposal === 'object' &&
+      node?.proposal &&
+      'id' in node.proposal &&
+      node?.proposal?.id
+  );
+
+export const isSingleProposalNode = (
+  node: Maybe<ProposalNode>
+): node is SingleProposalNode =>
+  Boolean(
+    node &&
+      node?.proposalType === 'TYPE_SINGLE_OR_UNSPECIFIED' &&
+      node?.proposal
+  );
+
+export const isBatchProposalNode = (
+  node: Maybe<ProposalNode>
+): node is BatchProposalNode =>
+  Boolean(
+    node &&
+      node?.proposalType === 'TYPE_BATCH' &&
+      node?.proposal &&
+      'batchTerms' in node.proposal &&
+      node?.proposals?.length > 0
+  );
+
+// this includes also batch proposals with `updateMarket`s 👍
+const PROPOSALS_ENDPOINT = `${ENV.rest}governances?proposalState=:proposalState&proposalType=:proposalType`;
+
+// this can be queried also by sub proposal id as `proposalId` and it will
+// return full batch proposal data with all of its sub proposals including
+// the requested one inside `proposals` array.
+const PROPOSAL_ENDPOINT = `${ENV.rest}governance?proposalId=:proposalId`;
+
+export const getProposals = async ({
+  proposalState,
+  proposalType,
+}: {
+  proposalState: ProposalState;
+  proposalType: ProposalType;
+}) => {
+  try {
+    const response = await fetch(
+      PROPOSALS_ENDPOINT.replace(':proposalState', proposalState).replace(
+        ':proposalType',
+        proposalType
+      )
+    );
+    if (response.ok) {
+      const data = await response.json();
+      if (
+        data &&
+        'connection' in data &&
+        data.connection &&
+        'edges' in data.connection &&
+        data.connection.edges?.length > 0
+      ) {
+        const nodes = compact(
+          data.connection.edges.map((e: { node?: object }) => e?.node)
+        ).filter(isProposalNode);
+
+        return nodes;
+      }
+    }
+  } catch {
+    // NOOP - ignore errors
+  }
+
+  return [];
+};
+
+export const getProposal = async ({ proposalId }: { proposalId: string }) => {
+  try {
+    const response = await fetch(
+      PROPOSAL_ENDPOINT.replace(':proposalId', proposalId)
+    );
+    if (response.ok) {
+      const data = await response.json();
+      if (data && 'data' in data && isProposalNode(data.data)) {
+        return data.data as ProposalNode;
+      }
+    }
+  } catch (err) {
+    // NOOP - ignore errors
+  }
+  return null;
+};
+
+export const useFetchProposal = ({ proposalId }: { proposalId?: string }) => {
+  const [data, setData] = useState<ProposalNode | null>(null);
+  const [loading, setLoading] = useState<boolean>(false);
+
+  useEffect(() => {
+    const cb = async () => {
+      if (!proposalId) return;
+
+      setLoading(true);
+      const data = await getProposal({ proposalId });
+      setLoading(false);
+      if (data) {
+        setData(data);
+      }
+    };
+    cb();
+  }, [proposalId]);
+
+  return { data, loading };
+};
+
+export const useFetchProposals = ({
+  proposalState,
+  proposalType,
+}: {
+  proposalState: ProposalState;
+  proposalType: ProposalType;
+}) => {
+  const [data, setData] = useState<ProposalNode[]>([]);
+  const [loading, setLoading] = useState<boolean>(false);
+
+  useEffect(() => {
+    const cb = async () => {
+      setLoading(true);
+      const data = await getProposals({ proposalState, proposalType });
+      setLoading(false);
+      if (data) {
+        setData(data);
+      }
+    };
+    cb();
+  }, [proposalState, proposalType]);
+
+  return { data, loading };
+};
+
+export const flatten = (
+  nodes: ProposalNode[]
+): (SingleProposalData | SubProposalData)[] => {
+  const flattenNodes = [];
+  for (const node of nodes) {
+    if (isSingleProposalNode(node)) {
+      flattenNodes.push(node.proposal);
+    }
+    if (isBatchProposalNode(node)) {
+      for (const sub of node.proposals) {
+        flattenNodes.push(sub);
+      }
+    }
+  }
+  return flattenNodes;
+};
@@ -61,7 +61,7 @@ const renderComponent = (proposal: IProposal) => {
    <MemoryRouter>
      <MockedProvider>
        <VegaWalletProvider config={vegaWalletConfig}>
-          <Proposal restData={{}} proposal={proposal} />
+          <Proposal restData={null} proposal={proposal} />
        </VegaWalletProvider>
      </MockedProvider>
    </MemoryRouter>
@@ -8,15 +8,17 @@ import { ProposalJson } from '../proposal-json';
 import { UserVote } from '../vote-details';
 import Routes from '../../../routes';
 import { ProposalState } from '@vegaprotocol/types';
+import { type ProposalNode } from './proposal-utils';
 import { useVoteSubmit } from '@vegaprotocol/proposals';
 import { useUserVote } from '../vote-details/use-user-vote';
 import { type Proposal as IProposal, type BatchProposal } from '../../types';
 import { ProposalChangeDetails } from './proposal-change-details';
+import { type JsonValue } from 'type-fest';

 export interface ProposalProps {
  proposal: IProposal | BatchProposal;
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  restData: any;
+  restData: ProposalNode | null;
 }

 export const Proposal = ({ proposal, restData }: ProposalProps) => {
@@ -58,7 +60,7 @@ export const Proposal = ({ proposal, restData }: ProposalProps) => {
        <ProposalDescription description={proposal.rationale.description} />
      </div>

-      <div className="mb-4">
+      <div className="mb-4 flex flex-col gap-0">
        {proposal.__typename === 'Proposal' ? (
          <ProposalChangeDetails
            proposal={proposal}
@@ -70,6 +72,7 @@ export const Proposal = ({ proposal, restData }: ProposalProps) => {
            if (!p?.terms) return null;
            return (
              <ProposalChangeDetails
+                indicator={i + 1}
                key={i}
                proposal={proposal}
                terms={p.terms}
@@ -94,7 +97,7 @@ export const Proposal = ({ proposal, restData }: ProposalProps) => {
      </div>

      <div className="mb-6">
-        <ProposalJson proposal={restData?.data?.proposal} />
+        <ProposalJson proposal={restData?.proposal as unknown as JsonValue} />
      </div>
    </section>
  );
@@ -206,7 +206,7 @@ export const ProposalsList = ({
        />
      )}

-      <section className="-mx-4 p-4 mb-8 bg-vega-dark-100">
+      <section className="-mx-4 p-4 mb-8 bg-vega-cdark-900 rounded-l-sm">
        <SubHeading title={t('openProposals')} />

        {sortedProposals.open.length > 0 ||
@@ -15,6 +15,8 @@ import {
  type VoteFieldsFragment,
 } from '../../__generated__/Proposals';
 import { useBatchVoteInformation } from '../../hooks/use-vote-information';
+import { MarketName } from '../proposal/market-name';
+import { Indicator } from '../proposal/indicator';

 export const CompactVotes = ({ number }: { number: BigNumber }) => (
  <CompactNumber
@@ -39,8 +41,9 @@ const VoteProgress = ({
  children,
 }: VoteProgressProps) => {
  const containerClasses = classNames(
-    'relative h-10 rounded-md border border-vega-dark-300 overflow-hidden',
-    colourfulBg ? 'bg-vega-pink' : 'bg-vega-dark-400'
+    'relative h-2 rounded-md overflow-hidden',
+    // 'border border-vega-dark-300',
+    colourfulBg ? 'bg-vega-red' : 'bg-vega-dark-200'
  );

  const progressClasses = classNames(
@@ -49,17 +52,19 @@ const VoteProgress = ({
  );

  const textClasses = classNames(
-    'absolute top-0 left-0 w-full h-full flex items-center justify-start px-3 text-black'
+    'w-full flex items-center justify-start text-white text-sm pb-1'
  );

  return (
-    <div className={containerClasses}>
-      <div
-        className={progressClasses}
-        style={{ width: `${percentageFor}%` }}
-        data-testid={testId}
-      />
+    <div>
      <div className={textClasses}>{children}</div>
+      <div className={containerClasses}>
+        <div
+          className={progressClasses}
+          style={{ width: `${percentageFor}%` }}
+          data-testid={testId}
+        />
+      </div>
    </div>
  );
 };
@@ -78,14 +83,22 @@ const Status = ({ reached, threshold, text, testId }: StatusProps) => {
    <div data-testid={testId}>
      {reached ? (
        <div className="flex items-center gap-2">
-          <VegaIcon name={VegaIconNames.TICK} size={20} />
+          <VegaIcon
+            name={VegaIconNames.TICK}
+            className="text-vega-green"
+            size={20}
+          />
          <span>
            {threshold.toString()}% {text} {t('met')}
          </span>
        </div>
      ) : (
        <div className="flex items-center gap-2">
-          <VegaIcon name={VegaIconNames.CROSS} size={20} />
+          <VegaIcon
+            name={VegaIconNames.CROSS}
+            className="text-vega-red"
+            size={20}
+          />
          <span>
            {threshold.toString()}% {text} {t('not met')}
          </span>
@@ -151,7 +164,7 @@ const VoteBreakdownBatch = ({ proposal }: { proposal: BatchProposal }) => {
            <p className="flex gap-2 m-0 items-center">
              <VegaIcon
                name={VegaIconNames.CROSS}
-                className="text-vega-pink"
+                className="text-vega-red"
                size={20}
              />
              {t(
@@ -176,6 +189,7 @@ const VoteBreakdownBatch = ({ proposal }: { proposal: BatchProposal }) => {
              if (!p?.terms) return null;
              return (
                <VoteBreakdownBatchSubProposal
+                  indicator={i + 1}
                  key={i}
                  proposal={proposal}
                  votes={proposal.votes}
@@ -213,7 +227,7 @@ const VoteBreakdownBatch = ({ proposal }: { proposal: BatchProposal }) => {
            <p className="flex gap-2 m-0 items-center">
              <VegaIcon
                name={VegaIconNames.CROSS}
-                className="text-vega-pink"
+                className="text-vega-red"
                size={20}
              />
              {t('Proposal failed: {{count}} of {{total}} proposals passed', {
@@ -235,6 +249,7 @@ const VoteBreakdownBatch = ({ proposal }: { proposal: BatchProposal }) => {
              if (!p?.terms) return null;
              return (
                <VoteBreakdownBatchSubProposal
+                  indicator={i + 1}
                  key={i}
                  proposal={proposal}
                  votes={proposal.votes}
@@ -255,10 +270,12 @@ const VoteBreakdownBatchSubProposal = ({
  proposal,
  votes,
  terms,
+  indicator,
 }: {
  proposal: BatchProposal;
  votes: VoteFieldsFragment;
  terms: ProposalTermsFieldsFragment;
+  indicator?: number;
 }) => {
  const { t } = useTranslation();
  const voteInfo = useVoteInformation({
@@ -269,14 +286,37 @@ const VoteBreakdownBatchSubProposal = ({
  const isProposalOpen = proposal?.state === ProposalState.STATE_OPEN;
  const isUpdateMarket = terms?.change?.__typename === 'UpdateMarket';

+  let marketId = undefined;
+  if (terms?.change?.__typename === 'UpdateMarket') {
+    marketId = terms.change.marketId;
+  }
+  if (terms?.change?.__typename === 'UpdateMarketState') {
+    marketId = terms.change.market.id;
+  }
+
+  const marketName = marketId ? (
+    <>
+      : <MarketName marketId={marketId} />
+    </>
+  ) : null;
+
+  const indicatorElement = indicator && <Indicator indicator={indicator} />;
+
  return (
-    <div>
-      <h4>{t(terms.change.__typename)}</h4>
-      <VoteBreakDownUI
-        voteInfo={voteInfo}
-        isProposalOpen={isProposalOpen}
-        isUpdateMarket={isUpdateMarket}
-      />
+    <div className="mb-6">
+      <div className="flex items-center gap-3 mb-3">
+        {indicatorElement}
+        <h4>
+          {t(terms.change.__typename)} {marketName}
+        </h4>
+      </div>
+      <div className="rounded-sm bg-vega-dark-100 p-3">
+        <VoteBreakDownUI
+          voteInfo={voteInfo}
+          isProposalOpen={isProposalOpen}
+          isUpdateMarket={isUpdateMarket}
+        />
+      </div>
    </div>
  );
 };
@@ -291,11 +331,13 @@ const VoteBreakdownNormal = ({ proposal }: { proposal: Proposal }) => {
  const isUpdateMarket = proposal?.terms?.change?.__typename === 'UpdateMarket';

  return (
-    <VoteBreakDownUI
-      voteInfo={voteInfo}
-      isProposalOpen={isProposalOpen}
-      isUpdateMarket={isUpdateMarket}
-    />
+    <div className="mb-6">
+      <VoteBreakDownUI
+        voteInfo={voteInfo}
+        isProposalOpen={isProposalOpen}
+        isUpdateMarket={isUpdateMarket}
+      />
+    </div>
  );
 };

@@ -322,7 +364,6 @@ const VoteBreakDownUI = ({
    noPercentage,
    noLPPercentage,
    yesPercentage,
-    yesLPPercentage,
    yesTokens,
    noTokens,
    totalEquityLikeShareWeight,
@@ -335,6 +376,7 @@ const VoteBreakDownUI = ({
    majorityLPMet,
    willPassByTokenVote,
    willPassByLPVote,
+    lpVoteWeight,
  } = voteInfo;

  const participationThresholdProgress = BigNumber.min(
@@ -359,13 +401,13 @@ const VoteBreakDownUI = ({
    'flex justify-between flex-wrap gap-6'
  );
  const sectionClasses = classNames('min-w-[300px] flex-1 flex-grow');
-  const headingClasses = classNames('mb-2 text-vega-dark-400');
+  const headingClasses = classNames('mb-2 text-sm text-white font-bold');
  const progressDetailsClasses = classNames(
    'flex justify-between flex-wrap mt-2 text-sm'
  );

  return (
-    <div className="mb-6">
+    <div>
      {isProposalOpen && (
        <div
          data-testid="vote-status"
@@ -382,7 +424,7 @@ const VoteBreakDownUI = ({
              <VegaIcon
                name={VegaIconNames.CROSS}
                size={20}
-                className="text-vega-pink"
+                className="text-vega-red"
              />
            )}
          </span>
@@ -398,103 +440,13 @@ const VoteBreakDownUI = ({
            <p className="m-0">
              <Trans
                i18nKey={'Currently expected to <0>fail</0>'}
-                components={[<span className="text-vega-pink" />]}
+                components={[<span className="text-vega-red" />]}
              />
            </p>
          )}
        </div>
      )}

-      {isUpdateMarket && (
-        <div className="mb-4">
-          <h3 className={headingClasses}>{t('liquidityProviderVote')}</h3>
-          <div className={sectionWrapperClasses}>
-            <section
-              className={sectionClasses}
-              data-testid="lp-majority-breakdown"
-            >
-              <VoteProgress
-                percentageFor={yesLPPercentage}
-                colourfulBg={true}
-                testId="lp-majority-progress"
-              >
-                <Status
-                  reached={majorityLPMet}
-                  threshold={requiredMajorityLPPercentage}
-                  text={t('majorityThreshold')}
-                  testId={
-                    majorityLPMet ? 'lp-majority-met' : 'lp-majority-not-met'
-                  }
-                />
-              </VoteProgress>
-
-              <div className={progressDetailsClasses}>
-                <div className="flex items-center gap-1">
-                  <span>{t('liquidityProviderVotesFor')}:</span>
-                  <Tooltip
-                    description={
-                      <span>{yesLPPercentage.toFixed(defaultDP)}%</span>
-                    }
-                  >
-                    <button>{yesLPPercentage.toFixed(1)}%</button>
-                  </Tooltip>
-                </div>
-
-                <div className="flex items-center gap-1">
-                  <span>{t('liquidityProviderVotesAgainst')}:</span>
-                  <span>
-                    <Tooltip
-                      description={
-                        <span>{noLPPercentage.toFixed(defaultDP)}%</span>
-                      }
-                    >
-                      <button>{noLPPercentage.toFixed(1)}%</button>
-                    </Tooltip>
-                  </span>
-                </div>
-              </div>
-            </section>
-
-            <section
-              className={sectionClasses}
-              data-testid="lp-participation-breakdown"
-            >
-              <VoteProgress
-                percentageFor={
-                  lpParticipationThresholdProgress || new BigNumber(0)
-                }
-                testId="lp-participation-progress"
-              >
-                <Status
-                  reached={participationLPMet}
-                  threshold={requiredParticipationLP || new BigNumber(1)}
-                  text={t('participationThreshold')}
-                  testId={
-                    participationLPMet
-                      ? 'lp-participation-met'
-                      : 'lp-participation-not-met'
-                  }
-                />
-              </VoteProgress>
-
-              <div className="flex mt-2 text-sm">
-                <div className="flex items-center gap-1">
-                  <span>{t('totalLiquidityProviderTokensVoted')}:</span>
-                  <Tooltip
-                    description={formatNumber(
-                      totalEquityLikeShareWeight,
-                      defaultDP
-                    )}
-                  >
-                    <span>{totalEquityLikeShareWeight.toFixed(1)}%</span>
-                  </Tooltip>
-                </div>
-              </div>
-            </section>
-          </div>
-        </div>
-      )}
-
      {isUpdateMarket && <h3 className={headingClasses}>{t('tokenVote')}</h3>}
      <div className={sectionWrapperClasses}>
        <section
@@ -594,6 +546,97 @@ const VoteBreakDownUI = ({
          </div>
        </section>
      </div>
+
+      {/** Liquidity provider vote */}
+      {isUpdateMarket && (
+        <div className="mt-3">
+          <h3 className={headingClasses}>{t('liquidityProviderVote')}</h3>
+          <div className={sectionWrapperClasses}>
+            <section
+              className={sectionClasses}
+              data-testid="lp-majority-breakdown"
+            >
+              <VoteProgress
+                percentageFor={lpVoteWeight}
+                colourfulBg={true}
+                testId="lp-majority-progress"
+              >
+                <Status
+                  reached={majorityLPMet}
+                  threshold={requiredMajorityLPPercentage}
+                  text={t('majorityThreshold')}
+                  testId={
+                    majorityLPMet ? 'lp-majority-met' : 'lp-majority-not-met'
+                  }
+                />
+              </VoteProgress>
+
+              <div className={progressDetailsClasses}>
+                <div className="flex items-center gap-1">
+                  <span>{t('liquidityProviderVotesFor')}:</span>
+                  <Tooltip
+                    description={
+                      <span>{lpVoteWeight.toFixed(defaultDP)}%</span>
+                    }
+                  >
+                    <button>{lpVoteWeight.toFixed(1)}%</button>
+                  </Tooltip>
+                </div>
+
+                <div className="flex items-center gap-1">
+                  <span>{t('liquidityProviderVotesAgainst')}:</span>
+                  <span>
+                    <Tooltip
+                      description={
+                        <span>{noLPPercentage.toFixed(defaultDP)}%</span>
+                      }
+                    >
+                      <button>{noLPPercentage.toFixed(1)}%</button>
+                    </Tooltip>
+                  </span>
+                </div>
+              </div>
+            </section>
+
+            <section
+              className={sectionClasses}
+              data-testid="lp-participation-breakdown"
+            >
+              <VoteProgress
+                percentageFor={
+                  lpParticipationThresholdProgress || new BigNumber(0)
+                }
+                testId="lp-participation-progress"
+              >
+                <Status
+                  reached={participationLPMet}
+                  threshold={requiredParticipationLP || new BigNumber(1)}
+                  text={t('participationThreshold')}
+                  testId={
+                    participationLPMet
+                      ? 'lp-participation-met'
+                      : 'lp-participation-not-met'
+                  }
+                />
+              </VoteProgress>
+
+              <div className="flex mt-2 text-sm">
+                <div className="flex items-center gap-1">
+                  <span>{t('totalLiquidityProviderTokensVoted')}:</span>
+                  <Tooltip
+                    description={formatNumber(
+                      totalEquityLikeShareWeight,
+                      defaultDP
+                    )}
+                  >
+                    <span>{totalEquityLikeShareWeight.toFixed(1)}%</span>
+                  </Tooltip>
+                </div>
+              </div>
+            </section>
+          </div>
+        </div>
+      )}
    </div>
  );
 };
@@ -273,4 +273,74 @@ describe('use-vote-information', () => {
    expect(current?.willPassByTokenVote).toEqual(false);
    expect(current?.willPassByLPVote).toEqual(true);
  });
+
+  it('mainnet recreation: only yes LP votes equal passing', () => {
+    const yesVotes = 0;
+    const noVotes = 70;
+    const yesEquityLikeShareWeight = '0.21';
+    const noEquityLikeShareWeight = '0';
+    const fixedTokenValue = 1000000000000000000;
+
+    const proposal = generateProposal({
+      terms: {
+        change: {
+          __typename: 'UpdateMarket',
+          marketId: '12345',
+        },
+      },
+      votes: {
+        __typename: 'ProposalVotes',
+        yes: generateYesVotes(
+          yesVotes,
+          fixedTokenValue,
+          yesEquityLikeShareWeight
+        ),
+        no: generateNoVotes(noVotes, fixedTokenValue, noEquityLikeShareWeight),
+      },
+    });
+
+    const {
+      result: { current },
+    } = renderHook(() =>
+      useVoteInformation({ terms: proposal.terms, votes: proposal.votes })
+    );
+
+    expect(current?.willPassByTokenVote).toEqual(false);
+    expect(current?.willPassByLPVote).toEqual(true);
+  });
+
+  it('mainnet recreation: mixed yes and no LP votes equal failing', () => {
+    const yesVotes = 0;
+    const noVotes = 70;
+    const yesEquityLikeShareWeight = '0.21';
+    const noEquityLikeShareWeight = '0.22';
+    const fixedTokenValue = 1000000000000000000;
+
+    const proposal = generateProposal({
+      terms: {
+        change: {
+          __typename: 'UpdateMarket',
+          marketId: '12345',
+        },
+      },
+      votes: {
+        __typename: 'ProposalVotes',
+        yes: generateYesVotes(
+          yesVotes,
+          fixedTokenValue,
+          yesEquityLikeShareWeight
+        ),
+        no: generateNoVotes(noVotes, fixedTokenValue, noEquityLikeShareWeight),
+      },
+    });
+
+    const {
+      result: { current },
+    } = renderHook(() =>
+      useVoteInformation({ terms: proposal.terms, votes: proposal.votes })
+    );
+
+    expect(current?.willPassByTokenVote).toEqual(false);
+    expect(current?.willPassByLPVote).toEqual(false);
+  });
 });
@@ -123,15 +123,19 @@ const getVoteData = (
    totalSupply.multipliedBy(params.requiredParticipation)
  );

+  const lpVoteWeight = yesEquityLikeShareWeight
+    .dividedBy(totalEquityLikeShareWeight)
+    .multipliedBy(100);
+
  const participationLPMet = params.requiredParticipationLP
-    ? totalEquityLikeShareWeight.isGreaterThan(params.requiredParticipationLP)
+    ? lpVoteWeight.isGreaterThan(params.requiredParticipationLP)
    : false;

  const majorityMet = yesPercentage.isGreaterThanOrEqualTo(
    requiredMajorityPercentage
  );

-  const majorityLPMet = yesLPPercentage.isGreaterThanOrEqualTo(
+  const majorityLPMet = lpVoteWeight.isGreaterThanOrEqualTo(
    requiredMajorityLPPercentage
  );

@@ -149,14 +153,12 @@ const getVoteData = (

  const willPassByLPVote =
    participationLPMet &&
-    new BigNumber(yesLPPercentage).isGreaterThanOrEqualTo(
-      requiredMajorityLPPercentage
-    );
+    lpVoteWeight.isGreaterThanOrEqualTo(requiredMajorityLPPercentage);

  let willPass = false;

  if (changeType === 'UpdateMarket' || changeType === 'UpdateMarketState') {
-    willPass = willPassByTokenVote && willPassByLPVote;
+    willPass = willPassByTokenVote || willPassByLPVote;
  } else {
    willPass = willPassByTokenVote;
  }
@@ -182,6 +184,7 @@ const getVoteData = (
    totalLPTokensPercentage,
    willPassByTokenVote,
    willPassByLPVote,
+    lpVoteWeight: lpVoteWeight.isNaN() ? new BigNumber(0) : lpVoteWeight,
    yesVotes: new BigNumber(votes.yes.totalNumber ?? 0),
    noVotes: new BigNumber(votes.no.totalNumber ?? 0),
    totalVotes: new BigNumber(votes.yes.totalNumber ?? 0).plus(
@@ -1,17 +1,16 @@
 import { useParams } from 'react-router-dom';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
-import { useFetch } from '@vegaprotocol/react-helpers';
-import { ENV } from '../../../config';
 import { Proposal } from '../components/proposal';
 import { ProposalNotFound } from '../components/proposal-not-found';
 import { useProposalQuery } from '../__generated__/Proposals';
+import { useFetchProposal } from '../components/proposal/proposal-utils';

 export const ProposalContainer = () => {
  const params = useParams<{ proposalId: string }>();

-  const {
-    state: { data: restData, loading: restLoading, error: restError },
-  } = useFetch(`${ENV.rest}governance?proposalId=${params.proposalId}`);
+  const { data: restData, loading: restLoading } = useFetchProposal({
+    proposalId: params.proposalId,
+  });

  const { data, loading, error } = useProposalQuery({
    fetchPolicy: 'network-only',
@@ -26,7 +25,7 @@ export const ProposalContainer = () => {
  return (
    <AsyncRenderer
      loading={Boolean(loading || restLoading)}
-      error={error || restError}
+      error={error}
      data={{
        ...data,
        ...(restData ? { restData } : {}),
@@ -1,10 +1,9 @@
-import { useMemo, useEffect, useState, useCallback, useRef } from 'react';
+import { useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { AsyncRenderer, Pagination } from '@vegaprotocol/ui-toolkit';
 import { removePaginationWrapper } from '@vegaprotocol/utils';
 import type { EpochFieldsFragment } from '../home/__generated__/Rewards';
 import { useRewardsQuery } from '../home/__generated__/Rewards';
-import { ENV } from '../../../config';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { EpochIndividualRewardsTable } from './epoch-individual-rewards-table';
 import { generateEpochIndividualRewardsList } from './generate-epoch-individual-rewards-list';
@@ -27,22 +26,16 @@ export const EpochIndividualRewards = ({
  const [page, setPage] = useState(1);
  const { t } = useTranslation();
  const { pubKey } = useVegaWallet();
-  const { delegationsPagination } = ENV;
  const { param: marketCreationQuantumMultiple } = useNetworkParam(
    'rewards_marketCreationQuantumMultiple'
  );

-  const { data, loading, error, refetch } = useRewardsQuery({
+  const { data, loading, error } = useRewardsQuery({
    notifyOnNetworkStatusChange: true,
    variables: {
      partyId: pubKey || '',
-      fromEpoch: epochId - EPOCHS_PAGE_SIZE,
-      toEpoch: epochId,
-      delegationsPagination: delegationsPagination
-        ? {
-            first: Number(delegationsPagination),
-          }
-        : undefined,
+      ...calculateEpochOffset({ epochId, page, size: EPOCHS_PAGE_SIZE }),
+      delegationsPagination: { first: 50 },
    },
    skip: !pubKey,
  });
@@ -70,36 +63,6 @@ export const EpochIndividualRewards = ({
    });
  }, [data?.party, epochId, epochRewardSummaries, page, rewards]);

-  const refetchData = useCallback(
-    async (toPage?: number) => {
-      const targetPage = toPage ?? page;
-      await refetch({
-        partyId: pubKey || '',
-        ...calculateEpochOffset({ epochId, page, size: EPOCHS_PAGE_SIZE }),
-        delegationsPagination: delegationsPagination
-          ? {
-              first: Number(delegationsPagination),
-            }
-          : undefined,
-      });
-      setPage(targetPage);
-    },
-    [epochId, page, refetch, delegationsPagination, pubKey]
-  );
-
-  const prevEpochIdRef = useRef<number | null>(null);
-
-  useEffect(() => {
-    if (prevEpochIdRef.current === null) {
-      prevEpochIdRef.current = epochId;
-    } else if (epochId !== prevEpochIdRef.current) {
-      // When the epoch changes, we want to refetch the data to update the current page
-      refetchData();
-    }
-
-    prevEpochIdRef.current = epochId;
-  }, [epochId, refetchData]);
-
  // Workarounds for the error handling of AsyncRenderer
  const filteredErrors = filterAcceptableGraphqlErrors(error);
  const filteredData = data || [];
@@ -131,10 +94,10 @@ export const EpochIndividualRewards = ({
              isLoading={loading}
              hasPrevPage={page > 1}
              hasNextPage={page < totalPages}
-              onBack={() => refetchData(page - 1)}
-              onNext={() => refetchData(page + 1)}
-              onFirst={() => refetchData(1)}
-              onLast={() => refetchData(totalPages)}
+              onBack={() => setPage((x) => x - 1)}
+              onNext={() => setPage((x) => x + 1)}
+              onFirst={() => setPage(1)}
+              onLast={() => setPage(totalPages)}
            >
              {t('Page')} {page}
            </Pagination>
@@ -23,36 +23,6 @@ describe('generateEpochIndividualRewardsList', () => {
    epoch: { id: '2' },
  };

-  const reward3: RewardFieldsFragment = {
-    rewardType: AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
-    amount: '200',
-    percentageOfTotal: '0.2',
-    receivedAt: new Date(),
-    asset: { id: 'gbp', symbol: 'GBP', name: 'GBP', decimals: 7 },
-    party: { id: 'blah' },
-    epoch: { id: '2' },
-  };
-
-  const reward4: RewardFieldsFragment = {
-    rewardType: AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
-    amount: '100',
-    percentageOfTotal: '0.1',
-    receivedAt: new Date(),
-    asset: { id: 'usd', symbol: 'USD', name: 'USD', decimals: 6 },
-    party: { id: 'blah' },
-    epoch: { id: '1' },
-  };
-
-  const reward5: RewardFieldsFragment = {
-    rewardType: AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
-    amount: '150',
-    percentageOfTotal: '0.15',
-    receivedAt: new Date(),
-    asset: { id: 'usd', symbol: 'USD', name: 'USD', decimals: 6 },
-    party: { id: 'blah' },
-    epoch: { id: '3' },
-  };
-
  const rewardWrongType: RewardFieldsFragment = {
    rewardType: AccountType.ACCOUNT_TYPE_INSURANCE,
    amount: '50',
@@ -120,26 +90,10 @@ describe('generateEpochIndividualRewardsList', () => {
              amount: '0',
              percentageOfTotal: '0',
            },
-            [AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES]: {
-              amount: '0',
-              percentageOfTotal: '0',
-            },
            [AccountType.ACCOUNT_TYPE_GLOBAL_REWARD]: {
              amount: '100',
              percentageOfTotal: '0.1',
            },
-            [AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES]: {
-              amount: '0',
-              percentageOfTotal: '0',
-            },
-            [AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES]: {
-              amount: '0',
-              percentageOfTotal: '0',
-            },
-            [AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS]: {
-              amount: '0',
-              percentageOfTotal: '0',
-            },
          },
        },
      ],
@@ -147,7 +101,7 @@ describe('generateEpochIndividualRewardsList', () => {
  });

  it('should return an array sorted by epoch descending', () => {
-    const rewards = [reward1, reward2, reward3, reward4];
+    const rewards = [reward1, reward2];
    const result1 = generateEpochIndividualRewardsList({
      rewards,
      epochId: 2,
@@ -157,7 +111,7 @@ describe('generateEpochIndividualRewardsList', () => {
    expect(result1[0].epoch).toEqual(2);
    expect(result1[1].epoch).toEqual(1);

-    const reorderedRewards = [reward4, reward3, reward2, reward1];
+    const reorderedRewards = [reward2, reward1];
    const result2 = generateEpochIndividualRewardsList({
      rewards: reorderedRewards,
      epochId: 2,
@@ -170,7 +124,7 @@ describe('generateEpochIndividualRewardsList', () => {

  it('returns data in the expected shape', () => {
    // Just sanity checking the whole structure here
-    const rewards = [reward1, reward2, reward3, reward4];
+    const rewards = [reward1, reward2];
    const result = generateEpochIndividualRewardsList({
      rewards,
      epochId: 2,
@@ -181,37 +135,6 @@ describe('generateEpochIndividualRewardsList', () => {
      {
        epoch: 2,
        rewards: [
-          {
-            asset: 'GBP',
-            totalAmount: '200',
-            decimals: 7,
-            rewardTypes: {
-              [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES]: {
-                amount: '200',
-                percentageOfTotal: '0.2',
-              },
-              [AccountType.ACCOUNT_TYPE_GLOBAL_REWARD]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-            },
-          },
          {
            asset: 'EUR',
            totalAmount: '50',
@@ -221,26 +144,10 @@ describe('generateEpochIndividualRewardsList', () => {
                amount: '0',
                percentageOfTotal: '0',
              },
-              [AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
              [AccountType.ACCOUNT_TYPE_GLOBAL_REWARD]: {
                amount: '50',
                percentageOfTotal: '0.05',
              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
            },
          },
        ],
@@ -250,33 +157,17 @@ describe('generateEpochIndividualRewardsList', () => {
        rewards: [
          {
            asset: 'USD',
-            totalAmount: '200',
+            totalAmount: '100',
            decimals: 6,
            rewardTypes: {
              [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
                amount: '0',
                percentageOfTotal: '0',
              },
-              [AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES]: {
-                amount: '100',
-                percentageOfTotal: '0.1',
-              },
              [AccountType.ACCOUNT_TYPE_GLOBAL_REWARD]: {
                amount: '100',
                percentageOfTotal: '0.1',
              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
            },
          },
        ],
@@ -285,7 +176,7 @@ describe('generateEpochIndividualRewardsList', () => {
  });

  it('returns data correctly for the requested epoch range', () => {
-    const rewards = [reward1, reward2, reward3, reward4, reward5];
+    const rewards = [reward1, reward2];
    const resultPageOne = generateEpochIndividualRewardsList({
      rewards,
      epochId: 3,
@@ -297,74 +188,11 @@ describe('generateEpochIndividualRewardsList', () => {
    expect(resultPageOne).toEqual([
      {
        epoch: 3,
-        rewards: [
-          {
-            asset: 'USD',
-            decimals: 6,
-            totalAmount: '150',
-            rewardTypes: {
-              [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES]: {
-                amount: '150',
-                percentageOfTotal: '0.15',
-              },
-              [AccountType.ACCOUNT_TYPE_GLOBAL_REWARD]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-            },
-          },
-        ],
+        rewards: [],
      },
      {
        epoch: 2,
        rewards: [
-          {
-            asset: 'GBP',
-            totalAmount: '200',
-            decimals: 7,
-            rewardTypes: {
-              [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES]: {
-                amount: '200',
-                percentageOfTotal: '0.2',
-              },
-              [AccountType.ACCOUNT_TYPE_GLOBAL_REWARD]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-            },
-          },
          {
            asset: 'EUR',
            totalAmount: '50',
@@ -374,26 +202,10 @@ describe('generateEpochIndividualRewardsList', () => {
                amount: '0',
                percentageOfTotal: '0',
              },
-              [AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
              [AccountType.ACCOUNT_TYPE_GLOBAL_REWARD]: {
                amount: '50',
                percentageOfTotal: '0.05',
              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
            },
          },
        ],
@@ -414,33 +226,17 @@ describe('generateEpochIndividualRewardsList', () => {
        rewards: [
          {
            asset: 'USD',
-            totalAmount: '200',
+            totalAmount: '100',
            decimals: 6,
            rewardTypes: {
              [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
                amount: '0',
                percentageOfTotal: '0',
              },
-              [AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES]: {
-                amount: '100',
-                percentageOfTotal: '0.1',
-              },
              [AccountType.ACCOUNT_TYPE_GLOBAL_REWARD]: {
                amount: '100',
                percentageOfTotal: '0.1',
              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
-              [AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS]: {
-                amount: '0',
-                percentageOfTotal: '0',
-              },
            },
          },
        ],
@@ -1,4 +1,4 @@
-import { useState, useCallback, useEffect } from 'react';
+import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { AsyncRenderer, Pagination } from '@vegaprotocol/ui-toolkit';
 import type { EpochFieldsFragment } from '../home/__generated__/Rewards';
@@ -23,37 +23,17 @@ export const EpochTotalRewards = ({ currentEpoch }: EpochTotalRewardsProps) => {
    'rewards_marketCreationQuantumMultiple'
  );
  const [page, setPage] = useState(1);
-  const { data, loading, error, refetch } = useEpochAssetsRewardsQuery({
+  const { data, loading, error } = useEpochAssetsRewardsQuery({
    notifyOnNetworkStatusChange: true,
    variables: {
-      epochRewardSummariesFilter: {
-        fromEpoch: epochId - EPOCHS_PAGE_SIZE,
-      },
+      epochRewardSummariesFilter: calculateEpochOffset({
+        epochId,
+        page: page,
+        size: EPOCHS_PAGE_SIZE,
+      }),
    },
  });

-  const refetchData = useCallback(
-    async (toPage?: number) => {
-      const targetPage = toPage ?? page;
-      await refetch({
-        epochRewardSummariesFilter: calculateEpochOffset({
-          epochId,
-          page: targetPage,
-          size: EPOCHS_PAGE_SIZE,
-        }),
-      });
-      setPage(targetPage);
-    },
-    [epochId, page, refetch]
-  );
-
-  useEffect(() => {
-    // when the epoch changes, we want to refetch the data to update the current page
-    if (data) {
-      refetchData();
-    }
-  }, [epochId, data, refetchData]);
-
  const epochTotalRewardSummaries =
    generateEpochTotalRewardsList({
      data,
@@ -85,10 +65,10 @@ export const EpochTotalRewards = ({ currentEpoch }: EpochTotalRewardsProps) => {
            isLoading={loading}
            hasPrevPage={page > 1}
            hasNextPage={page < totalPages}
-            onBack={() => refetchData(page - 1)}
-            onNext={() => refetchData(page + 1)}
-            onFirst={() => refetchData(1)}
-            onLast={() => refetchData(totalPages)}
+            onBack={() => setPage((x) => x - 1)}
+            onNext={() => setPage((x) => x + 1)}
+            onFirst={() => setPage(1)}
+            onLast={() => setPage(totalPages)}
          >
            {t('Page')} {page}
          </Pagination>
@@ -149,38 +149,6 @@ describe('generateEpochAssetRewardsList', () => {
                        amount: '0',
                      },
                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
-                        amount: '0',
-                      },
-                    ],
                  ]),
                  totalAmount: '123',
                },
@@ -291,40 +259,8 @@ describe('generateEpochAssetRewardsList', () => {
                        amount: '100',
                      },
                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-                        amount: '123',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
-                        amount: '0',
-                      },
-                    ],
                  ]),
-                  totalAmount: '223',
+                  totalAmount: '100',
                },
              ],
            ]),
@@ -334,66 +270,7 @@ describe('generateEpochAssetRewardsList', () => {
          '2',
          {
            epoch: 2,
-            assetRewards: new Map([
-              [
-                '1',
-                {
-                  assetId: '1',
-                  decimals: 18,
-                  name: 'Asset 1',
-                  rewards: new Map([
-                    [
-                      AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
-                      {
-                        rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
-                        amount: '5',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
-                        amount: '0',
-                      },
-                    ],
-                  ]),
-                  totalAmount: '5',
-                },
-              ],
-            ]),
+            assetRewards: new Map(),
          },
        ],
      ])
@@ -489,66 +366,7 @@ describe('generateEpochAssetRewardsList', () => {
          '2',
          {
            epoch: 2,
-            assetRewards: new Map([
-              [
-                '1',
-                {
-                  assetId: '1',
-                  name: 'Asset 1',
-                  decimals: 18,
-                  rewards: new Map([
-                    [
-                      AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
-                      {
-                        rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
-                        amount: '33',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
-                        amount: '0',
-                      },
-                    ],
-                  ]),
-                  totalAmount: '33',
-                },
-              ],
-            ]),
+            assetRewards: new Map(),
          },
        ],
        [
@@ -578,38 +396,6 @@ describe('generateEpochAssetRewardsList', () => {
                        amount: '15',
                      },
                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
-                        amount: '0',
-                      },
-                    ],
                  ]),
                  totalAmount: '15',
                },
@@ -656,40 +442,8 @@ describe('generateEpochAssetRewardsList', () => {
                        amount: '100',
                      },
                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-                        amount: '123',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
-                        amount: '0',
-                      },
-                    ],
-                    [
-                      AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
-                      {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
-                        amount: '0',
-                      },
-                    ],
                  ]),
-                  totalAmount: '223',
+                  totalAmount: '100',
                },
              ],
            ]),
@@ -18,22 +18,6 @@ export const RowAccountTypes = {
    columnTitle: 'rewardsColInfraHeader',
    description: 'rewardsColInfraTooltip',
  },
-  [AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES]: {
-    columnTitle: 'rewardsColPriceTakingHeader',
-    description: 'rewardsColPriceTakingTooltip',
-  },
-  [AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES]: {
-    columnTitle: 'rewardsColPriceMakingHeader',
-    description: 'rewardsColPriceMakingTooltip',
-  },
-  [AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES]: {
-    columnTitle: 'rewardsColLiquidityProvisionHeader',
-    description: 'rewardsColLiquidityProvisionTooltip',
-  },
-  [AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS]: {
-    columnTitle: 'rewardsColMarketCreationHeader',
-    description: 'rewardsColMarketCreationTooltip',
-  },
 };

 interface ColumnHeaderProps {
@@ -55,7 +39,7 @@ export const rowGridItemStyles = (last = false) =>
  });

 const gridStyles = classNames(
-  'grid grid-cols-[repeat(8,minmax(100px,auto))] max-w-full overflow-auto',
+  'grid grid-cols-[repeat(4,minmax(100px,auto))] max-w-full overflow-auto',
  `border-t border-vega-dark-200`,
  'text-sm'
 );
@@ -1,27 +1,31 @@
+fragment ValidatorNode on Node {
+  id
+  stakedTotal
+  rewardScore {
+    rawValidatorScore
+    performanceScore
+    multisigScore
+    validatorScore
+    normalisedScore
+    validatorStatus
+  }
+  rankingScore {
+    status
+    previousStatus
+    rankingScore
+    stakeScore
+    performanceScore
+    votingPower
+  }
+}
+
 query PreviousEpoch($epochId: ID) {
  epoch(id: $epochId) {
    id
    validatorsConnection {
      edges {
        node {
-          id
-          stakedTotal
-          rewardScore {
-            rawValidatorScore
-            performanceScore
-            multisigScore
-            validatorScore
-            normalisedScore
-            validatorStatus
-          }
-          rankingScore {
-            status
-            previousStatus
-            rankingScore
-            stakeScore
-            performanceScore
-            votingPower
-          }
+          ...ValidatorNode
        }
      }
    }
@@ -3,6 +3,8 @@ import * as Types from '@vegaprotocol/types';
 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
+export type ValidatorNodeFragment = { __typename?: 'Node', id: string, stakedTotal: string, rewardScore?: { __typename?: 'RewardScore', rawValidatorScore: string, performanceScore: string, multisigScore: string, validatorScore: string, normalisedScore: string, validatorStatus: Types.ValidatorStatus } | null, rankingScore: { __typename?: 'RankingScore', status: Types.ValidatorStatus, previousStatus: Types.ValidatorStatus, rankingScore: string, stakeScore: string, performanceScore: string, votingPower: string } };
+
 export type PreviousEpochQueryVariables = Types.Exact<{
  epochId?: Types.InputMaybe<Types.Scalars['ID']>;
 }>;
@@ -10,7 +12,28 @@ export type PreviousEpochQueryVariables = Types.Exact<{

 export type PreviousEpochQuery = { __typename?: 'Query', epoch: { __typename?: 'Epoch', id: string, validatorsConnection?: { __typename?: 'NodesConnection', edges?: Array<{ __typename?: 'NodeEdge', node: { __typename?: 'Node', id: string, stakedTotal: string, rewardScore?: { __typename?: 'RewardScore', rawValidatorScore: string, performanceScore: string, multisigScore: string, validatorScore: string, normalisedScore: string, validatorStatus: Types.ValidatorStatus } | null, rankingScore: { __typename?: 'RankingScore', status: Types.ValidatorStatus, previousStatus: Types.ValidatorStatus, rankingScore: string, stakeScore: string, performanceScore: string, votingPower: string } } } | null> | null } | null } };

-
+export const ValidatorNodeFragmentDoc = gql`
+    fragment ValidatorNode on Node {
+  id
+  stakedTotal
+  rewardScore {
+    rawValidatorScore
+    performanceScore
+    multisigScore
+    validatorScore
+    normalisedScore
+    validatorStatus
+  }
+  rankingScore {
+    status
+    previousStatus
+    rankingScore
+    stakeScore
+    performanceScore
+    votingPower
+  }
+}
+    `;
 export const PreviousEpochDocument = gql`
    query PreviousEpoch($epochId: ID) {
  epoch(id: $epochId) {
@@ -18,30 +41,13 @@ export const PreviousEpochDocument = gql`
    validatorsConnection {
      edges {
        node {
-          id
-          stakedTotal
-          rewardScore {
-            rawValidatorScore
-            performanceScore
-            multisigScore
-            validatorScore
-            normalisedScore
-            validatorStatus
-          }
-          rankingScore {
-            status
-            previousStatus
-            rankingScore
-            stakeScore
-            performanceScore
-            votingPower
-          }
+          ...ValidatorNode
        }
      }
    }
  }
 }
-    `;
+    ${ValidatorNodeFragmentDoc}`;

 /**
 * __usePreviousEpochQuery__
@@ -6,7 +6,6 @@ import { usePreviousEpochQuery } from '../__generated__/PreviousEpoch';
 import { ValidatorTables } from './validator-tables';
 import { useRefreshAfterEpoch } from '../../../hooks/use-refresh-after-epoch';
 import { useVegaWallet } from '@vegaprotocol/wallet';
-import { ENV } from '../../../config';
 import { getMultisigStatusInfo } from '../../../lib/get-multisig-status-info';
 import { MultisigIncorrectNotice } from '../../../components/multisig-incorrect-notice';

@@ -20,7 +19,6 @@ export const EpochData = () => {
    refetch: nodesRefetch,
  } = useNodesQuery();

-  const { delegationsPagination } = ENV;
  const {
    data: userStakingData,
    error: userStakingError,
@@ -29,11 +27,9 @@ export const EpochData = () => {
  } = useStakingQuery({
    variables: {
      partyId: pubKey || '',
-      delegationsPagination: delegationsPagination
-        ? {
-            first: Number(delegationsPagination),
-          }
-        : undefined,
+      delegationsPagination: {
+        first: 50,
+      },
    },
  });
  const { data: previousEpochData } = usePreviousEpochQuery({
@@ -288,7 +288,7 @@ describe('Consensus validators table', () => {

    expect(
      grid.querySelector('[role="gridcell"][col-id="totalPenalties"]')
-    ).toHaveTextContent('13.16%');
+    ).toHaveTextContent('10.07%');

    expect(
      grid.querySelector('[role="gridcell"][col-id="normalisedVotingPower"]')
@@ -185,15 +185,19 @@ export const ConsensusValidatorsTable = ({
          const { rawValidatorScore: previousEpochValidatorScore } =
            getLastEpochScoreAndPerformance(previousEpochData, id);

-          const overstakingPenalty = calculateOverallPenalty(
+          const overstakingPenalty = calculateOverstakedPenalty(
            id,
            allNodesInPreviousEpoch
          );
-          const totalPenalty = calculateOverstakedPenalty(
+          const totalPenalty = calculateOverallPenalty(
            id,
            allNodesInPreviousEpoch
          );

+          const lastEpochDataForNode = allNodesInPreviousEpoch.find(
+            (node) => node.id === id
+          );
+
          return {
            id,
            [ValidatorFields.RANKING_INDEX]: stakedTotalRanking,
@@ -239,6 +243,12 @@ export const ConsensusValidatorsTable = ({
              : undefined,
            [ValidatorFields.MULTISIG_ERROR]:
              multisigStatus?.showMultisigStatusError,
+            [ValidatorFields.MULTISIG_PENALTY]: formatNumberPercentage(
+              new BigNumber(1)
+                .minus(lastEpochDataForNode?.rewardScore?.multisigScore ?? 1)
+                .times(100),
+              2
+            ),
          };
        }
      );
@@ -378,7 +388,6 @@ export const ConsensusValidatorsTable = ({
          headerTooltip: t('StakeDescription').toString(),
          cellRenderer: TotalStakeRenderer,
          width: 120,
-          sort: 'desc',
        },
        {
          field: ValidatorFields.PENDING_STAKE,
@@ -400,6 +409,7 @@ export const ConsensusValidatorsTable = ({
          headerTooltip: t('NormalisedVotingPowerDescription').toString(),
          cellRenderer: VotingPowerRenderer,
          width: 120,
+          sort: 'desc',
        },
        {
          field: ValidatorFields.TOTAL_PENALTIES,
@@ -40,6 +40,7 @@ export enum ValidatorFields {
  PENDING_USER_STAKE = 'pendingUserStake',
  USER_STAKE_SHARE = 'userStakeShare',
  MULTISIG_ERROR = 'multisigError',
+  MULTISIG_PENALTY = 'multisigPenalty',
 }

 export const addUserDataToValidator = (
@@ -327,7 +328,7 @@ interface TotalPenaltiesRendererProps {
    overstakedAmount: string;
    overstakingPenalty: string;
    totalPenalties: string;
-    multisigError?: boolean;
+    multisigPenalty: string;
  };
 }

@@ -346,11 +347,9 @@ export const TotalPenaltiesRenderer = ({
          <div data-testid="overstaked-penalty-tooltip">
            {t('overstakedPenalty')}: {data.overstakingPenalty}
          </div>
-          {data.multisigError && (
-            <div data-testid="multisig-error-tooltip">
-              {t('multisigPenalty')}: 100%
-            </div>
-          )}
+          <div data-testid="multisig-error-tooltip">
+            {t('multisigPenalty')}: {data.multisigPenalty}
+          </div>
        </>
      }
    >
@@ -1,4 +1,3 @@
-import { ENV } from '../../../config';
 import { Callout, Intent, Splash } from '@vegaprotocol/ui-toolkit';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { useTranslation } from 'react-i18next';
@@ -28,16 +27,13 @@ export const NodeContainer = ({
 }) => {
  const { t } = useTranslation();
  const { pubKey } = useVegaWallet();
-  const { delegationsPagination } = ENV;

  const { data, loading, error, refetch } = useStakingQuery({
    variables: {
      partyId: pubKey || '',
-      delegationsPagination: delegationsPagination
-        ? {
-            first: Number(delegationsPagination),
-          }
-        : undefined,
+      delegationsPagination: {
+        first: 50,
+      },
    },
    errorPolicy: 'all',
  });
@@ -3,7 +3,6 @@ import * as Sentry from '@sentry/react';
 import React, { useCallback, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
-import { ENV } from '../../../config';
 import { usePartyDelegationsLazyQuery } from './__generated__/PartyDelegations';
 import { TokenInput } from '../../../components/token-input';
 import { useAppState } from '../../../contexts/app-state/app-state-context';
@@ -79,7 +78,6 @@ export const StakingForm = ({
  const [error, setError] = useState<Error | null>(null);
  const [isDialogVisible, setIsDialogVisible] = useState(false);
  const { t } = useTranslation();
-  const { delegationsPagination } = ENV;
  const [action, setAction] = React.useState<StakeAction>(
    params.action as StakeAction
  );
@@ -154,11 +152,9 @@ export const StakingForm = ({
  const [delegationSearch, { data }] = usePartyDelegationsLazyQuery({
    variables: {
      partyId: pubKey,
-      delegationsPagination: delegationsPagination
-        ? {
-            first: Number(delegationsPagination),
-          }
-        : undefined,
+      delegationsPagination: {
+        first: 50,
+      },
    },
    fetchPolicy: 'network-only',
  });
@@ -104,6 +104,11 @@ export const ValidatorTable = ({
    };
  }, [node, previousEpochData?.epoch.validatorsConnection?.edges]);

+  const previousNodeData =
+    previousEpochData?.epoch.validatorsConnection?.edges?.find(
+      (e) => e?.node.id === node.id
+    );
+
  return (
    <>
      <p className="mb-12">
@@ -281,6 +286,28 @@ export const ValidatorTable = ({
                  </span>
                </Tooltip>
              </KeyValueTableRow>
+              <KeyValueTableRow>
+                <span className="uppercase">{t('multisigPenalty')}</span>
+
+                <span
+                  data-testid="multisig-penalty"
+                  className="flex gap-2 items-baseline"
+                >
+                  <Tooltip description={t('multisigPenaltyDescription')}>
+                    <span>
+                      {formatNumberPercentage(
+                        new BigNumber(1)
+                          .minus(
+                            previousNodeData?.node.rewardScore?.multisigScore ??
+                              1
+                          )
+                          .times(100),
+                        2
+                      )}
+                    </span>
+                  </Tooltip>
+                </span>
+              </KeyValueTableRow>
              <KeyValueTableRow noBorder={true}>
                <span>
                  <strong>{t('TOTAL PENALTIES')}</strong>
@@ -14,7 +14,7 @@ NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
+NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/en-GB/firefox/addon/vega-wallet-beta/
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72

@@ -13,7 +13,7 @@ NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
+NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/en-GB/firefox/addon/vega-wallet-beta/

 NX_ETH_LOCAL_PROVIDER_URL=http://localhost:8545/
 NX_ETH_WALLET_MNEMONIC="ozone access unlock valid olympic save include omit supply green clown session"
@@ -14,7 +14,7 @@ NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega-dev-releases/releases
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
+NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/en-GB/firefox/addon/vega-wallet-beta/
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json

 # Cosmic elevator flags
@@ -14,7 +14,7 @@ NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
+NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/en-GB/firefox/addon/vega-wallet-beta/
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72

@@ -15,7 +15,7 @@ NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/annou
 NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
 NX_VEGA_CONSOLE_URL=https://console.fairground.wtf
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
+NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/en-GB/firefox/addon/vega-wallet-beta/
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72

@@ -16,7 +16,7 @@ NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
 NX_VEGA_CONSOLE_URL=https://trading.validators-testnet.vega.rocks

 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
+NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/en-GB/firefox/addon/vega-wallet-beta/
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json

 # Cosmic elevator flags
@@ -1,9 +1,12 @@
 import { useT } from '../../lib/use-t';
 import { ErrorBoundary } from '@sentry/react';
 import { CompetitionsHeader } from '../../components/competitions/competitions-header';
-import { Intent, Loader, TradingButton } from '@vegaprotocol/ui-toolkit';
-
-import { useGameCards } from '../../lib/hooks/use-game-cards';
+import {
+  ExternalLink,
+  Intent,
+  Loader,
+  TradingButton,
+} from '@vegaprotocol/ui-toolkit';
 import { useEpochInfoQuery } from '../../lib/hooks/__generated__/Epoch';
 import { Link, useNavigate } from 'react-router-dom';
 import { Links } from '../../lib/links';
@@ -18,6 +21,9 @@ import take from 'lodash/take';
 import { usePageTitle } from '../../lib/hooks/use-page-title';
 import { TeamCard } from '../../components/competitions/team-card';
 import { useMyTeam } from '../../lib/hooks/use-my-team';
+import { useRewards } from '../../lib/hooks/use-rewards';
+import { Trans } from 'react-i18next';
+import { DocsLinks } from '@vegaprotocol/environment';

 export const CompetitionsHome = () => {
  const t = useT();
@@ -28,9 +34,9 @@ export const CompetitionsHome = () => {
  const { data: epochData } = useEpochInfoQuery();
  const currentEpoch = Number(epochData?.epoch.id);

-  const { data: gamesData, loading: gamesLoading } = useGameCards({
+  const { data: gamesData, loading: gamesLoading } = useRewards({
    onlyActive: true,
-    currentEpoch,
+    scopeToTeams: true,
  });

  const { data: teamsData, loading: teamsLoading } = useTeams();
@@ -45,10 +51,34 @@ export const CompetitionsHome = () => {
  return (
    <ErrorBoundary>
      <CompetitionsHeader title={t('Competitions')}>
+        <p className="text-lg mb-3">
+          <Trans
+            i18nKey={
+              'Check the cards below to see what community-created, on-chain games are active and how to compete. Joining a team also lets you take part in the on-chain <0>referral program</0>.'
+            }
+            components={[
+              <Link className="underline" key="ref-prog" to={Links.REFERRALS()}>
+                referral program
+              </Link>,
+            ]}
+          />
+        </p>
        <p className="text-lg mb-1">
-          {t(
-            'Be a team player! Participate in games and work together to rake in as much profit to win.'
-          )}
+          <Trans
+            i18nKey={
+              'Got an idea for a competition? Anyone can define and fund one -- <0>propose an on-chain game</0> yourself.'
+            }
+            components={[
+              <ExternalLink
+                className="underline"
+                key="propose"
+                href={DocsLinks?.ASSET_TRANSFER_PROPOSAL}
+              >
+                propose an on-chain game
+              </ExternalLink>,
+            ]}
+          />
+          {/** Docs: https://docs.vega.xyz/mainnet/tutorials/proposals/asset-transfer-proposal */}
        </p>
      </CompetitionsHeader>

@@ -75,7 +105,7 @@ export const CompetitionsHome = () => {
              variant="A"
              title={t('Create a team')}
              description={t(
-                'Lorem ipsum dolor sit amet, consectetur adipisicing elit placeat ipsum minus nemo error dicta.'
+                'Create a new team, share your code with potential members, or set a whitelist for an exclusive group.'
              )}
              actionElement={
                <TradingButton
@@ -94,7 +124,7 @@ export const CompetitionsHome = () => {
              variant="B"
              title={t('Solo team / lone wolf')}
              description={t(
-                'Lorem ipsum dolor sit amet, consectetur adipisicing elit placeat ipsum minus nemo error dicta.'
+                'Want to compete but think the best team size is one? This is the option for you.'
              )}
              actionElement={
                <TradingButton
@@ -112,7 +142,7 @@ export const CompetitionsHome = () => {
              variant="C"
              title={t('Join a team')}
              description={t(
-                'Lorem ipsum dolor sit amet, consectetur adipisicing elit placeat ipsum minus nemo error dicta.'
+                'Browse existing public teams to find your perfect match.'
              )}
              actionElement={
                <TradingButton
@@ -131,27 +161,57 @@ export const CompetitionsHome = () => {
      )}

      {/** List of available games */}
-      <h2 className="text-2xl mb-6">{t('Games')}</h2>
+      <h2 className="text-2xl mb-1">{t('Games')}</h2>
+      <p className="mb-6 text-sm">
+        <Trans
+          i18nKey={
+            'See all the live games on the cards below. Every on-chain game is community funded and designed. <0>Find out how to create one</0>.'
+          }
+          components={[
+            <ExternalLink
+              className="underline"
+              key="find-out"
+              href={DocsLinks?.ASSET_TRANSFER_PROPOSAL}
+            >
+              Find out how to create one
+            </ExternalLink>,
+          ]}
+        />
+        {/** Docs: https://docs.vega.xyz/mainnet/tutorials/proposals/asset-transfer-proposal */}
+      </p>

-      {gamesLoading ? (
-        <Loader size="small" />
-      ) : (
-        <GamesContainer data={gamesData} currentEpoch={currentEpoch} />
-      )}
+      <div className="mb-12 flex">
+        {gamesLoading ? (
+          <Loader size="small" />
+        ) : (
+          <GamesContainer data={gamesData} currentEpoch={currentEpoch} />
+        )}
+      </div>

      {/** The teams ranking */}
-      <div className="mb-6 flex flex-row items-baseline justify-between">
-        <h2 className="text-2xl">{t('Leaderboard')}</h2>
+      <div className="mb-1 flex flex-row items-baseline gap-3 justify-between">
+        <h2 className="text-2xl">
+          <Link to={Links.COMPETITIONS_TEAMS()} className=" underline">
+            {t('Leaderboard')}
+          </Link>
+        </h2>
        <Link to={Links.COMPETITIONS_TEAMS()} className="text-sm underline">
          {t('View all teams')}
        </Link>
      </div>
+      <p className="mb-6 text-sm">
+        {t(
+          'Teams can earn rewards if they meet the goals set in the on-chain trading competitions. Track your earned rewards here, and see which teams are top of the leaderboard this month.'
+        )}
+      </p>

-      {teamsLoading ? (
-        <Loader size="small" />
-      ) : (
-        <CompetitionsLeaderboard data={take(teamsData, 10)} />
-      )}
+      <div className="flex">
+        {teamsLoading ? (
+          <Loader size="small" />
+        ) : (
+          <CompetitionsLeaderboard data={take(teamsData, 10)} />
+        )}
+      </div>
    </ErrorBoundary>
  );
 };
@@ -10,11 +10,7 @@ import {
  VegaIcon,
  VegaIconNames,
 } from '@vegaprotocol/ui-toolkit';
-import {
-  TransferStatus,
-  type Asset,
-  type RecurringTransfer,
-} from '@vegaprotocol/types';
+import { TransferStatus, type Asset } from '@vegaprotocol/types';
 import classNames from 'classnames';
 import { useT } from '../../lib/use-t';
 import { Table } from '../../components/table';
@@ -44,11 +40,6 @@ import {
  areTeamGames,
 } from '../../lib/hooks/use-games';
 import { useEpochInfoQuery } from '../../lib/hooks/__generated__/Epoch';
-import {
-  type EnrichedTransfer,
-  isScopedToTeams,
-  useGameCards,
-} from '../../lib/hooks/use-game-cards';
 import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
 import {
  ActiveRewardCard,
@@ -56,6 +47,11 @@ import {
 } from '../../components/rewards-container/active-rewards';
 import { type MarketMap, useMarketsMapProvider } from '@vegaprotocol/markets';
 import format from 'date-fns/format';
+import {
+  type EnrichedRewardTransfer,
+  isScopedToTeams,
+  useRewards,
+} from '../../lib/hooks/use-rewards';

 export const CompetitionsTeam = () => {
  const t = useT();
@@ -78,10 +74,9 @@ const TeamPageContainer = ({ teamId }: { teamId: string | undefined }) => {

  const { data: games, loading: gamesLoading } = useGames(teamId);

-  const { data: epochData, loading: epochLoading } = useEpochInfoQuery();
-  const { data: transfersData, loading: transfersLoading } = useGameCards({
-    currentEpoch: Number(epochData?.epoch.id),
+  const { data: transfersData, loading: transfersLoading } = useRewards({
    onlyActive: false,
+    scopeToTeams: true,
  });

  const { data: markets } = useMarketsMapProvider();
@@ -112,7 +107,7 @@ const TeamPageContainer = ({ teamId }: { teamId: string | undefined }) => {
      games={areTeamGames(games) ? games : undefined}
      gamesLoading={gamesLoading}
      transfers={transfersData}
-      transfersLoading={epochLoading || transfersLoading}
+      transfersLoading={transfersLoading}
      allMarkets={markets || undefined}
      refetch={refetch}
    />
@@ -137,7 +132,7 @@ const TeamPage = ({
  members?: Member[];
  games?: TeamGame[];
  gamesLoading?: boolean;
-  transfers?: EnrichedTransfer[];
+  transfers?: EnrichedRewardTransfer[];
  transfersLoading?: boolean;
  allMarkets?: MarketMap;
  refetch: () => void;
@@ -211,7 +206,7 @@ const Games = ({
 }: {
  games?: TeamGame[];
  gamesLoading?: boolean;
-  transfers?: EnrichedTransfer[];
+  transfers?: EnrichedRewardTransfer[];
  transfersLoading?: boolean;
  allMarkets?: MarketMap;
 }) => {
@@ -451,7 +446,7 @@ const GameTypeCell = ({
  transfer,
  allMarkets,
 }: {
-  transfer?: EnrichedTransfer;
+  transfer?: EnrichedRewardTransfer;
  allMarkets?: MarketMap;
 }) => {
  const [open, setOpen] = useState(false);
@@ -474,7 +469,7 @@ const GameTypeCell = ({
        ref={ref}
        className="border-b border-dashed border-vega-clight-200 dark:border-vega-cdark-200 text-left md:truncate md:max-w-[25vw]"
      >
-        <DispatchMetricInfo transferNode={transfer} allMarkets={allMarkets} />
+        <DispatchMetricInfo reward={transfer} />
      </button>
    </>
  );
@@ -490,7 +485,7 @@ const ActiveRewardCardDialog = ({
  open: boolean;
  onChange: (isOpen: boolean) => void;
  trigger?: HTMLElement | null;
-  transfer: EnrichedTransfer;
+  transfer: EnrichedRewardTransfer;
  allMarkets?: MarketMap;
 }) => {
  const t = useT();
@@ -516,8 +511,6 @@ const ActiveRewardCardDialog = ({
        <ActiveRewardCard
          transferNode={transfer}
          currentEpoch={Number(data?.epoch.id)}
-          kind={transfer.transfer.kind as RecurringTransfer}
-          allMarkets={allMarkets}
        />
      </div>
      <div className="w-1/4">
@@ -75,6 +75,7 @@ export const TradePanels = ({ market, pinnedAsset }: TradePanelsProps) => {
          {[
            'chart',
            'orderbook',
+            'depth',
            'trades',
            'liquidity',
            'fundingPayments',
@@ -1,5 +1,4 @@
 import { Link } from 'react-router-dom';
-import { Splash } from '@vegaprotocol/ui-toolkit';
 import { formatNumber } from '@vegaprotocol/utils';
 import { type useTeams } from '../../lib/hooks/use-teams';
 import { useT } from '../../lib/use-t';
@@ -18,7 +17,11 @@ export const CompetitionsLeaderboard = ({
  const num = (n?: number | string) => (!n ? '-' : formatNumber(n, 0));

  if (!data || data.length === 0) {
-    return <Splash>{t('Could not find any teams')}</Splash>;
+    return (
+      <p className="text-sm">
+        {t('Currently no active teams on the network.')}
+      </p>
+    );
  }

  return (
@@ -1,28 +1,26 @@
 import { ActiveRewardCard } from '../rewards-container/active-rewards';
 import { useT } from '../../lib/use-t';
-import { type EnrichedTransfer } from '../../lib/hooks/use-game-cards';
-import { useMarketsMapProvider } from '@vegaprotocol/markets';
+import { type EnrichedRewardTransfer } from '../../lib/hooks/use-rewards';

 export const GamesContainer = ({
  data,
  currentEpoch,
 }: {
-  data: EnrichedTransfer[];
+  data: EnrichedRewardTransfer[];
  currentEpoch: number;
 }) => {
  const t = useT();
-  const { data: markets } = useMarketsMapProvider();

  if (!data || data.length === 0) {
    return (
-      <p className="mb-6 text-muted">
-        {t('There are currently no games available.')}
+      <p className="text-sm">
+        {t('Currently no active games on the network.')}
      </p>
    );
  }

  return (
-    <div className="mb-12 grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
+    <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
      {data.map((game, i) => {
        // TODO: Remove `kind` prop from ActiveRewardCard
        const { transfer } = game;
@@ -37,8 +35,6 @@ export const GamesContainer = ({
            key={i}
            transferNode={game}
            currentEpoch={currentEpoch}
-            kind={transfer.kind}
-            allMarkets={markets || undefined}
          />
        );
      })}
@@ -21,18 +21,13 @@ const useFeesTableColumnDefs = (): ColDef[] => {
          pinned: 'left',
          width: 150,
        },
-        {
-          field: 'liquidityFee',
-          valueFormatter: ({ value }: { value: number }) => value + '%',
-        },
        {
          field: 'feeAfterDiscount',
          headerName: t('Total fee after discount'),
          valueFormatter: ({ value }: { value: number }) => value + '%',
        },
        {
-          field: 'totalFee',
-          headerName: t('Total fee before discount'),
+          field: 'liquidityFee',
          valueFormatter: ({ value }: { value: number }) => value + '%',
        },
        {
@@ -43,6 +38,11 @@ const useFeesTableColumnDefs = (): ColDef[] => {
          field: 'makerFee',
          valueFormatter: ({ value }: { value: number }) => value + '%',
        },
+        {
+          field: 'totalFee',
+          headerName: t('Total fee before discount'),
+          valueFormatter: ({ value }: { value: number }) => value + '%',
+        },
      ] as ColDef[],
    [t]
  );
@@ -4,7 +4,6 @@ import {
  lpAggregatedDataProvider,
  type Filter,
  LiquidityTable,
-  liquidityProvisionsDataProvider,
 } from '@vegaprotocol/liquidity';
 import { getAsset, useMarket } from '@vegaprotocol/markets';
 import {
@@ -71,7 +70,7 @@ export const LiquidityContainer = ({

 const useReloadLiquidityData = (marketId: string | undefined) => {
  const { reload } = useDataProvider({
-    dataProvider: liquidityProvisionsDataProvider,
+    dataProvider: lpAggregatedDataProvider,
    variables: { marketId: marketId || '' },
    update: () => true,
    skip: !marketId,
@@ -7,7 +7,7 @@ import {
  useMaliciousOracle,
 } from '@vegaprotocol/markets';
 import { useState } from 'react';
-import { type MarketViewProposalFieldsFragment } from '@vegaprotocol/proposals';
+import { type ProposalFragment } from '@vegaprotocol/proposals';
 import { MarketSuspendedBanner } from './market-suspended-banner';
 import { MarketUpdateBanner } from './market-update-banner';
 import { MarketUpdateStateBanner } from './market-update-state-banner';
@@ -22,17 +22,17 @@ import {

 type UpdateMarketBanner = {
  kind: 'UpdateMarket';
-  proposals: MarketViewProposalFieldsFragment[];
+  proposals: ProposalFragment[];
 };

 type UpdateMarketStateBanner = {
  kind: 'UpdateMarketState';
-  proposals: MarketViewProposalFieldsFragment[];
+  proposals: ProposalFragment[];
 };

 type NewMarketBanner = {
  kind: 'NewMarket'; // aka a proposal of NewMarket which succeeds the current market
-  proposals: MarketViewProposalFieldsFragment[];
+  proposals: ProposalFragment[];
 };

 type SettledBanner = {
@@ -1,5 +1,5 @@
 import { Fragment } from 'react';
-import { type MarketViewProposalFieldsFragment } from '@vegaprotocol/proposals';
+import { type ProposalFragment } from '@vegaprotocol/proposals';
 import { ExternalLink } from '@vegaprotocol/ui-toolkit';
 import { DApp, TOKEN_PROPOSAL, useLinks } from '@vegaprotocol/environment';
 import { useT } from '../../lib/use-t';
@@ -7,7 +7,7 @@ import { useT } from '../../lib/use-t';
 export const MarketSuccessorProposalBanner = ({
  proposals,
 }: {
-  proposals: MarketViewProposalFieldsFragment[];
+  proposals: ProposalFragment[];
 }) => {
  const t = useT();
  const tokenLink = useLinks(DApp.Governance);
@@ -28,7 +28,7 @@ export const MarketSuccessorProposalBanner = ({
          }
        )}{' '}
        {proposals.map((item, i) => {
-          if (item.terms.change.__typename !== 'NewMarket') {
+          if (item.terms?.change.__typename !== 'NewMarket') {
            return null;
          }

@@ -1,7 +1,7 @@
 import { render, screen } from '@testing-library/react';
 import { ProposalState } from '@vegaprotocol/types';
 import { MarketUpdateBanner } from './market-update-banner';
-import { type MarketViewProposalFieldsFragment } from '@vegaprotocol/proposals';
+import { type ProposalFragment } from '@vegaprotocol/proposals';

 describe('MarketUpdateBanner', () => {
  const change = {
@@ -34,9 +34,7 @@ describe('MarketUpdateBanner', () => {

  it('renders content for a single open proposal', () => {
    render(
-      <MarketUpdateBanner
-        proposals={[openProposal as MarketViewProposalFieldsFragment]}
-      />
+      <MarketUpdateBanner proposals={[openProposal as ProposalFragment]} />
    );

    expect(
@@ -50,9 +48,7 @@ describe('MarketUpdateBanner', () => {

  it('renders content for a single passed proposal', () => {
    render(
-      <MarketUpdateBanner
-        proposals={[passedProposal as MarketViewProposalFieldsFragment]}
-      />
+      <MarketUpdateBanner proposals={[passedProposal as ProposalFragment]} />
    );

    expect(
@@ -65,10 +61,7 @@ describe('MarketUpdateBanner', () => {
  });

  it('renders content for multiple passed proposals', () => {
-    const proposals = [
-      openProposal,
-      openProposal,
-    ] as MarketViewProposalFieldsFragment[];
+    const proposals = [openProposal, openProposal] as ProposalFragment[];

    render(<MarketUpdateBanner proposals={proposals} />);

@@ -6,7 +6,7 @@ import {
  TOKEN_PROPOSALS,
  useLinks,
 } from '@vegaprotocol/environment';
-import { type MarketViewProposalFieldsFragment } from '@vegaprotocol/proposals';
+import { type ProposalFragment } from '@vegaprotocol/proposals';
 import { ExternalLink } from '@vegaprotocol/ui-toolkit';
 import { ProposalState } from '@vegaprotocol/types';
 import { useT } from '../../lib/use-t';
@@ -14,17 +14,17 @@ import { useT } from '../../lib/use-t';
 export const MarketUpdateBanner = ({
  proposals,
 }: {
-  proposals: MarketViewProposalFieldsFragment[];
+  proposals: ProposalFragment[];
 }) => {
  const governanceLink = useLinks(DApp.Governance);
  const t = useT();
  const openProposals = sortBy(
    proposals.filter((p) => p.state === ProposalState.STATE_OPEN),
-    (p) => p.terms.enactmentDatetime
+    (p) => p.terms?.enactmentDatetime
  );
  const passedProposals = sortBy(
    proposals.filter((p) => p.state === ProposalState.STATE_PASSED),
-    (p) => p.terms.enactmentDatetime
+    (p) => p.terms?.enactmentDatetime
  );

  let content = null;
@@ -49,7 +49,7 @@ export const MarketUpdateBanner = ({
    content = (
      <p>
        {t('Proposal set to change market on {{date}}.', {
-          date: format(new Date(proposal.terms.enactmentDatetime), 'dd MMMM'),
+          date: format(new Date(proposal.terms?.enactmentDatetime), 'dd MMMM'),
        })}
        <ExternalLink href={proposalLink}>{t('View proposal')}</ExternalLink>,
      </p>
@@ -1,8 +1,8 @@
 import { type ReactNode } from 'react';
 import sortBy from 'lodash/sortBy';
 import { format, formatDuration, intervalToDuration } from 'date-fns';
-import { type MarketViewProposalFieldsFragment } from '@vegaprotocol/proposals';
-import { ProposalState } from '@vegaprotocol/types';
+import { type ProposalFragment } from '@vegaprotocol/proposals';
+import { MarketUpdateType, ProposalState } from '@vegaprotocol/types';
 import {
  DApp,
  TOKEN_PROPOSAL,
@@ -19,18 +19,29 @@ export const MarketUpdateStateBanner = ({
  proposals,
 }: {
  market: Market;
-  proposals: MarketViewProposalFieldsFragment[];
+  proposals: ProposalFragment[];
 }) => {
  const t = useT();
  const governanceLink = useLinks(DApp.Governance);

+  const openTradingProposals = sortBy(
+    proposals.filter(
+      (p) =>
+        p.terms &&
+        p.terms.change.__typename === 'UpdateMarketState' &&
+        p.terms.change.updateType ===
+          MarketUpdateType.MARKET_STATE_UPDATE_TYPE_RESUME
+    ),
+    (p) => p.terms?.enactmentDatetime
+  );
+
  const openProposals = sortBy(
    proposals.filter((p) => p.state === ProposalState.STATE_OPEN),
-    (p) => p.terms.enactmentDatetime
+    (p) => p.terms?.enactmentDatetime
  );
  const passedProposals = sortBy(
    proposals.filter((p) => p.state === ProposalState.STATE_PASSED),
-    (p) => p.terms.enactmentDatetime
+    (p) => p.terms?.enactmentDatetime
  );

  if (!passedProposals.length && !openProposals.length) {
@@ -45,12 +56,41 @@ export const MarketUpdateStateBanner = ({
      ? governanceLink(TOKEN_PROPOSAL.replace(':id', openProposals[0]?.id))
      : undefined;

+  const openTradingProposalsLink =
+    openTradingProposals[0]?.__typename === 'Proposal' &&
+    openTradingProposals[0]?.id
+      ? governanceLink(
+          TOKEN_PROPOSAL.replace(':id', openTradingProposals[0].id)
+        )
+      : openTradingProposals[0]?.__typename === 'ProposalDetail' &&
+        openTradingProposals[0]?.batchId
+      ? governanceLink(
+          TOKEN_PROPOSAL.replace(':id', openTradingProposals[0].batchId)
+        )
+      : undefined;
+
  const proposalsLink =
    openProposals.length > 1 ? governanceLink(TOKEN_PROPOSALS) : undefined;

  let content: ReactNode;

-  if (passedProposals.length) {
+  if (openTradingProposals.length >= 1) {
+    content = (
+      <>
+        <p className="mb-1">
+          {t(
+            'Trading on market {{name}} was suspended by governance. There are open proposals to resume trading on this market.',
+            { name }
+          )}
+        </p>
+        <p>
+          <ExternalLink href={openTradingProposalsLink}>
+            {t('View proposals')}
+          </ExternalLink>
+        </p>
+      </>
+    );
+  } else if (passedProposals.length) {
    const { date, duration, price } = getMessageVariables(passedProposals[0]);
    content = (
      <>
@@ -116,20 +156,23 @@ export const MarketUpdateStateBanner = ({
  return <div data-testid={`update-state-banner-${market.id}`}>{content}</div>;
 };

-const getMessageVariables = (proposal: MarketViewProposalFieldsFragment) => {
-  const enactmentDatetime = new Date(proposal.terms.enactmentDatetime);
-  const date = format(enactmentDatetime, 'dd MMMM');
-  const duration = formatDuration(
-    intervalToDuration({
-      start: new Date(),
-      end: enactmentDatetime,
-    }),
-    {
-      format: ['days', 'hours'],
-    }
-  );
+const getMessageVariables = (proposal: ProposalFragment) => {
+  const enactmentDatetime =
+    proposal.terms && new Date(proposal.terms.enactmentDatetime);
+  const date = enactmentDatetime && format(enactmentDatetime, 'dd MMMM');
+  const duration =
+    enactmentDatetime &&
+    formatDuration(
+      intervalToDuration({
+        start: new Date(),
+        end: enactmentDatetime,
+      }),
+      {
+        format: ['days', 'hours'],
+      }
+    );
  const price =
-    proposal.terms.change.__typename === 'UpdateMarketState'
+    proposal.terms?.change.__typename === 'UpdateMarketState'
      ? proposal.terms.change.price
      : '';
  return {
@@ -1,10 +1,10 @@
 import {
  useMarketProposals,
-  type MarketViewProposalFieldsFragment,
+  type ProposalFragment,
 } from '@vegaprotocol/proposals';
 import { ProposalState, ProposalType } from '@vegaprotocol/types';

-const isPending = (p: MarketViewProposalFieldsFragment) => {
+const isPending = (p: ProposalFragment) => {
  return [ProposalState.STATE_OPEN, ProposalState.STATE_PASSED].includes(
    p.state
  );
@@ -21,9 +21,10 @@ export const useUpdateMarketStateProposals = (

  const proposals = data
    ? data.filter(isPending).filter((p) => {
-        const change = p.terms.change;
+        const change = p.terms?.change;

        if (
+          change &&
          change.__typename === 'UpdateMarketState' &&
          change.market.id === marketId
        ) {
@@ -48,8 +49,9 @@ export const useUpdateMarketProposals = (

  const proposals = data
    ? data.filter(isPending).filter((p) => {
-        const change = p.terms.change;
+        const change = p.terms?.change;
        if (
+          change &&
          change.__typename === 'UpdateMarket' &&
          change.marketId === marketId
        ) {
@@ -73,8 +75,9 @@ export const useSuccessorMarketProposals = (

  const proposals = data
    ? data.filter(isPending).filter((p) => {
-        const change = p.terms.change;
+        const change = p.terms?.change;
        if (
+          change &&
          change.__typename === 'NewMarket' &&
          change.successorConfiguration?.parentMarketId === marketId
        ) {
@@ -12,6 +12,7 @@ import { useT } from '../../lib/use-t';
 import classNames from 'classnames';
 import { MarketHeaderStats } from '../../client-pages/market/market-header-stats';
 import { MarketMarkPrice } from '../market-mark-price';
+import { MarketBanner } from '../market-banner';
 /**
 * This is only rendered for the mobile navigation
 */
@@ -108,8 +109,11 @@ export const MobileMarketHeader = () => {
        }
      >
        {data && (
-          <div className="px-3 py-6 text-sm grid grid-cols-2 items-center gap-x-4 gap-y-6">
-            <MarketHeaderStats market={data} />
+          <div>
+            <MarketBanner market={data} />
+            <div className="px-3 py-6 text-sm grid grid-cols-2 items-center gap-x-4 gap-y-6">
+              <MarketHeaderStats market={data} />
+            </div>
          </div>
        )}
      </FullScreenPopover>
@@ -1,9 +1,5 @@
 import { render, screen } from '@testing-library/react';
-import {
-  ActiveRewardCard,
-  applyFilter,
-  isActiveReward,
-} from './active-rewards';
+import { ActiveRewardCard, applyFilter } from './active-rewards';
 import {
  AccountType,
  AssetStatus,
@@ -11,54 +7,13 @@ import {
  DistributionStrategy,
  EntityScope,
  IndividualScope,
-  type RecurringTransfer,
-  type TransferNode,
  TransferStatus,
  type Transfer,
 } from '@vegaprotocol/types';
-
-jest.mock('./__generated__/Rewards', () => ({
-  useMarketForRewardsQuery: () => ({
-    data: undefined,
-  }),
-}));
-
-jest.mock('@vegaprotocol/assets', () => ({
-  useAssetDataProvider: () => {
-    return {
-      data: {
-        assetId: 'asset-1',
-      },
-    };
-  },
-}));
+import { type EnrichedRewardTransfer } from '../../lib/hooks/use-rewards';

 describe('ActiveRewards', () => {
-  const mockRecurringTransfer: RecurringTransfer = {
-    __typename: 'RecurringTransfer',
-    startEpoch: 115332,
-    endEpoch: 115432,
-    factor: '1',
-    dispatchStrategy: {
-      __typename: 'DispatchStrategy',
-      dispatchMetric: DispatchMetric.DISPATCH_METRIC_LP_FEES_RECEIVED,
-      dispatchMetricAssetId:
-        'c9fe6fc24fce121b2cc72680543a886055abb560043fda394ba5376203b7527d',
-      marketIdsInScope: null,
-      entityScope: EntityScope.ENTITY_SCOPE_INDIVIDUALS,
-      individualScope: IndividualScope.INDIVIDUAL_SCOPE_ALL,
-      teamScope: null,
-      nTopPerformers: '',
-      stakingRequirement: '',
-      notionalTimeWeightedAveragePositionRequirement: '',
-      windowLength: 1,
-      lockPeriod: 0,
-      distributionStrategy: DistributionStrategy.DISTRIBUTION_STRATEGY_PRO_RATA,
-      rankTable: null,
-    },
-  };
-
-  const mockTransferNode: TransferNode = {
+  const reward: EnrichedRewardTransfer = {
    __typename: 'TransferNode',
    transfer: {
      __typename: 'Transfer',
@@ -86,21 +41,37 @@ describe('ActiveRewards', () => {
      reference: 'reward',
      status: TransferStatus.STATUS_PENDING,
      timestamp: '2023-12-18T13:05:35.948706Z',
-      kind: mockRecurringTransfer,
+      kind: {
+        __typename: 'RecurringTransfer',
+        startEpoch: 115332,
+        endEpoch: 115432,
+        factor: '1',
+        dispatchStrategy: {
+          __typename: 'DispatchStrategy',
+          dispatchMetric: DispatchMetric.DISPATCH_METRIC_LP_FEES_RECEIVED,
+          dispatchMetricAssetId:
+            'c9fe6fc24fce121b2cc72680543a886055abb560043fda394ba5376203b7527d',
+          marketIdsInScope: null,
+          entityScope: EntityScope.ENTITY_SCOPE_INDIVIDUALS,
+          individualScope: IndividualScope.INDIVIDUAL_SCOPE_ALL,
+          teamScope: null,
+          nTopPerformers: '',
+          stakingRequirement: '',
+          notionalTimeWeightedAveragePositionRequirement: '',
+          windowLength: 1,
+          lockPeriod: 0,
+          distributionStrategy:
+            DistributionStrategy.DISTRIBUTION_STRATEGY_PRO_RATA,
+          rankTable: null,
+        },
+      },
      reason: null,
    },
    fees: [],
  };

  it('renders with valid props', () => {
-    render(
-      <ActiveRewardCard
-        transferNode={mockTransferNode}
-        currentEpoch={1}
-        kind={mockRecurringTransfer}
-        allMarkets={{}}
-      />
-    );
+    render(<ActiveRewardCard transferNode={reward} currentEpoch={115432} />);

    expect(
      screen.getByText(/Liquidity provision fees received/i)
@@ -108,41 +79,11 @@ describe('ActiveRewards', () => {
    expect(screen.getByText('Individual scope')).toBeInTheDocument();
    expect(screen.getByText('Average position')).toBeInTheDocument();
    expect(screen.getByText('Ends in')).toBeInTheDocument();
-    expect(screen.getByText('115431 epochs')).toBeInTheDocument();
+    expect(screen.getByText('1 epoch')).toBeInTheDocument();
    expect(screen.getByText('Assessed over')).toBeInTheDocument();
    expect(screen.getByText('1 epoch')).toBeInTheDocument();
  });

-  describe('isActiveReward', () => {
-    it('returns true for valid active reward', () => {
-      const node = {
-        transfer: {
-          kind: {
-            __typename: 'RecurringTransfer',
-            dispatchStrategy: {},
-            endEpoch: 10,
-          },
-          status: TransferStatus.STATUS_PENDING,
-        },
-      } as TransferNode;
-      expect(isActiveReward(node, 5)).toBeTruthy();
-    });
-
-    it('returns false for invalid active reward', () => {
-      const node = {
-        transfer: {
-          kind: {
-            __typename: 'RecurringTransfer',
-            dispatchStrategy: {},
-            endEpoch: 10,
-          },
-          status: TransferStatus.STATUS_PENDING,
-        },
-      } as TransferNode;
-      expect(isActiveReward(node, 15)).toBeFalsy();
-    });
-  });
-
  describe('applyFilter', () => {
    it('returns true when filter matches dispatch metric label', () => {
      const transfer = {
@@ -1,12 +1,8 @@
-import { useActiveRewardsQuery } from './__generated__/Rewards';
 import { useT } from '../../lib/use-t';
 import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
 import classNames from 'classnames';
 import {
-  type IconName,
  type VegaIconSize,
-  Icon,
-  Intent,
  Tooltip,
  VegaIcon,
  VegaIconNames,
@@ -14,18 +10,12 @@ import {
  TinyScroll,
  truncateMiddle,
 } from '@vegaprotocol/ui-toolkit';
-import { IconNames } from '@blueprintjs/icons';
 import {
-  type Maybe,
-  type Transfer,
  type TransferNode,
-  type RecurringTransfer,
  DistributionStrategyDescriptionMapping,
  DistributionStrategyMapping,
  EntityScope,
  EntityScopeMapping,
-  TransferStatus,
-  TransferStatusMapping,
  DispatchMetric,
  DispatchMetricDescription,
  DispatchMetricLabels,
@@ -34,45 +24,36 @@ import {
  type DispatchStrategy,
  IndividualScopeMapping,
  IndividualScopeDescriptionMapping,
+  type Asset,
 } from '@vegaprotocol/types';
 import { Card } from '../card/card';
-import { useMemo, useState } from 'react';
+import { type ReactNode, useState } from 'react';
 import {
  type AssetFieldsFragment,
-  useAssetsMapProvider,
+  type BasicAssetDetails,
 } from '@vegaprotocol/assets';
+import { type MarketFieldsFragment } from '@vegaprotocol/markets';
 import {
-  type MarketFieldsFragment,
-  useMarketsMapProvider,
-  getAsset,
-} from '@vegaprotocol/markets';
+  type EnrichedRewardTransfer,
+  useRewards,
+} from '../../lib/hooks/use-rewards';
+import compact from 'lodash/compact';
+
+enum CardColour {
+  BLUE = 'BLUE',
+  GREEN = 'GREEN',
+  GREY = 'GREY',
+  ORANGE = 'ORANGE',
+  PINK = 'PINK',
+  PURPLE = 'PURPLE',
+  WHITE = 'WHITE',
+  YELLOW = 'YELLOW',
+}

 export type Filter = {
  searchTerm: string;
 };

-export const isActiveReward = (node: TransferNode, currentEpoch: number) => {
-  const { transfer } = node;
-  if (transfer.kind.__typename !== 'RecurringTransfer') {
-    return false;
-  }
-  const { dispatchStrategy } = transfer.kind;
-
-  if (!dispatchStrategy) {
-    return false;
-  }
-
-  if (transfer.kind.endEpoch && transfer.kind.endEpoch < currentEpoch) {
-    return false;
-  }
-
-  if (transfer.status !== TransferStatus.STATUS_PENDING) {
-    return false;
-  }
-
-  return true;
-};
-
 export const applyFilter = (
  node: TransferNode & {
    asset?: AssetFieldsFragment | null;
@@ -95,7 +76,10 @@ export const applyFilter = (
    transfer.asset?.symbol
      .toLowerCase()
      .includes(filter.searchTerm.toLowerCase()) ||
-    EntityScopeLabelMapping[transfer.kind.dispatchStrategy.entityScope]
+    (
+      EntityScopeLabelMapping[transfer.kind.dispatchStrategy.entityScope] ||
+      'Unspecified'
+    )
      .toLowerCase()
      .includes(filter.searchTerm.toLowerCase()) ||
    node.asset?.name
@@ -114,42 +98,15 @@ export const applyFilter = (

 export const ActiveRewards = ({ currentEpoch }: { currentEpoch: number }) => {
  const t = useT();
-  const { data: activeRewardsData } = useActiveRewardsQuery({
-    variables: {
-      isReward: true,
-    },
+  const { data } = useRewards({
+    onlyActive: true,
  });

  const [filter, setFilter] = useState<Filter>({
    searchTerm: '',
  });

-  const { data: assets } = useAssetsMapProvider();
-  const { data: markets } = useMarketsMapProvider();
-
-  const enrichedTransfers = activeRewardsData?.transfersConnection?.edges
-    ?.map((e) => e?.node as TransferNode)
-    .filter((node) => isActiveReward(node, currentEpoch))
-    .map((node) => {
-      if (node.transfer.kind.__typename !== 'RecurringTransfer') {
-        return node;
-      }
-
-      const asset =
-        assets &&
-        assets[
-          node.transfer.kind.dispatchStrategy?.dispatchMetricAssetId || ''
-        ];
-
-      const marketsInScope =
-        node.transfer.kind.dispatchStrategy?.marketIdsInScope?.map(
-          (id) => markets && markets[id]
-        );
-
-      return { ...node, asset, markets: marketsInScope };
-    });
-
-  if (!enrichedTransfers || !enrichedTransfers.length) return null;
+  if (!data || !data.length) return null;

  return (
    <Card
@@ -157,7 +114,8 @@ export const ActiveRewards = ({ currentEpoch }: { currentEpoch: number }) => {
      className="lg:col-span-full"
      data-testid="active-rewards-card"
    >
-      {enrichedTransfers.length > 1 && (
+      {/** CARDS FILTER */}
+      {data.length > 1 && (
        <TradingInput
          onChange={(e) =>
            setFilter((curr) => ({ ...curr, searchTerm: e.target.value }))
@@ -172,142 +130,32 @@ export const ActiveRewards = ({ currentEpoch }: { currentEpoch: number }) => {
          prependElement={<VegaIcon name={VegaIconNames.SEARCH} />}
        />
      )}
+      {/** CARDS */}
      <TinyScroll className="grid gap-x-8 gap-y-10 h-fit grid-cols-[repeat(auto-fill,_minmax(230px,_1fr))] md:grid-cols-[repeat(auto-fill,_minmax(230px,_1fr))] lg:grid-cols-[repeat(auto-fill,_minmax(320px,_1fr))] xl:grid-cols-[repeat(auto-fill,_minmax(335px,_1fr))] max-h-[40rem] overflow-auto pr-2">
-        {enrichedTransfers
+        {data
          .filter((n) => applyFilter(n, filter))
-          .map((node, i) => {
-            const { transfer } = node;
-            if (
-              transfer.kind.__typename !== 'RecurringTransfer' ||
-              !transfer.kind.dispatchStrategy?.dispatchMetric
-            ) {
-              return null;
-            }
-
-            return (
-              node && (
-                <ActiveRewardCard
-                  key={i}
-                  transferNode={node}
-                  kind={transfer.kind}
-                  currentEpoch={currentEpoch}
-                  allMarkets={markets || {}}
-                />
-              )
-            );
-          })}
+          .map((node, i) => (
+            <ActiveRewardCard
+              key={i}
+              transferNode={node}
+              currentEpoch={currentEpoch}
+            />
+          ))}
      </TinyScroll>
    </Card>
  );
 };

-// This was built to be a status indicator for the rewards based on the transfer status
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const StatusIndicator = ({
-  status,
-  reason,
-}: {
-  status: TransferStatus;
-  reason?: Maybe<string> | undefined;
-}) => {
-  const t = useT();
-  const getIconIntent = (status: string) => {
-    switch (status) {
-      case TransferStatus.STATUS_DONE:
-        return { icon: IconNames.TICK_CIRCLE, intent: Intent.Success };
-      case TransferStatus.STATUS_REJECTED:
-        return { icon: IconNames.ERROR, intent: Intent.Danger };
-      default:
-        return { icon: IconNames.HELP, intent: Intent.Primary };
-    }
-  };
-  const { icon, intent } = getIconIntent(status);
-  return (
-    <Tooltip
-      description={
-        <span>
-          {t('Transfer status: {{status}} {{reason}}', {
-            status: TransferStatusMapping[status],
-            reason: reason ? `(${reason})` : '',
-          })}
-        </span>
-      }
-    >
-      <span
-        className={classNames(
-          {
-            'text-gray-700 dark:text-gray-300': intent === Intent.None,
-            'text-vega-blue': intent === Intent.Primary,
-            'text-vega-green dark:text-vega-green': intent === Intent.Success,
-            'dark:text-yellow text-yellow-600': intent === Intent.Warning,
-            'text-vega-red': intent === Intent.Danger,
-          },
-          'flex items-start p-1 align-text-bottom'
-        )}
-      >
-        <Icon size={3} name={icon as IconName} />
-      </span>
-    </Tooltip>
-  );
-};
-
 type ActiveRewardCardProps = {
-  transferNode: TransferNode & {
-    asset?: AssetFieldsFragment | null;
-    markets?: (MarketFieldsFragment | null)[];
-  };
+  transferNode: EnrichedRewardTransfer;
  currentEpoch: number;
-  kind: RecurringTransfer;
-  allMarkets?: Record<string, MarketFieldsFragment | null>;
 };
 export const ActiveRewardCard = ({
  transferNode,
  currentEpoch,
-  kind,
-  allMarkets,
 }: ActiveRewardCardProps) => {
-  const t = useT();
-
-  const { transfer } = transferNode;
-  const { dispatchStrategy } = kind;
-
-  const marketIdsInScope = dispatchStrategy?.marketIdsInScope;
-  const firstMarketData = transferNode.markets?.[0];
-
-  const specificMarkets = useMemo(() => {
-    if (
-      !firstMarketData ||
-      !marketIdsInScope ||
-      marketIdsInScope.length === 0
-    ) {
-      return null;
-    }
-    if (marketIdsInScope.length > 1) {
-      const marketNames =
-        allMarkets &&
-        marketIdsInScope
-          .map((id) => allMarkets[id]?.tradableInstrument?.instrument?.name)
-          .join(', ');
-
-      return (
-        <Tooltip description={marketNames}>
-          <span>Specific markets</span>
-        </Tooltip>
-      );
-    }
-    return (
-      <span>{firstMarketData?.tradableInstrument?.instrument?.name || ''}</span>
-    );
-  }, [firstMarketData, marketIdsInScope, allMarkets]);
-
-  const dispatchAsset = transferNode.asset;
-
-  if (!dispatchStrategy) {
-    return null;
-  }
-
-  // Gray out/hide the cards that are related to not trading markets
-  const marketSettled = transferNode.markets?.some(
+  // don't display the cards that are scoped to not trading markets
+  const marketSettled = transferNode.markets?.filter(
    (m) =>
      m?.state &&
      [
@@ -318,97 +166,140 @@ export const ActiveRewardCard = ({
      ].includes(m.state)
  );

-  if (marketSettled) {
+  // hide the card if all of the markets are being marked as e.g. settled
+  if (
+    marketSettled?.length === transferNode.markets?.length &&
+    Boolean(transferNode.markets && transferNode.markets.length > 0)
+  ) {
    return null;
  }

-  const assetInActiveMarket =
-    allMarkets &&
-    Object.values(allMarkets).some((m: MarketFieldsFragment | null) => {
-      if (m && getAsset(m).id === dispatchStrategy.dispatchMetricAssetId) {
-        return m?.state && MarketState.STATE_ACTIVE === m.state;
+  let colour =
+    DispatchMetricColourMap[
+      transferNode.transfer.kind.dispatchStrategy.dispatchMetric
+    ];
+
+  // grey out of any of the markets is suspended or
+  // if the asset is not currently traded on any of the active markets
+  const marketSuspended =
+    transferNode.markets?.filter(
+      (m) =>
+        m?.state === MarketState.STATE_SUSPENDED ||
+        m?.state === MarketState.STATE_SUSPENDED_VIA_GOVERNANCE
+    ).length === transferNode.markets?.length &&
+    Boolean(transferNode.markets && transferNode.markets.length > 0);
+
+  if (marketSuspended || !transferNode.isAssetTraded) {
+    colour = CardColour.GREY;
+  }
+
+  return (
+    <RewardCard
+      colour={colour}
+      rewardAmount={addDecimalsFormatNumber(
+        transferNode.transfer.amount,
+        transferNode.transfer.asset?.decimals || 0,
+        6
+      )}
+      rewardAsset={transferNode.dispatchAsset}
+      transferAsset={transferNode.transfer.asset || undefined}
+      endsIn={
+        transferNode.transfer.kind.endEpoch != null
+          ? transferNode.transfer.kind.endEpoch - currentEpoch
+          : undefined
      }
-      return false;
-    });
-
-  const marketSuspended = transferNode.markets?.some(
-    (m) =>
-      m?.state === MarketState.STATE_SUSPENDED ||
-      m?.state === MarketState.STATE_SUSPENDED_VIA_GOVERNANCE
+      dispatchStrategy={transferNode.transfer.kind.dispatchStrategy}
+      dispatchMetricInfo={<DispatchMetricInfo reward={transferNode} />}
+    />
  );
+};

-  // Gray out the cards that are related to suspended markets
-  // Or settlement assets in markets that are not active and eligible for rewards
-  const { gradientClassName, mainClassName } =
-    marketSuspended || !assetInActiveMarket
-      ? {
-          gradientClassName: 'from-vega-cdark-500 to-vega-clight-400',
-          mainClassName: 'from-vega-cdark-400 dark:from-vega-cdark-600 to-20%',
-        }
-      : getGradientClasses(dispatchStrategy.dispatchMetric);
-
-  const entityScope = dispatchStrategy.entityScope;
-
+const RewardCard = ({
+  colour,
+  rewardAmount,
+  rewardAsset,
+  transferAsset,
+  vegaAsset,
+  dispatchStrategy,
+  endsIn,
+  dispatchMetricInfo,
+}: {
+  colour: CardColour;
+  rewardAmount: string;
+  /** The asset linked to the dispatch strategy via `dispatchMetricAssetId` property. */
+  rewardAsset?: BasicAssetDetails;
+  /** The VEGA asset details, required to format the min staking amount. */
+  transferAsset?: Asset | undefined;
+  /** The VEGA asset details, required to format the min staking amount. */
+  vegaAsset?: BasicAssetDetails;
+  /** The transfer's dispatch strategy. */
+  dispatchStrategy: DispatchStrategy;
+  /** The number of epochs until the transfer stops. */
+  endsIn?: number;
+  dispatchMetricInfo?: ReactNode;
+}) => {
+  const t = useT();
  return (
    <div>
      <div
        className={classNames(
          'bg-gradient-to-r col-span-full p-0.5 lg:col-auto h-full',
          'rounded-lg',
-          gradientClassName
+          CardColourStyles[colour].gradientClassName
        )}
        data-testid="active-rewards-card"
      >
        <div
          className={classNames(
-            mainClassName,
-            'bg-gradient-to-b bg-vega-clight-800 dark:bg-vega-cdark-800 h-full w-full rounded p-4 flex flex-col gap-4'
+            CardColourStyles[colour].mainClassName,
+            'bg-gradient-to-b bg-vega-clight-800 dark:bg-vega-cdark-800 h-full w-full rounded-md p-4 flex flex-col gap-4'
          )}
        >
          <div className="flex justify-between gap-4">
+            {/** ENTITY SCOPE */}
            <div className="flex flex-col gap-2 items-center text-center">
-              <EntityIcon transfer={transfer} />
-              {entityScope && (
+              <EntityIcon entityScope={dispatchStrategy.entityScope} />
+              {dispatchStrategy.entityScope && (
                <span className="text-muted text-xs" data-testid="entity-scope">
-                  {EntityScopeLabelMapping[entityScope] || t('Unspecified')}
+                  {EntityScopeLabelMapping[dispatchStrategy.entityScope] ||
+                    t('Unspecified')}
                </span>
              )}
            </div>

+            {/** AMOUNT AND DISTRIBUTION STRATEGY */}
            <div className="flex flex-col gap-2 items-center text-center">
+              {/** AMOUNT */}
              <h3 className="flex flex-col gap-1 text-2xl shrink-1 text-center">
                <span className="font-glitch" data-testid="reward-value">
-                  {addDecimalsFormatNumber(
-                    transferNode.transfer.amount,
-                    transferNode.transfer.asset?.decimals || 0,
-                    6
-                  )}
+                  {rewardAmount}
                </span>

-                <span className="font-alpha">
-                  {transferNode.transfer.asset?.symbol}
+                <span className="font-alpha" data-testid="reward-asset">
+                  {transferAsset?.symbol || ''}
                </span>
              </h3>
-              {
-                <Tooltip
-                  description={t(
-                    DistributionStrategyDescriptionMapping[
+
+              {/** DISTRIBUTION STRATEGY */}
+              <Tooltip
+                description={t(
+                  DistributionStrategyDescriptionMapping[
+                    dispatchStrategy.distributionStrategy
+                  ]
+                )}
+                underline={true}
+              >
+                <span className="text-xs" data-testid="distribution-strategy">
+                  {
+                    DistributionStrategyMapping[
                      dispatchStrategy.distributionStrategy
                    ]
-                  )}
-                  underline={true}
-                >
-                  <span className="text-xs" data-testid="distribution-strategy">
-                    {
-                      DistributionStrategyMapping[
-                        dispatchStrategy.distributionStrategy
-                      ]
-                    }
-                  </span>
-                </Tooltip>
-              }
+                  }
+                </span>
+              </Tooltip>
            </div>

+            {/** DISTRIBUTION DELAY */}
            <div className="flex flex-col gap-2 items-center text-center">
              <CardIcon
                iconName={VegaIconNames.LOCK}
@@ -421,63 +312,60 @@ export const ActiveRewardCard = ({
                data-testid="locked-for"
              >
                {t('numberEpochs', '{{count}} epochs', {
-                  count: kind.dispatchStrategy?.lockPeriod,
+                  count: dispatchStrategy.lockPeriod,
                })}
              </span>
            </div>
          </div>

          <span className="border-[0.5px] border-gray-700" />
-          <span data-testid="dispatch-metric-info">
-            {DispatchMetricLabels[dispatchStrategy.dispatchMetric]} •{' '}
-            <Tooltip
-              underline={marketSuspended}
-              description={
-                (marketSuspended || !assetInActiveMarket) &&
-                (specificMarkets
-                  ? t('Eligible market(s) currently suspended')
-                  : !assetInActiveMarket
-                  ? t('Currently no markets eligible for reward')
-                  : '')
-              }
-            >
-              <span>{specificMarkets || dispatchAsset?.name}</span>
-            </Tooltip>
-          </span>
+          {/** DISPATCH METRIC */}
+          {dispatchMetricInfo ? (
+            dispatchMetricInfo
+          ) : (
+            <span data-testid="dispatch-metric-info">
+              {DispatchMetricLabels[dispatchStrategy.dispatchMetric]}
+            </span>
+          )}

          <div className="flex items-center gap-8 flex-wrap">
-            {kind.endEpoch && (
+            {/** ENDS IN */}
+            {endsIn != null && (
              <span className="flex flex-col">
                <span className="text-muted text-xs">{t('Ends in')} </span>
-                <span data-testid="ends-in">
-                  {t('numberEpochs', '{{count}} epochs', {
-                    count: kind.endEpoch - currentEpoch,
-                  })}
+                <span data-testid="ends-in" data-endsin={endsIn}>
+                  {endsIn >= 0
+                    ? t('numberEpochs', '{{count}} epochs', {
+                        count: endsIn,
+                      })
+                    : t('Ended')}
                </span>
              </span>
            )}

-            {
-              <span className="flex flex-col">
-                <span className="text-muted text-xs">{t('Assessed over')}</span>
-                <span data-testid="assessed-over">
-                  {t('numberEpochs', '{{count}} epochs', {
-                    count: dispatchStrategy.windowLength,
-                  })}
-                </span>
+            {/** WINDOW LENGTH */}
+            <span className="flex flex-col">
+              <span className="text-muted text-xs">{t('Assessed over')}</span>
+              <span data-testid="assessed-over">
+                {t('numberEpochs', '{{count}} epochs', {
+                  count: dispatchStrategy.windowLength,
+                })}
              </span>
-            }
+            </span>
          </div>
+          {/** DISPATCH METRIC DESCRIPTION */}
          {dispatchStrategy?.dispatchMetric && (
            <span className="text-muted text-sm h-[3rem]">
              {t(DispatchMetricDescription[dispatchStrategy?.dispatchMetric])}
            </span>
          )}
          <span className="border-[0.5px] border-gray-700" />
-          {kind.dispatchStrategy && (
+          {/** REQUIREMENTS */}
+          {dispatchStrategy && (
            <RewardRequirements
-              dispatchStrategy={kind.dispatchStrategy}
-              assetDecimalPlaces={transfer.asset?.decimals}
+              dispatchStrategy={dispatchStrategy}
+              rewardAsset={rewardAsset}
+              vegaAsset={vegaAsset}
            />
          )}
        </div>
@@ -487,77 +375,67 @@ export const ActiveRewardCard = ({
 };

 export const DispatchMetricInfo = ({
-  transferNode,
-  allMarkets,
+  reward,
 }: {
-  transferNode: ActiveRewardCardProps['transferNode'];
-  allMarkets?: ActiveRewardCardProps['allMarkets'];
+  reward: EnrichedRewardTransfer;
 }) => {
-  const dispatchStrategy =
-    transferNode.transfer.kind.__typename === 'RecurringTransfer'
-      ? transferNode.transfer.kind.dispatchStrategy
-      : null;
+  const t = useT();
+  const dispatchStrategy = reward.transfer.kind.dispatchStrategy;
+  const marketNames = compact(
+    reward.markets?.map((m) => m.tradableInstrument.instrument.name)
+  );

-  const dispatchAsset = transferNode.transfer.asset;
+  let additionalDispatchMetricInfo = null;

-  const marketIdsInScope = dispatchStrategy?.marketIdsInScope;
-  const firstMarketData = transferNode.markets?.[0];
-  const specificMarkets = useMemo(() => {
-    if (
-      !firstMarketData ||
-      !marketIdsInScope ||
-      marketIdsInScope.length === 0
-    ) {
-      return null;
-    }
-    if (marketIdsInScope.length > 1) {
-      const marketNames =
-        allMarkets &&
-        marketIdsInScope
-          .map((id) => allMarkets[id]?.tradableInstrument?.instrument?.name)
-          .join(', ');
-
-      return (
-        <Tooltip description={marketNames}>
-          <span>Specific markets</span>
-        </Tooltip>
-      );
-    }
-
-    const name = firstMarketData?.tradableInstrument?.instrument?.name;
-    if (name) {
-      return <span>{name}</span>;
-    }
-
-    return null;
-  }, [firstMarketData, marketIdsInScope, allMarkets]);
-
-  if (!dispatchStrategy) return null;
+  // if asset found then display asset symbol
+  if (reward.dispatchAsset) {
+    additionalDispatchMetricInfo = <span>{reward.dispatchAsset.symbol}</span>;
+  }
+  // but if scoped to only one market then display market name
+  if (marketNames.length === 1) {
+    additionalDispatchMetricInfo = <span>{marketNames[0]}</span>;
+  }
+  // or if scoped to many markets then indicate it's scoped to "specific markets"
+  if (marketNames.length > 1) {
+    additionalDispatchMetricInfo = (
+      <Tooltip description={marketNames}>
+        <span>{t('Specific markets')}</span>
+      </Tooltip>
+    );
+  }

  return (
    <span data-testid="dispatch-metric-info">
-      {DispatchMetricLabels[dispatchStrategy.dispatchMetric]} •{' '}
-      <span>{specificMarkets || dispatchAsset?.name}</span>
+      {DispatchMetricLabels[dispatchStrategy.dispatchMetric]}
+      {additionalDispatchMetricInfo != null && (
+        <> • {additionalDispatchMetricInfo}</>
+      )}
    </span>
  );
 };

 const RewardRequirements = ({
  dispatchStrategy,
-  assetDecimalPlaces = 0,
+  rewardAsset,
+  vegaAsset,
 }: {
  dispatchStrategy: DispatchStrategy;
-  assetDecimalPlaces: number | undefined;
+  rewardAsset?: BasicAssetDetails;
+  vegaAsset?: BasicAssetDetails;
 }) => {
  const t = useT();

+  const entityLabel = EntityScopeLabelMapping[dispatchStrategy.entityScope];
+
  return (
    <dl className="flex justify-between flex-wrap items-center gap-3 text-xs">
      <div className="flex flex-col gap-1">
        <dt className="flex items-center gap-1 text-muted">
-          {t('{{entity}} scope', {
-            entity: EntityScopeLabelMapping[dispatchStrategy.entityScope],
-          })}
+          {entityLabel
+            ? t('{{entity}} scope', {
+                entity: entityLabel,
+              })
+            : t('Scope')}
        </dt>
        <dd className="flex items-center gap-1" data-testid="scope">
          <RewardEntityScope dispatchStrategy={dispatchStrategy} />
@@ -574,7 +452,7 @@ const RewardRequirements = ({
        >
          {addDecimalsFormatNumber(
            dispatchStrategy?.stakingRequirement || 0,
-            assetDecimalPlaces
+            vegaAsset?.decimals || 18
          )}
        </dd>
      </div>
@@ -587,7 +465,7 @@ const RewardRequirements = ({
          {addDecimalsFormatNumber(
            dispatchStrategy?.notionalTimeWeightedAveragePositionRequirement ||
              0,
-            assetDecimalPlaces
+            rewardAsset?.decimals || 0
          )}
        </dd>
      </div>
@@ -645,44 +523,65 @@ const RewardEntityScope = ({
    );
  }

-  return null;
+  return t('Unspecified');
 };

-const getGradientClasses = (d: DispatchMetric | undefined) => {
-  switch (d) {
-    case DispatchMetric.DISPATCH_METRIC_AVERAGE_POSITION:
-      return {
-        gradientClassName: 'from-vega-pink-500 to-vega-purple-400',
-        mainClassName: 'from-vega-pink-400 dark:from-vega-pink-600 to-20%',
-      };
-    case DispatchMetric.DISPATCH_METRIC_LP_FEES_RECEIVED:
-      return {
-        gradientClassName: 'from-vega-green-500 to-vega-yellow-500',
-        mainClassName: 'from-vega-green-400 dark:from-vega-green-600 to-20%',
-      };
-    case DispatchMetric.DISPATCH_METRIC_MAKER_FEES_PAID:
-      return {
-        gradientClassName: 'from-vega-orange-500 to-vega-pink-400',
-        mainClassName: 'from-vega-orange-400 dark:from-vega-orange-600 to-20%',
-      };
-    case DispatchMetric.DISPATCH_METRIC_MARKET_VALUE:
-    case DispatchMetric.DISPATCH_METRIC_RELATIVE_RETURN:
-      return {
-        gradientClassName: 'from-vega-purple-500 to-vega-blue-400',
-        mainClassName: 'from-vega-purple-400 dark:from-vega-purple-600 to-20%',
-      };
-    case DispatchMetric.DISPATCH_METRIC_RETURN_VOLATILITY:
-      return {
-        gradientClassName: 'from-vega-blue-500 to-vega-green-400',
-        mainClassName: 'from-vega-blue-400 dark:from-vega-blue-600 to-20%',
-      };
-    case DispatchMetric.DISPATCH_METRIC_VALIDATOR_RANKING:
-    default:
-      return {
-        gradientClassName: 'from-vega-pink-500 to-vega-purple-400',
-        mainClassName: 'from-vega-pink-400 dark:from-vega-pink-600 to-20%',
-      };
-  }
+const CardColourStyles: Record<
+  CardColour,
+  { gradientClassName: string; mainClassName: string }
+> = {
+  [CardColour.BLUE]: {
+    gradientClassName: 'from-vega-blue-500 to-vega-green-400',
+    mainClassName: 'from-vega-blue-400 dark:from-vega-blue-600 to-20%',
+  },
+  [CardColour.GREEN]: {
+    gradientClassName: 'from-vega-green-500 to-vega-yellow-500',
+    mainClassName: 'from-vega-green-400 dark:from-vega-green-600 to-20%',
+  },
+  [CardColour.GREY]: {
+    gradientClassName: 'from-vega-cdark-500 to-vega-clight-200',
+    mainClassName: 'from-vega-cdark-400 dark:from-vega-cdark-600 to-20%',
+  },
+  [CardColour.ORANGE]: {
+    gradientClassName: 'from-vega-orange-500 to-vega-pink-400',
+    mainClassName: 'from-vega-orange-400 dark:from-vega-orange-600 to-20%',
+  },
+  [CardColour.PINK]: {
+    gradientClassName: 'from-vega-pink-500 to-vega-purple-400',
+    mainClassName: 'from-vega-pink-400 dark:from-vega-pink-600 to-20%',
+  },
+  [CardColour.PURPLE]: {
+    gradientClassName: 'from-vega-purple-500 to-vega-blue-400',
+    mainClassName: 'from-vega-purple-400 dark:from-vega-purple-600 to-20%',
+  },
+  [CardColour.WHITE]: {
+    gradientClassName:
+      'from-vega-clight-600 dark:from-vega-clight-900 to-vega-yellow-500 dark:to-vega-yellow-400',
+    mainClassName: 'from-white dark:from-vega-clight-100 to-20%',
+  },
+  [CardColour.YELLOW]: {
+    gradientClassName: 'from-vega-yellow-500 to-vega-orange-400',
+    mainClassName: 'from-vega-yellow-400 dark:from-vega-yellow-600 to-20%',
+  },
+};
+
+const DispatchMetricColourMap: Record<DispatchMetric, CardColour> = {
+  // Liquidity provision fees received
+  [DispatchMetric.DISPATCH_METRIC_LP_FEES_RECEIVED]: CardColour.BLUE,
+  // Price maker fees paid
+  [DispatchMetric.DISPATCH_METRIC_MAKER_FEES_PAID]: CardColour.PINK,
+  // Price maker fees earned
+  [DispatchMetric.DISPATCH_METRIC_MAKER_FEES_RECEIVED]: CardColour.GREEN,
+  // Total market value
+  [DispatchMetric.DISPATCH_METRIC_MARKET_VALUE]: CardColour.WHITE,
+  // Average position
+  [DispatchMetric.DISPATCH_METRIC_AVERAGE_POSITION]: CardColour.ORANGE,
+  // Relative return
+  [DispatchMetric.DISPATCH_METRIC_RELATIVE_RETURN]: CardColour.PURPLE,
+  // Return volatility
+  [DispatchMetric.DISPATCH_METRIC_RETURN_VOLATILITY]: CardColour.YELLOW,
+  // Validator ranking
+  [DispatchMetric.DISPATCH_METRIC_VALIDATOR_RANKING]: CardColour.WHITE,
 };

 const CardIcon = ({
@@ -703,36 +602,29 @@ const CardIcon = ({
  );
 };

+const EntityScopeIconMap: Record<EntityScope, VegaIconNames> = {
+  [EntityScope.ENTITY_SCOPE_TEAMS]: VegaIconNames.TEAM,
+  [EntityScope.ENTITY_SCOPE_INDIVIDUALS]: VegaIconNames.MAN,
+};
+
 const EntityIcon = ({
-  transfer,
+  entityScope,
  size = 18,
 }: {
-  transfer: Transfer;
+  entityScope: EntityScope;
  size?: VegaIconSize;
 }) => {
-  if (transfer.kind.__typename !== 'RecurringTransfer') {
-    return null;
-  }
-  const entityScope = transfer.kind.dispatchStrategy?.entityScope;
-  const getIconName = () => {
-    switch (entityScope) {
-      case EntityScope.ENTITY_SCOPE_TEAMS:
-        return VegaIconNames.TEAM;
-      case EntityScope.ENTITY_SCOPE_INDIVIDUALS:
-        return VegaIconNames.MAN;
-      default:
-        return VegaIconNames.QUESTION_MARK;
-    }
-  };
-  const iconName = getIconName();
  return (
    <Tooltip
      description={
-        <span>{entityScope ? EntityScopeMapping[entityScope] : ''}</span>
+        entityScope ? <span>{EntityScopeMapping[entityScope]}</span> : undefined
      }
    >
      <span className="flex items-center p-2 rounded-full border border-gray-600">
-        {iconName && <VegaIcon name={iconName} size={size} />}
+        <VegaIcon
+          name={EntityScopeIconMap[entityScope] || VegaIconNames.QUESTION_MARK}
+          size={size}
+        />
      </span>
    </Tooltip>
  );
@@ -20,7 +20,7 @@ import {
  type RewardsPageQuery,
  useRewardsPageQuery,
  useRewardsEpochQuery,
-} from './__generated__/Rewards';
+} from '../../lib/hooks/__generated__/Rewards';
 import {
  TradingButton,
  VegaIcon,
@@ -16,7 +16,7 @@ import {
 import {
  useRewardsHistoryQuery,
  type RewardsHistoryQuery,
-} from './__generated__/Rewards';
+} from '../../lib/hooks/__generated__/Rewards';
 import { useRewardsRowData } from './use-reward-row-data';
 import { useT } from '../../lib/use-t';

@@ -4,7 +4,7 @@ import BigNumber from 'bignumber.js';
 import { removePaginationWrapper } from '@vegaprotocol/utils';
 import { type Asset } from '@vegaprotocol/assets';
 import { type PartyRewardsConnection } from './rewards-history';
-import { type RewardsHistoryQuery } from './__generated__/Rewards';
+import { type RewardsHistoryQuery } from '../../lib/hooks/__generated__/Rewards';

 const REWARD_ACCOUNT_TYPES = [
  AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
@@ -1,3 +1,3 @@
 CONSOLE_IMAGE_NAME=vegaprotocol/trading:latest
-VEGA_VERSION=v0.74.1
+VEGA_VERSION=v0.74.6
 LOCAL_SERVER=false
@@ -1,3 +1,3 @@
 CONSOLE_IMAGE_NAME=vegaprotocol/trading:develop
-VEGA_VERSION=v0.74.1
+VEGA_VERSION=v0.74.6
 LOCAL_SERVER=false
@@ -1,156 +1,100 @@
 # Trading Market-Sim End-To-End Tests

-This direcotry contains end-to-end tests for the trading application using vega-market-sim. This README will guide you through setting up your environment and running the tests.
+This directory contains end-to-end tests for the Trading application using Vega-market-sim. This guide will help you set up your environment and run the tests efficiently.

 ## Prerequisites

- [Poetry](https://python-poetry.org/docs/#installing-with-the-official-installer)
- [Docker](https://www.docker.com/)
- [Python versions ">=3.9,<3.11"](https://www.python.org/)
+Ensure you have the following installed:

-## Getting Started
+- [Poetry](https://python-poetry.org/docs/#installing-with-the-official-installer) for dependency management.
+- [Docker](https://www.docker.com/) for running isolated application containers.
+- Python, versions ">=3.9,<3.11". Install from the [official Python website](https://www.python.org/).

-1. **Install Poetry**: Follow the instructions on the [official Poetry website](https://python-poetry.org/docs/#installing-with-the-official-installer).
-2. **Install Docker**: Follow the instructions on the [official Docker website](https://docs.docker.com/desktop/).
-3. **Install Python**: Follow the instructions on the [official Python website](https://www.python.org/)
-   **ensure you install a version between 3.9 and 3.11.**
-4. **Start up a Poetry environment**: Execute the commands below to configure the Poetry environment.
+## Setup

-### Ensure you are in the tests folder before running commands
+### 1. Install Dependencies
+
+- **Poetry**: Follow the installation guide on the [official Poetry website](https://python-poetry.org/docs/#installing-with-the-official-installer).
+- **Docker**: Installation instructions are available on the [official Docker website](https://docs.docker.com/desktop/).
+- **Python**: Install a version between 3.9 and 3.11, as detailed on the [official Python website](https://www.python.org/).
+
+### 2. Configure Your Environment
+
+Ensure you're in the tests folder before executing commands.

 ```bash
 poetry shell
-```
-
-5. **Install python dependencies**
-
-To make sure you are on the latest version of our market-sim branch.
-
-```bash
-poetry update vega-sim
-```
-
-```bash
+poetry update vega-sim  # Updates to the latest version of the market-sim branch
 poetry install
+playwright install chromium  # Installs necessary browsers for Playwright
 ```

-6. **Install Playwright Browsers**: Execute the command below to browsers for Playwright.
+### 3. Prepare Binaries and Docker Images

-```bash
-playwright install chromium
-```
-
-7. **Download necessary binaries**:
-   Use the following command within your Python environment. The `--force` flag ensures the binaries are overwritten, and the `--version` specifies the desired version. e.g. `v0.73.4`
+Download necessary binaries for the desired Vega version:

 ```bash
 python -m vega_sim.tools.load_binaries --force --version $VEGA_VERSION
 ```

-8. **Pull the desired Docker image**
+Pull Docker images for your environment:

-```bash
-docker pull vegaprotocol/trading:develop
-```
+- **Development**: `docker pull vegaprotocol/trading:develop`
+- **Production**: `docker pull vegaprotocol/trading:main`

-9. **Run tests**: Poetry/Python will serve the app from docker
-
-### Update the .env file with the correct trading image.
-
-```bash
-poetry run pytest
-```
-
-### Docker images
-
-Pull the desired image:
-
-**Testnet**
-
-```bash
-docker pull vegaprotocol/trading:develop
-```
-
-**Mainnet**
-
-```bash
-docker pull vegaprotocol/trading:main
-```
-
-Find all available images on [Docker Hub](https://hub.docker.com/r/vegaprotocol/trading/tags).
-
-#### Create a Docker Image of Your Locally Built Trading App
-
-To build your Docker image, use the following commands:
-
-```bash
-yarn nx build trading ./docker/prepare-dist.sh
-```
+### 4. Build a Docker Image of Your Locally Built Trading App

 ```bash
+./docker/prepare-dist.sh
 docker build -f docker/node-outside-docker.Dockerfile --build-arg APP=trading --build-arg ENV_NAME=stagnet1 -t vegaprotocol/trading:latest .
 ```

-## Running Tests 🧪
+## Running Tests

-Before running make sure the docker daemon is running.
+Ensure the Docker daemon is running. Update the `.env` file with the correct trading image before proceeding.

-To run a specific test, use the `-k` option followed by the name of the test.
-Run all tests:
+- **Run all tests**: `poetry run pytest`
+- **Run a specific test**: `poetry run pytest -k "test_name" -s --headed`
+- **Run tests using your locally served console**:

-```bash
-poetry run pytest
+  In one terminal window, build and serve the trading console:
+
+  ```bash
+  yarn nx build trading
+  yarn nx serve trading
+  ```
+
+  Once the console is served, update the `.env` file to set `local_server=true`. You can then run your tests using the same commands as above.
+  NOTE: Parallel running of tests will not work against locally served console.
+
+## Test Strategy and Container Cleanup
+
+### Strategy
+
+We aim for each test file to use a single Vega instance to ensure test isolation and manage resources efficiently. This approach helps in maintaining test performance and reliability.
+
+### Cleanup Procedure
+
+To ensure proper cleanup of containers after each test, use the following fixture pattern:
+
+```python
+@pytest.fixture
+def vega(request):
+    with init_vega(request) as vega_instance:
+        request.addfinalizer(lambda: cleanup_container(vega_instance))
+        yield vega_instance
 ```

-Run a targeted test:
+## Running Tests in Parallel

-```bash
-poetry run pytest -k "test_name" -s --headed
-```
+For running tests in parallel:

-Run from anywhere:
+- **Within the e2e folder**: `poetry run pytest -s --numprocesses auto --dist loadfile`
+- **From anywhere**: `yarn trading:test:all`

-```bash
-yarn trading:test -- "test_name" -s --headed
-```
+## Troubleshooting

-Run using your locally served console:
+If IntelliSense is not working in VSCode, follow these steps:

-Within one terminal
-
-```bash
-yarn nx build trading
-```
-
-```bash
-yarn nx serve trading
-
-```
-
-Once console is served you can update the .env file to have local_server to true.
-
-## Running Tests in Parallel 🔢
-
-To run tests in parallel, use the `--numprocesses auto` option. The `--dist loadfile` setting ensures that multiple runners are not assigned to a single test file.
-
-### From within the e2e folder:
-
-```bash
-poetry run pytest -s --numprocesses auto --dist loadfile
-```
-
-### From anywhere:
-
-```bash
-yarn trading:test:all
-```
-
-# Things to know
-
-If you "intellisense" isn't working follow these steps:
-
-1. ```bash
-   poetry run which python
-   ```
-
-2. Then open the command menu in vscode (cmd + shift + p) and type `select interpreter` , press enter, select enter interpreter path press enter then paste in the output from that above command you should get the right python again
+1. Find the Poetry environment's Python binary: `poetry run which python`
+2. In VSCode, open the command menu (`cmd + shift + p`), search for `Python: Select Interpreter`, select `Enter interpreter path`, and paste the path from step 1.
@@ -235,7 +235,7 @@ def test_submit_stop_oco_market_order_pending(
        "PendingOCO"
    )

-@pytest.mark.usefixtures("page", "continuous_market", "auth", "risk_accepted")
+@pytest.mark.usefixtures("auth", "risk_accepted")
 def test_submit_stop_oco_limit_order_pending(
    continuous_market, vega: VegaServiceNull, page: Page
 ):
@@ -15,8 +15,7 @@ deal_ticket_deposit_dialog_button = "deal-ticket-deposit-dialog-button"
@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


@@ -25,7 +24,6 @@ def continuous_market(vega):
    return setup_continuous_market(vega)


-@pytest.mark.skip("tbd - issue only on the sim, should work in vega 0.74.0")
@pytest.mark.usefixtures("auth", "risk_accepted")
 def test_should_display_info_and_button_for_deposit(continuous_market, page: Page):
    page.goto(f"/#/markets/{continuous_market}")
@@ -33,17 +31,20 @@ def test_should_display_info_and_button_for_deposit(continuous_market, page: Pag
    page.get_by_test_id(order_price).fill("20")
    # 7002-SORD-060
    expect(page.get_by_test_id(deal_ticket_warning_margin)).to_have_text(
-        "You may not have enough margin available to open this position.")
+        "You may not have enough margin available to open this position."
+    )
    page.get_by_test_id(deal_ticket_warning_margin).hover()
    expect(page.get_by_test_id("tooltip-content").nth(0)).to_have_text(
-        "1,661,888.12901 tDAI is currently required.You have only 999,991.49731.Deposit tDAI")
+        "1,661,888.12901 tDAI is currently required.You have only 999,991.49731.Deposit tDAI"
+    )
    page.get_by_test_id(deal_ticket_deposit_dialog_button).nth(0).click()
-    expect(page.get_by_test_id("sidebar-content")
-           ).to_contain_text("DepositFrom")
+    expect(page.get_by_test_id("sidebar-content")).to_contain_text("DepositFrom")


@pytest.mark.usefixtures("auth", "risk_accepted")
-def test_should_show_an_error_if_your_balance_is_zero(continuous_market, vega: VegaServiceNull, page: Page):
+def test_should_show_an_error_if_your_balance_is_zero(
+    continuous_market, vega: VegaServiceNull, page: Page
+):
    page.goto(f"/#/markets/{continuous_market}")
    vega.create_key("key_empty")
    change_keys(page, vega, "key_empty")
@@ -52,6 +53,7 @@ def test_should_show_an_error_if_your_balance_is_zero(continuous_market, vega: V
    # 7002-SORD-060
    expect(page.get_by_test_id(place_order)).to_be_enabled()
    # 7002-SORD-003
-    expect(page.get_by_test_id("deal-ticket-error-message-zero-balance")
-           ).to_have_text("You need tDAI in your wallet to trade in this market.Make a deposit")
+    expect(page.get_by_test_id("deal-ticket-error-message-zero-balance")).to_have_text(
+        "You need tDAI in your wallet to trade in this market.Make a deposit"
+    )
    expect(page.get_by_test_id(deal_ticket_deposit_dialog_button)).to_be_visible()
@@ -0,0 +1,60 @@
+# test_ids.py
+
+# Constants for test IDs
+ADJUSTED_FEES = "adjusted-fees"
+TOTAL_FEE_BEFORE_DISCOUNT = "total-fee-before-discount"
+INFRASTRUCTURE_FEES = "infrastructure-fees"
+MAKER_FEES = "maker-fees"
+LIQUIDITY_FEES = "liquidity-fees"
+TOTAL_DISCOUNT = "total-discount"
+VOLUME_DISCOUNT_ROW = "volume-discount-row"
+REFERRAL_DISCOUNT_ROW = "referral-discount-row"
+PAST_EPOCHS_VOLUME = "past-epochs-volume"
+REQUIRED_FOR_NEXT_TIER = "required-for-next-tier"
+TIER_VALUE_0 = "tier-value-0"
+TIER_VALUE_1 = "tier-value-1"
+DISCOUNT_VALUE_0 = "discount-value-0"
+DISCOUNT_VALUE_1 = "discount-value-1"
+MIN_VOLUME_VALUE_0 = "min-volume-value-0"
+MIN_VOLUME_VALUE_1 = "min-volume-value-1"
+MY_VOLUME_VALUE_0 = "my-volume-value-0"
+MY_VOLUME_VALUE_1 = "my-volume-value-1"
+ORDER_SIZE = "order-size"
+ORDER_PRICE = "order-price"
+DISCOUNT_PILL = "discount-pill"
+FEES_TEXT = "fees-text"
+TOOLTIP_CONTENT = "tooltip-content"
+INFRASTRUCTURE_FEE_FACTOR = "infrastructure-fee-factor"
+INFRASTRUCTURE_FEE_VALUE = "infrastructure-fee-value"
+LIQUIDITY_FEE_FACTOR = "liquidity-fee-factor"
+LIQUIDITY_FEE_VALUE = "liquidity-fee-value"
+MAKER_FEE_FACTOR = "maker-fee-factor"
+MAKER_FEE_VALUE = "maker-fee-value"
+SUBTOTAL_FEE_FACTOR = "subtotal-fee-factor"
+SUBTOTAL_FEE_VALUE = "subtotal-fee-value"
+DISCOUNT_FEE_FACTOR = "discount-fee-factor"
+DISCOUNT_FEE_VALUE = "discount-fee-value"
+TOTAL_FEE_VALUE = "total-fee-value"
+RUNNING_NOTIONAL_TAKER_VOLUME = "running-notional-taker-volume"
+EPOCHS_IN_REFERRAL_SET = "epochs-in-referral-set"
+REQUIRED_EPOCHS_VALUE_0 = "required-epochs-value-0"
+REQUIRED_EPOCHS_VALUE_1 = "required-epochs-value-1"
+FILLS = "Fills"
+TAB_FILLS = "tab-fills"
+FEE_BREAKDOWN_TOOLTIP = "fee-breakdown-tooltip"
+PINNED_ROW_LOCATOR = ".ag-pinned-left-cols-container .ag-row"
+ROW_LOCATOR = ".ag-center-cols-container .ag-row"
+# Col-Ids:
+COL_INSTRUMENT_CODE = '[data-testid="market-code"]'
+COL_CODE = '[col-id="code"]'
+COL_SIZE = '[col-id="size"]'
+COL_PRICE = '[col-id="price"]'
+COL_PRICE_1 = '[col-id="price_1"]'
+COL_AGGRESSOR = '[col-id="aggressor"]'
+COL_FEE = '[col-id="fee"]'
+COL_FEE_DISCOUNT = '[col-id="fee-discount"]'
+COL_FEE_AFTER_DISCOUNT = '[col-id="feeAfterDiscount"]'
+COL_INFRA_FEE = '[col-id="infraFee"]'
+COL_MAKER_FEE = '[col-id="makerFee"]'
+COL_LIQUIDITY_FEE = '[col-id="liquidityFee"]'
+COL_TOTAL_FEE = '[col-id="totalFee"]'
@@ -1,689 +0,0 @@
-import pytest
-
-from playwright.sync_api import Page, expect
-from vega_sim.null_service import VegaServiceNull
-from actions.vega import submit_order
-from wallet_config import MM_WALLET
-from conftest import init_vega, init_page, auth_setup, cleanup_container
-from actions.utils import next_epoch, change_keys, forward_time
-from fixtures.market import market_exists, setup_continuous_market
-
-# region Constants for test IDs
-ADJUSTED_FEES = "adjusted-fees"
-TOTAL_FEE_BEFORE_DISCOUNT = "total-fee-before-discount"
-INFRASTRUCTURE_FEES = "infrastructure-fees"
-MAKER_FEES = "maker-fees"
-LIQUIDITY_FEES = "liquidity-fees"
-TOTAL_DISCOUNT = "total-discount"
-VOLUME_DISCOUNT_ROW = "volume-discount-row"
-REFERRAL_DISCOUNT_ROW = "referral-discount-row"
-PAST_EPOCHS_VOLUME = "past-epochs-volume"
-REQUIRED_FOR_NEXT_TIER = "required-for-next-tier"
-TIER_VALUE_0 = "tier-value-0"
-TIER_VALUE_1 = "tier-value-1"
-DISCOUNT_VALUE_0 = "discount-value-0"
-DISCOUNT_VALUE_1 = "discount-value-1"
-MIN_VOLUME_VALUE_0 = "min-volume-value-0"
-MIN_VOLUME_VALUE_1 = "min-volume-value-1"
-MY_VOLUME_VALUE_0 = "my-volume-value-0"
-MY_VOLUME_VALUE_1 = "my-volume-value-1"
-ORDER_SIZE = "order-size"
-ORDER_PRICE = "order-price"
-DISCOUNT_PILL = "discount-pill"
-FEES_TEXT = "fees-text"
-TOOLTIP_CONTENT = "tooltip-content"
-INFRASTRUCTURE_FEE_FACTOR = "infrastructure-fee-factor"
-INFRASTRUCTURE_FEE_VALUE = "infrastructure-fee-value"
-LIQUIDITY_FEE_FACTOR = "liquidity-fee-factor"
-LIQUIDITY_FEE_VALUE = "liquidity-fee-value"
-MAKER_FEE_FACTOR = "maker-fee-factor"
-MAKER_FEE_VALUE = "maker-fee-value"
-SUBTOTAL_FEE_FACTOR = "subtotal-fee-factor"
-SUBTOTAL_FEE_VALUE = "subtotal-fee-value"
-DISCOUNT_FEE_FACTOR = "discount-fee-factor"
-DISCOUNT_FEE_VALUE = "discount-fee-value"
-TOTAL_FEE_VALUE = "total-fee-value"
-RUNNING_NOTIONAL_TAKER_VOLUME = "running-notional-taker-volume"
-EPOCHS_IN_REFERRAL_SET = "epochs-in-referral-set"
-REQUIRED_EPOCHS_VALUE_0 = "required-epochs-value-0"
-REQUIRED_EPOCHS_VALUE_1 = "required-epochs-value-1"
-FILLS = "Fills"
-TAB_FILLS = "tab-fills"
-FEE_BREAKDOWN_TOOLTIP = "fee-breakdown-tooltip"
-PINNED_ROW_LOCATOR = ".ag-pinned-left-cols-container .ag-row"
-ROW_LOCATOR = ".ag-center-cols-container .ag-row"
-# Col-Ids:
-COL_INSTRUMENT_CODE = '[data-testid="market-code"]'
-COL_CODE = '[col-id="code"]'
-COL_SIZE = '[col-id="size"]'
-COL_PRICE = '[col-id="price"]'
-COL_PRICE_1 = '[col-id="price_1"]'
-COL_AGGRESSOR = '[col-id="aggressor"]'
-COL_FEE = '[col-id="fee"]'
-COL_FEE_DISCOUNT = '[col-id="fee-discount"]'
-COL_FEE_AFTER_DISCOUNT = '[col-id="feeAfterDiscount"]'
-COL_INFRA_FEE = '[col-id="infraFee"]'
-COL_MAKER_FEE = '[col-id="makerFee"]'
-COL_LIQUIDITY_FEE = '[col-id="liquidityFee"]'
-COL_TOTAL_FEE = '[col-id="totalFee"]'
-# endregion
-
-@pytest.fixture(scope="module")
-def market_ids():
-    return {
-        "tier_1_volume": "default_id",
-        "tier_2_volume": "default_id",
-        "tier_1_referral": "default_id",
-        "tier_2_referral": "default_id",
-        "combo": "default_id",
-    }
-
-
-@pytest.fixture(scope="module")
-def vega_volume_discount_tier_1(request):
-    with init_vega(request) as vega_volume_discount_tier_1:
-            request.addfinalizer(lambda: cleanup_container(vega_volume_discount_tier_1))  # Register the cleanup function
-            yield vega_volume_discount_tier_1
-
-
-@pytest.fixture(scope="module")
-def vega_volume_discount_tier_2(request):
-    with init_vega(request) as vega_volume_discount_tier_2:
-            request.addfinalizer(lambda: cleanup_container(vega_volume_discount_tier_2))  # Register the cleanup function
-            yield vega_volume_discount_tier_2
-
-
-@pytest.fixture(scope="module")
-def vega_referral_discount_tier_1(request):
-    with init_vega(request) as vega_referral_discount_tier_1:
-            request.addfinalizer(lambda: cleanup_container(vega_referral_discount_tier_1))  # Register the cleanup function
-            yield vega_referral_discount_tier_1
-
-
-@pytest.fixture(scope="module")
-def vega_referral_discount_tier_2(request):
-    with init_vega(request) as vega_referral_discount_tier_2:
-            request.addfinalizer(lambda: cleanup_container(vega_referral_discount_tier_2))  # Register the cleanup function
-            yield vega_referral_discount_tier_2
-
-
-@pytest.fixture(scope="module")
-def vega_referral_and_volume_discount(request):
-    with init_vega(request) as vega_referral_and_volume_discount:
-            request.addfinalizer(lambda: cleanup_container(vega_referral_and_volume_discount))  # Register the cleanup function
-            yield vega_referral_and_volume_discount
-
-
-@pytest.fixture
-def page(vega_instance, browser, request):
-    with init_page(vega_instance, browser, request) as page_instance:
-        yield page_instance
-
-
-@pytest.fixture
-def vega_instance(
-    tier,
-    discount_program,
-    vega_volume_discount_tier_1,
-    vega_volume_discount_tier_2,
-    vega_referral_discount_tier_1,
-    vega_referral_discount_tier_2,
-    vega_referral_and_volume_discount,
-):
-    if discount_program == "volume":
-        return vega_volume_discount_tier_1 if tier == 1 else vega_volume_discount_tier_2
-    elif discount_program == "referral":
-        return (
-            vega_referral_discount_tier_1
-            if tier == 1
-            else vega_referral_discount_tier_2
-        )
-    elif discount_program == "combo":
-        return vega_referral_and_volume_discount
-
-
-@pytest.fixture
-def auth(vega_instance, page):
-    return auth_setup(vega_instance, page)
-
-
-def setup_market_with_volume_discount_program(vega: VegaServiceNull, tier: int):
-    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)
-
-    order_count = 2 if tier == 1 else 3
-    for _ in range(order_count):
-        submit_order(vega, "Key 1", market, "SIDE_BUY", 1, 110)
-        forward_time(vega, True if _ < order_count - 1 else False)
-
-    return market
-
-
-def setup_market_with_referral_discount_program(vega: VegaServiceNull, tier: int):
-    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)
-
-    order_count = 2
-    order_size = 1 if tier == 1 else 2
-    for _ in range(order_count):
-        submit_order(vega, "Key 1", market, "SIDE_BUY", order_size, 110)
-        forward_time(vega, True if _ < order_count - 1 else False)
-
-    return market
-
-
-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)
-
-    order_count = 2
-    order_size = 2
-    for _ in range(order_count):
-        submit_order(vega, "Key 1", market, "SIDE_BUY", order_size, 110)
-        forward_time(vega, True if _ < order_count - 1 else False)
-    return market
-
-
-def set_market_volume_discount(vega, tier, discount_program, market_ids):
-    market_id_key = f"tier_{tier}_{discount_program}"
-    if discount_program == "combo":
-        market_id_key = "combo"
-
-    market_id = market_ids.get(market_id_key, "default_id")
-
-    print(f"Checking if market exists: {market_id}")
-    if not market_exists(vega, market_id):
-        print(
-            f"Market doesn't exist for {discount_program} tier {tier}. Setting up new market."
-        )
-
-        if discount_program == "volume":
-            market_id = setup_market_with_volume_discount_program(vega, tier)
-        elif discount_program == "referral":
-            market_id = setup_market_with_referral_discount_program(vega, tier)
-        elif discount_program == "combo":
-            market_id = setup_combined_market(vega)
-
-        market_ids[market_id_key] = market_id
-
-    print(f"Using market ID: {market_id}")
-    return market_ids
-
-
-@pytest.mark.parametrize(
-    "tier, discount_program, expected_text",
-    [
-        (1, "volume", "9.045%-9.045%"),
-        (2, "volume", "8.04%-8.04%"),
-        (1, "referral", "9.045%-9.045%"),
-        (2, "referral", "8.04%-8.04%"),
-        (2, "combo", "6.432%-6.432%"),
-    ],
-)
-@pytest.mark.usefixtures("risk_accepted", "auth", "market_ids")
-def test_fees_page_discount_program_my_trading_fees(
-    tier, expected_text, discount_program, vega_instance, page: Page, market_ids
-):
-    market_ids = set_market_volume_discount(
-        vega_instance, tier, discount_program, market_ids
-    )
-
-    page.goto("/#/fees")
-    expect(page.get_by_test_id(ADJUSTED_FEES)).to_have_text(expected_text)
-    expect(page.get_by_test_id(TOTAL_FEE_BEFORE_DISCOUNT)).to_have_text(
-        "Total fee before discount10.05%-10.05%"
-    )
-    expect(page.get_by_test_id(INFRASTRUCTURE_FEES)).to_have_text("Infrastructure0.05%")
-    expect(page.get_by_test_id(MAKER_FEES)).to_have_text("Maker10%")
-    expect(page.get_by_test_id(LIQUIDITY_FEES)).to_have_text("Liquidity0%-0%")
-
-
-@pytest.mark.parametrize(
-    "tier, discount_program, volume_discount, total_discount, referral_discount",
-    [
-        (1, "volume", "Volume discount10%", "10%", "Referral discount0%"),
-        (2, "volume", "Volume discount20%", "20%", "Referral discount0%"),
-        (1, "referral", "Volume discount0%", "10%", "Referral discount10%"),
-        (2, "referral", "Volume discount0%", "20%", "Referral discount20%"),
-        (2, "combo", "Volume discount20%", "36%", "Referral discount20%"),
-    ],
-)
-@pytest.mark.usefixtures("risk_accepted", "auth", "market_ids")
-def test_fees_page_discount_program_total_discount(
-    tier,
-    discount_program,
-    volume_discount,
-    referral_discount,
-    total_discount,
-    vega_instance,
-    page: Page,
-    market_ids,
-):
-    market_ids = set_market_volume_discount(
-        vega_instance, tier, discount_program, market_ids
-    )
-    page.goto("/#/fees")
-    expect(page.get_by_test_id(TOTAL_DISCOUNT)).to_have_text(total_discount)
-    expect(page.get_by_test_id(VOLUME_DISCOUNT_ROW)).to_have_text(volume_discount)
-    expect(page.get_by_test_id(REFERRAL_DISCOUNT_ROW)).to_have_text(referral_discount)
-    page.get_by_test_id(TOTAL_DISCOUNT).hover()
-    expect(page.get_by_test_id(TOOLTIP_CONTENT).nth(0)).to_have_text(
-        "The total discount is calculated according to the following formula: 1 - (1 - dvolume) ⋇ (1 - dreferral)"
-    )
-
-
-@pytest.mark.parametrize(
-    "tier, discount_program, past_epochs_volume, required_for_next_tier",
-    [(1, "volume", "103", "97"), (2, "volume", "206", "")],
-)
-@pytest.mark.usefixtures("risk_accepted", "auth", "market_ids")
-def test_fees_page_volume_discount_program_my_current_volume(
-    tier,
-    discount_program,
-    past_epochs_volume,
-    required_for_next_tier,
-    vega_instance,
-    page: Page,
-    market_ids,
-):
-    market_ids = set_market_volume_discount(
-        vega_instance, tier, discount_program, market_ids
-    )
-    page.goto("/#/fees")
-    expect(page.get_by_test_id(PAST_EPOCHS_VOLUME)).to_have_text(past_epochs_volume)
-
-    if tier == 1:
-        expect(page.get_by_test_id(REQUIRED_FOR_NEXT_TIER)).to_have_text(
-            required_for_next_tier
-        )
-    else:
-        expect(page.get_by_test_id(REQUIRED_FOR_NEXT_TIER)).not_to_be_visible()
-
-
-@pytest.mark.parametrize(
-    "tier, discount_program, notional_taker_volume, epochs_in_set",
-    [(1, "referral", "103", "1"), (2, "referral", "207", "1")],
-)
-@pytest.mark.usefixtures("risk_accepted", "auth", "market_ids")
-def test_fees_page_referral_discount_program_referral_benefits(
-    tier,
-    vega_instance,
-    discount_program,
-    notional_taker_volume,
-    epochs_in_set,
-    page: Page,
-    market_ids,
-):
-    market_ids = set_market_volume_discount(
-        vega_instance, tier, discount_program, market_ids
-    )
-    page.goto("/#/fees")
-    expect(page.get_by_test_id(RUNNING_NOTIONAL_TAKER_VOLUME)).to_have_text(
-        notional_taker_volume
-    )
-    expect(page.get_by_test_id(EPOCHS_IN_REFERRAL_SET)).to_have_text(epochs_in_set)
-
-
-@pytest.mark.parametrize(
-    "tier, discount_program, my_volume_test_id, my_volume_value, your_tier",
-    [
-        (1, "volume", "my-volume-value-0", "103", "your-volume-tier-0"),
-        (2, "volume", "my-volume-value-1", "206", "your-volume-tier-1"),
-        (1, "referral", "my-volume-value-0", "103", "your-referral-tier-0"),
-        (2, "referral", "my-volume-value-1", "206", "your-referral-tier-1"),
-    ],
-)
-@pytest.mark.usefixtures("risk_accepted", "auth", "market_ids")
-def test_fees_page_discount_program_discount(
-    tier,
-    discount_program,
-    my_volume_test_id,
-    my_volume_value,
-    your_tier,
-    vega_instance,
-    page: Page,
-    market_ids,
-):
-    market_ids = set_market_volume_discount(
-        vega_instance, tier, discount_program, market_ids
-    )
-    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")
-    expect(page.get_by_test_id(DISCOUNT_VALUE_0)).to_have_text("10%")
-    expect(page.get_by_test_id(DISCOUNT_VALUE_1)).to_have_text("20%")
-    expect(page.get_by_test_id(MIN_VOLUME_VALUE_0)).to_have_text("100")
-    expect(page.get_by_test_id(MIN_VOLUME_VALUE_1)).to_have_text("200")
-
-    if discount_program == "volume":
-        expect(page.get_by_test_id(my_volume_test_id)).to_have_text(my_volume_value)
-    else:
-        expect(page.get_by_test_id(REQUIRED_EPOCHS_VALUE_0)).to_have_text("1")
-        expect(page.get_by_test_id(REQUIRED_EPOCHS_VALUE_1)).to_have_text("2")
-
-    expect(page.get_by_test_id(your_tier).nth(1)).to_be_visible()
-    expect(page.get_by_test_id(your_tier).nth(1)).to_have_text("Your tier")
-
-
-@pytest.mark.parametrize(
-    "tier, discount_program, fees_after_discount",
-    [
-        (1, "volume", "9.045%"),
-        (2, "volume", "8.04%"),
-        (1, "referral", "9.045%"),
-        (2, "referral", "8.04%"),
-        (2, "combo", "6.432%"),
-    ],
-)
-@pytest.mark.usefixtures("risk_accepted", "auth", "market_ids")
-def test_fees_page_discount_program_fees_by_market(
-    tier, discount_program, fees_after_discount, vega_instance, page: Page, market_ids
-):
-    market_ids = set_market_volume_discount(
-        vega_instance, tier, discount_program, market_ids
-    )
-    page.goto("/#/fees")
-    pinned = page.locator(PINNED_ROW_LOCATOR)
-    row = page.locator(ROW_LOCATOR)
-    expect(pinned.locator(COL_CODE)).to_have_text("BTC:DAI_2023Futr")
-    expect(row.locator(COL_FEE_AFTER_DISCOUNT)).to_have_text(fees_after_discount)
-    expect(row.locator(COL_INFRA_FEE)).to_have_text("0.05%")
-    expect(row.locator(COL_MAKER_FEE)).to_have_text("10%")
-    expect(row.locator(COL_LIQUIDITY_FEE)).to_have_text("0%")
-    expect(row.locator(COL_TOTAL_FEE)).to_have_text("10.05%")
-
-
-@pytest.mark.parametrize(
-    "tier, discount_program, discount, discount_value, total_fee",
-    [
-        (1, "volume", "-10%", "-0.01005 tDAI", "0.09045 tDAI"),
-        (2, "volume", "-20%", "-0.0201 tDAI", "0.0804 tDAI"),
-        (1, "referral", "-10%", "-0.01005 tDAI", "0.09045 tDAI"),
-        (2, "referral", "-20%", "-0.0201 tDAI", "0.0804 tDAI"),
-        (2, "combo", "-36%", "-0.03618 tDAI", "0.06432 tDAI"),
-    ],
-)
-@pytest.mark.usefixtures("risk_accepted", "auth", "market_ids")
-def test_deal_ticket_discount_program(
-    tier,
-    discount_program,
-    discount,
-    discount_value,
-    total_fee,
-    vega_instance,
-    page: Page,
-    market_ids,
-):
-    market_ids = set_market_volume_discount(
-        vega_instance, tier, discount_program, market_ids
-    )
-    market_id_key = f"tier_{tier}_{discount_program}"
-    if discount_program == "combo":
-        market_id_key = "combo"
-    market_id = market_ids.get(market_id_key)
-    page.goto(f"/#/markets/{market_id}")
-    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(discount)
-    page.get_by_test_id(FEES_TEXT).hover()
-    tooltip = page.get_by_test_id(TOOLTIP_CONTENT).first
-    expect(tooltip.get_by_test_id(INFRASTRUCTURE_FEE_FACTOR)).to_have_text("0.05%")
-    expect(tooltip.get_by_test_id(INFRASTRUCTURE_FEE_VALUE)).to_have_text("0.0005 tDAI")
-    expect(tooltip.get_by_test_id(LIQUIDITY_FEE_FACTOR)).to_have_text("0%")
-    expect(tooltip.get_by_test_id(LIQUIDITY_FEE_VALUE)).to_have_text("0.00 tDAI")
-    expect(tooltip.get_by_test_id(MAKER_FEE_FACTOR)).to_have_text("10%")
-    expect(tooltip.get_by_test_id(MAKER_FEE_VALUE)).to_have_text("0.10 tDAI")
-    expect(tooltip.get_by_test_id(SUBTOTAL_FEE_FACTOR)).to_have_text("10.05%")
-    expect(tooltip.get_by_test_id(SUBTOTAL_FEE_VALUE)).to_have_text("0.1005 tDAI")
-    expect(tooltip.get_by_test_id(DISCOUNT_FEE_FACTOR)).to_have_text(discount)
-    expect(tooltip.get_by_test_id(DISCOUNT_FEE_VALUE)).to_have_text(discount_value)
-    expect(tooltip.get_by_test_id(TOTAL_FEE_VALUE)).to_have_text(total_fee)
-
-
-@pytest.mark.parametrize(
-    "tier, discount_program, fee, fee_discount, price_1, size",
-    [
-        (1, "volume", "9.36158 tDAI", "1.04017 tDAI", "103.50 tDAI", "+1"),
-        (2, "volume", "8.3214 tDAI", "2.08035 tDAI", "103.50 tDAI", "+1"),
-        (
-            1,
-            "referral",
-            "8.42543 tDAI ",
-            "1.04017 tDAI",
-            "103.50 tDAI",
-            "+1",
-        ),
-        (
-            2,
-            "referral",
-            "13.31424 tDAI",
-            "4.1607 tDAI",
-            "207.00 tDAI",
-            "+2",
-        ),
-        (2, "combo", "10.6514 tDAI ", "7.48926 tDAI", "207.00 tDAI", "+2"),
-    ],
-)
-@pytest.mark.usefixtures("risk_accepted", "auth", "market_ids")
-def test_fills_taker_discount_program(
-    tier,
-    discount_program,
-    fee,
-    fee_discount,
-    price_1,
-    size,
-    vega_instance,
-    page: Page,
-    market_ids,
-):
-    market_ids = set_market_volume_discount(
-        vega_instance, tier, discount_program, market_ids
-    )
-    market_id_key = f"tier_{tier}_{discount_program}"
-    if discount_program == "combo":
-        market_id_key = "combo"
-    market_id = market_ids.get(market_id_key)
-    page.goto(f"/#/markets/{market_id}")
-    page.get_by_test_id(FILLS).click()
-    row = page.get_by_test_id(TAB_FILLS).locator(ROW_LOCATOR).first
-    expect(row.locator(COL_SIZE)).to_have_text(size)
-    expect(row.locator(COL_PRICE)).to_have_text("103.50 tDAI")
-    expect(row.locator(COL_PRICE_1)).to_have_text(price_1)
-    expect(row.locator(COL_AGGRESSOR)).to_have_text("Taker")
-    expect(row.locator(COL_FEE)).to_have_text(fee)
-    expect(row.locator(COL_FEE_DISCOUNT)).to_have_text(fee_discount)
-
-
-@pytest.mark.parametrize(
-    "tier, discount_program, fee, fee_discount, size, price_1",
-    [
-        (1, "volume", "-9.315 tDAI", "1.035 tDAI", "-1", "103.50 tDAI"),
-        (2, "volume", "-8.28 tDAI", "2.07 tDAI", "-1", "103.50 tDAI"),
-        (1, "referral", "-8.3835 tDAI", "1.035 tDAI", "-1", "103.50 tDAI"),
-        (2, "referral", "-13.248 tDAI", "4.14 tDAI", "-2", "207.00 tDAI"),
-        (2, "combo", "-10.5984 tDAI ", "7.452 tDAI", "-2", "207.00 tDAI"),
-    ],
-)
-@pytest.mark.usefixtures("risk_accepted", "auth", "market_ids")
-def test_fills_maker_discount_program(
-    tier,
-    discount_program,
-    vega_instance,
-    fee,
-    fee_discount,
-    size,
-    price_1,
-    page: Page,
-    market_ids,
-):
-    market_ids = set_market_volume_discount(
-        vega_instance, tier, discount_program, market_ids
-    )
-    market_id_key = f"tier_{tier}_{discount_program}"
-    if discount_program == "combo":
-        market_id_key = "combo"
-    market_id = market_ids.get(market_id_key)
-    page.goto(f"/#/markets/{market_id}")
-    change_keys(page, vega_instance, MM_WALLET.name)
-    page.get_by_test_id(FILLS).click()
-    row = page.get_by_test_id(TAB_FILLS).locator(ROW_LOCATOR).first
-    expect(row.locator(COL_SIZE)).to_have_text(size)
-    expect(row.locator(COL_PRICE)).to_have_text("103.50 tDAI")
-    expect(row.locator(COL_PRICE_1)).to_have_text(price_1)
-    expect(row.locator(COL_AGGRESSOR)).to_have_text("Maker")
-    expect(row.locator(COL_FEE)).to_have_text(fee)
-    expect(row.locator(COL_FEE_DISCOUNT)).to_have_text(fee_discount)
-
-
-@pytest.mark.parametrize(
-    "tier, discount_program, fee",
-    [
-        (1, "volume", "9.315"),
-        (2, "volume", "8.28"),
-        (1, "referral", "8.3835"),
-        (2, "referral", "13.248"),
-        (2, "combo", "10.5984"),
-    ],
-)
-@pytest.mark.usefixtures("risk_accepted", "auth", "market_ids")
-def test_fills_maker_fee_tooltip_discount_program(
-    tier, discount_program, fee, vega_instance, page: Page, market_ids
-):
-    market_ids = set_market_volume_discount(
-        vega_instance, tier, discount_program, market_ids
-    )
-    market_id_key = f"tier_{tier}_{discount_program}"
-    if discount_program == "combo":
-        market_id_key = "combo"
-    market_id = market_ids.get(market_id_key)
-    page.goto(f"/#/markets/{market_id}")
-    change_keys(page, vega_instance, MM_WALLET.name)
-    page.get_by_test_id(FILLS).click()
-    row = page.get_by_test_id(TAB_FILLS).locator(ROW_LOCATOR).first
-    # tbd - tooltip is not visible without this wait
-    page.wait_for_timeout(1000)
-    row.locator(COL_FEE).hover()
-    expect(page.get_by_test_id(FEE_BREAKDOWN_TOOLTIP)).to_have_text(
-        f"If the market was activeFee revenue to be received by the maker, takers' fee discounts already applied.During continuous trading the maker pays no infrastructure and liquidity fees.Infrastructure fee0.00 tDAILiquidity fee0.00 tDAIMaker fee-{fee} tDAITotal fees-{fee} tDAI"
-    )
-
-
-@pytest.mark.parametrize(
-    "tier, discount_program, maker_fee, total_fee, infra_fee",
-    [
-        (1, "volume", "9.315", "9.36158", "0.04658"),
-        (2, "volume", "8.28", "8.3214", "0.0414"),
-        (1, "referral", "8.3835", "8.42543", "0.04193"),
-        (2, "referral", "13.248", "13.31424", "0.06624"),
-        (2, "combo", "10.5984", "10.6514", "0.053"),
-    ],
-)
-@pytest.mark.usefixtures("risk_accepted", "auth", "market_ids")
-def test_fills_taker_fee_tooltip_discount_program(
-    tier,
-    discount_program,
-    vega_instance,
-    maker_fee,
-    total_fee,
-    infra_fee,
-    page: Page,
-    market_ids,
-):
-    market_ids = set_market_volume_discount(
-        vega_instance, tier, discount_program, market_ids
-    )
-    market_id_key = f"tier_{tier}_{discount_program}"
-    if discount_program == "combo":
-        market_id_key = "combo"
-    market_id = market_ids.get(market_id_key)
-    page.goto(f"/#/markets/{market_id}")
-    page.get_by_test_id(FILLS).click()
-    row = page.get_by_test_id(TAB_FILLS).locator(ROW_LOCATOR).first
-    # tbd - tooltip is not visible without this wait
-    page.wait_for_timeout(1000)
-    row.locator(COL_FEE).hover()
-    expect(page.get_by_test_id(FEE_BREAKDOWN_TOOLTIP)).to_have_text(
-        f"If the market was activeFees to be paid by the taker; discounts are already applied.Infrastructure fee{infra_fee} tDAILiquidity fee0.00 tDAIMaker fee{maker_fee} tDAITotal fees{total_fee} tDAI"
-    )
@@ -0,0 +1,216 @@
+import pytest
+from fees_test_ids import *
+from playwright.sync_api import Page, expect
+from vega_sim.null_service import VegaServiceNull
+from actions.vega import submit_order
+from wallet_config import MM_WALLET
+from conftest import (
+    init_vega,
+    init_page,
+    auth_setup,
+    risk_accepted_setup,
+    cleanup_container,
+)
+from actions.utils import next_epoch, change_keys, forward_time
+from fixtures.market import setup_continuous_market
+
+
+@pytest.fixture(scope="module")
+def vega(request):
+    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)
+        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):
+    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(
+        "Total fee before discount10.05%-10.05%"
+    )
+    expect(page.get_by_test_id(INFRASTRUCTURE_FEES)).to_have_text("Infrastructure0.05%")
+    expect(page.get_by_test_id(MAKER_FEES)).to_have_text("Maker10%")
+    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,
+):
+    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%")
+    expect(page.get_by_test_id(REFERRAL_DISCOUNT_ROW)).to_have_text(
+        "Referral discount20%"
+    )
+    page.get_by_test_id(TOTAL_DISCOUNT).hover()
+    expect(page.get_by_test_id(TOOLTIP_CONTENT).nth(0)).to_have_text(
+        "The total discount is calculated according to the following formula: 1 - (1 - dvolume) ⋇ (1 - dreferral)"
+    )
+
+
+@pytest.mark.xdist_group(name="test_fees_combo_tier_2")
+def test_fees_page_discount_program_fees_by_market(page: Page):
+    page.goto("/#/fees")
+    pinned = page.locator(PINNED_ROW_LOCATOR)
+    row = page.locator(ROW_LOCATOR)
+    expect(pinned.locator(COL_CODE)).to_have_text("BTC:DAI_2023Futr")
+    expect(row.locator(COL_FEE_AFTER_DISCOUNT)).to_have_text("6.432%")
+    expect(row.locator(COL_INFRA_FEE)).to_have_text("0.05%")
+    expect(row.locator(COL_MAKER_FEE)).to_have_text("10%")
+    expect(row.locator(COL_LIQUIDITY_FEE)).to_have_text("0%")
+    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}")
+    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%")
+    page.get_by_test_id(FEES_TEXT).hover()
+    tooltip = page.get_by_test_id(TOOLTIP_CONTENT).first
+    expect(tooltip.get_by_test_id(INFRASTRUCTURE_FEE_FACTOR)).to_have_text("0.05%")
+    expect(tooltip.get_by_test_id(INFRASTRUCTURE_FEE_VALUE)).to_have_text("0.0005 tDAI")
+    expect(tooltip.get_by_test_id(LIQUIDITY_FEE_FACTOR)).to_have_text("0%")
+    expect(tooltip.get_by_test_id(LIQUIDITY_FEE_VALUE)).to_have_text("0.00 tDAI")
+    expect(tooltip.get_by_test_id(MAKER_FEE_FACTOR)).to_have_text("10%")
+    expect(tooltip.get_by_test_id(MAKER_FEE_VALUE)).to_have_text("0.10 tDAI")
+    expect(tooltip.get_by_test_id(SUBTOTAL_FEE_FACTOR)).to_have_text("10.05%")
+    expect(tooltip.get_by_test_id(SUBTOTAL_FEE_VALUE)).to_have_text("0.1005 tDAI")
+    expect(tooltip.get_by_test_id(DISCOUNT_FEE_FACTOR)).to_have_text("-36%")
+    expect(tooltip.get_by_test_id(DISCOUNT_FEE_VALUE)).to_have_text("-0.03618 tDAI")
+    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}")
+    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")
+    expect(row.locator(COL_PRICE)).to_have_text("103.50 tDAI")
+    expect(row.locator(COL_PRICE_1)).to_have_text("207.00 tDAI")
+    expect(row.locator(COL_AGGRESSOR)).to_have_text("Taker")
+    expect(row.locator(COL_FEE)).to_have_text("10.6514 tDAI")
+    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}")
+    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
+    expect(row.locator(COL_SIZE)).to_have_text("-2")
+    expect(row.locator(COL_PRICE)).to_have_text("103.50 tDAI")
+    expect(row.locator(COL_PRICE_1)).to_have_text("207.00 tDAI")
+    expect(row.locator(COL_AGGRESSOR)).to_have_text("Maker")
+    expect(row.locator(COL_FEE)).to_have_text("-10.5984 tDAI")
+    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}")
+    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
+    # tbd - tooltip is not visible without this wait
+    page.wait_for_timeout(1000)
+    row.locator(COL_FEE).hover()
+    expect(page.get_by_test_id(FEE_BREAKDOWN_TOOLTIP)).to_have_text(
+        "If the market was activeFee revenue to be received by the maker, takers' fee discounts already applied.During continuous trading the maker pays no infrastructure and liquidity fees.Infrastructure fee0.00 tDAILiquidity fee0.00 tDAIMaker fee-10.5984 tDAITotal fees-10.5984 tDAI"
+    )
+
+
+@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}")
+    page.get_by_test_id(FILLS).click()
+    row = page.get_by_test_id(TAB_FILLS).locator(ROW_LOCATOR).first
+    # tbd - tooltip is not visible without this wait
+    page.wait_for_timeout(1000)
+    row.locator(COL_FEE).hover()
+    expect(page.get_by_test_id(FEE_BREAKDOWN_TOOLTIP)).to_have_text(
+        "If the market was activeFee revenue to be received by the maker, takers' fee discounts already applied.During continuous trading the maker pays no infrastructure and liquidity fees.Infrastructure fee0.00 tDAILiquidity fee0.00 tDAIMaker fee-10.5984 tDAITotal fees-10.5984 tDAI"
+    )
@@ -0,0 +1,221 @@
+import pytest
+from fees_test_ids import *
+from playwright.sync_api import Page, expect
+from vega_sim.null_service import VegaServiceNull
+from actions.vega import submit_order
+from wallet_config import MM_WALLET
+from conftest import (
+    init_vega,
+    init_page,
+    auth_setup,
+    risk_accepted_setup,
+    cleanup_container,
+)
+from actions.utils import next_epoch, change_keys, forward_time
+from fixtures.market import setup_continuous_market
+
+@pytest.fixture(scope="module")
+def vega(request):
+    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)
+        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):
+    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(
+        "Total fee before discount10.05%-10.05%"
+    )
+    expect(page.get_by_test_id(INFRASTRUCTURE_FEES)).to_have_text("Infrastructure0.05%")
+    expect(page.get_by_test_id(MAKER_FEES)).to_have_text("Maker10%")
+    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):
+    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%")
+    expect(page.get_by_test_id(REFERRAL_DISCOUNT_ROW)).to_have_text(
+        "Referral discount10%"
+    )
+    page.get_by_test_id(TOTAL_DISCOUNT).hover()
+    expect(page.get_by_test_id(TOOLTIP_CONTENT).nth(0)).to_have_text(
+        "The total discount is calculated according to the following formula: 1 - (1 - dvolume) ⋇ (1 - dreferral)"
+    )
+
+
+@pytest.mark.xdist_group(name="test_fees_referral_tier_1")
+def test_fees_page_referral_discount_program_referral_benefits(page: Page):
+    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):
+    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")
+    expect(page.get_by_test_id(DISCOUNT_VALUE_0)).to_have_text("10%")
+    expect(page.get_by_test_id(DISCOUNT_VALUE_1)).to_have_text("20%")
+    expect(page.get_by_test_id(MIN_VOLUME_VALUE_0)).to_have_text("100")
+    expect(page.get_by_test_id(MIN_VOLUME_VALUE_1)).to_have_text("200")
+
+    expect(page.get_by_test_id(REQUIRED_EPOCHS_VALUE_0)).to_have_text("1")
+    expect(page.get_by_test_id(REQUIRED_EPOCHS_VALUE_1)).to_have_text("2")
+
+    expect(page.get_by_test_id("your-referral-tier-0").nth(1)).to_be_visible()
+    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):
+    page.goto("/#/fees")
+    pinned = page.locator(PINNED_ROW_LOCATOR)
+    row = page.locator(ROW_LOCATOR)
+    expect(pinned.locator(COL_CODE)).to_have_text("BTC:DAI_2023Futr")
+    expect(row.locator(COL_FEE_AFTER_DISCOUNT)).to_have_text("9.045%")
+    expect(row.locator(COL_INFRA_FEE)).to_have_text("0.05%")
+    expect(row.locator(COL_MAKER_FEE)).to_have_text("10%")
+    expect(row.locator(COL_LIQUIDITY_FEE)).to_have_text("0%")
+    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}")
+    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%")
+    page.get_by_test_id(FEES_TEXT).hover()
+    tooltip = page.get_by_test_id(TOOLTIP_CONTENT).first
+    expect(tooltip.get_by_test_id(INFRASTRUCTURE_FEE_FACTOR)).to_have_text("0.05%")
+    expect(tooltip.get_by_test_id(INFRASTRUCTURE_FEE_VALUE)).to_have_text("0.0005 tDAI")
+    expect(tooltip.get_by_test_id(LIQUIDITY_FEE_FACTOR)).to_have_text("0%")
+    expect(tooltip.get_by_test_id(LIQUIDITY_FEE_VALUE)).to_have_text("0.00 tDAI")
+    expect(tooltip.get_by_test_id(MAKER_FEE_FACTOR)).to_have_text("10%")
+    expect(tooltip.get_by_test_id(MAKER_FEE_VALUE)).to_have_text("0.10 tDAI")
+    expect(tooltip.get_by_test_id(SUBTOTAL_FEE_FACTOR)).to_have_text("10.05%")
+    expect(tooltip.get_by_test_id(SUBTOTAL_FEE_VALUE)).to_have_text("0.1005 tDAI")
+    expect(tooltip.get_by_test_id(DISCOUNT_FEE_FACTOR)).to_have_text("-10%")
+    expect(tooltip.get_by_test_id(DISCOUNT_FEE_VALUE)).to_have_text("-0.01005 tDAI")
+    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}")
+    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")
+    expect(row.locator(COL_PRICE)).to_have_text("103.50 tDAI")
+    expect(row.locator(COL_PRICE_1)).to_have_text("103.50 tDAI")
+    expect(row.locator(COL_AGGRESSOR)).to_have_text("Taker")
+    expect(row.locator(COL_FEE)).to_have_text("8.42543 tDAI")
+    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}")
+    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
+    expect(row.locator(COL_SIZE)).to_have_text("-1")
+    expect(row.locator(COL_PRICE)).to_have_text("103.50 tDAI")
+    expect(row.locator(COL_PRICE_1)).to_have_text("103.50 tDAI")
+    expect(row.locator(COL_AGGRESSOR)).to_have_text("Maker")
+    expect(row.locator(COL_FEE)).to_have_text("-8.3835 tDAI")
+    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}")
+    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
+    # tbd - tooltip is not visible without this wait
+    page.wait_for_timeout(1000)
+    row.locator(COL_FEE).hover()
+    expect(page.get_by_test_id(FEE_BREAKDOWN_TOOLTIP)).to_have_text(
+        "If the market was activeFee revenue to be received by the maker, takers' fee discounts already applied.During continuous trading the maker pays no infrastructure and liquidity fees.Infrastructure fee0.00 tDAILiquidity fee0.00 tDAIMaker fee-8.3835 tDAITotal fees-8.3835 tDAI"
+    )
+
+
+@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}")
+    page.get_by_test_id(FILLS).click()
+    row = page.get_by_test_id(TAB_FILLS).locator(ROW_LOCATOR).first
+    # tbd - tooltip is not visible without this wait
+    page.wait_for_timeout(1000)
+    row.locator(COL_FEE).hover()
+    expect(page.get_by_test_id(FEE_BREAKDOWN_TOOLTIP)).to_have_text(
+        "If the market was activeFee revenue to be received by the maker, takers' fee discounts already applied.During continuous trading the maker pays no infrastructure and liquidity fees.Infrastructure fee0.00 tDAILiquidity fee0.00 tDAIMaker fee-8.3835 tDAITotal fees-8.3835 tDAI"
+    )
@@ -0,0 +1,222 @@
+import pytest
+from fees_test_ids import *
+from playwright.sync_api import Page, expect
+from vega_sim.null_service import VegaServiceNull
+from actions.vega import submit_order
+from wallet_config import MM_WALLET
+from conftest import (
+    init_vega,
+    init_page,
+    auth_setup,
+    risk_accepted_setup,
+    cleanup_container,
+)
+from actions.utils import next_epoch, change_keys, forward_time
+from fixtures.market import setup_continuous_market
+
+
+@pytest.fixture(scope="module")
+def vega(request):
+    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)
+        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):
+    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(
+        "Total fee before discount10.05%-10.05%"
+    )
+    expect(page.get_by_test_id(INFRASTRUCTURE_FEES)).to_have_text("Infrastructure0.05%")
+    expect(page.get_by_test_id(MAKER_FEES)).to_have_text("Maker10%")
+    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):
+    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%")
+    expect(page.get_by_test_id(REFERRAL_DISCOUNT_ROW)).to_have_text(
+        "Referral discount20%"
+    )
+    page.get_by_test_id(TOTAL_DISCOUNT).hover()
+    expect(page.get_by_test_id(TOOLTIP_CONTENT).nth(0)).to_have_text(
+        "The total discount is calculated according to the following formula: 1 - (1 - dvolume) ⋇ (1 - dreferral)"
+    )
+
+
+@pytest.mark.xdist_group(name="test_fees_referral_tier_2")
+def test_fees_page_referral_discount_program_referral_benefits(page: Page):
+    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):
+    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")
+    expect(page.get_by_test_id(DISCOUNT_VALUE_0)).to_have_text("10%")
+    expect(page.get_by_test_id(DISCOUNT_VALUE_1)).to_have_text("20%")
+    expect(page.get_by_test_id(MIN_VOLUME_VALUE_0)).to_have_text("100")
+    expect(page.get_by_test_id(MIN_VOLUME_VALUE_1)).to_have_text("200")
+
+    expect(page.get_by_test_id(REQUIRED_EPOCHS_VALUE_0)).to_have_text("1")
+    expect(page.get_by_test_id(REQUIRED_EPOCHS_VALUE_1)).to_have_text("2")
+
+    expect(page.get_by_test_id("your-referral-tier-1").nth(1)).to_be_visible()
+    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):
+    page.goto("/#/fees")
+    pinned = page.locator(PINNED_ROW_LOCATOR)
+    row = page.locator(ROW_LOCATOR)
+    expect(pinned.locator(COL_CODE)).to_have_text("BTC:DAI_2023Futr")
+    expect(row.locator(COL_FEE_AFTER_DISCOUNT)).to_have_text("8.04%")
+    expect(row.locator(COL_INFRA_FEE)).to_have_text("0.05%")
+    expect(row.locator(COL_MAKER_FEE)).to_have_text("10%")
+    expect(row.locator(COL_LIQUIDITY_FEE)).to_have_text("0%")
+    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}")
+    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%")
+    page.get_by_test_id(FEES_TEXT).hover()
+    tooltip = page.get_by_test_id(TOOLTIP_CONTENT).first
+    expect(tooltip.get_by_test_id(INFRASTRUCTURE_FEE_FACTOR)).to_have_text("0.05%")
+    expect(tooltip.get_by_test_id(INFRASTRUCTURE_FEE_VALUE)).to_have_text("0.0005 tDAI")
+    expect(tooltip.get_by_test_id(LIQUIDITY_FEE_FACTOR)).to_have_text("0%")
+    expect(tooltip.get_by_test_id(LIQUIDITY_FEE_VALUE)).to_have_text("0.00 tDAI")
+    expect(tooltip.get_by_test_id(MAKER_FEE_FACTOR)).to_have_text("10%")
+    expect(tooltip.get_by_test_id(MAKER_FEE_VALUE)).to_have_text("0.10 tDAI")
+    expect(tooltip.get_by_test_id(SUBTOTAL_FEE_FACTOR)).to_have_text("10.05%")
+    expect(tooltip.get_by_test_id(SUBTOTAL_FEE_VALUE)).to_have_text("0.1005 tDAI")
+    expect(tooltip.get_by_test_id(DISCOUNT_FEE_FACTOR)).to_have_text("-20%")
+    expect(tooltip.get_by_test_id(DISCOUNT_FEE_VALUE)).to_have_text("-0.0201 tDAI")
+    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}")
+    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")
+    expect(row.locator(COL_PRICE)).to_have_text("103.50 tDAI")
+    expect(row.locator(COL_PRICE_1)).to_have_text("207.00 tDAI")
+    expect(row.locator(COL_AGGRESSOR)).to_have_text("Taker")
+    expect(row.locator(COL_FEE)).to_have_text("13.31424 tDAI")
+    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}")
+    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
+    expect(row.locator(COL_SIZE)).to_have_text("-2")
+    expect(row.locator(COL_PRICE)).to_have_text("103.50 tDAI")
+    expect(row.locator(COL_PRICE_1)).to_have_text("207.00 tDAI")
+    expect(row.locator(COL_AGGRESSOR)).to_have_text("Maker")
+    expect(row.locator(COL_FEE)).to_have_text("-13.248 tDAI")
+    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}")
+    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
+    # tbd - tooltip is not visible without this wait
+    page.wait_for_timeout(1000)
+    row.locator(COL_FEE).hover()
+    expect(page.get_by_test_id(FEE_BREAKDOWN_TOOLTIP)).to_have_text(
+        " If the market was activeFee revenue to be received by the maker, takers' fee discounts already applied.During continuous trading the maker pays no infrastructure and liquidity fees.Infrastructure fee0.00 tDAILiquidity fee0.00 tDAIMaker fee-13.248 tDAITotal fees-13.248 tDAI "
+    )
+
+
+@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}")
+    page.get_by_test_id(FILLS).click()
+    row = page.get_by_test_id(TAB_FILLS).locator(ROW_LOCATOR).first
+    # tbd - tooltip is not visible without this wait
+    page.wait_for_timeout(1000)
+    row.locator(COL_FEE).hover()
+    expect(page.get_by_test_id(FEE_BREAKDOWN_TOOLTIP)).to_have_text(
+        "If the market was activeFee revenue to be received by the maker, takers' fee discounts already applied.During continuous trading the maker pays no infrastructure and liquidity fees.Infrastructure fee0.00 tDAILiquidity fee0.00 tDAIMaker fee-13.248 tDAITotal fees-13.248 tDAI "
+    )
@@ -0,0 +1,210 @@
+import pytest
+from fees_test_ids import *
+from playwright.sync_api import Page, expect
+from vega_sim.null_service import VegaServiceNull
+from actions.vega import submit_order
+from wallet_config import MM_WALLET
+from conftest import (
+    init_vega,
+    init_page,
+    auth_setup,
+    risk_accepted_setup,
+    cleanup_container,
+)
+from actions.utils import next_epoch, change_keys, forward_time
+from fixtures.market import setup_continuous_market
+
+
+@pytest.fixture(scope="module")
+def vega(request):
+    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)
+        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):
+    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(
+        "Total fee before discount10.05%-10.05%"
+    )
+    expect(page.get_by_test_id(INFRASTRUCTURE_FEES)).to_have_text("Infrastructure0.05%")
+    expect(page.get_by_test_id(MAKER_FEES)).to_have_text("Maker10%")
+    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,
+):
+    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%")
+    expect(page.get_by_test_id(REFERRAL_DISCOUNT_ROW)).to_have_text(
+        "Referral discount0%"
+    )
+    page.get_by_test_id(TOTAL_DISCOUNT).hover()
+    expect(page.get_by_test_id(TOOLTIP_CONTENT).nth(0)).to_have_text(
+        "The total discount is calculated according to the following formula: 1 - (1 - dvolume) ⋇ (1 - dreferral)"
+    )
+
+
+@pytest.mark.xdist_group(name="test_fees_volume_tier_1")
+def test_fees_page_volume_discount_program_my_current_volume(
+    page: Page,
+):
+    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,
+):
+    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")
+    expect(page.get_by_test_id(DISCOUNT_VALUE_0)).to_have_text("10%")
+    expect(page.get_by_test_id(DISCOUNT_VALUE_1)).to_have_text("20%")
+    expect(page.get_by_test_id(MIN_VOLUME_VALUE_0)).to_have_text("100")
+    expect(page.get_by_test_id(MIN_VOLUME_VALUE_1)).to_have_text("200")
+    expect(page.get_by_test_id("my-volume-value-0")).to_have_text("103")
+    expect(page.get_by_test_id("your-volume-tier-0").nth(1)).to_be_visible()
+    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):
+    page.goto("/#/fees")
+    pinned = page.locator(PINNED_ROW_LOCATOR)
+    row = page.locator(ROW_LOCATOR)
+    expect(pinned.locator(COL_CODE)).to_have_text("BTC:DAI_2023Futr")
+    expect(row.locator(COL_FEE_AFTER_DISCOUNT)).to_have_text("9.045%")
+    expect(row.locator(COL_INFRA_FEE)).to_have_text("0.05%")
+    expect(row.locator(COL_MAKER_FEE)).to_have_text("10%")
+    expect(row.locator(COL_LIQUIDITY_FEE)).to_have_text("0%")
+    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}")
+    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%")
+    page.get_by_test_id(FEES_TEXT).hover()
+    tooltip = page.get_by_test_id(TOOLTIP_CONTENT).first
+    expect(tooltip.get_by_test_id(INFRASTRUCTURE_FEE_FACTOR)).to_have_text("0.05%")
+    expect(tooltip.get_by_test_id(INFRASTRUCTURE_FEE_VALUE)).to_have_text("0.0005 tDAI")
+    expect(tooltip.get_by_test_id(LIQUIDITY_FEE_FACTOR)).to_have_text("0%")
+    expect(tooltip.get_by_test_id(LIQUIDITY_FEE_VALUE)).to_have_text("0.00 tDAI")
+    expect(tooltip.get_by_test_id(MAKER_FEE_FACTOR)).to_have_text("10%")
+    expect(tooltip.get_by_test_id(MAKER_FEE_VALUE)).to_have_text("0.10 tDAI")
+    expect(tooltip.get_by_test_id(SUBTOTAL_FEE_FACTOR)).to_have_text("10.05%")
+    expect(tooltip.get_by_test_id(SUBTOTAL_FEE_VALUE)).to_have_text("0.1005 tDAI")
+    expect(tooltip.get_by_test_id(DISCOUNT_FEE_FACTOR)).to_have_text("-10%")
+    expect(tooltip.get_by_test_id(DISCOUNT_FEE_VALUE)).to_have_text("-0.01005 tDAI")
+    expect(tooltip.get_by_test_id(TOTAL_FEE_VALUE)).to_have_text("0.09045 tDAI")
+
+
+@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}")
+    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")
+    expect(row.locator(COL_PRICE)).to_have_text("103.50 tDAI")
+    expect(row.locator(COL_PRICE_1)).to_have_text("103.50 tDAI")
+    expect(row.locator(COL_AGGRESSOR)).to_have_text("Taker")
+    expect(row.locator(COL_FEE)).to_have_text("9.36158 tDAI")
+    expect(row.locator(COL_FEE_DISCOUNT)).to_have_text("1.04017 tDAI")
+
+
+@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}")
+    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
+    expect(row.locator(COL_SIZE)).to_have_text("-1")
+    expect(row.locator(COL_PRICE)).to_have_text("103.50 tDAI")
+    expect(row.locator(COL_PRICE_1)).to_have_text("103.50 tDAI")
+    expect(row.locator(COL_AGGRESSOR)).to_have_text("Maker")
+    expect(row.locator(COL_FEE)).to_have_text("-9.315 tDAI")
+    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}")
+    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
+    # tbd - tooltip is not visible without this wait
+    page.wait_for_timeout(1000)
+    row.locator(COL_FEE).hover()
+    expect(page.get_by_test_id(FEE_BREAKDOWN_TOOLTIP)).to_have_text(
+        "If the market was activeFee revenue to be received by the maker, takers' fee discounts already applied.During continuous trading the maker pays no infrastructure and liquidity fees.Infrastructure fee0.00 tDAILiquidity fee0.00 tDAIMaker fee-9.315 tDAITotal fees-9.315 tDAI"
+    )
+
+
+@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}")
+    page.get_by_test_id(FILLS).click()
+    row = page.get_by_test_id(TAB_FILLS).locator(ROW_LOCATOR).first
+    # tbd - tooltip is not visible without this wait
+    page.wait_for_timeout(1000)
+    row.locator(COL_FEE).hover()
+    expect(page.get_by_test_id(FEE_BREAKDOWN_TOOLTIP)).to_have_text(
+        "If the market was activeFee revenue to be received by the maker, takers' fee discounts already applied.During continuous trading the maker pays no infrastructure and liquidity fees.Infrastructure fee0.00 tDAILiquidity fee0.00 tDAIMaker fee-9.315 tDAITotal fees-9.315 tDAI"
+    )
@@ -0,0 +1,209 @@
+import pytest
+from fees_test_ids import *
+from playwright.sync_api import Page, expect
+from vega_sim.null_service import VegaServiceNull
+from actions.vega import submit_order
+from wallet_config import MM_WALLET
+from conftest import (
+    init_vega,
+    init_page,
+    auth_setup,
+    risk_accepted_setup,
+    cleanup_container,
+)
+from actions.utils import next_epoch, change_keys, forward_time
+from fixtures.market import setup_continuous_market
+
+@pytest.fixture(scope="module")
+def vega(request):
+    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)
+        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):
+    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(
+        "Total fee before discount10.05%-10.05%"
+    )
+    expect(page.get_by_test_id(INFRASTRUCTURE_FEES)).to_have_text("Infrastructure0.05%")
+    expect(page.get_by_test_id(MAKER_FEES)).to_have_text("Maker10%")
+    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):
+    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%")
+    expect(page.get_by_test_id(REFERRAL_DISCOUNT_ROW)).to_have_text(
+        "Referral discount0%"
+    )
+    page.get_by_test_id(TOTAL_DISCOUNT).hover()
+    expect(page.get_by_test_id(TOOLTIP_CONTENT).nth(0)).to_have_text(
+        "The total discount is calculated according to the following formula: 1 - (1 - dvolume) ⋇ (1 - dreferral)"
+    )
+
+
+@pytest.mark.xdist_group(name="test_fees_volume_tier_2")
+def test_fees_page_volume_discount_program_my_current_volume(page: Page):
+    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):
+    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")
+    expect(page.get_by_test_id(DISCOUNT_VALUE_0)).to_have_text("10%")
+    expect(page.get_by_test_id(DISCOUNT_VALUE_1)).to_have_text("20%")
+    expect(page.get_by_test_id(MIN_VOLUME_VALUE_0)).to_have_text("100")
+    expect(page.get_by_test_id(MIN_VOLUME_VALUE_1)).to_have_text("200")
+    expect(page.get_by_test_id("my-volume-value-1")).to_have_text("206")
+    expect(page.get_by_test_id("your-volume-tier-1").nth(1)).to_be_visible()
+    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):
+    page.goto("/#/fees")
+    pinned = page.locator(PINNED_ROW_LOCATOR)
+    row = page.locator(ROW_LOCATOR)
+    expect(pinned.locator(COL_CODE)).to_have_text("BTC:DAI_2023Futr")
+    expect(row.locator(COL_FEE_AFTER_DISCOUNT)).to_have_text("8.04%")
+    expect(row.locator(COL_INFRA_FEE)).to_have_text("0.05%")
+    expect(row.locator(COL_MAKER_FEE)).to_have_text("10%")
+    expect(row.locator(COL_LIQUIDITY_FEE)).to_have_text("0%")
+    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}")
+    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%")
+    page.get_by_test_id(FEES_TEXT).hover()
+    tooltip = page.get_by_test_id(TOOLTIP_CONTENT).first
+    expect(tooltip.get_by_test_id(INFRASTRUCTURE_FEE_FACTOR)).to_have_text("0.05%")
+    expect(tooltip.get_by_test_id(INFRASTRUCTURE_FEE_VALUE)).to_have_text("0.0005 tDAI")
+    expect(tooltip.get_by_test_id(LIQUIDITY_FEE_FACTOR)).to_have_text("0%")
+    expect(tooltip.get_by_test_id(LIQUIDITY_FEE_VALUE)).to_have_text("0.00 tDAI")
+    expect(tooltip.get_by_test_id(MAKER_FEE_FACTOR)).to_have_text("10%")
+    expect(tooltip.get_by_test_id(MAKER_FEE_VALUE)).to_have_text("0.10 tDAI")
+    expect(tooltip.get_by_test_id(SUBTOTAL_FEE_FACTOR)).to_have_text("10.05%")
+    expect(tooltip.get_by_test_id(SUBTOTAL_FEE_VALUE)).to_have_text("0.1005 tDAI")
+    expect(tooltip.get_by_test_id(DISCOUNT_FEE_FACTOR)).to_have_text("-20%")
+    expect(tooltip.get_by_test_id(DISCOUNT_FEE_VALUE)).to_have_text("-0.0201 tDAI")
+    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}")
+    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")
+    expect(row.locator(COL_PRICE)).to_have_text("103.50 tDAI")
+    expect(row.locator(COL_PRICE_1)).to_have_text("103.50 tDAI")
+    expect(row.locator(COL_AGGRESSOR)).to_have_text("Taker")
+    expect(row.locator(COL_FEE)).to_have_text(
+        "8.3214 tDAI",
+    )
+    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}")
+    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
+    expect(row.locator(COL_SIZE)).to_have_text("-1")
+    expect(row.locator(COL_PRICE)).to_have_text("103.50 tDAI")
+    expect(row.locator(COL_PRICE_1)).to_have_text("103.50 tDAI")
+    expect(row.locator(COL_AGGRESSOR)).to_have_text("Maker")
+    expect(row.locator(COL_FEE)).to_have_text("-8.28 tDAI ")
+    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}")
+    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
+    # tbd - tooltip is not visible without this wait
+    page.wait_for_timeout(1000)
+    row.locator(COL_FEE).hover()
+    expect(page.get_by_test_id(FEE_BREAKDOWN_TOOLTIP)).to_have_text(
+        "If the market was activeFee revenue to be received by the maker, takers' fee discounts already applied.During continuous trading the maker pays no infrastructure and liquidity fees.Infrastructure fee0.00 tDAILiquidity fee0.00 tDAIMaker fee-8.28 tDAITotal fees-8.28 tDAI"
+    )
+
+
+@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}")
+    page.get_by_test_id(FILLS).click()
+    row = page.get_by_test_id(TAB_FILLS).locator(ROW_LOCATOR).first
+    # tbd - tooltip is not visible without this wait
+    page.wait_for_timeout(1000)
+    row.locator(COL_FEE).hover()
+    expect(page.get_by_test_id(FEE_BREAKDOWN_TOOLTIP)).to_have_text(
+        "If the market was activeFee revenue to be received by the maker, takers' fee discounts already applied.During continuous trading the maker pays no infrastructure and liquidity fees.Infrastructure fee0.00 tDAILiquidity fee0.00 tDAIMaker fee-8.28 tDAITotal fees-8.28 tDAI "
+    )
@@ -14,7 +14,7 @@ logger = logging.getLogger()
@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


@@ -142,8 +142,7 @@ class TestGetStarted:
    def test_get_started_seen_already(self, simple_market, page: Page):
        page.goto(f"/#/markets/{simple_market}")
        get_started_locator = page.get_by_test_id("connect-vega-wallet")
-        page.wait_for_selector(
-            '[data-testid="connect-vega-wallet"]', state="attached")
+        page.wait_for_selector('[data-testid="connect-vega-wallet"]', state="attached")
        expect(get_started_locator).to_be_enabled
        expect(get_started_locator).to_be_visible
        # 0007-FUGS-015
@@ -153,7 +152,9 @@ class TestGetStarted:
        expect(page.get_by_test_id("dialog-content").nth(1)).to_be_visible()

    @pytest.mark.skip("tbd-market-sim")
-    def test_redirect_default_market(self, continuous_market, vega: VegaServiceNull, page: Page):
+    def test_redirect_default_market(
+        self, continuous_market, vega: VegaServiceNull, page: Page
+    ):
        page.goto("/")
        # 0007-FUGS-012
        expect(page).to_have_url(
@@ -8,7 +8,7 @@ from actions.utils import next_epoch, truncate_middle, change_keys
@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


@@ -11,7 +11,7 @@ from actions.utils import next_epoch
@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


@@ -11,7 +11,7 @@ market_title_test_id = "accordion-title"
@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


@@ -77,7 +77,7 @@ def test_market_info_market_volume(page: Page):
    page.get_by_test_id(market_title_test_id).get_by_text(
        "Market volume").click()
    fields = [
-        ["24 Hour Volume", "-"],
+        ["24 Hour Volume", "0 (0 )"],
        ["Open Interest", "1"],
        ["Best Bid Volume", "99"],
        ["Best Offer Volume", "99"],
@@ -107,7 +107,6 @@ def test_market_info_liquidation(page: Page):
    validate_info_section(page, fields)


-@pytest.mark.skip("core issue #5681")
 def test_market_info_key_details(page: Page, vega: VegaServiceNull):
    # 6002-MDET-201
    page.get_by_test_id(market_title_test_id).get_by_text(
@@ -117,8 +116,6 @@ def test_market_info_key_details(page: Page, vega: VegaServiceNull):
    fields = [
        ["Market ID", short_market_id],
        ["Name", "BTC:DAI_2023"],
-        ["Parent Market ID", "-"],
-        ["Insurance Pool Fraction", "-"],
        ["Status", "Active"],
        ["Trading Mode", "Continuous"],
        ["Market Decimal Places", "5"],
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Matthew Russellandbwallacee	7ea7362a7d	fix(trading): market into tab 24hr vol and price fix (#5910 ) Co-authored-by: bwallacee <ben@vega.xyz>	2024-03-04 19:08:42 +00:00
Art	bbfe42ddb1	fix(governance): rewards moved to console notification (#5904 )	2024-03-04 18:09:52 +00:00
Matthew Russell	b163af3e8a	fix(trading): 24hr price and volume in header (#5908 )	2024-03-04 18:00:54 +00:00
Matthew Russell	82df401611	fix(governance): incorrect penalty information in validators table and page (#5896 )	2024-03-01 22:22:17 +00:00
Matthew Russell	4733bc169c	fix(governance): rewards pagination and columns (#5879 )	2024-02-29 14:57:07 +00:00
m.ray	2b91aebc2a	fix(trading): fees by market fix order (#5877 )	2024-02-29 10:25:56 +00:00
m.rayandbwallacee	375f4da541	fix(trading): fix reward card asssets (#5888 ) Co-authored-by: bwallacee <ben@vega.xyz>	2024-02-29 09:21:35 +00:00
Matthew Russell	bc413ed314	chore(trading): revert reuse vega work (#5883 )	2024-02-28 16:57:42 +00:00
BenandMatthew Russell	2fab3daebd	chore(trading): update vega binaries (#5873 ) Co-authored-by: Matthew Russell <mattrussell36@gmail.com>	2024-02-27 23:24:28 +00:00
Art	2e07ada966	fix(governance): network paramater change in batch proposals (#5869 )	2024-02-27 11:47:10 +01:00
ArtandDariusz Majcherczyk	b81c4bc948	fix(governance): add multisig score to the validator page (#5845 ) Co-authored-by: Dariusz Majcherczyk <dariusz.majcherczyk@gmail.com>	2024-02-27 11:46:48 +01:00
m.ray Art Dariusz Majcherczyk	4f8d6bd876	fix(trading): banner for resume trading (#5849 ) Co-authored-by: Art <artur@vegaprotocol.io> Co-authored-by: Dariusz Majcherczyk <dariusz.majcherczyk@gmail.com>	2024-02-26 16:17:08 +00:00
Ben	52e5a37da3	chore(trading): fix skipped tests (#5868 )	2024-02-26 15:52:22 +00:00
Ben	22599673ec	chore(trading): remove fixture usage (#5865 )	2024-02-26 14:24:56 +00:00
Ben	3c6a806ad3	chore(trading): reuse vega (#5850 )	2024-02-26 12:57:16 +00:00
Dexter Edwards	7101d49d1d	chore(governance, trading): update links for new beta extension (#5858 )	2024-02-26 12:57:09 +00:00
Art	72e0cb76aa	feat(governance): batch proposal indicators, vote breakdown ui changes (#5857 )	2024-02-26 09:48:29 +00:00
m.ray	ca64516a52	fix(trading): lp data provider reload - updating book (#5846 )	2024-02-23 17:08:22 +00:00
daro-majanddaniel1302	55d692ea6f	test(governance): revert tests (#5808 ) Co-authored-by: daniel1302 <daniel.1302@gmail.com>	2024-02-23 10:27:35 +01:00
Ben	f235c03abe	chore(trading): update e2e test readme (#5844 )	2024-02-22 21:50:55 +01:00
Matthew Russell	546deb0e1c	fix(trading): use same epochs for all games/stats (#5834 )	2024-02-22 13:27:13 +00:00
Art	042919eca9	fix(governance): update market proposal diff (#5842 )	2024-02-22 13:37:48 +01:00
Ben	c4a56e0de3	chore(trading): fix-order-status-test (#5840 )	2024-02-21 15:36:55 +00:00
Ben	3c3bfb7dac	chore(trading): update e2e dependencies (#5831 )	2024-02-21 13:51:30 +00:00
Ben	196ba78806	chore(trading): refactor tests (#5835 )	2024-02-21 13:22:48 +00:00
Bartłomiej GłowniaandMatthew Russell	53ac2dadee	feat(trading): support modified funding payment calc (#5780 ) Co-authored-by: Matthew Russell <mattrussell36@gmail.com>	2024-02-20 19:08:29 +00:00
Matthew Russell	e532f88daa	fix(governance): market name component not showing correct instrument code (#5830 )	2024-02-20 18:00:51 +00:00
Ben	7b06c05853	chore(trading): update to vega 74.3 (#5829 )	2024-02-20 17:56:54 +00:00
Edd	a92fe92778	fix(governance): fix willpassbylpvotecalculation (#5824 )	2024-02-20 16:10:44 +00:00
Art	b8725a7fa8	fix(trading): competitions font tweaks (#5828 )	2024-02-20 16:17:02 +01:00
Art	f556247e1a	chore(trading): competitions texts (#5826 )	2024-02-20 14:39:41 +00:00
Art	48d6be0adf	fix(governance): batch proposal diff and proposal headers (#5825 )	2024-02-20 15:04:11 +01:00
Art	be6f395ce4	feat(trading): colourful rewards (#5812 )	2024-02-20 13:20:35 +01:00
Edd	9a37572f51	fix(explorer): sizedelta in ammends displayed incorrectly' (#5816 )	2024-02-20 09:24:25 +00:00
Edd	19fb406d49	feat(explorer): add treasury view (#5798 )	2024-02-19 10:24:51 +00:00
Matthew Russell	a2a04c57d2	fix(trading): add depth chart on mobile view (#5811 )	2024-02-16 21:34:01 +00:00