feat(proposals): generic proposal toasts

2023-10-26 17:28:34 +02:00
95 changed files with 798 additions and 3387 deletions
@@ -39,6 +39,7 @@ context('Market page', { tags: '@regression' }, function () {
      cy.contains('Test market 1').click();
      cy.getByTestId(marketHeaders).should('have.text', 'Test market 1');
      cy.validate_element_from_table('Name', 'Test market 1');
+      cy.validate_element_from_table('Market ID', this.createdMarketId);
      cy.validate_element_from_table('Trading Mode', 'Opening auction');
      cy.validate_element_from_table('Market Decimal Places', '5');
      cy.validate_element_from_table('Position Decimal Places', '5');
@@ -537,10 +537,10 @@ describe(
      cy.VegaWalletSubmitProposal(createGovernanceTransferProposalTxBody());
      cy.reload();
      getProposalFromTitle('Governance transfer proposal').within(() => {
-        cy.getByTestId(marketProposalType).should('have.text', 'New transfer');
+        cy.getByTestId(marketProposalType).should('have.text', 'NewTransfer');
        cy.getByTestId(viewProposalButton).click();
      });
-      cy.getByTestId(marketProposalType).should('have.text', 'New transfer');
+      cy.getByTestId(marketProposalType).should('have.text', 'NewTransfer');
      cy.getByTestId(governanceTransferToggle).click();
      cy.getByTestId('proposal-transfer-details-table').within(() => {
        getProposalInformationFromTable('Source Type')
@@ -590,7 +590,7 @@ describe(
        );
        cy.getByTestId(viewProposalButton).click();
      });
-      cy.getByTestId(marketProposalType).should('have.text', 'Cancel transfer');
+      cy.getByTestId(marketProposalType).should('have.text', 'CancelTransfer');
      getProposalInformationFromTable('Error details')
        .invoke('text')
        .and('eq', 'Governance transfer invalid transfer id not found');
@@ -909,14 +909,6 @@
  "BenefitTierReferralDiscountFactorDescription": "The proportion of the referee's taker fees to be discounted",
  "BenefitTierReferralRewardFactor": "Referral reward factor",
  "BenefitTierReferralRewardFactorDescription": "The proportion of the referee's taker fees to be rewarded to the referrer",
-  "BenefitTierMinimumActivityStreak": "Minimum activity streak",
-  "BenefitTierMinimumActivityStreakDescription": "The minimum number of times the party needs to have completed the activity",
-  "BenefitTierMinimumQuantumBalance": "Minimum quantum balance",
-  "BenefitTierMinimumQuantumBalanceDescription": "The minimum amount of the vesting token to qualify",
-  "BenefitTierVestingMultiplier": "Vesting multiplier",
-  "BenefitTierVestingMultiplierDescription": "Vesting multiplier for the tier",
-  "BenefitTierRewardMultiplier": "Reward multiplier",
-  "BenefitTierRewardMultiplierDescription": "The multiplier",
  "StakingTiers": "Staking tiers",
  "StakingTierMinimumStakedTokens": "Minimum staked tokens",
  "StakingTierMinimumStakedTokensDescription": "Required number of governance tokens ($VEGA) a referrer must have staked to receive the multiplier",
@@ -1 +0,0 @@
-export * from './proposal-update-benefit-tiers-details';
@@ -1,158 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import { ProposalUpdateBenefitTiers } from './proposal-update-benefit-tiers-details';
-import { generateProposal } from '../../test-helpers/generate-proposals';
-
-jest.mock('../../../../contexts/app-state/app-state-context', () => ({
-  useAppState: () => ({
-    appState: {
-      decimals: 2,
-    },
-  }),
-}));
-
-const mockVestingBenefitTierProposal = generateProposal({
-  terms: {
-    change: {
-      __typename: 'UpdateNetworkParameter',
-      networkParameter: {
-        key: 'blah.blah.benefitTiers',
-        value: JSON.stringify({
-          tiers: [
-            {
-              minimum_quantum_balance: '10000',
-              reward_multiplier: '0.05',
-            },
-            {
-              minimum_quantum_balance: '500000000000',
-              reward_multiplier: '0.1',
-            },
-            {
-              minimum_quantum_balance: '10000000000000',
-              reward_multiplier: '10',
-            },
-          ],
-        }),
-      },
-    },
-  },
-});
-
-const mockActivityStreakBenefitTierProposal = generateProposal({
-  terms: {
-    change: {
-      __typename: 'UpdateNetworkParameter',
-      networkParameter: {
-        key: 'blah.blah.benefitTiers',
-        value: JSON.stringify({
-          tiers: [
-            {
-              minimum_activity_streak: '10000',
-              vesting_multiplier: '5',
-              reward_multiplier: '0.1',
-            },
-            {
-              minimum_activity_streak: '10000000000000',
-              vesting_multiplier: '100',
-              reward_multiplier: '10',
-            },
-          ],
-        }),
-      },
-    },
-  },
-});
-describe('ProposalUpdateBenefitTiers', () => {
-  it('should not render if proposal is null', () => {
-    render(<ProposalUpdateBenefitTiers proposal={null} />);
-    expect(screen.queryByTestId('proposal-update-benefit-tiers')).toBeNull();
-  });
-
-  it('should not render if __typename is not UpdateNetworkParameter', () => {
-    const updateMarketProposal = generateProposal({
-      terms: {
-        change: {
-          __typename: 'UpdateMarket',
-        },
-      },
-    });
-    render(<ProposalUpdateBenefitTiers proposal={updateMarketProposal} />);
-    expect(screen.queryByTestId('proposal-update-benefit-tiers')).toBeNull();
-  });
-
-  it('should not render if there are no relevant fields', () => {
-    const incompleteProposal = generateProposal({
-      terms: {
-        change: {
-          __typename: 'UpdateNetworkParameter',
-        },
-      },
-    });
-
-    render(<ProposalUpdateBenefitTiers proposal={incompleteProposal} />);
-    expect(screen.queryByTestId('proposal-update-benefit-tiers')).toBeNull();
-  });
-
-  it('should not render if there are relevant fields that are empty', () => {
-    const incompleteProposal = generateProposal({
-      terms: {
-        change: {
-          __typename: 'UpdateNetworkParameter',
-          networkParameter: {
-            key: 'blah.blah.benefitTiers',
-            value: JSON.stringify({}),
-          },
-        },
-      },
-    });
-
-    render(<ProposalUpdateBenefitTiers proposal={incompleteProposal} />);
-    expect(screen.queryByTestId('proposal-update-benefit-tiers')).toBeNull();
-  });
-
-  it('should render a valid vesting benefit tier proposal', () => {
-    render(
-      <ProposalUpdateBenefitTiers proposal={mockVestingBenefitTierProposal} />
-    );
-
-    // 3 tiers in the sample data
-    expect(screen.getByText('Tier 1')).toBeInTheDocument();
-    expect(screen.getByText('Tier 2')).toBeInTheDocument();
-    expect(screen.getByText('Tier 3')).toBeInTheDocument();
-
-    expect(screen.getAllByText('Minimum quantum balance').length).toBe(3);
-    expect(screen.getAllByText('Reward multiplier').length).toBe(3);
-
-    expect(screen.getByText('0.00000000000001')).toBeInTheDocument();
-    expect(screen.getByText('0.05x')).toBeInTheDocument();
-
-    expect(screen.getByText('0.0000005')).toBeInTheDocument();
-    expect(screen.getByText('0.1x')).toBeInTheDocument();
-
-    expect(screen.getByText('0.00001')).toBeInTheDocument();
-    expect(screen.getByText('10x')).toBeInTheDocument();
-  });
-
-  it('should render a valid activity streak benefit tier proposal', () => {
-    render(
-      <ProposalUpdateBenefitTiers
-        proposal={mockActivityStreakBenefitTierProposal}
-      />
-    );
-
-    // 3 tiers in the sample data
-    expect(screen.getByText('Tier 1')).toBeInTheDocument();
-    expect(screen.getByText('Tier 2')).toBeInTheDocument();
-
-    expect(screen.getAllByText('Minimum activity streak').length).toBe(2);
-    expect(screen.getAllByText('Vesting multiplier').length).toBe(2);
-    expect(screen.getAllByText('Reward multiplier').length).toBe(2);
-
-    expect(screen.getByText('10000')).toBeInTheDocument();
-    expect(screen.getByText('5x')).toBeInTheDocument();
-    expect(screen.getByText('0.1x')).toBeInTheDocument();
-
-    expect(screen.getByText('10000000000000')).toBeInTheDocument();
-    expect(screen.getByText('100x')).toBeInTheDocument();
-    expect(screen.getByText('10x')).toBeInTheDocument();
-  });
-});
@@ -1,164 +0,0 @@
-import { useTranslation } from 'react-i18next';
-import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
-import {
-  KeyValueTable,
-  KeyValueTableRow,
-  RoundedWrapper,
-  Tooltip,
-} from '@vegaprotocol/ui-toolkit';
-import {
-  formatMinimumStakedTokens,
-  formatReferralRewardMultiplier,
-} from '../proposal-referral-program-details';
-import { formatNumberPercentage } from '@vegaprotocol/utils';
-import BigNumber from 'bignumber.js';
-
-// These types are not generated as it's not known how dynamic these are
-type VestingBenefitTier = {
-  minimum_quantum_balance: string;
-  reward_multiplier: string;
-};
-
-type ActivityStreakBenefitTier = {
-  minimum_activity_streak: number;
-  reward_multiplier: string;
-  vesting_multiplier: string;
-};
-
-export type BenefitTiers =
-  | Array<ActivityStreakBenefitTier>
-  | Array<VestingBenefitTier>;
-
-export function getBenefitTiers(json: string): BenefitTiers {
-  try {
-    const parsed = JSON.parse(json);
-    return parsed.tiers;
-  } catch (e) {
-    return [];
-  }
-}
-
-export const formatVolumeDiscountFactor = (value: string) => {
-  return formatNumberPercentage(new BigNumber(value).times(100));
-};
-
-interface ProposalReferralProgramDetailsProps {
-  proposal: ProposalQuery['proposal'];
-}
-
-/**
- * Special rendered for network proposals that change any benefit tiers,
- * which is detected by:
- * 1) it being a network parameter change
- * 2) the name of the field ending in `.benefitTiers`
- *
- * It only renders known fields so that they can be formatted correctly.
- */
-export const ProposalUpdateBenefitTiers = ({
-  proposal,
-}: ProposalReferralProgramDetailsProps) => {
-  const { t } = useTranslation();
-  if (
-    proposal?.terms?.change?.__typename !== 'UpdateNetworkParameter' ||
-    proposal?.terms?.change?.networkParameter.key.slice(-13) !== '.benefitTiers'
-  ) {
-    return null;
-  }
-
-  const benefitTiersString = proposal?.terms?.change?.networkParameter.value;
-  const benefitTiers = getBenefitTiers(benefitTiersString);
-
-  if (!benefitTiers) {
-    return null;
-  }
-
-  return (
-    <div data-testid="proposal-update-benefit-tiers">
-      <RoundedWrapper paddingBottom={true}>
-        {benefitTiers && (
-          <div
-            className="mb-6"
-            data-testid="proposal-volume-discount-program-benefit-tiers"
-          >
-            <h3 className="mb-3 uppercase font-semibold text-lg">
-              {t('BenefitTiers')}
-            </h3>
-            <KeyValueTable>
-              {benefitTiers
-                .sort(
-                  (a, b) =>
-                    Number(a.reward_multiplier) - Number(b.reward_multiplier)
-                )
-                .map((benefitTier, index) => (
-                  <div className="mb-4" key={index}>
-                    <h4 className="font-semibold uppercase">
-                      Tier {index + 1}
-                    </h4>
-                    {'minimum_activity_streak' in benefitTier && (
-                      <KeyValueTableRow
-                        data-testid={`mas-${benefitTier.reward_multiplier}`}
-                      >
-                        <Tooltip
-                          description={t(
-                            'BenefitTierMinimumActivityStreakDescription'
-                          )}
-                        >
-                          <span>{t('BenefitTierMinimumActivityStreak')}</span>
-                        </Tooltip>
-
-                        {benefitTier.minimum_activity_streak}
-                      </KeyValueTableRow>
-                    )}
-                    {'minimum_quantum_balance' in benefitTier && (
-                      <KeyValueTableRow
-                        data-testid={`mqb-${benefitTier.reward_multiplier}`}
-                      >
-                        <Tooltip
-                          description={t(
-                            'BenefitTierMinimumQuantumBalanceDescription'
-                          )}
-                        >
-                          <span>{t('BenefitTierMinimumQuantumBalance')}</span>
-                        </Tooltip>
-
-                        {formatMinimumStakedTokens(
-                          benefitTier.minimum_quantum_balance,
-                          18
-                        )}
-                      </KeyValueTableRow>
-                    )}
-                    {'vesting_multiplier' in benefitTier && (
-                      <KeyValueTableRow
-                        data-testid={`vm-${benefitTier.reward_multiplier}`}
-                      >
-                        <Tooltip
-                          description={t('BenefitTierVestingMultiplier')}
-                        >
-                          <span>{t('BenefitTierVestingMultiplier')}</span>
-                        </Tooltip>
-                        {formatReferralRewardMultiplier(
-                          benefitTier.vesting_multiplier
-                        )}
-                      </KeyValueTableRow>
-                    )}
-                    {'reward_multiplier' in benefitTier && (
-                      <KeyValueTableRow
-                        data-testid={`rm-${benefitTier.reward_multiplier}`}
-                      >
-                        <Tooltip description={t('BenefitTierRewardMultiplier')}>
-                          <span>{t('BenefitTierRewardMultiplier')}</span>
-                        </Tooltip>
-                        {formatReferralRewardMultiplier(
-                          benefitTier.reward_multiplier
-                        )}
-                      </KeyValueTableRow>
-                    )}
-                  </div>
-                ))}
-            </KeyValueTable>
-          </div>
-        )}
-      </RoundedWrapper>
-    </div>
-  );
-};
@@ -27,7 +27,6 @@ import {
  ProposalTransferDetails,
 } from '../proposal-transfer';
 import { FLAGS } from '@vegaprotocol/environment';
-import { ProposalUpdateBenefitTiers } from '../proposal-update-benefit-tiers';

 export interface ProposalProps {
  proposal: ProposalQuery['proposal'];
@@ -244,14 +243,6 @@ export const Proposal = ({
        </div>
      )}

-      {proposal.terms.change.__typename === 'UpdateNetworkParameter' &&
-        proposal.terms.change.networkParameter.key.slice(-13) ===
-          '.benefitTiers' && (
-          <div className="mb-4">
-            <ProposalUpdateBenefitTiers proposal={proposal} />
-          </div>
-        )}
-
      {governanceTransferDetails}

      <div className="mb-10">
@@ -28,10 +28,9 @@ const headers = [
  'Adjusted stake share',
  'Share',
  'Live supplied liquidity',
-  'Fees accrued this epoch',
-  'Live time on book',
+  'Live time fraction on book',
  'Live liquidity quality score (%)',
-  'Last time on the book',
+  'Last time fraction on the book',
  'Last fee penalty',
  'Last bond penalty',
  'Status',
@@ -0,0 +1,70 @@
+import * as Schema from '@vegaprotocol/types';
+import {
+  TIFlist,
+  orderPriceField,
+  orderSizeField,
+  orderTIFDropDown,
+  placeOrderBtn,
+  toggleLimit,
+  toggleMarket,
+} from '../support/deal-ticket';
+import { aliasGQLQuery } from '@vegaprotocol/cypress';
+import { accountsQuery } from '@vegaprotocol/mock';
+
+describe('suspended market validation', { tags: '@regression' }, () => {
+  before(() => {
+    cy.setVegaWallet();
+    cy.mockTradingPage(
+      Schema.MarketState.STATE_SUSPENDED,
+      Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
+      Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
+    );
+    const accounts = accountsQuery();
+    cy.mockGQL((req) => {
+      aliasGQLQuery(req, 'Accounts', accounts);
+    });
+    cy.mockSubscription();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@Markets');
+  });
+
+  beforeEach(() => {
+    cy.setVegaWallet();
+  });
+
+  it('should show warning for market order', function () {
+    cy.getByTestId(toggleMarket).click();
+    // 7002-SORD-060
+    cy.getByTestId(placeOrderBtn).should('be.enabled');
+    cy.getByTestId(placeOrderBtn).click();
+    cy.getByTestId('deal-ticket-error-message-type').should(
+      'have.text',
+      'This market is in auction until it reaches sufficient liquidity. Only limit orders are permitted when market is in auction'
+    );
+  });
+
+  it('should show info for allowed TIF', function () {
+    cy.getByTestId(toggleLimit).click();
+    cy.getByTestId(orderPriceField).clear().type('0.1');
+    cy.getByTestId(orderSizeField).clear().type('1');
+    cy.getByTestId(placeOrderBtn).should('be.enabled');
+    cy.getByTestId(placeOrderBtn).click();
+    cy.getByTestId('deal-ticket-warning-auction').should(
+      'have.text',
+      'Any orders placed now will not trade until the auction ends'
+    );
+  });
+
+  it('should show warning for not allowed TIF', function () {
+    cy.getByTestId(toggleLimit).click();
+    cy.getByTestId(orderTIFDropDown).select(
+      TIFlist.filter((item) => item.code === 'FOK')[0].value
+    );
+    cy.getByTestId(placeOrderBtn).should('be.enabled');
+    cy.getByTestId(placeOrderBtn).click();
+    cy.getByTestId('deal-ticket-error-message-tif').should(
+      'have.text',
+      'This market is in auction until it reaches sufficient liquidity. Until the auction ends, you can only place GFA, GTT, or GTC limit orders'
+    );
+  });
+});
@@ -0,0 +1,110 @@
+import { aliasGQLQuery } from '@vegaprotocol/cypress';
+import { fillsQuery } from '@vegaprotocol/mock';
+
+const tabFills = 'tab-fills';
+
+describe('fills', { tags: '@regression' }, () => {
+  // 7005-FILL-001
+  // 7005-FILL-002
+  // 7005-FILL-003
+  // 7005-FILL-004
+  // 7005-FILL-005
+  // 7005-FILL-006
+  // 7005-FILL-007
+  // 7005-FILL-008
+
+  beforeEach(() => {
+    // Ensure page loads with correct key
+    cy.window().then((window) => {
+      cy.wrap(
+        window.localStorage.setItem(
+          'vega_wallet_key',
+          Cypress.env('VEGA_PUBLIC_KEY')
+        )
+      );
+    });
+    cy.setVegaWallet();
+    cy.mockTradingPage();
+    cy.mockGQL((req) => {
+      aliasGQLQuery(
+        req,
+        'Fills',
+        fillsQuery({}, Cypress.env('VEGA_PUBLIC_KEY'))
+      );
+    });
+    cy.mockSubscription();
+  });
+
+  it('renders fills on portfolio page', () => {
+    cy.visit('/#/portfolio');
+    cy.get('[data-testid="pathname-/portfolio"]').should('exist');
+    cy.getByTestId('Fills').click();
+    validateFillsDisplayed();
+  });
+
+  it('renders fills on trading tab', () => {
+    cy.visit('/#/markets/market-0');
+    cy.getByTestId('Fills').click();
+    validateFillsDisplayed();
+  });
+
+  function validateFillsDisplayed() {
+    cy.getByTestId(tabFills).should('be.visible');
+    cy.getByTestId(tabFills).contains('Market');
+    cy.getByTestId(tabFills)
+      .get(
+        '[role="gridcell"][col-id="market.tradableInstrument.instrument.code"]'
+      )
+      .each(($marketSymbol) => {
+        cy.wrap($marketSymbol).invoke('text').should('not.be.empty');
+      });
+    cy.getByTestId(tabFills).contains('Size');
+    cy.get(`[col-id='size']`).eq(1).should('contain.text', '+');
+    cy.get(`[col-id='size']`).eq(2).should('contain.text', '-');
+    cy.getByTestId(tabFills)
+      .get('[role="gridcell"][col-id="size"]')
+      .each(($amount) => {
+        cy.wrap($amount).invoke('text').should('not.be.empty');
+      });
+    cy.getByTestId(tabFills).contains('Price');
+    cy.getByTestId(tabFills)
+      .get('[role="gridcell"][col-id="price"]')
+      .each(($prices) => {
+        cy.wrap($prices).invoke('text').should('not.be.empty');
+      });
+    cy.getByTestId(tabFills).contains('Notional');
+    cy.getByTestId(tabFills)
+      .get('[role="gridcell"][col-id="price_1"]')
+      .each(($total) => {
+        cy.wrap($total).invoke('text').should('not.be.empty');
+      });
+    cy.getByTestId(tabFills).contains('Role');
+    cy.getByTestId(tabFills)
+      .get('[role="gridcell"][col-id="aggressor"]')
+      .each(($role) => {
+        cy.wrap($role)
+          .invoke('text')
+          .then((text) => {
+            const roles = ['Maker', 'Taker', '-'];
+            expect(roles.indexOf(text.trim())).to.be.greaterThan(-1);
+          });
+      });
+    cy.getByTestId(tabFills).contains('Fee');
+    cy.getByTestId(tabFills)
+      .get(
+        '[role="gridcell"][col-id="market.tradableInstrument.instrument.product"]'
+      )
+      .each(($fees) => {
+        cy.wrap($fees).invoke('text').should('not.be.empty');
+      });
+    cy.getByTestId(tabFills).contains('Date');
+    const dateTimeRegex =
+      /(\d{1,2})\/(\d{1,2})\/(\d{4}), (\d{1,2}):(\d{1,2}):(\d{1,2})/gm;
+    cy.get('[col-id="createdAt"]').each(($tradeDateTime, index) => {
+      if (index != 0) {
+        //ignore header
+        cy.wrap($tradeDateTime).invoke('text').should('match', dateTimeRegex);
+      }
+    });
+  }
+});
@@ -0,0 +1,119 @@
+import { selectAsset } from '../support/helpers';
+
+const amountField = 'input[name="amount"]';
+const includeTransferFeeRadioBtn = 'include-transfer-fee';
+const manageVegaWallet = 'manage-vega-wallet';
+const toAddressField = '[name="toAddress"]';
+const totalTransferfee = 'total-transfer-fee';
+const transferAmount = 'transfer-amount';
+const transferForm = 'transfer-form';
+const transferFee = 'transfer-fee';
+const walletTransfer = 'wallet-transfer';
+
+const ASSET_SEPOLIA_TBTC = 2;
+
+describe.skip(
+  'transfer fees',
+  { tags: '@regression', testIsolation: true },
+  () => {
+    beforeEach(() => {
+      cy.mockWeb3Provider();
+      cy.mockTradingPage();
+      cy.mockSubscription();
+      cy.setVegaWallet();
+
+      cy.visit('/');
+      cy.getByTestId(manageVegaWallet).click();
+      cy.getByTestId(walletTransfer).click();
+
+      cy.wait('@Assets');
+      cy.wait('@Accounts');
+
+      cy.mockVegaWalletTransaction();
+    });
+
+    it('transfer fees tooltips', () => {
+      // 1003-TRAN-015
+      // 1003-TRAN-016
+      // 1003-TRAN-017
+      // 1003-TRAN-018
+      // 1003-TRAN-019
+      cy.getByTestId(transferForm);
+      cy.contains('Enter manually').click();
+      cy.getByTestId(transferForm)
+        .find(toAddressField)
+        .type(
+          '7f9cf07d3a9905b1a61a1069f7a758855da428bc0f4a97de87f48644bfc25535'
+        );
+      selectAsset(ASSET_SEPOLIA_TBTC);
+      cy.getByTestId(transferForm)
+        .find(amountField)
+        .type('1', { delay: 100, force: true });
+
+      /// Check Include Transfer Fee tooltip
+      cy.get('label[for="include-transfer-fee"] div').realHover();
+      cy.get('[data-side="bottom"] div')
+        .should('be.visible')
+        .should('not.be.empty');
+
+      //Check Transfer Fee tooltip
+      cy.contains('div', 'Transfer fee').realHover();
+      cy.get('[data-side="bottom"] div')
+        .should('be.visible')
+        .should('not.be.empty');
+
+      //Check Amount to be transferred tooltip
+      cy.contains('div', 'Amount to be transferred').realHover();
+      cy.get('[data-side="bottom"] div')
+        .should('be.visible')
+        .should('not.be.empty');
+
+      //Check Total amount (with fee) tooltip
+      cy.contains('div', 'Total amount (with fee)').realHover();
+      cy.get('[data-side="bottom"] div')
+        .should('be.visible')
+        .should('not.be.empty');
+    });
+
+    it('transfer fees', () => {
+      // 1003-TRAN-020
+      // 1003-TRAN-021
+      // 1003-TRAN-022
+      // 1003-TRAN-023
+      cy.getByTestId(transferForm);
+      cy.contains('Enter manually').click();
+
+      cy.getByTestId(transferForm)
+        .find(toAddressField)
+        .type(
+          '7f9cf07d3a9905b1a61a1069f7a758855da428bc0f4a97de87f48644bfc25535'
+        );
+      selectAsset(ASSET_SEPOLIA_TBTC);
+      cy.getByTestId(includeTransferFeeRadioBtn).should('be.disabled');
+
+      cy.getByTestId(transferForm)
+        .find(amountField)
+        .type('1', { delay: 100, force: true });
+
+      cy.getByTestId(transferFee)
+        .should('be.visible')
+        .should('contain.text', '0.01');
+      cy.getByTestId(transferAmount)
+        .should('be.visible')
+        .should('contain.text', '1.00');
+      cy.getByTestId(totalTransferfee)
+        .should('be.visible')
+        .should('contain.text', '1.01');
+      cy.getByTestId(includeTransferFeeRadioBtn).click();
+      cy.getByTestId(transferFee)
+        .should('be.visible')
+        .should('contain.text', '0.01');
+      cy.getByTestId(transferAmount)
+        .should('be.visible')
+        .should('contain.text', '0.99');
+      cy.getByTestId(totalTransferfee)
+        .should('be.visible')
+        .should('contain.text', '1.00');
+    });
+  }
+);
@@ -3,16 +3,17 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_SENTRY_DSN=https://2ffce43721964aafa78277c50654ece4@o286262.ingest.sentry.io/6300613
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
-NX_VEGA_ENV=STAGNET1
-NX_VEGA_EXPLORER_URL=https://explorer.stagnet1.vega.rocks
+NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
+NX_VEGA_ENV=TESTNET
+NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
 NX_VEGA_NETWORKS={\"MAINNET\":\"https://console.vega.xyz\",\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://trading.stagnet1.vega.rocks\"}
-NX_VEGA_TOKEN_URL=https://governance.stagnet1.vega.rocks
+NX_VEGA_TOKEN_URL=https://governance.fairground.wtf
 NX_VEGA_WALLET_URL=http://localhost:1789
 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/fairground/announcements.json
 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_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
@@ -25,3 +26,6 @@ NX_ICEBERG_ORDERS=true
 # NX_PRODUCT_PERPETUALS
 NX_METAMASK_SNAPS=true
 NX_REFERRALS=true
+
+NX_TENDERMINT_URL=https://tm.be.testnet.vega.xyz
+NX_TENDERMINT_WEBSOCKET_URL=wss://be.testnet.vega.xyz/websocket
@@ -1,11 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import { FeesContainer } from '../../components/fees-container';
-
-export const Fees = () => {
-  return (
-    <div className="container p-4 mx-auto">
-      <h1 className="px-4 pb-4 text-2xl">{t('Fees')}</h1>
-      <FeesContainer />
-    </div>
-  );
-};
@@ -1 +0,0 @@
-export { Fees } from './fees';
@@ -32,7 +32,7 @@ const WithdrawalsIndicator = () => {
    return null;
  }
  return (
-    <span className="p-1 leading-none rounded bg-vega-clight-500 dark:bg-vega-cdark-500 text-default">
+    <span className="bg-vega-clight-500 dark:bg-vega-cdark-500 text-default rounded p-1 leading-none">
      {ready.length}
    </span>
  );
@@ -128,7 +128,7 @@ interface PortfolioGridChildProps {
 const PortfolioGridChild = ({ children }: PortfolioGridChildProps) => {
  return (
    <section className="h-full p-1">
-      <div className="h-full border rounded-sm border-default">{children}</div>
+      <div className="border border-default h-full rounded-sm">{children}</div>
    </section>
  );
 };
@@ -18,7 +18,6 @@ import { Routes } from '../../lib/links';
 import { useTransactionEventSubscription } from '@vegaprotocol/web3';
 import { t } from '@vegaprotocol/i18n';
 import { Statistics } from './referral-statistics';
-import { useReferralProgram } from './hooks/use-referral-program';

 const RELOAD_DELAY = 3000;

@@ -33,7 +32,6 @@ const validateCode = (value: string) => {
 };

 export const ApplyCodeForm = () => {
-  const program = useReferralProgram();
  const navigate = useNavigate();
  const openWalletDialog = useVegaWalletDialogStore(
    (store) => store.openVegaWalletDialog
@@ -239,7 +237,7 @@ export const ApplyCodeForm = () => {
      {previewData ? (
        <div className="mt-10">
          <h2 className="text-2xl mb-5">{t('You are joining')}</h2>
-          <Statistics data={previewData} program={program} as="referee" />
+          <Statistics data={previewData} as="referee" />
        </div>
      ) : null}
    </>
@@ -1,5 +1,5 @@
-query Referees($code: ID!, $aggregationEpochs: Int) {
-  referralSetReferees(id: $code, aggregationEpochs: $aggregationEpochs) {
+query Referees($code: ID!, $aggregationDays: Int) {
+  referralSetReferees(id: $code, aggregationDays: $aggregationDays) {
    edges {
      node {
        referralSetId
@@ -10,7 +10,6 @@ query ReferralSetStats($code: ID!, $epoch: Int) {
        referralSetRunningNotionalTakerVolume
        rewardsMultiplier
        rewardsFactorMultiplier
-        referrerTakerVolume
      }
    }
  }
@@ -5,7 +5,7 @@ import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
 export type RefereesQueryVariables = Types.Exact<{
  code: Types.Scalars['ID'];
-  aggregationEpochs?: Types.InputMaybe<Types.Scalars['Int']>;
+  aggregationDays?: Types.InputMaybe<Types.Scalars['Int']>;
 }>;


@@ -13,8 +13,8 @@ export type RefereesQuery = { __typename?: 'Query', referralSetReferees: { __typ


 export const RefereesDocument = gql`
-    query Referees($code: ID!, $aggregationEpochs: Int) {
-  referralSetReferees(id: $code, aggregationEpochs: $aggregationEpochs) {
+    query Referees($code: ID!, $aggregationDays: Int) {
+  referralSetReferees(id: $code, aggregationDays: $aggregationDays) {
    edges {
      node {
        referralSetId
@@ -42,7 +42,7 @@ export const RefereesDocument = gql`
 * const { data, loading, error } = useRefereesQuery({
 *   variables: {
 *      code: // value for 'code'
- *      aggregationEpochs: // value for 'aggregationEpochs'
+ *      aggregationDays: // value for 'aggregationDays'
 *   },
 * });
 */
@@ -9,7 +9,7 @@ export type ReferralSetStatsQueryVariables = Types.Exact<{
 }>;


-export type ReferralSetStatsQuery = { __typename?: 'Query', referralSetStats: { __typename?: 'ReferralSetStatsConnection', edges: Array<{ __typename?: 'ReferralSetStatsEdge', node: { __typename?: 'ReferralSetStats', atEpoch: number, partyId: string, discountFactor: string, rewardFactor: string, epochNotionalTakerVolume: string, referralSetRunningNotionalTakerVolume: string, rewardsMultiplier: string, rewardsFactorMultiplier: string, referrerTakerVolume: string } } | null> } };
+export type ReferralSetStatsQuery = { __typename?: 'Query', referralSetStats: { __typename?: 'ReferralSetStatsConnection', edges: Array<{ __typename?: 'ReferralSetStatsEdge', node: { __typename?: 'ReferralSetStats', atEpoch: number, partyId: string, discountFactor: string, rewardFactor: string, epochNotionalTakerVolume: string, referralSetRunningNotionalTakerVolume: string, rewardsMultiplier: string, rewardsFactorMultiplier: string } } | null> } };


 export const ReferralSetStatsDocument = gql`
@@ -25,7 +25,6 @@ export const ReferralSetStatsDocument = gql`
        referralSetRunningNotionalTakerVolume
        rewardsMultiplier
        rewardsFactorMultiplier
-        referrerTakerVolume
      }
    }
  }
@@ -5,14 +5,14 @@ import compact from 'lodash/compact';
 import type { ReferralSetsQueryVariables } from './__generated__/ReferralSets';
 import { useReferralSetsQuery } from './__generated__/ReferralSets';

-export const DEFAULT_AGGREGATION_DAYS = 30;
+const DEFAULT_AGGREGATION_DAYS = 30;

 export type Role = 'referrer' | 'referee';
 type UseReferralArgs = (
  | { code: string }
  | { pubKey: string | null; role: Role }
 ) & {
-  aggregationEpochs?: number;
+  aggregationDays?: number;
 };

 const prepareVariables = (
@@ -70,9 +70,9 @@ export const useReferral = (args: UseReferralArgs) => {
  } = useRefereesQuery({
    variables: {
      code: referralSet?.id as string,
-      aggregationEpochs:
-        args.aggregationEpochs != null
-          ? args.aggregationEpochs
+      aggregationDays:
+        args.aggregationDays != null
+          ? args.aggregationDays
          : DEFAULT_AGGREGATION_DAYS,
    },
    skip: !referralSet?.id,
@@ -6,7 +6,7 @@ import {
 } from '@vegaprotocol/ui-toolkit';

 import { useVegaWallet } from '@vegaprotocol/wallet';
-import { DEFAULT_AGGREGATION_DAYS, useReferral } from './hooks/use-referral';
+import { useReferral } from './hooks/use-referral';
 import { CreateCodeContainer } from './create-code-form';
 import classNames from 'classnames';
 import { Table } from './table';
@@ -27,30 +27,25 @@ import { useLayoutEffect, useRef, useState } from 'react';
 import { useCurrentEpochInfoQuery } from './hooks/__generated__/Epoch';
 import BigNumber from 'bignumber.js';
 import { t } from '@vegaprotocol/i18n';
-import maxBy from 'lodash/maxBy';

 export const ReferralStatistics = () => {
  const { pubKey } = useVegaWallet();

-  const program = useReferralProgram();
-
  const { data: referee } = useReferral({
    pubKey,
    role: 'referee',
-    aggregationEpochs: program.details?.windowLength,
  });
  const { data: referrer } = useReferral({
    pubKey,
    role: 'referrer',
-    aggregationEpochs: program.details?.windowLength,
  });

  if (referee?.code) {
-    return <Statistics data={referee} program={program} as="referee" />;
+    return <Statistics data={referee} as="referee" />;
  }

  if (referrer?.code) {
-    return <Statistics data={referrer} program={program} as="referrer" />;
+    return <Statistics data={referrer} as="referrer" />;
  }

  return <CreateCodeContainer />;
@@ -58,16 +53,14 @@ export const ReferralStatistics = () => {

 export const Statistics = ({
  data,
-  program,
  as,
 }: {
  data: NonNullable<ReturnType<typeof useReferral>['data']>;
-  program: ReturnType<typeof useReferralProgram>;
  as: 'referrer' | 'referee';
 }) => {
-  const { benefitTiers, details } = program;
  const { data: epochData } = useCurrentEpochInfoQuery();
  const { stakeAvailable } = useStakeAvailable();
+  const { benefitTiers } = useReferralProgram();
  const { data: statsData } = useReferralSetStatsQuery({
    variables: {
      code: data.code,
@@ -78,13 +71,6 @@ export const Statistics = ({

  const currentEpoch = Number(epochData?.epoch.id);

-  const compactNumFormat = new Intl.NumberFormat(getUserLocale(), {
-    minimumFractionDigits: 0,
-    maximumFractionDigits: 2,
-    notation: 'compact',
-    compactDisplay: 'short',
-  });
-
  const stats =
    statsData?.referralSetStats.edges &&
    compact(removePaginationWrapper(statsData.referralSetStats.edges));
@@ -100,13 +86,10 @@ export const Statistics = ({
  const runningVolumeValue = statsAvailable
    ? Number(statsAvailable.referralSetRunningNotionalTakerVolume)
    : 0;
-  const referrerVolumeValue = statsAvailable
-    ? Number(statsAvailable.referrerTakerVolume)
-    : 0;
  const multiplier = statsAvailable
    ? Number(statsAvailable.rewardsMultiplier)
    : 1;
-  const finalCommissionValue = isNaN(multiplier)
+  const finalCommissionValue = !isNaN(multiplier)
    ? baseCommissionValue
    : multiplier * baseCommissionValue;

@@ -119,9 +102,9 @@ export const Statistics = ({
      !isNaN(t.discountFactor) &&
      t.discountFactor === discountFactorValue
  );
-  const nextBenefitTierValue = currentBenefitTierValue
-    ? benefitTiers.find((t) => t.tier === currentBenefitTierValue.tier - 1)
-    : maxBy(benefitTiers, (bt) => bt.tier); // max tier number is lowest tier
+  const nextBenefitTierValue =
+    currentBenefitTierValue &&
+    benefitTiers.find((t) => t.tier === currentBenefitTierValue.tier - 1);
  const epochsValue =
    !isNaN(currentEpoch) && refereeInfo?.atEpoch
      ? currentEpoch - refereeInfo?.atEpoch
@@ -134,13 +117,7 @@ export const Statistics = ({
    : 0;

  const baseCommissionTile = (
-    <StatTile
-      title={t('Base commission rate')}
-      description={t('(Combined set volume %s over last %s epochs)', [
-        compactNumFormat.format(runningVolumeValue),
-        (details?.windowLength || DEFAULT_AGGREGATION_DAYS).toString(),
-      ])}
-    >
+    <StatTile title={t('Base commission rate')}>
      {baseCommissionValue * 100}%
    </StatTile>
  );
@@ -156,16 +133,7 @@ export const Statistics = ({
    </StatTile>
  );
  const finalCommissionTile = (
-    <StatTile
-      title={t('Final commission rate')}
-      description={
-        !isNaN(multiplier)
-          ? `(${baseCommissionValue * 100}% ⨉ ${multiplier} = ${
-              finalCommissionValue * 100
-            }%)`
-          : undefined
-      }
-    >
+    <StatTile title={t('Final commission rate')}>
      {finalCommissionValue * 100}%
    </StatTile>
  );
@@ -174,21 +142,12 @@ export const Statistics = ({
    <StatTile title={t('Number of traders')}>{numberOfTradersValue}</StatTile>
  );

-  const codeTile = (
-    <CodeTile
-      code={data?.code}
-      createdAt={getDateFormat().format(new Date(data.createdAt))}
-    />
-  );
-
-  const referrerVolumeTile = (
-    <StatTile
-      title={t(
-        'My volume (last %s epochs)',
-        (details?.windowLength || DEFAULT_AGGREGATION_DAYS).toString()
-      )}
-    >
-      {compactNumFormat.format(referrerVolumeValue)}
+  const codeTile = <CodeTile code={data?.code} />;
+  const createdAtTile = (
+    <StatTile title={t('Created at')}>
+      <span className="text-3xl">
+        {getDateFormat().format(new Date(data.createdAt))}
+      </span>
    </StatTile>
  );

@@ -197,10 +156,7 @@ export const Statistics = ({
    .reduce((all, r) => all.plus(r), new BigNumber(0));
  const totalCommissionTile = (
    <StatTile
-      title={t(
-        'Total commission (last %s epochs)',
-        (details?.windowLength || DEFAULT_AGGREGATION_DAYS).toString()
-      )}
+      title={t('Total commission (last 30 days)')}
      description={t('(qUSD)')}
    >
      {getNumberFormat(0).format(Number(totalCommissionValue))}
@@ -217,16 +173,23 @@ export const Statistics = ({

      <div className="grid grid-rows-1 gap-5 grid-cols-1 sm:grid-cols-2 xl:grid-cols-4">
        {codeTile}
-        {referrerVolumeTile}
+        {createdAtTile}
        {numberOfTradersTile}
        {totalCommissionTile}
      </div>
    </>
  );

+  const compactNumFormat = new Intl.NumberFormat(getUserLocale(), {
+    minimumFractionDigits: 0,
+    maximumFractionDigits: 2,
+    notation: 'compact',
+    compactDisplay: 'short',
+  });
+
  const currentBenefitTierTile = (
    <StatTile title={t('Current tier')}>
-      {currentBenefitTierValue?.tier || 'None'}
+      {currentBenefitTierValue?.tier || '-'}
    </StatTile>
  );
  const discountFactorTile = (
@@ -241,24 +204,14 @@ export const Statistics = ({
    <StatTile title={t('Epochs in set')}>{epochsValue}</StatTile>
  );
  const nextTierVolumeTile = (
-    <StatTile
-      title={t(
-        'Volume to next tier %s',
-        nextBenefitTierValue?.tier ? `(${nextBenefitTierValue.tier})` : ''
-      )}
-    >
+    <StatTile title={t('Volume to next tier')}>
      {nextBenefitTierVolumeValue <= 0
        ? '0'
        : compactNumFormat.format(nextBenefitTierVolumeValue)}
    </StatTile>
  );
  const nextTierEpochsTile = (
-    <StatTile
-      title={t(
-        'Epochs to next tier %s',
-        nextBenefitTierValue?.tier ? `(${nextBenefitTierValue.tier})` : ''
-      )}
-    >
+    <StatTile title={t('Epochs to next tier')}>
      {nextBenefitTierEpochsValue <= 0 ? '0' : nextBenefitTierEpochsValue}
    </StatTile>
  );
@@ -302,7 +255,7 @@ export const Statistics = ({
      {/* Referees (only for referrer view) */}
      {as === 'referrer' && data.referees.length > 0 && (
        <div className="mt-20 mb-20">
-          <h2 className="mb-5 text-2xl">{t('Referees')}</h2>
+          <h2 className="text-2xl mb-5">{t('Referees')}</h2>
          <div
            className={classNames(
              collapsed && [
@@ -328,23 +281,10 @@ export const Statistics = ({
              columns={[
                { name: 'party', displayName: t('Trader') },
                { name: 'joined', displayName: t('Date Joined') },
-                {
-                  name: 'volume',
-                  displayName: t(
-                    'Volume (last %s epochs)',
-                    (
-                      details?.windowLength || DEFAULT_AGGREGATION_DAYS
-                    ).toString()
-                  ),
-                },
+                { name: 'volume', displayName: t('Volume (last 30 days)') },
                {
                  name: 'commission',
-                  displayName: t(
-                    'Commission earned (last %s epochs)',
-                    (
-                      details?.windowLength || DEFAULT_AGGREGATION_DAYS
-                    ).toString()
-                  ),
+                  displayName: t('Commission earned (last 30 days)'),
                },
              ]}
              data={sortBy(
@@ -109,7 +109,6 @@ export const TiersContainer = () => {
          <Loading variant="large" />
        ) : (
          <TiersTable
-            windowLength={details?.windowLength}
            data={benefitTiers.map((bt) => ({
              ...bt,
              tierElement: (
@@ -163,7 +162,6 @@ const StakingTiers = ({

 const TiersTable = ({
  data,
-  windowLength,
 }: {
  data: Array<{
    tier: number;
@@ -172,7 +170,6 @@ const TiersTable = ({
    discount: string;
    volume: string;
  }>;
-  windowLength?: number;
 }) => {
  return (
    <Table
@@ -184,15 +181,7 @@ const TiersTable = ({
          tooltip: t('A percentage of commission earned by the referrer'),
        },
        { name: 'discount', displayName: t('Referrer trading discount') },
-        {
-          name: 'volume',
-          displayName: t(
-            'Min. trading volume %s',
-            windowLength
-              ? t('(last %s epochs)', windowLength.toString())
-              : undefined
-          ),
-        },
+        { name: 'volume', displayName: t('Min. trading volume') },
        { name: 'epochs', displayName: t('Min. epochs') },
      ]}
      data={data.map((d) => ({
@@ -7,7 +7,6 @@ import {
 import classNames from 'classnames';
 import type { HTMLAttributes, ReactNode } from 'react';
 import { Button } from './buttons';
-import { t } from '@vegaprotocol/i18n';

 export const Tile = ({
  className,
@@ -55,18 +54,13 @@ const FADE_OUT_STYLE = classNames(

 export const CodeTile = ({
  code,
-  createdAt,
  className,
 }: {
  code: string;
-  createdAt?: string;
  className?: string;
 }) => {
  return (
-    <StatTile
-      title={t('Your referral code')}
-      description={createdAt ? t('(Created at: %s)', createdAt) : undefined}
-    >
+    <StatTile title="Your referral code">
      <div className="flex gap-2 items-center justify-between">
        <Tooltip
          description={
@@ -88,7 +82,7 @@ export const CodeTile = ({
        </Tooltip>
        <CopyWithTooltip text={code}>
          <Button className="text-sm no-underline !py-0 !px-0 h-fit !bg-transparent">
-            <span className="sr-only">{t('Copy')}</span>
+            <span className="sr-only">Copy</span>
            <VegaIcon size={24} name={VegaIconNames.COPY} />
          </Button>
        </CopyWithTooltip>
@@ -1,58 +0,0 @@
-query DiscountPrograms {
-  currentReferralProgram {
-    benefitTiers {
-      minimumEpochs
-      minimumRunningNotionalTakerVolume
-      referralDiscountFactor
-    }
-    windowLength
-  }
-  currentVolumeDiscountProgram {
-    benefitTiers {
-      minimumRunningNotionalTakerVolume
-      volumeDiscountFactor
-    }
-    windowLength
-  }
-}
-
-query Fees(
-  $partyId: ID!
-  $volumeDiscountEpochs: Int!
-  $referralDiscountEpochs: Int!
-) {
-  epoch {
-    id
-  }
-  volumeDiscountStats(
-    partyId: $partyId
-    pagination: { last: $volumeDiscountEpochs }
-  ) {
-    edges {
-      node {
-        atEpoch
-        discountFactor
-        runningVolume
-      }
-    }
-  }
-  referralSetReferees(referee: $partyId) {
-    edges {
-      node {
-        atEpoch
-      }
-    }
-  }
-  referralSetStats(
-    partyId: $partyId
-    pagination: { last: $referralDiscountEpochs }
-  ) {
-    edges {
-      node {
-        atEpoch
-        discountFactor
-        referralSetRunningNotionalTakerVolume
-      }
-    }
-  }
-}
@@ -1,131 +0,0 @@
-import * as Types from '@vegaprotocol/types';
-
-import { gql } from '@apollo/client';
-import * as Apollo from '@apollo/client';
-const defaultOptions = {} as const;
-export type DiscountProgramsQueryVariables = Types.Exact<{ [key: string]: never; }>;
-
-
-export type DiscountProgramsQuery = { __typename?: 'Query', currentReferralProgram?: { __typename?: 'CurrentReferralProgram', windowLength: number, benefitTiers: Array<{ __typename?: 'BenefitTier', minimumEpochs: number, minimumRunningNotionalTakerVolume: string, referralDiscountFactor: string }> } | null, currentVolumeDiscountProgram?: { __typename?: 'VolumeDiscountProgram', windowLength: number, benefitTiers: Array<{ __typename?: 'VolumeBenefitTier', minimumRunningNotionalTakerVolume: string, volumeDiscountFactor: string }> } | null };
-
-export type FeesQueryVariables = Types.Exact<{
-  partyId: Types.Scalars['ID'];
-  volumeDiscountEpochs: Types.Scalars['Int'];
-  referralDiscountEpochs: Types.Scalars['Int'];
-}>;
-
-
-export type FeesQuery = { __typename?: 'Query', epoch: { __typename?: 'Epoch', id: string }, volumeDiscountStats: { __typename?: 'VolumeDiscountStatsConnection', edges: Array<{ __typename?: 'VolumeDiscountStatsEdge', node: { __typename?: 'VolumeDiscountStats', atEpoch: number, discountFactor: string, runningVolume: string } } | null> }, referralSetReferees: { __typename?: 'ReferralSetRefereeConnection', edges: Array<{ __typename?: 'ReferralSetRefereeEdge', node: { __typename?: 'ReferralSetReferee', atEpoch: number } } | null> }, referralSetStats: { __typename?: 'ReferralSetStatsConnection', edges: Array<{ __typename?: 'ReferralSetStatsEdge', node: { __typename?: 'ReferralSetStats', atEpoch: number, discountFactor: string, referralSetRunningNotionalTakerVolume: string } } | null> } };
-
-
-export const DiscountProgramsDocument = gql`
-    query DiscountPrograms {
-  currentReferralProgram {
-    benefitTiers {
-      minimumEpochs
-      minimumRunningNotionalTakerVolume
-      referralDiscountFactor
-    }
-    windowLength
-  }
-  currentVolumeDiscountProgram {
-    benefitTiers {
-      minimumRunningNotionalTakerVolume
-      volumeDiscountFactor
-    }
-    windowLength
-  }
-}
-    `;
-
-/**
- * __useDiscountProgramsQuery__
- *
- * To run a query within a React component, call `useDiscountProgramsQuery` and pass it any options that fit your needs.
- * When your component renders, `useDiscountProgramsQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useDiscountProgramsQuery({
- *   variables: {
- *   },
- * });
- */
-export function useDiscountProgramsQuery(baseOptions?: Apollo.QueryHookOptions<DiscountProgramsQuery, DiscountProgramsQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<DiscountProgramsQuery, DiscountProgramsQueryVariables>(DiscountProgramsDocument, options);
-      }
-export function useDiscountProgramsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<DiscountProgramsQuery, DiscountProgramsQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<DiscountProgramsQuery, DiscountProgramsQueryVariables>(DiscountProgramsDocument, options);
-        }
-export type DiscountProgramsQueryHookResult = ReturnType<typeof useDiscountProgramsQuery>;
-export type DiscountProgramsLazyQueryHookResult = ReturnType<typeof useDiscountProgramsLazyQuery>;
-export type DiscountProgramsQueryResult = Apollo.QueryResult<DiscountProgramsQuery, DiscountProgramsQueryVariables>;
-export const FeesDocument = gql`
-    query Fees($partyId: ID!, $volumeDiscountEpochs: Int!, $referralDiscountEpochs: Int!) {
-  epoch {
-    id
-  }
-  volumeDiscountStats(
-    partyId: $partyId
-    pagination: {last: $volumeDiscountEpochs}
-  ) {
-    edges {
-      node {
-        atEpoch
-        discountFactor
-        runningVolume
-      }
-    }
-  }
-  referralSetReferees(referee: $partyId) {
-    edges {
-      node {
-        atEpoch
-      }
-    }
-  }
-  referralSetStats(partyId: $partyId, pagination: {last: $referralDiscountEpochs}) {
-    edges {
-      node {
-        atEpoch
-        discountFactor
-        referralSetRunningNotionalTakerVolume
-      }
-    }
-  }
-}
-    `;
-
-/**
- * __useFeesQuery__
- *
- * To run a query within a React component, call `useFeesQuery` and pass it any options that fit your needs.
- * When your component renders, `useFeesQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useFeesQuery({
- *   variables: {
- *      partyId: // value for 'partyId'
- *      volumeDiscountEpochs: // value for 'volumeDiscountEpochs'
- *      referralDiscountEpochs: // value for 'referralDiscountEpochs'
- *   },
- * });
- */
-export function useFeesQuery(baseOptions: Apollo.QueryHookOptions<FeesQuery, FeesQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<FeesQuery, FeesQueryVariables>(FeesDocument, options);
-      }
-export function useFeesLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<FeesQuery, FeesQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<FeesQuery, FeesQueryVariables>(FeesDocument, options);
-        }
-export type FeesQueryHookResult = ReturnType<typeof useFeesQuery>;
-export type FeesLazyQueryHookResult = ReturnType<typeof useFeesLazyQuery>;
-export type FeesQueryResult = Apollo.QueryResult<FeesQuery, FeesQueryVariables>;
@@ -1,36 +0,0 @@
-import classNames from 'classnames';
-import type { ReactNode } from 'react';
-
-export const FeeCard = ({
-  children,
-  title,
-  className,
-  loading = false,
-}: {
-  children: ReactNode;
-  title: string;
-  className?: string;
-  loading?: boolean;
-}) => {
-  return (
-    <div
-      className={classNames(
-        'p-4 bg-vega-clight-800 dark:bg-vega-cdark-800 col-span-full lg:col-auto',
-        'rounded-lg',
-        className
-      )}
-    >
-      <h2 className="mb-3">{title}</h2>
-      {loading ? <FeeCardLoader /> : children}
-    </div>
-  );
-};
-
-export const FeeCardLoader = () => {
-  return (
-    <div className="flex flex-col gap-2">
-      <div className="w-full h-5 bg-vega-clight-600 dark:bg-vega-cdark-600" />
-      <div className="w-3/4 h-6 bg-vega-clight-600 dark:bg-vega-cdark-600" />
-    </div>
-  );
-};
@@ -1,103 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import { formatNumber } from '@vegaprotocol/utils';
-import BigNumber from 'bignumber.js';
-import { CurrentVolume, TradingFees } from './fees-container';
-import { formatPercentage, getAdjustedFee } from './utils';
-
-describe('TradingFees', () => {
-  it('renders correct fee data', () => {
-    const makerFee = 0.01;
-    const infraFee = 0.01;
-    const minLiqFee = 0.1;
-    const maxLiqFee = 0.3;
-
-    const referralDiscount = 0.01;
-    const volumeDiscount = 0.01;
-
-    const makerBigNum = new BigNumber(makerFee);
-    const infraBigNum = new BigNumber(infraFee);
-    const minLiqBigNum = new BigNumber(minLiqFee);
-    const maxLiqBigNum = new BigNumber(maxLiqFee);
-    const referralBigNum = new BigNumber(referralDiscount);
-    const volumeBigNum = new BigNumber(volumeDiscount);
-
-    const props = {
-      params: {
-        market_fee_factors_makerFee: makerFee.toString(),
-        market_fee_factors_infrastructureFee: infraFee.toString(),
-      },
-      markets: [
-        { fees: { factors: { liquidityFee: minLiqFee.toString() } } },
-        { fees: { factors: { liquidityFee: '0.2' } } },
-        { fees: { factors: { liquidityFee: maxLiqFee.toString() } } },
-      ],
-      referralDiscount,
-      volumeDiscount,
-    };
-    render(<TradingFees {...props} />);
-
-    const minFee = formatPercentage(
-      makerBigNum.plus(infraFee).plus(minLiqFee).toNumber()
-    );
-    const maxFee = formatPercentage(
-      makerBigNum.plus(infraFee).plus(maxLiqFee).toNumber()
-    );
-
-    expect(
-      screen.getByText('Total fee before discount').nextElementSibling
-    ).toHaveTextContent(`${minFee}%-${maxFee}%`);
-    expect(
-      screen.getByText('Infrastructure').nextElementSibling
-    ).toHaveTextContent(formatPercentage(infraFee) + '%');
-    expect(screen.getByText('Maker').nextElementSibling).toHaveTextContent(
-      formatPercentage(makerFee) + '%'
-    );
-
-    const minAdjustedFees = formatPercentage(
-      getAdjustedFee(
-        [makerBigNum, infraBigNum, minLiqBigNum],
-        [referralBigNum, volumeBigNum]
-      )
-    );
-
-    const maxAdjustedFees = formatPercentage(
-      getAdjustedFee(
-        [makerBigNum, infraBigNum, maxLiqBigNum],
-        [referralBigNum, volumeBigNum]
-      )
-    );
-
-    expect(screen.getByTestId('adjusted-fees')).toHaveTextContent(
-      `${minAdjustedFees}%-${maxAdjustedFees}%`
-    );
-  });
-});
-
-describe('CurerntVolume', () => {
-  it('renders the required amount for the next tier', () => {
-    const windowLengthVolume = 1500;
-    const nextTierVolume = 2000;
-
-    const props = {
-      tiers: [
-        { minimumRunningNotionalTakerVolume: '1000' },
-        { minimumRunningNotionalTakerVolume: nextTierVolume.toString() },
-        { minimumRunningNotionalTakerVolume: '3000' },
-      ],
-      tierIndex: 0,
-      windowLengthVolume,
-      epochs: 5,
-    };
-
-    render(<CurrentVolume {...props} />);
-
-    expect(
-      screen.getByText(formatNumber(windowLengthVolume)).nextElementSibling
-    ).toHaveTextContent(`Past ${props.epochs} epochs`);
-
-    expect(
-      screen.getByText(formatNumber(nextTierVolume - windowLengthVolume))
-        .nextElementSibling
-    ).toHaveTextContent('Required for next tier');
-  });
-});
@@ -1,490 +0,0 @@
-import maxBy from 'lodash/maxBy';
-import minBy from 'lodash/minBy';
-import { t } from '@vegaprotocol/i18n';
-import { useVegaWallet } from '@vegaprotocol/wallet';
-import {
-  useNetworkParams,
-  NetworkParams,
-} from '@vegaprotocol/network-parameters';
-import { useMarketList } from '@vegaprotocol/markets';
-import { formatNumber, formatNumberRounded } from '@vegaprotocol/utils';
-import { useDiscountProgramsQuery, useFeesQuery } from './__generated__/Fees';
-import { FeeCard } from './fees-card';
-import { MarketFees } from './market-fees';
-import { Stat } from './stat';
-import { useVolumeStats } from './use-volume-stats';
-import { useReferralStats } from './use-referral-stats';
-import { formatPercentage, getAdjustedFee } from './utils';
-import { Table, Td, Th, THead, Tr } from './table';
-import BigNumber from 'bignumber.js';
-
-export const FeesContainer = () => {
-  const { pubKey } = useVegaWallet();
-  const { params, loading: paramsLoading } = useNetworkParams([
-    NetworkParams.market_fee_factors_makerFee,
-    NetworkParams.market_fee_factors_infrastructureFee,
-  ]);
-
-  const { data: markets, loading: marketsLoading } = useMarketList();
-
-  const { data: programData, loading: programLoading } =
-    useDiscountProgramsQuery();
-
-  const volumeDiscountEpochs =
-    programData?.currentVolumeDiscountProgram?.windowLength || 1;
-  const referralDiscountEpochs =
-    programData?.currentReferralProgram?.windowLength || 1;
-
-  const { data: feesData, loading: feesLoading } = useFeesQuery({
-    variables: {
-      partyId: pubKey || '',
-      volumeDiscountEpochs,
-      referralDiscountEpochs,
-    },
-    skip: !pubKey || !programData,
-  });
-
-  const { volumeDiscount, volumeTierIndex, volumeInWindow, volumeTiers } =
-    useVolumeStats(
-      feesData?.volumeDiscountStats,
-      programData?.currentVolumeDiscountProgram
-    );
-
-  const {
-    referralDiscount,
-    referralVolumeInWindow,
-    referralTierIndex,
-    referralTiers,
-    epochsInSet,
-  } = useReferralStats(
-    feesData?.referralSetStats,
-    feesData?.referralSetReferees,
-    programData?.currentReferralProgram,
-    feesData?.epoch
-  );
-
-  const loading = paramsLoading || feesLoading || programLoading;
-  const isConnected = Boolean(pubKey);
-
-  return (
-    <div className="grid auto-rows-min grid-cols-4 gap-3">
-      {isConnected && (
-        <>
-          <FeeCard
-            title={t('My trading fees')}
-            className="sm:col-span-2"
-            loading={loading}
-          >
-            <TradingFees
-              params={params}
-              markets={markets}
-              referralDiscount={referralDiscount}
-              volumeDiscount={volumeDiscount}
-            />
-          </FeeCard>
-          <FeeCard
-            title={t('Total discount')}
-            className="sm:col-span-2"
-            loading={loading}
-          >
-            <TotalDiscount
-              referralDiscount={referralDiscount}
-              volumeDiscount={volumeDiscount}
-            />
-          </FeeCard>
-          <FeeCard
-            title={t('My current volume')}
-            className="sm:col-span-2"
-            loading={loading}
-          >
-            <CurrentVolume
-              tiers={volumeTiers}
-              tierIndex={volumeTierIndex}
-              windowLengthVolume={volumeInWindow}
-              epochs={volumeDiscountEpochs}
-            />
-          </FeeCard>
-          <FeeCard
-            title={t('Referral benefits')}
-            className="sm:col-span-2"
-            loading={loading}
-          >
-            <ReferralBenefits
-              setRunningNotionalTakerVolume={referralVolumeInWindow}
-              epochsInSet={epochsInSet}
-              epochs={referralDiscountEpochs}
-            />
-          </FeeCard>
-        </>
-      )}
-      <FeeCard
-        title={t('Volume discount')}
-        className="lg:col-span-full xl:col-span-2"
-        loading={loading}
-      >
-        <VolumeTiers
-          tiers={volumeTiers}
-          tierIndex={volumeTierIndex}
-          lastEpochVolume={volumeInWindow}
-        />
-      </FeeCard>
-      <FeeCard
-        title={t('Referral discount')}
-        className="lg:col-span-full xl:col-span-2"
-        loading={loading}
-      >
-        <ReferralTiers
-          tiers={referralTiers}
-          tierIndex={referralTierIndex}
-          epochsInSet={epochsInSet}
-          referralVolumeInWindow={referralVolumeInWindow}
-        />
-      </FeeCard>
-      <FeeCard
-        title={t('Liquidity fees')}
-        className="lg:col-span-full"
-        loading={marketsLoading}
-      >
-        <MarketFees
-          markets={markets}
-          referralDiscount={referralDiscount}
-          volumeDiscount={volumeDiscount}
-        />
-      </FeeCard>
-    </div>
-  );
-};
-
-export const TradingFees = ({
-  params,
-  markets,
-  referralDiscount,
-  volumeDiscount,
-}: {
-  params: {
-    market_fee_factors_infrastructureFee: string;
-    market_fee_factors_makerFee: string;
-  };
-  markets: Array<{ fees: { factors: { liquidityFee: string } } }> | null;
-  referralDiscount: number;
-  volumeDiscount: number;
-}) => {
-  const referralDiscountBigNum = new BigNumber(referralDiscount);
-  const volumeDiscountBigNum = new BigNumber(volumeDiscount);
-
-  // Show min and max liquidity fees from all markets
-  const minLiq = minBy(markets, (m) => Number(m.fees.factors.liquidityFee));
-  const maxLiq = maxBy(markets, (m) => Number(m.fees.factors.liquidityFee));
-
-  const total = new BigNumber(params.market_fee_factors_makerFee).plus(
-    new BigNumber(params.market_fee_factors_infrastructureFee)
-  );
-
-  const adjustedTotal = getAdjustedFee(
-    [total],
-    [referralDiscountBigNum, volumeDiscountBigNum]
-  );
-
-  let minTotal;
-  let maxTotal;
-
-  let minAdjustedTotal;
-  let maxAdjustedTotal;
-
-  if (minLiq && maxLiq) {
-    const minLiqFee = new BigNumber(minLiq.fees.factors.liquidityFee);
-    const maxLiqFee = new BigNumber(maxLiq.fees.factors.liquidityFee);
-
-    minTotal = total.plus(minLiqFee);
-    maxTotal = total.plus(maxLiqFee);
-
-    minAdjustedTotal = getAdjustedFee(
-      [total, minLiqFee],
-      [referralDiscountBigNum, volumeDiscountBigNum]
-    );
-
-    maxAdjustedTotal = getAdjustedFee(
-      [total, maxLiqFee],
-      [referralDiscountBigNum, volumeDiscountBigNum]
-    );
-  }
-
-  return (
-    <div>
-      <div className="pt-6 leading-none">
-        <p className="block text-3xl leading-none" data-testid="adjusted-fees">
-          {minAdjustedTotal !== undefined && maxAdjustedTotal !== undefined
-            ? `${formatPercentage(minAdjustedTotal)}%-${formatPercentage(
-                maxAdjustedTotal
-              )}%`
-            : `${formatPercentage(adjustedTotal)}%`}
-        </p>
-        <table className="w-full mt-0.5 text-xs text-muted">
-          <tbody>
-            <tr>
-              <th className="font-normal text-left text-default">
-                {t('Total fee before discount')}
-              </th>
-              <td className="text-right text-default">
-                {minTotal !== undefined && maxTotal !== undefined
-                  ? `${formatPercentage(
-                      minTotal.toNumber()
-                    )}%-${formatPercentage(maxTotal.toNumber())}%`
-                  : `${formatPercentage(total.toNumber())}%`}
-              </td>
-            </tr>
-            <tr>
-              <th className="font-normal text-left">{t('Infrastructure')}</th>
-              <td className="text-right">
-                {formatPercentage(
-                  Number(params.market_fee_factors_infrastructureFee)
-                )}
-                %
-              </td>
-            </tr>
-            <tr>
-              <th className="font-normal text-left ">{t('Maker')}</th>
-              <td className="text-right">
-                {formatPercentage(Number(params.market_fee_factors_makerFee))}%
-              </td>
-            </tr>
-            {minLiq && maxLiq && (
-              <tr>
-                <th className="font-normal text-left ">{t('Liquidity')}</th>
-                <td className="text-right">
-                  {formatPercentage(Number(minLiq.fees.factors.liquidityFee))}%
-                  {'-'}
-                  {formatPercentage(Number(maxLiq.fees.factors.liquidityFee))}%
-                </td>
-              </tr>
-            )}
-          </tbody>
-        </table>
-      </div>
-    </div>
-  );
-};
-
-export const CurrentVolume = ({
-  tiers,
-  tierIndex,
-  windowLengthVolume,
-  epochs,
-}: {
-  tiers: Array<{ minimumRunningNotionalTakerVolume: string }>;
-  tierIndex: number;
-  windowLengthVolume: number;
-  epochs: number;
-}) => {
-  const nextTier = tiers[tierIndex + 1];
-  const requiredForNextTier = nextTier
-    ? Number(nextTier.minimumRunningNotionalTakerVolume) - windowLengthVolume
-    : 0;
-
-  return (
-    <div>
-      <Stat
-        value={formatNumberRounded(new BigNumber(windowLengthVolume))}
-        text={t('Past %s epochs', epochs.toString())}
-      />
-      {requiredForNextTier > 0 && (
-        <Stat
-          value={formatNumber(requiredForNextTier)}
-          text={t('Required for next tier')}
-        />
-      )}
-    </div>
-  );
-};
-
-const ReferralBenefits = ({
-  epochsInSet,
-  setRunningNotionalTakerVolume,
-  epochs,
-}: {
-  epochsInSet: number;
-  setRunningNotionalTakerVolume: number;
-  epochs: number;
-}) => {
-  return (
-    <div>
-      <Stat
-        // all sets volume (not just current party)
-        value={formatNumber(setRunningNotionalTakerVolume)}
-        text={t(
-          'Combined running notional over the %s epochs',
-          epochs.toString()
-        )}
-      />
-      <Stat value={epochsInSet} text={t('epochs in referral set')} />
-    </div>
-  );
-};
-
-const TotalDiscount = ({
-  referralDiscount,
-  volumeDiscount,
-}: {
-  referralDiscount: number;
-  volumeDiscount: number;
-}) => {
-  return (
-    <div>
-      <Stat
-        value={formatPercentage(referralDiscount + volumeDiscount) + '%'}
-        highlight={true}
-      />
-      <table className="w-full mt-0.5 text-xs text-muted">
-        <tbody>
-          <tr>
-            <th className="font-normal text-left">{t('Volume discount')}</th>
-            <td className="text-right">{formatPercentage(volumeDiscount)}%</td>
-          </tr>
-          <tr>
-            <th className="font-normal text-left ">{t('Referral discount')}</th>
-            <td className="text-right">
-              {formatPercentage(referralDiscount)}%
-            </td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
-  );
-};
-
-const VolumeTiers = ({
-  tiers,
-  tierIndex,
-  lastEpochVolume,
-}: {
-  tiers: Array<{
-    volumeDiscountFactor: string;
-    minimumRunningNotionalTakerVolume: string;
-  }>;
-  tierIndex: number;
-  lastEpochVolume: number;
-}) => {
-  if (!tiers.length) {
-    return (
-      <p className="text-sm text-muted">
-        {t('No volume discount program active')}
-      </p>
-    );
-  }
-
-  return (
-    <div>
-      <Table>
-        <THead>
-          <tr>
-            <Th>{t('Tier')}</Th>
-            <Th>{t('Discount')}</Th>
-            <Th>{t('Min. trading volume')}</Th>
-            <Th>{t('My volume (last epoch)')}</Th>
-            <Th />
-          </tr>
-        </THead>
-        <tbody>
-          {Array.from(tiers)
-            .reverse()
-            .map((tier, i) => {
-              const isUserTier = tiers.length - 1 - tierIndex === i;
-
-              return (
-                <Tr key={i}>
-                  <Td>{i + 1}</Td>
-                  <Td>
-                    {formatPercentage(Number(tier.volumeDiscountFactor))}%
-                  </Td>
-                  <Td>
-                    {formatNumber(tier.minimumRunningNotionalTakerVolume)}
-                  </Td>
-                  <Td>{isUserTier ? formatNumber(lastEpochVolume) : ''}</Td>
-                  <Td>{isUserTier ? <YourTier /> : null}</Td>
-                </Tr>
-              );
-            })}
-        </tbody>
-      </Table>
-    </div>
-  );
-};
-
-const ReferralTiers = ({
-  tiers,
-  tierIndex,
-  epochsInSet,
-  referralVolumeInWindow,
-}: {
-  tiers: Array<{
-    referralDiscountFactor: string;
-    minimumRunningNotionalTakerVolume: string;
-    minimumEpochs: number;
-  }>;
-  tierIndex: number;
-  epochsInSet: number;
-  referralVolumeInWindow: number;
-}) => {
-  if (!tiers.length) {
-    return (
-      <p className="text-sm text-muted">{t('No referral program active')}</p>
-    );
-  }
-
-  return (
-    <div>
-      <Table>
-        <THead>
-          <tr>
-            <Th>{t('Tier')}</Th>
-            <Th>{t('Discount')}</Th>
-            <Th>{t('Min. trading volume')}</Th>
-            <Th>{t('Required epochs')}</Th>
-            <Th />
-          </tr>
-        </THead>
-        <tbody>
-          {Array.from(tiers)
-            .reverse()
-            .map((t, i) => {
-              const isUserTier = tiers.length - 1 - tierIndex === i;
-
-              const requiredVolume = Number(
-                t.minimumRunningNotionalTakerVolume
-              );
-              let unlocksIn = null;
-
-              if (
-                referralVolumeInWindow >= requiredVolume &&
-                epochsInSet < t.minimumEpochs
-              ) {
-                unlocksIn = (
-                  <span className="text-muted">
-                    Unlocks in {t.minimumEpochs - epochsInSet} epochs
-                  </span>
-                );
-              }
-
-              return (
-                <Tr key={i}>
-                  <Td>{i + 1}</Td>
-                  <Td>{formatPercentage(Number(t.referralDiscountFactor))}%</Td>
-                  <Td>{formatNumber(t.minimumRunningNotionalTakerVolume)}</Td>
-                  <Td>{t.minimumEpochs}</Td>
-                  <Td>{isUserTier ? <YourTier /> : unlocksIn}</Td>
-                </Tr>
-              );
-            })}
-        </tbody>
-      </Table>
-    </div>
-  );
-};
-
-const YourTier = () => {
-  return (
-    <span className="px-4 py-1.5 rounded-xl bg-rainbow whitespace-nowrap text-white">
-      {t('Your tier')}
-    </span>
-  );
-};
@@ -1 +0,0 @@
-export { FeesContainer } from './fees-container';
@@ -1,104 +0,0 @@
-import compact from 'lodash/compact';
-import type { MarketMaybeWithDataAndCandles } from '@vegaprotocol/markets';
-import { AgGrid } from '@vegaprotocol/datagrid';
-import { t } from '@vegaprotocol/i18n';
-import { formatPercentage, getAdjustedFee } from './utils';
-import { MarketCodeCell } from '../../client-pages/markets/market-code-cell';
-import BigNumber from 'bignumber.js';
-import { useNavigateWithMeta } from '../../lib/hooks/use-market-click-handler';
-import { Links } from '../../lib/links';
-
-const feesTableColumnDefs = [
-  { field: 'code', cellRenderer: 'MarketCodeCell' },
-  {
-    field: 'feeAfterDiscount',
-    headerName: t('Total fee after discount'),
-    valueFormatter: ({ value }: { value: number }) => value + '%',
-  },
-  {
-    field: 'infraFee',
-    valueFormatter: ({ value }: { value: number }) => value + '%',
-  },
-  {
-    field: 'makerFee',
-    valueFormatter: ({ value }: { value: number }) => value + '%',
-  },
-  {
-    field: 'liquidityFee',
-    valueFormatter: ({ value }: { value: number }) => value + '%',
-  },
-  {
-    field: 'totalFee',
-    headerName: t('Total fee before discount'),
-    valueFormatter: ({ value }: { value: number }) => value + '%',
-  },
-];
-
-const feesTableDefaultColDef = {
-  flex: 1,
-  resizable: true,
-  sortable: true,
-};
-
-const components = {
-  MarketCodeCell,
-};
-
-export const MarketFees = ({
-  markets,
-  referralDiscount,
-  volumeDiscount,
-}: {
-  markets: MarketMaybeWithDataAndCandles[] | null;
-  referralDiscount: number;
-  volumeDiscount: number;
-}) => {
-  const navigateWithMeta = useNavigateWithMeta();
-
-  const rows = compact(markets || []).map((m) => {
-    const infraFee = new BigNumber(m.fees.factors.infrastructureFee);
-    const makerFee = new BigNumber(m.fees.factors.makerFee);
-    const liquidityFee = new BigNumber(m.fees.factors.liquidityFee);
-    const totalFee = infraFee.plus(makerFee).plus(liquidityFee);
-
-    const feeAfterDiscount = getAdjustedFee(
-      [infraFee, makerFee, liquidityFee],
-      [new BigNumber(referralDiscount), new BigNumber(volumeDiscount)]
-    );
-
-    return {
-      id: m.id,
-      code: m.tradableInstrument.instrument.code,
-      productType: m.tradableInstrument.instrument.product.__typename,
-      infraFee: formatPercentage(infraFee.toNumber()),
-      makerFee: formatPercentage(makerFee.toNumber()),
-      liquidityFee: formatPercentage(liquidityFee.toNumber()),
-      totalFee: formatPercentage(totalFee.toNumber()),
-      feeAfterDiscount: formatPercentage(feeAfterDiscount),
-      parentMarketID: m.parentMarketID,
-      successorMarketID: m.successorMarketID,
-    };
-  });
-
-  return (
-    <div className="border rounded-sm border-default">
-      <AgGrid
-        columnDefs={feesTableColumnDefs}
-        rowData={rows}
-        getRowId={({ data }) => data.id}
-        defaultColDef={feesTableDefaultColDef}
-        domLayout="autoHeight"
-        components={components}
-        rowHeight={45}
-        rowClass="cursor-pointer"
-        onRowClicked={({ data, event }) => {
-          navigateWithMeta(
-            Links.MARKET(data.id),
-            // @ts-ignore metaKey and ctrlKey exist
-            event.metaKey || event.ctrlKey
-          );
-        }}
-      />
-    </div>
-  );
-};
@@ -1,26 +0,0 @@
-import classNames from 'classnames';
-
-export const Stat = ({
-  value,
-  text,
-  highlight,
-}: {
-  value: string | number;
-  text?: string;
-  highlight?: boolean;
-}) => {
-  return (
-    <p className="pt-3 leading-none first:pt-6">
-      <span
-        className={classNames('inline-block text-3xl leading-none', {
-          'text-transparent bg-rainbow bg-clip-text': highlight,
-        })}
-      >
-        {value}
-      </span>
-      {text && (
-        <small className="block mt-0.5 text-xs text-muted">{text}</small>
-      )}
-    </p>
-  );
-};
@@ -1,40 +0,0 @@
-import classNames from 'classnames';
-import type { ReactNode } from 'react';
-
-const cellClass = 'px-4 py-2 text-xs font-normal text-left last:text-right';
-
-export const Th = ({ children }: { children?: ReactNode }) => {
-  return (
-    <th className={classNames(cellClass, 'text-secondary leading-none py-3')}>
-      {children}
-    </th>
-  );
-};
-
-export const Td = ({ children }: { children?: ReactNode }) => {
-  return <th className={cellClass}>{children}</th>;
-};
-
-export const Tr = ({ children }: { children?: ReactNode }) => {
-  return (
-    <tr className="hover:bg-vega-clight-600 dark:hover:bg-vega-cdark-700">
-      {children}
-    </tr>
-  );
-};
-
-export const Table = ({ children }: { children: ReactNode }) => {
-  return (
-    <table className="w-full border border-separate rounded-sm border-spacing-0 border-vega-clight-600 dark:border-vega-cdark-600">
-      {children}
-    </table>
-  );
-};
-
-export const THead = ({ children }: { children: ReactNode }) => {
-  return (
-    <thead className="border-b bg-vega-clight-700 dark:bg-vega-cdark-700 border-vega-clight-600 dark:border-vega-cdark-600">
-      {children}
-    </thead>
-  );
-};
@@ -1,175 +0,0 @@
-import { renderHook } from '@testing-library/react';
-import { useReferralStats } from './use-referral-stats';
-
-describe('useReferralStats', () => {
-  const setStats = {
-    edges: [
-      {
-        __typename: 'ReferralSetStatsEdge' as const,
-        node: {
-          __typename: 'ReferralSetStats' as const,
-          atEpoch: 9,
-          discountFactor: '0.2',
-          referralSetRunningNotionalTakerVolume: '100',
-        },
-      },
-      {
-        __typename: 'ReferralSetStatsEdge' as const,
-        node: {
-          __typename: 'ReferralSetStats' as const,
-          atEpoch: 10,
-          discountFactor: '0.3',
-          referralSetRunningNotionalTakerVolume: '200',
-        },
-      },
-    ],
-  };
-
-  const sets = {
-    edges: [
-      {
-        node: {
-          atEpoch: 3,
-        },
-      },
-      {
-        node: {
-          atEpoch: 4,
-        },
-      },
-    ],
-  };
-
-  const epoch = {
-    id: '10',
-  };
-
-  const program = {
-    windowLength: 5,
-    benefitTiers: [
-      {
-        minimumEpochs: 4,
-        minimumRunningNotionalTakerVolume: '100',
-        referralDiscountFactor: '0.01',
-      },
-      {
-        minimumEpochs: 6,
-        minimumRunningNotionalTakerVolume: '200',
-        referralDiscountFactor: '0.05',
-      },
-      {
-        minimumEpochs: 8,
-        minimumRunningNotionalTakerVolume: '300',
-        referralDiscountFactor: '0.1',
-      },
-    ],
-  };
-
-  it('returns correct default values', () => {
-    const { result } = renderHook(() => useReferralStats());
-    expect(result.current).toEqual({
-      referralDiscount: 0,
-      referralVolumeInWindow: 0,
-      referralTierIndex: -1,
-      referralTiers: [],
-      epochsInSet: 0,
-    });
-  });
-
-  it('returns formatted data and tiers', () => {
-    const { result } = renderHook(() =>
-      useReferralStats(setStats, sets, program, epoch)
-    );
-
-    // should use stats from latest epoch
-    const stats = setStats.edges[1].node;
-    const set = sets.edges[1].node;
-
-    expect(result.current).toEqual({
-      referralDiscount: Number(stats.discountFactor),
-      referralVolumeInWindow: Number(
-        stats.referralSetRunningNotionalTakerVolume
-      ),
-      referralTierIndex: 1,
-      referralTiers: program.benefitTiers,
-      epochsInSet: Number(epoch.id) - set.atEpoch,
-    });
-  });
-
-  it.each([
-    { joinedAt: 2, index: -1 },
-    { joinedAt: 3, index: -1 },
-    { joinedAt: 4, index: 0 },
-    { joinedAt: 5, index: 0 },
-    { joinedAt: 6, index: 1 },
-    { joinedAt: 7, index: 1 },
-    { joinedAt: 8, index: 2 },
-    { joinedAt: 9, index: 2 },
-  ])('joined at epoch: $joinedAt should be index: $index', (obj) => {
-    const statsA = {
-      edges: [
-        {
-          __typename: 'ReferralSetStatsEdge' as const,
-          node: {
-            __typename: 'ReferralSetStats' as const,
-            atEpoch: 10,
-            discountFactor: '0.3',
-            referralSetRunningNotionalTakerVolume: '100000',
-          },
-        },
-      ],
-    };
-    const setsA = {
-      edges: [
-        {
-          node: {
-            atEpoch: Number(epoch.id) - obj.joinedAt,
-          },
-        },
-      ],
-    };
-    const { result } = renderHook(() =>
-      useReferralStats(statsA, setsA, program, epoch)
-    );
-
-    expect(result.current.referralTierIndex).toEqual(obj.index);
-  });
-
-  it.each([
-    { volume: '50', index: -1 },
-    { volume: '100', index: 0 },
-    { volume: '150', index: 0 },
-    { volume: '200', index: 1 },
-    { volume: '250', index: 1 },
-    { volume: '300', index: 2 },
-    { volume: '999', index: 2 },
-  ])('volume: $volume should be index: $index', (obj) => {
-    const statsA = {
-      edges: [
-        {
-          __typename: 'ReferralSetStatsEdge' as const,
-          node: {
-            __typename: 'ReferralSetStats' as const,
-            atEpoch: 10,
-            discountFactor: '0.3',
-            referralSetRunningNotionalTakerVolume: obj.volume,
-          },
-        },
-      ],
-    };
-    const setsA = {
-      edges: [
-        {
-          node: {
-            atEpoch: 1,
-          },
-        },
-      ],
-    };
-    const { result } = renderHook(() =>
-      useReferralStats(statsA, setsA, program, epoch)
-    );
-
-    expect(result.current.referralTierIndex).toEqual(obj.index);
-  });
-});
@@ -1,52 +0,0 @@
-import compact from 'lodash/compact';
-import maxBy from 'lodash/maxBy';
-import { getReferralBenefitTier } from './utils';
-import type { DiscountProgramsQuery, FeesQuery } from './__generated__/Fees';
-
-export const useReferralStats = (
-  setStats?: FeesQuery['referralSetStats'],
-  setReferees?: FeesQuery['referralSetReferees'],
-  program?: DiscountProgramsQuery['currentReferralProgram'],
-  epoch?: FeesQuery['epoch']
-) => {
-  const referralTiers = program?.benefitTiers || [];
-
-  if (!setStats || !setReferees || !program || !epoch) {
-    return {
-      referralDiscount: 0,
-      referralVolumeInWindow: 0,
-      referralTierIndex: -1,
-      referralTiers,
-      epochsInSet: 0,
-    };
-  }
-
-  const referralSetsStats = compact(setStats.edges).map((e) => e.node);
-  const referralSets = compact(setReferees.edges).map((e) => e.node);
-
-  const referralSet = maxBy(referralSets, (s) => s.atEpoch);
-  const referralStats = maxBy(referralSetsStats, (s) => s.atEpoch);
-
-  const epochsInSet = referralSet ? Number(epoch.id) - referralSet.atEpoch : 0;
-
-  const referralDiscount = Number(referralStats?.discountFactor || 0);
-  const referralVolumeInWindow = Number(
-    referralStats?.referralSetRunningNotionalTakerVolume || 0
-  );
-
-  const referralTierIndex = referralStats
-    ? getReferralBenefitTier(
-        epochsInSet,
-        Number(referralStats.referralSetRunningNotionalTakerVolume),
-        referralTiers
-      )
-    : -1;
-
-  return {
-    referralDiscount,
-    referralVolumeInWindow,
-    referralTierIndex,
-    referralTiers,
-    epochsInSet,
-  };
-};
@@ -1,95 +0,0 @@
-import { renderHook } from '@testing-library/react';
-import { useVolumeStats } from './use-volume-stats';
-
-describe('useReferralStats', () => {
-  const statsList = {
-    edges: [
-      {
-        __typename: 'VolumeDiscountStatsEdge' as const,
-        node: {
-          __typename: 'VolumeDiscountStats' as const,
-          atEpoch: 9,
-          discountFactor: '0.1',
-          runningVolume: '100',
-        },
-      },
-      {
-        __typename: 'VolumeDiscountStatsEdge' as const,
-        node: {
-          __typename: 'VolumeDiscountStats' as const,
-          atEpoch: 10,
-          discountFactor: '0.3',
-          runningVolume: '200',
-        },
-      },
-    ],
-  };
-
-  const program = {
-    windowLength: 5,
-    benefitTiers: [
-      {
-        minimumRunningNotionalTakerVolume: '100',
-        volumeDiscountFactor: '0.01',
-      },
-      {
-        minimumRunningNotionalTakerVolume: '200',
-        volumeDiscountFactor: '0.05',
-      },
-      {
-        minimumRunningNotionalTakerVolume: '300',
-        volumeDiscountFactor: '0.1',
-      },
-    ],
-  };
-
-  it('returns correct default values', () => {
-    const { result } = renderHook(() => useVolumeStats());
-    expect(result.current).toEqual({
-      volumeDiscount: 0,
-      volumeInWindow: 0,
-      volumeTierIndex: -1,
-      volumeTiers: [],
-    });
-  });
-
-  it('returns formatted data and tiers', () => {
-    const { result } = renderHook(() => useVolumeStats(statsList, program));
-
-    // should use stats from latest epoch
-    const stats = statsList.edges[1].node;
-
-    expect(result.current).toEqual({
-      volumeDiscount: Number(stats.discountFactor),
-      volumeInWindow: Number(stats.runningVolume),
-      volumeTierIndex: 1,
-      volumeTiers: program.benefitTiers,
-    });
-  });
-
-  it.each([
-    { volume: '100', index: 0 },
-    { volume: '150', index: 0 },
-    { volume: '200', index: 1 },
-    { volume: '250', index: 1 },
-    { volume: '300', index: 2 },
-    { volume: '350', index: 2 },
-  ])('returns index: $index for the running volume: $volume', (obj) => {
-    const statsA = {
-      edges: [
-        {
-          __typename: 'VolumeDiscountStatsEdge' as const,
-          node: {
-            __typename: 'VolumeDiscountStats' as const,
-            atEpoch: 10,
-            discountFactor: '0.3',
-            runningVolume: obj.volume,
-          },
-        },
-      ],
-    };
-
-    const { result } = renderHook(() => useVolumeStats(statsA, program));
-    expect(result.current.volumeTierIndex).toBe(obj.index);
-  });
-});
@@ -1,33 +0,0 @@
-import compact from 'lodash/compact';
-import maxBy from 'lodash/maxBy';
-import { getVolumeTier } from './utils';
-import type { DiscountProgramsQuery, FeesQuery } from './__generated__/Fees';
-
-export const useVolumeStats = (
-  stats?: FeesQuery['volumeDiscountStats'],
-  program?: DiscountProgramsQuery['currentVolumeDiscountProgram']
-) => {
-  const volumeTiers = program?.benefitTiers || [];
-
-  if (!stats || !program) {
-    return {
-      volumeDiscount: 0,
-      volumeTierIndex: -1,
-      volumeInWindow: 0,
-      volumeTiers,
-    };
-  }
-
-  const volumeStats = compact(stats.edges).map((e) => e.node);
-  const lastEpochStats = maxBy(volumeStats, (s) => s.atEpoch);
-  const volumeDiscount = Number(lastEpochStats?.discountFactor || 0);
-  const volumeInWindow = Number(lastEpochStats?.runningVolume || 0);
-  const volumeTierIndex = getVolumeTier(volumeInWindow, volumeTiers);
-
-  return {
-    volumeDiscount,
-    volumeTierIndex,
-    volumeInWindow,
-    volumeTiers,
-  };
-};
@@ -1,74 +0,0 @@
-import BigNumber from 'bignumber.js';
-import { getAdjustedFee } from './utils';
-
-describe('getAdjustedFee', () => {
-  it('simple', () => {
-    const volumeDiscount = 0.5;
-    const referralDiscount = 0.5;
-
-    const infraFee = 0.1;
-    const makerFee = 0.1;
-    const liqFee = 0.1;
-
-    const fees = [
-      new BigNumber(infraFee),
-      new BigNumber(makerFee),
-      new BigNumber(liqFee),
-    ];
-
-    const discounts = [
-      new BigNumber(volumeDiscount),
-      new BigNumber(referralDiscount),
-    ];
-
-    // 1 - 0.5 - 0.5
-    const v = new BigNumber(1).minus(new BigNumber(volumeDiscount));
-
-    // 1 - 0.5 = 0.5
-    const r = new BigNumber(1).minus(new BigNumber(referralDiscount));
-
-    // 0.5 * 0.5 = 0.25
-    // 1 - 0.25 = 0.75
-    const factor = new BigNumber(1).minus(v.times(r));
-
-    // 0.1 + 0.1 + 0.1 = 0.3
-    const totalFees = fees.reduce((sum, x) => sum.plus(x), new BigNumber(0));
-
-    // 0.3 * 0.75 = 0.225
-    const expected = new BigNumber(totalFees).times(factor).toNumber();
-
-    expect(getAdjustedFee(fees, discounts)).toBe(expected);
-  });
-
-  it('combines discount factors multiplicativly', () => {
-    const volumeDiscount = 0.4;
-    const referralDiscount = 0.1;
-
-    const infraFee = 0.0005;
-    const makerFee = 0.0002;
-    const liqFee = 0.01;
-
-    const fees = [
-      new BigNumber(infraFee),
-      new BigNumber(makerFee),
-      new BigNumber(liqFee),
-    ];
-
-    const discounts = [
-      new BigNumber(volumeDiscount),
-      new BigNumber(referralDiscount),
-    ];
-
-    // formula for calculating adjusted fees
-    const v = new BigNumber(1).minus(new BigNumber(volumeDiscount));
-    const r = new BigNumber(1).minus(new BigNumber(referralDiscount));
-    const factor = new BigNumber(1).minus(v.times(r));
-
-    // summed fees
-    const totalFees = fees.reduce((sum, x) => sum.plus(x), new BigNumber(0));
-
-    const expected = new BigNumber(totalFees).times(factor).toNumber();
-
-    expect(getAdjustedFee(fees, discounts)).toBe(expected);
-  });
-});
@@ -1,105 +0,0 @@
-import { getUserLocale } from '@vegaprotocol/utils';
-import BigNumber from 'bignumber.js';
-
-/**
- * Convert a number between 0-1 into a percentage value between 0-100
- *
- * Not using formatNumberPercentage from vegaprotocol/utils as this
- * returns a string and includes extra 0s on the end. We need these
- * values in aggrid as numbers for sorting
- */
-export const formatPercentage = (num: number) => {
-  const pct = new BigNumber(num).times(100);
-  const dps = pct.decimalPlaces();
-  const formatter = new Intl.NumberFormat(getUserLocale(), {
-    minimumFractionDigits: dps || 0,
-    maximumFractionDigits: dps || 0,
-  });
-  return formatter.format(parseFloat(pct.toFixed(5)));
-};
-
-/**
- * Return the index of the benefit tier for volume discounts. A user
- * only needs to fulfill a minimum volume requirement for the tier
- */
-export const getVolumeTier = (
-  volume: number,
-  tiers: Array<{
-    minimumRunningNotionalTakerVolume: string;
-  }>
-) => {
-  return tiers.findIndex((tier, i) => {
-    const nextTier = tiers[i + 1];
-    const validVolume =
-      volume >= Number(tier.minimumRunningNotionalTakerVolume);
-
-    if (nextTier) {
-      return (
-        validVolume &&
-        volume < Number(nextTier.minimumRunningNotionalTakerVolume)
-      );
-    }
-
-    return validVolume;
-  });
-};
-
-/**
- * Return the index of the benefit tiers for referrals. A user must
- * fulfill both the minimum epochs in the referral set, and the set
- * must reach the combined total volume
- */
-export const getReferralBenefitTier = (
-  epochsInSet: number,
-  volume: number,
-  tiers: Array<{
-    minimumRunningNotionalTakerVolume: string;
-    minimumEpochs: number;
-  }>
-) => {
-  const indexByEpoch = tiers.findIndex((tier, i) => {
-    const nextTier = tiers[i + 1];
-    const validEpochs = epochsInSet >= tier.minimumEpochs;
-
-    if (nextTier) {
-      return validEpochs && epochsInSet < nextTier.minimumEpochs;
-    }
-
-    return validEpochs;
-  });
-  const indexByVolume = tiers.findIndex((tier, i) => {
-    const nextTier = tiers[i + 1];
-    const validVolume =
-      volume >= Number(tier.minimumRunningNotionalTakerVolume);
-
-    if (nextTier) {
-      return (
-        validVolume &&
-        volume < Number(nextTier.minimumRunningNotionalTakerVolume)
-      );
-    }
-
-    return validVolume;
-  });
-
-  return Math.min(indexByEpoch, indexByVolume);
-};
-
-/**
- * Given a set of fees and a set of discounts return
- * the adjusted fee factor
- *
- * Formula for calculating the adjusted fees
- *  total_discount_factor = 1 - (1 - volumeDiscount) * (1 - referralDiscount)
- */
-export const getAdjustedFee = (fees: BigNumber[], discounts: BigNumber[]) => {
-  const totalFee = fees.reduce((sum, f) => sum.plus(f), new BigNumber(0));
-
-  const combinedFactors = discounts.reduce((acc, d) => {
-    return acc.times(new BigNumber(1).minus(d));
-  }, new BigNumber(1));
-
-  const totalFactor = new BigNumber(1).minus(combinedFactors);
-
-  return totalFee.times(BigNumber.max(0, totalFactor)).toNumber();
-};
@@ -27,7 +27,7 @@ export const LayoutWithSidebar = ({
    <div className={gridClasses}>
      <div className="col-span-full">{header}</div>
      <main
-        className={classNames('col-start-1 col-end-1 overflow-y-auto', {
+        className={classNames('col-start-1 col-end-1 overflow-hidden', {
          'lg:col-end-3': !sidebarOpen,
          'hidden lg:block lg:col-end-2': sidebarOpen,
        })}
@@ -10,28 +10,15 @@ import {
  formatNumberPercentage,
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
-import {
-  CopyWithTooltip,
-  ExternalLink,
-  Indicator,
-  VegaIcon,
-  VegaIconNames,
-  truncateMiddle,
-} from '@vegaprotocol/ui-toolkit';
+import { ExternalLink, Indicator } from '@vegaprotocol/ui-toolkit';
 import { DocsLinks } from '@vegaprotocol/environment';
-import {
-  useCheckLiquidityStatus,
-  usePaidFeesQuery,
-} from '@vegaprotocol/liquidity';
+import { useCheckLiquidityStatus } from '@vegaprotocol/liquidity';
 import { useParams } from 'react-router-dom';

 export const LiquidityHeader = () => {
  const { marketId } = useParams();
  const { data: market } = useMarket(marketId);
  const { data: marketData } = useStaticMarketData(marketId);
-  const { data: feesPaidRes } = usePaidFeesQuery({
-    variables: { marketId: marketId || '' },
-  });
  const targetStake = marketData?.targetStake;
  const suppliedStake = marketData?.suppliedStake;

@@ -49,10 +36,6 @@ export const LiquidityHeader = () => {
    triggeringRatio,
  });

-  const feesObject = feesPaidRes?.paidLiquidityFees?.edges?.find(
-    (e) => e?.node.marketId === marketId
-  );
-
  return (
    <Header
      title={
@@ -99,40 +82,9 @@ export const LiquidityHeader = () => {
      <HeaderStat heading={t('Liquidity supplied')} testId="liquidity-supplied">
        <Indicator variant={status} /> {formatNumberPercentage(percentage, 2)}
      </HeaderStat>
-      <HeaderStat
-        heading={t('Fees paid')}
-        description={t(
-          'The amount of fees paid to liquidity providers across the whole market during the last epoch %s.',
-          feesObject?.node.epoch.toString() || '-'
-        )}
-        testId="fees-paid"
-      >
-        <div>
-          {feesObject?.node.totalFeesPaid
-            ? `${addDecimalsFormatNumber(
-                feesObject?.node.totalFeesPaid,
-                assetDecimalPlaces ?? 0
-              )} ${symbol}`
-            : '-'}
-        </div>
+      <HeaderStat heading={t('Market ID')} testId="liquidity-market-id">
+        <div className="break-word">{marketId}</div>
      </HeaderStat>
-      {marketId && (
-        <HeaderStat heading={t('Market ID')} testId="liquidity-market-id">
-          <div className="break-word">
-            <CopyWithTooltip text={marketId}>
-              <button
-                data-testid="copy-eth-oracle-address"
-                className="uppercase text-right"
-              >
-                <span className="flex gap-1">
-                  {truncateMiddle(marketId)}
-                  <VegaIcon name={VegaIconNames.COPY} size={16} />
-                </span>
-              </button>
-            </CopyWithTooltip>
-          </div>
-        </HeaderStat>
-      )}
      <HeaderStat heading={t('Learn more')} testId="liquidity-learn-more">
        {DocsLinks ? (
          <ExternalLink href={DocsLinks.LIQUIDITY}>
@@ -67,7 +67,6 @@ describe('Navbar', () => {
      [`/markets/${marketId}`, 'Trading'],
      ['/portfolio', 'Portfolio'],
      ['/referrals', 'Referrals'],
-      ['/fees', 'Fees'],
      [expect.stringContaining('governance'), 'Governance'],
    ];

@@ -101,7 +100,6 @@ describe('Navbar', () => {
      [`/markets/${marketId}`, 'Trading'],
      ['/portfolio', 'Portfolio'],
      ['/referrals', 'Referrals'],
-      ['/fees', 'Fees'],
      [expect.stringContaining('governance'), 'Governance'],
    ];
    const links = menu.getAllByRole('link');
@@ -187,11 +187,6 @@ const NavbarMenu = ({ onClick }: { onClick: () => void }) => {
            </NavbarLink>
          </NavbarItem>
        )}
-        <NavbarItem>
-          <NavbarLink to={Links.FEES()} onClick={onClick}>
-            {t('Fees')}
-          </NavbarLink>
-        </NavbarItem>
        <NavbarItem>
          <NavbarLinkExternal to={useLinks(DApp.Governance)()}>
            {t('Governance')}
@@ -17,7 +17,6 @@ export const Routes = {
  REFERRALS_APPLY_CODE: '/referrals/apply-code',
  REFERRALS_CREATE_CODE: '/referrals/create-code',
  TEAMS: '/teams',
-  FEES: '/fees',
 } as const;

 type ConsoleLinks = {
@@ -41,5 +40,4 @@ export const Links: ConsoleLinks = {
  REFERRALS_APPLY_CODE: () => Routes.REFERRALS_APPLY_CODE,
  REFERRALS_CREATE_CODE: () => Routes.REFERRALS_CREATE_CODE,
  TEAMS: () => Routes.TEAMS,
-  FEES: () => Routes.FEES,
 };
@@ -13,7 +13,6 @@ import { Assets } from '../client-pages/assets';
 import { Deposit } from '../client-pages/deposit';
 import { Withdraw } from '../client-pages/withdraw';
 import { Transfer } from '../client-pages/transfer';
-import { Fees } from '../client-pages/fees';
 import { Routes as AppRoutes } from '../lib/links';
 import { LayoutWithSky } from '../client-pages/referrals/layout';
 import { Referrals } from '../client-pages/referrals/referrals';
@@ -86,16 +85,6 @@ export const routerConfig: RouteObject[] = compact([
        ],
      }
    : undefined,
-  {
-    path: 'fees/*',
-    element: <LayoutWithSidebar sidebar={<PortfolioSidebar />} />,
-    children: [
-      {
-        index: true,
-        element: <Fees />,
-      },
-    ],
-  },
  {
    path: 'markets/*',
    element: (
@@ -184,10 +184,10 @@ html [data-theme='dark'] {

 /* Light variables */
 .ag-theme-balham {
-  --ag-background-color: transparent;
+  --ag-background-color: theme(colors.white);
  --ag-border-color: theme(colors.vega.clight.600);
  --ag-header-background-color: theme(colors.vega.clight.700);
-  --ag-odd-row-background-color: transparent;
+  --ag-odd-row-background-color: theme(colors.white);
  --ag-header-column-separator-color: theme(colors.vega.clight.500);
  --ag-row-border-color: theme(colors.vega.clight.600);
  --ag-row-hover-color: theme(colors.vega.clight.800);
@@ -196,10 +196,10 @@ html [data-theme='dark'] {

 /* Dark variables */
 .ag-theme-balham-dark {
-  --ag-background-color: transparent;
+  --ag-background-color: theme(colors.vega.cdark.900);
  --ag-border-color: theme(colors.vega.cdark.600);
  --ag-header-background-color: theme(colors.vega.cdark.700);
-  --ag-odd-row-background-color: transparent;
+  --ag-odd-row-background-color: theme(colors.vega.cdark.900);
  --ag-header-column-separator-color: theme(colors.vega.cdark.500);
  --ag-row-border-color: theme(colors.vega.cdark.600);
  --ag-row-hover-color: theme(colors.vega.cdark.800);
@@ -1,83 +1,31 @@
-import { render, screen, within } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { CandlesMenu } from './candles-menu';
-import {
-  useCandlesChartSettingsStore,
-  DEFAULT_CHART_SETTINGS,
-} from './use-candles-chart-settings';
-import { Overlay, Study, overlayLabels, studyLabels } from 'pennant';

 describe('CandlesMenu', () => {
-  const openDropdown = async () => {
-    await userEvent.click(
-      screen.getByRole('button', {
-        name: 'Indicators',
-      })
-    );
-  };
-
-  beforeEach(() => {
-    // clear store each time to avoid conditional testing of defaults
-    useCandlesChartSettingsStore.setState({ overlays: [], studies: [] });
-  });
-
-  it.each(Object.values(Overlay))('can set %s overlay', async (overlay) => {
-    render(<CandlesMenu />);
-
-    await openDropdown();
-
-    const menu = within(await screen.findByRole('menu'));
-
-    await userEvent.click(menu.getByText(overlayLabels[overlay as Overlay]));
-
-    // re-open the dropdown
-    await openDropdown();
-
-    expect(screen.getByText(overlayLabels[overlay as Overlay])).toHaveAttribute(
-      'data-state',
-      'checked'
-    );
-  });
-
-  it.each(Object.values(Study))('can set %s study', async (study) => {
-    render(<CandlesMenu />);
-
-    await openDropdown();
-
-    const menu = within(await screen.findByRole('menu'));
-
-    await userEvent.click(menu.getByText(studyLabels[study as Study]));
-
-    // re-open the dropdown
-    await openDropdown();
-
-    expect(screen.getByText(studyLabels[study as Study])).toHaveAttribute(
-      'data-state',
-      'checked'
-    );
-  });
-
-  it('should render with the correct default studies and overlays', async () => {
-    useCandlesChartSettingsStore.setState(DEFAULT_CHART_SETTINGS);
-
+  it('should render with the correct default studies', async () => {
    render(<CandlesMenu />);

    await userEvent.click(
      screen.getByRole('button', {
-        name: 'Indicators',
+        name: 'Studies',
      })
    );
-    const menu = within(await screen.findByRole('menu'));
+    expect(await screen.findByRole('menu')).toBeInTheDocument();
+    expect(screen.getByText('Volume')).toHaveAttribute('data-state', 'checked');
+    expect(screen.getByText('MACD')).toHaveAttribute('data-state', 'checked');
+  });

-    expect(menu.getByText(studyLabels.volume)).toHaveAttribute(
-      'data-state',
-      'checked'
+  it('should render with the correct default overlays', async () => {
+    render(<CandlesMenu />);
+
+    await userEvent.click(
+      screen.getByRole('button', {
+        name: 'Overlays',
+      })
    );
-    expect(menu.getByText(studyLabels.macd)).toHaveAttribute(
-      'data-state',
-      'checked'
-    );
-    expect(menu.getByText(overlayLabels.movingAverage)).toHaveAttribute(
+    expect(await screen.findByRole('menu')).toBeInTheDocument();
+    expect(screen.getByText('Moving average')).toHaveAttribute(
      'data-state',
      'checked'
    );
@@ -107,7 +107,7 @@ export const CandlesMenu = () => {
        trigger={
          <TradingDropdownTrigger className={triggerClasses}>
            <TradingButton {...triggerButtonProps}>
-              {t('Indicators')}
+              {t('Overlays')}
            </TradingButton>
          </TradingDropdownTrigger>
        }
@@ -132,6 +132,18 @@ export const CandlesMenu = () => {
              <TradingDropdownItemIndicator />
            </TradingDropdownCheckboxItem>
          ))}
+        </TradingDropdownContent>
+      </TradingDropdown>
+      <TradingDropdown
+        trigger={
+          <TradingDropdownTrigger className={triggerClasses}>
+            <TradingButton {...triggerButtonProps}>
+              {t('Studies')}
+            </TradingButton>
+          </TradingDropdownTrigger>
+        }
+      >
+        <TradingDropdownContent align={contentAlign}>
          {Object.values(Study).map((study) => (
            <TradingDropdownCheckboxItem
              key={study}
@@ -24,7 +24,7 @@ const STUDY_ORDER: Study[] = [
  Study.VOLUME,
 ];

-export const DEFAULT_CHART_SETTINGS = {
+const DEFAULT_CHART_SETTINGS = {
  interval: Interval.I15M,
  type: ChartType.CANDLE,
  overlays: [Overlay.MOVING_AVERAGE],
@@ -3,12 +3,7 @@ import throttle from 'lodash/throttle';
 import isEqualWith from 'lodash/isEqualWith';
 import { useApolloClient } from '@apollo/client';
 import type { OperationVariables } from '@apollo/client';
-import type {
-  Subscribe,
-  Load,
-  UpdateCallback,
-  PageInfo,
-} from './generic-data-provider';
+import type { Subscribe, Load, UpdateCallback } from './generic-data-provider';
 import { variablesIsEqualCustomizer } from './generic-data-provider';

 export interface useDataProviderParams<
@@ -17,23 +12,13 @@ export interface useDataProviderParams<
  Variables extends OperationVariables | undefined = undefined
 > {
  dataProvider: Subscribe<Data, Delta, Variables>;
-  update?: ({
-    delta,
-    data,
-    pageInfo,
-  }: {
-    delta?: Delta;
-    data: Data | null;
-    pageInfo: PageInfo | null;
-  }) => boolean;
+  update?: ({ delta, data }: { delta?: Delta; data: Data | null }) => boolean;
  insert?: ({
    insertionData,
    data,
-    pageInfo,
  }: {
    insertionData?: Data | null;
    data: Data | null;
-    pageInfo: PageInfo | null;
  }) => boolean;
  variables: Variables;
  skipUpdates?: boolean;
@@ -45,7 +30,7 @@ export interface useDataProviderParams<
 * @param dataProvider subscribe function created by makeDataProvider
 * @param update optional function called on each delta received in subscription, if returns true updated data will be not passed from hook (component handles updates internally)
 * @param variables optional
- * @returns state: data, loading, pageInfo, error, methods: flush (pass updated data to update function without delta), restart: () => void}};
+ * @returns state: data, loading, error, methods: flush (pass updated data to update function without delta), restart: () => void}};
 */
 export const useDataProvider = <
  Data,
@@ -63,7 +48,6 @@ export const useDataProvider = <
  const [data, setData] = useState<Data | null>(null);
  const [loading, setLoading] = useState<boolean>(!skip);
  const [error, setError] = useState<Error | undefined>(undefined);
-  const [pageInfo, setPageInfo] = useState<PageInfo | null>(null);
  const flushRef = useRef<(() => void) | undefined>(undefined);
  const reloadRef = useRef<((force?: boolean) => void) | undefined>(undefined);
  const loadRef = useRef<Load<Data> | undefined>(undefined);
@@ -109,7 +93,6 @@ export const useDataProvider = <
      isInsert,
      isUpdate,
      loaded,
-      pageInfo,
    } = args;
    setError(error);
    setLoading(!loaded && loading);
@@ -121,22 +104,21 @@ export const useDataProvider = <
        (skipUpdatesRef.current ||
          (!skipUpdatesRef.current &&
            updateRef.current &&
-            updateRef.current({ delta, data, pageInfo })))
+            updateRef.current({ delta, data })))
      ) {
        return;
      }
      if (
        isInsert &&
        insertRef.current &&
-        insertRef.current({ insertionData, data, pageInfo })
+        insertRef.current({ insertionData, data })
      ) {
        return;
      }
    }
    setData(data);
-    setPageInfo(pageInfo);
    if (!loading && !isUpdate && updateRef.current) {
-      updateRef.current({ data, pageInfo });
+      updateRef.current({ data });
    }
  }, []);

@@ -154,13 +136,15 @@ export const useDataProvider = <

  useEffect(() => {
    setData(null);
-    setPageInfo(null);
    setError(undefined);
    if (updateRef.current) {
-      updateRef.current({ data: null, pageInfo: null });
+      updateRef.current({ data: null });
    }
    if (skip) {
      setLoading(false);
+      if (updateRef.current) {
+        updateRef.current({ data: null });
+      }
      return;
    }
    setLoading(true);
@@ -181,7 +165,6 @@ export const useDataProvider = <
  }, [client, dataProvider, callback, variables, skip]);
  return {
    data,
-    pageInfo,
    loading,
    error,
    flush,
@@ -23,4 +23,3 @@ export * from './lib/type-helpers';
 export * from './lib/cells/grid-progress-bar';

 export * from './lib/use-datagrid-events';
-export * from './lib/pagination';
@@ -1,51 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import { Pagination } from './pagination';
-
-describe('Pagination', () => {
-  const props = {
-    pageInfo: {
-      hasNextPage: true,
-    },
-    count: 0,
-    onLoad: () => undefined,
-    showRetentionMessage: false,
-    hasDisplayedRows: false,
-  };
-
-  it('renders message for 0 rows', async () => {
-    const mockOnLoad = jest.fn();
-    render(<Pagination {...props} onLoad={mockOnLoad} />);
-    expect(screen.getByText('0 rows loaded')).toBeInTheDocument();
-    await userEvent.click(screen.getByRole('button', { name: 'Load more' }));
-    expect(mockOnLoad).toHaveBeenCalled();
-  });
-
-  it('renders mesasge for multiple rows', async () => {
-    const mockOnLoad = jest.fn();
-    const count = 10;
-    render(<Pagination {...props} count={count} onLoad={mockOnLoad} />);
-    expect(screen.getByText(`${count} rows loaded`)).toBeInTheDocument();
-    await userEvent.click(screen.getByRole('button', { name: 'Load more' }));
-    expect(mockOnLoad).toHaveBeenCalled();
-  });
-
-  it('renders message for a single row', async () => {
-    const mockOnLoad = jest.fn();
-    const count = 1;
-    render(<Pagination {...props} count={count} onLoad={mockOnLoad} />);
-    expect(screen.getByText(`${count} row loaded`)).toBeInTheDocument();
-    await userEvent.click(screen.getByRole('button', { name: 'Load more' }));
-    expect(mockOnLoad).toHaveBeenCalled();
-  });
-
-  it('renders the data rentention message', () => {
-    render(<Pagination {...props} showRetentionMessage={true} />);
-    expect(screen.getByText(/data node retention/)).toBeInTheDocument();
-  });
-
-  it('renders the row filter message', () => {
-    render(<Pagination {...props} count={1} hasDisplayedRows={false} />);
-    expect(screen.getByText(/No rows matching/)).toBeInTheDocument();
-  });
-});
@@ -1,53 +0,0 @@
-import { TradingButton as Button } from '@vegaprotocol/ui-toolkit';
-import { t } from '@vegaprotocol/i18n';
-
-export const Pagination = ({
-  count,
-  pageInfo,
-  onLoad,
-  hasDisplayedRows,
-  showRetentionMessage,
-}: {
-  count: number;
-  pageInfo: { hasNextPage?: boolean } | null;
-  onLoad: () => void;
-  hasDisplayedRows: boolean;
-  showRetentionMessage: boolean;
-}) => {
-  let rowMessage = '';
-
-  if (count && !pageInfo?.hasNextPage) {
-    rowMessage = t('all %s rows loaded', count.toString());
-  } else {
-    if (count === 1) {
-      rowMessage = t('%s row loaded', count.toString());
-    } else {
-      rowMessage = t('%s rows loaded', count.toString());
-    }
-  }
-
-  return (
-    <div className="flex items-center justify-between p-1 border-t border-default">
-      <div className="text-xs">
-        {false}
-        {showRetentionMessage &&
-          t(
-            'Depending on data node retention you may not be able see the "full" history'
-          )}
-      </div>
-      <div className="flex items-center text-xs">
-        <span>{rowMessage}</span>
-        {pageInfo?.hasNextPage ? (
-          <Button size="extra-small" className="ml-1" onClick={onLoad}>
-            {t('Load more')}
-          </Button>
-        ) : null}
-      </div>
-      {count && hasDisplayedRows === false ? (
-        <div className="absolute text-xs top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2">
-          {t('No rows matching selected filters')}
-        </div>
-      ) : null}
-    </div>
-  );
-};
@@ -26,7 +26,11 @@ import {
  EST_TOTAL_MARGIN_TOOLTIP_TEXT,
  MARGIN_ACCOUNT_TOOLTIP_TEXT,
 } from '../../constants';
-import { useEstimateFees } from '../../hooks/use-estimate-fees';
+import {
+  sumFees,
+  sumFeesDiscounts,
+  useEstimateFees,
+} from '../../hooks/use-estimate-fees';
 import { KeyValue } from './key-value';
 import {
  Accordion,
@@ -40,7 +44,6 @@ import {
 import classNames from 'classnames';
 import BigNumber from 'bignumber.js';
 import { FeesBreakdown } from '../fees-breakdown';
-import { getTotalDiscountFactor, getDiscountedFee } from '../discounts';

 const emptyValue = '-';

@@ -60,49 +63,48 @@ export const DealTicketFeeDetails = ({
  const feeEstimate = useEstimateFees(order, isMarketInAuction);
  const asset = getAsset(market);
  const { decimals: assetDecimals, quantum } = asset;
+  const totalFees = feeEstimate?.fees && sumFees(feeEstimate?.fees);
+  const feesDiscounts =
+    feeEstimate?.fees && sumFeesDiscounts(feeEstimate?.fees);

-  const totalDiscountFactor = getTotalDiscountFactor(feeEstimate);
-  const totalDiscountedFeeAmount =
-    feeEstimate?.totalFeeAmount &&
-    getDiscountedFee(
-      feeEstimate.totalFeeAmount,
-      feeEstimate.referralDiscountFactor,
-      feeEstimate.volumeDiscountFactor
-    ).discountedFee;
-
+  const totalPercentageDiscount =
+    feesDiscounts &&
+    totalFees &&
+    feesDiscounts.total !== '0' &&
+    totalFees !== '0' &&
+    new BigNumber(feesDiscounts.total)
+      .dividedBy(BigNumber.sum(totalFees, feesDiscounts.total))
+      .times(100);
  return (
    <KeyValue
      label={t('Fees')}
      value={
-        totalDiscountedFeeAmount &&
-        `~${formatValue(totalDiscountedFeeAmount, assetDecimals)}`
+        feeEstimate?.totalFeeAmount &&
+        `~${formatValue(feeEstimate?.totalFeeAmount, assetDecimals)}`
      }
      formattedValue={
        <>
-          {totalDiscountFactor && (
+          {totalPercentageDiscount && (
            <Pill size="xxs" intent={Intent.Warning} className="mr-1">
-              -
-              {formatNumberPercentage(
-                new BigNumber(totalDiscountFactor).multipliedBy(100),
-                2
-              )}
+              -{formatNumberPercentage(totalPercentageDiscount, 2)}
            </Pill>
          )}
-          {totalDiscountedFeeAmount &&
-            `~${formatValue(totalDiscountedFeeAmount, assetDecimals, quantum)}`}
+          {feeEstimate?.totalFeeAmount &&
+            `~${formatValue(
+              feeEstimate?.totalFeeAmount,
+              assetDecimals,
+              quantum
+            )}`}
        </>
      }
      labelDescription={
        <>
-          <p className="mb-2">
+          <span>
            {t(
              `An estimate of the most you would be expected to pay in fees, in the market's settlement asset ${assetSymbol}. Fees estimated are "taker" fees and will only be payable if the order trades aggressively. Rebate equal to the maker portion will be paid to the trader if the order trades passively.`
            )}
-          </p>
+          </span>
          <FeesBreakdown
-            totalFeeAmount={feeEstimate?.totalFeeAmount}
-            referralDiscountFactor={feeEstimate?.referralDiscountFactor}
-            volumeDiscountFactor={feeEstimate?.volumeDiscountFactor}
            fees={feeEstimate?.fees}
            feeFactors={market.fees.factors}
            symbol={assetSymbol}
@@ -109,7 +109,7 @@ describe('DealTicket', () => {
        variables: {
          partyId: 'pubKey',
          filter: { liveOnly: true },
-          pagination: { first: 1000 },
+          pagination: { first: 5000 },
        },
      },
      result: {
@@ -1,66 +0,0 @@
-import { getDiscountedFee, getTotalDiscountFactor } from './discounts';
-
-describe('getDiscountedFee', () => {
-  it('calculates values if volumeDiscount or referralDiscount is undefined', () => {
-    expect(getDiscountedFee('100')).toEqual({
-      discountedFee: '100',
-      volumeDiscount: '0',
-      referralDiscount: '0',
-    });
-    expect(getDiscountedFee('100', undefined, '0.1')).toEqual({
-      discountedFee: '90',
-      volumeDiscount: '10',
-      referralDiscount: '0',
-    });
-    expect(getDiscountedFee('100', '0.1', undefined)).toEqual({
-      discountedFee: '90',
-      volumeDiscount: '0',
-      referralDiscount: '10',
-    });
-  });
-
-  it('calculates values using volumeDiscount or referralDiscount', () => {
-    expect(getDiscountedFee('', '0.1', '0.2')).toEqual({
-      discountedFee: '',
-      volumeDiscount: '0',
-      referralDiscount: '0',
-    });
-  });
-});
-
-describe('getTotalDiscountFactor', () => {
-  it('returns 0 if discounts are 0', () => {
-    expect(
-      getTotalDiscountFactor({
-        volumeDiscountFactor: '0',
-        referralDiscountFactor: '0',
-      })
-    ).toEqual(0);
-  });
-
-  it('returns volumeDiscountFactor if referralDiscountFactor is 0', () => {
-    expect(
-      getTotalDiscountFactor({
-        volumeDiscountFactor: '0.1',
-        referralDiscountFactor: '0',
-      })
-    ).toEqual(0.1);
-  });
-  it('returns referralDiscountFactor if volumeDiscountFactor is 0', () => {
-    expect(
-      getTotalDiscountFactor({
-        volumeDiscountFactor: '0',
-        referralDiscountFactor: '0.1',
-      })
-    ).toEqual(0.1);
-  });
-
-  it('calculates discount using referralDiscountFactor and volumeDiscountFactor', () => {
-    expect(
-      getTotalDiscountFactor({
-        volumeDiscountFactor: '0.2',
-        referralDiscountFactor: '0.1',
-      })
-    ).toBeCloseTo(0.28);
-  });
-});
@@ -1,54 +0,0 @@
-import BigNumber from 'bignumber.js';
-
-export const getDiscountedFee = (
-  feeAmount: string,
-  referralDiscountFactor?: string,
-  volumeDiscountFactor?: string
-) => {
-  if (
-    ((!referralDiscountFactor || referralDiscountFactor === '0') &&
-      (!volumeDiscountFactor || volumeDiscountFactor === '0')) ||
-    !feeAmount ||
-    feeAmount === '0'
-  ) {
-    return {
-      discountedFee: feeAmount,
-      volumeDiscount: '0',
-      referralDiscount: '0',
-    };
-  }
-  const referralDiscount = new BigNumber(referralDiscountFactor || '0')
-    .multipliedBy(feeAmount)
-    .toFixed(0, BigNumber.ROUND_FLOOR);
-  const volumeDiscount = new BigNumber(volumeDiscountFactor || '0')
-    .multipliedBy((BigInt(feeAmount) - BigInt(referralDiscount)).toString())
-    .toFixed(0, BigNumber.ROUND_FLOOR);
-  const discountedFee = (
-    BigInt(feeAmount || '0') -
-    BigInt(referralDiscount) -
-    BigInt(volumeDiscount)
-  ).toString();
-  return {
-    referralDiscount,
-    volumeDiscount,
-    discountedFee,
-  };
-};
-
-export const getTotalDiscountFactor = (feeEstimate?: {
-  volumeDiscountFactor?: string;
-  referralDiscountFactor?: string;
-}) => {
-  if (!feeEstimate) {
-    return 0;
-  }
-  const volumeFactor = Number(feeEstimate?.volumeDiscountFactor) || 0;
-  const referralFactor = Number(feeEstimate?.referralDiscountFactor) || 0;
-  if (!volumeFactor) {
-    return referralFactor;
-  }
-  if (!referralFactor) {
-    return volumeFactor;
-  }
-  return 1 - (1 - volumeFactor) * (1 - referralFactor);
-};
@@ -6,7 +6,7 @@ import {
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import BigNumber from 'bignumber.js';
-import { getDiscountedFee } from '../discounts';
+import { sumFees, sumFeesDiscounts } from '../../hooks';

 const formatValue = (
  value: string | number | null | undefined,
@@ -24,7 +24,7 @@ const FeesBreakdownItem = ({
  decimals,
 }: {
  label: string;
-  factor?: string;
+  factor?: BigNumber;
  value: string;
  symbol?: string;
  decimals: number;
@@ -43,86 +43,76 @@ const FeesBreakdownItem = ({
 );

 export const FeesBreakdown = ({
-  totalFeeAmount,
  fees,
  feeFactors,
  symbol,
  decimals,
-  referralDiscountFactor,
-  volumeDiscountFactor,
 }: {
-  totalFeeAmount?: string;
  fees?: TradeFee;
  feeFactors?: FeeFactors;
  symbol?: string;
  decimals: number;
-  referralDiscountFactor?: string;
-  volumeDiscountFactor?: string;
 }) => {
-  if (!fees || !totalFeeAmount || totalFeeAmount === '0') return null;
-
-  const { discountedFee: discountedInfrastructureFee } = getDiscountedFee(
-    fees.infrastructureFee,
-    referralDiscountFactor,
-    volumeDiscountFactor
-  );
-
-  const { discountedFee: discountedLiquidityFee } = getDiscountedFee(
-    fees.liquidityFee,
-    referralDiscountFactor,
-    volumeDiscountFactor
-  );
-
-  const { discountedFee: discountedMakerFee } = getDiscountedFee(
-    fees.makerFee,
-    referralDiscountFactor,
-    volumeDiscountFactor
-  );
-
-  const { volumeDiscount, referralDiscount } = getDiscountedFee(
-    totalFeeAmount,
-    referralDiscountFactor,
-    volumeDiscountFactor
-  );
-
+  if (!fees) return null;
+  const totalFees = sumFees(fees);
+  const {
+    total: totalDiscount,
+    referral: referralDiscount,
+    volume: volumeDiscount,
+  } = sumFeesDiscounts(fees);
+  if (totalFees === '0') return null;
  return (
    <dl className="grid grid-cols-6">
      <FeesBreakdownItem
        label={t('Infrastructure fee')}
-        factor={feeFactors?.infrastructureFee}
-        value={discountedInfrastructureFee}
+        factor={
+          feeFactors?.infrastructureFee
+            ? new BigNumber(feeFactors?.infrastructureFee)
+            : undefined
+        }
+        value={fees.infrastructureFee}
        symbol={symbol}
        decimals={decimals}
      />

      <FeesBreakdownItem
        label={t('Liquidity fee')}
-        factor={feeFactors?.liquidityFee}
-        value={discountedLiquidityFee}
+        factor={
+          feeFactors?.liquidityFee
+            ? new BigNumber(feeFactors?.liquidityFee)
+            : undefined
+        }
+        value={fees.liquidityFee}
        symbol={symbol}
        decimals={decimals}
      />

      <FeesBreakdownItem
        label={t('Maker fee')}
-        factor={feeFactors?.makerFee}
-        value={discountedMakerFee}
+        factor={
+          feeFactors?.makerFee ? new BigNumber(feeFactors?.makerFee) : undefined
+        }
+        value={fees.makerFee}
        symbol={symbol}
        decimals={decimals}
      />
-      {volumeDiscountFactor && volumeDiscount !== '0' && (
+      {volumeDiscount && volumeDiscount !== '0' && (
        <FeesBreakdownItem
          label={t('Volume discount')}
-          factor={volumeDiscountFactor}
+          factor={new BigNumber(volumeDiscount).dividedBy(
+            BigNumber.sum(totalFees, totalDiscount)
+          )}
          value={volumeDiscount}
          symbol={symbol}
          decimals={decimals}
        />
      )}
-      {referralDiscountFactor && referralDiscount !== '0' && (
+      {referralDiscount && referralDiscount !== '0' && (
        <FeesBreakdownItem
          label={t('Referral discount')}
-          factor={referralDiscountFactor}
+          factor={new BigNumber(referralDiscount).dividedBy(
+            BigNumber.sum(totalFees, totalDiscount)
+          )}
          value={referralDiscount}
          symbol={symbol}
          decimals={decimals}
@@ -130,8 +120,8 @@ export const FeesBreakdown = ({
      )}
      <FeesBreakdownItem
        label={t('Total fees')}
-        factor={feeFactors ? sumFeesFactors(feeFactors)?.toString() : undefined}
-        value={totalFeeAmount}
+        factor={feeFactors ? sumFeesFactors(feeFactors) : undefined}
+        value={totalFees}
        symbol={symbol}
        decimals={decimals}
      />
@@ -31,25 +31,4 @@ query EstimateFees(
    }
    totalFeeAmount
  }
-  epoch {
-    id
-  }
-  volumeDiscountStats(partyId: $partyId, pagination: { last: 1 }) {
-    edges {
-      node {
-        atEpoch
-        discountFactor
-        runningVolume
-      }
-    }
-  }
-  referralSetStats(partyId: $partyId, pagination: { last: 1 }) {
-    edges {
-      node {
-        atEpoch
-        discountFactor
-        referralSetRunningNotionalTakerVolume
-      }
-    }
-  }
 }
@@ -15,7 +15,7 @@ export type EstimateFeesQueryVariables = Types.Exact<{
 }>;


-export type EstimateFeesQuery = { __typename?: 'Query', estimateFees: { __typename?: 'FeeEstimate', totalFeeAmount: string, fees: { __typename?: 'TradeFee', makerFee: string, infrastructureFee: string, liquidityFee: string, makerFeeReferralDiscount?: string | null, makerFeeVolumeDiscount?: string | null, infrastructureFeeReferralDiscount?: string | null, infrastructureFeeVolumeDiscount?: string | null, liquidityFeeReferralDiscount?: string | null, liquidityFeeVolumeDiscount?: string | null } }, epoch: { __typename?: 'Epoch', id: string }, volumeDiscountStats: { __typename?: 'VolumeDiscountStatsConnection', edges: Array<{ __typename?: 'VolumeDiscountStatsEdge', node: { __typename?: 'VolumeDiscountStats', atEpoch: number, discountFactor: string, runningVolume: string } } | null> }, referralSetStats: { __typename?: 'ReferralSetStatsConnection', edges: Array<{ __typename?: 'ReferralSetStatsEdge', node: { __typename?: 'ReferralSetStats', atEpoch: number, discountFactor: string, referralSetRunningNotionalTakerVolume: string } } | null> } };
+export type EstimateFeesQuery = { __typename?: 'Query', estimateFees: { __typename?: 'FeeEstimate', totalFeeAmount: string, fees: { __typename?: 'TradeFee', makerFee: string, infrastructureFee: string, liquidityFee: string, makerFeeReferralDiscount?: string | null, makerFeeVolumeDiscount?: string | null, infrastructureFeeReferralDiscount?: string | null, infrastructureFeeVolumeDiscount?: string | null, liquidityFeeReferralDiscount?: string | null, liquidityFeeVolumeDiscount?: string | null } } };


 export const EstimateFeesDocument = gql`
@@ -43,27 +43,6 @@ export const EstimateFeesDocument = gql`
    }
    totalFeeAmount
  }
-  epoch {
-    id
-  }
-  volumeDiscountStats(partyId: $partyId, pagination: {last: 1}) {
-    edges {
-      node {
-        atEpoch
-        discountFactor
-        runningVolume
-      }
-    }
-  }
-  referralSetStats(partyId: $partyId, pagination: {last: 1}) {
-    edges {
-      node {
-        atEpoch
-        discountFactor
-        referralSetRunningNotionalTakerVolume
-      }
-    }
-  }
 }
    `;

@@ -6,15 +6,6 @@ export const estimateFeesQuery = (
  override?: PartialDeep<EstimateFeesQuery>
 ): EstimateFeesQuery => {
  const defaultResult: EstimateFeesQuery = {
-    epoch: {
-      id: '1',
-    },
-    referralSetStats: {
-      edges: [],
-    },
-    volumeDiscountStats: {
-      edges: [],
-    },
    estimateFees: {
      __typename: 'FeeEstimate',
      totalFeeAmount: '0.0006',
@@ -5,31 +5,6 @@ import { Side, OrderTimeInForce, OrderType } from '@vegaprotocol/types';
 import type { EstimateFeesQuery } from './__generated__/EstimateOrder';

 const data: EstimateFeesQuery = {
-  epoch: {
-    id: '2',
-  },
-  volumeDiscountStats: {
-    edges: [
-      {
-        node: {
-          atEpoch: 1,
-          discountFactor: '0.1',
-          runningVolume: '100',
-        },
-      },
-    ],
-  },
-  referralSetStats: {
-    edges: [
-      {
-        node: {
-          atEpoch: 1,
-          discountFactor: '0.2',
-          referralSetRunningNotionalTakerVolume: '100',
-        },
-      },
-    ],
-  },
  estimateFees: {
    totalFeeAmount: '120',
    fees: {
@@ -79,8 +54,6 @@ describe('useEstimateFees', () => {
        liquidityFee: '0',
        makerFee: '0',
      },
-      referralDiscountFactor: '0',
-      volumeDiscountFactor: '0',
    });
    expect(mockUseEstimateFeesQuery.mock.lastCall?.[0].skip).toBeTruthy();
  });
@@ -112,46 +85,6 @@ describe('useEstimateFees', () => {
        makerFeeReferralDiscount: '5',
        makerFeeVolumeDiscount: '6',
      },
-      referralDiscountFactor: '0',
-      volumeDiscountFactor: '0',
    });
  });
-
-  it('returns 0 discounts if discount stats are not at the current epoch', () => {
-    const { result } = renderHook(() =>
-      useEstimateFees(
-        {
-          marketId: 'marketId',
-          side: Side.SIDE_BUY,
-          size: '1',
-          price: '1',
-          timeInForce: OrderTimeInForce.TIME_IN_FORCE_FOK,
-          type: OrderType.TYPE_LIMIT,
-        },
-        true
-      )
-    );
-    expect(result.current?.referralDiscountFactor).toEqual('0');
-    expect(result.current?.volumeDiscountFactor).toEqual('0');
-  });
-
-  it('returns discounts', () => {
-    data.epoch.id = '1';
-    const { result } = renderHook(() =>
-      useEstimateFees(
-        {
-          marketId: 'marketId',
-          side: Side.SIDE_BUY,
-          size: '1',
-          price: '1',
-          timeInForce: OrderTimeInForce.TIME_IN_FORCE_FOK,
-          type: OrderType.TYPE_LIMIT,
-        },
-        true
-      )
-    );
-
-    expect(result.current?.referralDiscountFactor).toEqual('0.2');
-    expect(result.current?.volumeDiscountFactor).toEqual('0.1');
-  });
 });
@@ -5,22 +5,39 @@ import type { EstimateFeesQuery } from './__generated__/EstimateOrder';
 import { useEstimateFeesQuery } from './__generated__/EstimateOrder';

 const divideByTwo = (n: string) => (BigInt(n) / BigInt(2)).toString();
+export const sumFeesDiscounts = (
+  fees: EstimateFeesQuery['estimateFees']['fees']
+) => {
+  const volume = (
+    BigInt(fees.makerFeeVolumeDiscount || '0') +
+    BigInt(fees.infrastructureFeeVolumeDiscount || '0') +
+    BigInt(fees.liquidityFeeVolumeDiscount || '0')
+  ).toString();
+  const referral = (
+    BigInt(fees.makerFeeReferralDiscount || '0') +
+    BigInt(fees.infrastructureFeeReferralDiscount || '0') +
+    BigInt(fees.liquidityFeeReferralDiscount || '0')
+  ).toString();
+  return {
+    volume,
+    referral,
+    total: (BigInt(volume) + BigInt(referral)).toString(),
+  };
+};
+
+export const sumFees = (fees: EstimateFeesQuery['estimateFees']['fees']) =>
+  (
+    BigInt(fees.makerFee || '0') +
+    BigInt(fees.infrastructureFee || '0') +
+    BigInt(fees.liquidityFee || '0')
+  ).toString();

 export const useEstimateFees = (
  order?: OrderSubmissionBody['orderSubmission'],
  isMarketInAuction?: boolean
-):
-  | (EstimateFeesQuery['estimateFees'] & {
-      referralDiscountFactor: string;
-      volumeDiscountFactor: string;
-    })
-  | undefined => {
+): EstimateFeesQuery['estimateFees'] | undefined => {
  const { pubKey } = useVegaWallet();
-  const {
-    data: currentData,
-    previousData,
-    loading,
-  } = useEstimateFeesQuery({
+  const { data } = useEstimateFeesQuery({
    variables: order && {
      marketId: order.marketId,
      partyId: pubKey || '',
@@ -33,21 +50,8 @@ export const useEstimateFees = (
    fetchPolicy: 'no-cache',
    skip: !pubKey || !order?.size || !order?.price || order.postOnly,
  });
-  const data = loading ? currentData || previousData : currentData;
-  const volumeDiscountFactor =
-    (data?.volumeDiscountStats.edges[0]?.node.atEpoch.toString() ===
-      data?.epoch.id &&
-      data?.volumeDiscountStats.edges[0]?.node.discountFactor) ||
-    '0';
-  const referralDiscountFactor =
-    (data?.referralSetStats.edges[0]?.node.atEpoch.toString() ===
-      data?.epoch.id &&
-      data?.referralSetStats.edges[0]?.node.discountFactor) ||
-    '0';
  if (order?.postOnly) {
    return {
-      volumeDiscountFactor,
-      referralDiscountFactor,
      totalFeeAmount: '0',
      fees: {
        infrastructureFee: '0',
@@ -56,13 +60,8 @@ export const useEstimateFees = (
      },
    };
  }
-  if (!data?.estimateFees) {
-    return undefined;
-  }
-  return isMarketInAuction
+  return isMarketInAuction && data?.estimateFees
    ? {
-        volumeDiscountFactor,
-        referralDiscountFactor,
        totalFeeAmount: divideByTwo(data.estimateFees.totalFeeAmount),
        fees: {
          infrastructureFee: divideByTwo(
@@ -92,9 +91,5 @@ export const useEstimateFees = (
            divideByTwo(data.estimateFees.fees.makerFeeVolumeDiscount),
        },
      }
-    : {
-        volumeDiscountFactor,
-        referralDiscountFactor,
-        ...data.estimateFees,
-      };
+    : data?.estimateFees;
 };
@@ -42,12 +42,8 @@ fragment FillEdge on TradeEdge {
  cursor
 }

-query Fills(
-  $filter: TradesFilter
-  $pagination: Pagination
-  $dateRange: DateRange
-) {
-  trades(filter: $filter, dateRange: $dateRange, pagination: $pagination) {
+query Fills($filter: TradesFilter, $pagination: Pagination) {
+  trades(filter: $filter, pagination: $pagination) {
    edges {
      ...FillEdge
    }
@@ -12,7 +12,6 @@ export type FillEdgeFragment = { __typename?: 'TradeEdge', cursor: string, node:
 export type FillsQueryVariables = Types.Exact<{
  filter?: Types.InputMaybe<Types.TradesFilter>;
  pagination?: Types.InputMaybe<Types.Pagination>;
-  dateRange?: Types.InputMaybe<Types.DateRange>;
 }>;


@@ -96,8 +95,8 @@ export const FillUpdateFieldsFragmentDoc = gql`
 }
    ${TradeFeeFieldsFragmentDoc}`;
 export const FillsDocument = gql`
-    query Fills($filter: TradesFilter, $pagination: Pagination, $dateRange: DateRange) {
-  trades(filter: $filter, dateRange: $dateRange, pagination: $pagination) {
+    query Fills($filter: TradesFilter, $pagination: Pagination) {
+  trades(filter: $filter, pagination: $pagination) {
    edges {
      ...FillEdge
    }
@@ -125,7 +124,6 @@ export const FillsDocument = gql`
 *   variables: {
 *      filter: // value for 'filter'
 *      pagination: // value for 'pagination'
- *      dateRange: // value for 'dateRange'
 *   },
 * });
 */
@@ -1,9 +1,8 @@
 import type { AgGridReact } from 'ag-grid-react';
-import { useCallback, useRef, useState } from 'react';
+import { useRef } from 'react';
 import { t } from '@vegaprotocol/i18n';
 import { FillsTable } from './fills-table';
 import type { useDataGridEvents } from '@vegaprotocol/datagrid';
-import { Pagination } from '@vegaprotocol/datagrid';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import type * as Schema from '@vegaprotocol/types';
 import { fillsWithMarketProvider } from './fills-data-provider';
@@ -23,42 +22,26 @@ export const FillsManager = ({
  const filter: Schema.TradesFilter | Schema.TradesSubscriptionFilter = {
    partyIds: [partyId],
  };
-  const [hasDisplayedRow, setHasDisplayedRow] = useState<boolean | undefined>(
-    undefined
-  );
-  const { onFilterChanged, ...props } = gridProps || {};
-  const onRowDataUpdated = useCallback(
-    ({ api }: { api: AgGridReact['api'] }) => {
-      setHasDisplayedRow(!!api.getDisplayedRowCount());
-    },
-    []
-  );
-  const { data, error, load, pageInfo } = useDataProvider({
+  const { data, error } = useDataProvider({
    dataProvider: fillsWithMarketProvider,
+    update: ({ data }) => {
+      if (data?.length && gridRef.current?.api) {
+        gridRef.current?.api.setRowData(data);
+        return true;
+      }
+      return false;
+    },
    variables: { filter },
  });
+
  return (
-    <div className="flex flex-col h-full">
-      <FillsTable
-        ref={gridRef}
-        rowData={data}
-        onFilterChanged={(event) => {
-          onRowDataUpdated(event);
-          onFilterChanged(event);
-        }}
-        onRowDataUpdated={onRowDataUpdated}
-        partyId={partyId}
-        onMarketClick={onMarketClick}
-        overlayNoRowsTemplate={error ? error.message : t('No fills')}
-        {...props}
-      />
-      <Pagination
-        count={data?.length || 0}
-        pageInfo={pageInfo}
-        showRetentionMessage={true}
-        onLoad={load}
-        hasDisplayedRows={hasDisplayedRow || false}
-      />
-    </div>
+    <FillsTable
+      ref={gridRef}
+      rowData={data}
+      partyId={partyId}
+      onMarketClick={onMarketClick}
+      overlayNoRowsTemplate={error ? error.message : t('No fills')}
+      {...gridProps}
+    />
  );
 };
@@ -37,14 +37,6 @@ const defaultFill: PartialDeep<Trade> = {
 };
 describe('FillsTable', () => {
  it('correct columns are rendered', async () => {
-    // 7005-FILL-001
-    // 7005-FILL-002
-    // 7005-FILL-003
-    // 7005-FILL-004
-    // 7005-FILL-005
-    // 7005-FILL-006
-    // 7005-FILL-007
-    // 7005-FILL-008
    await act(async () => {
      render(<FillsTable partyId="party-id" rowData={[generateFill()]} />);
    });
@@ -20,7 +20,6 @@ import {
  negativeClassNames,
  MarketNameCell,
  COL_DEFS,
-  DateRangeFilter,
 } from '@vegaprotocol/datagrid';
 import type {
  VegaValueFormatterParams,
@@ -121,7 +120,6 @@ export const FillsTable = forwardRef<AgGridReact, Props>(
        },
        {
          headerName: t('Date'),
-          filter: DateRangeFilter,
          field: 'createdAt',
          valueFormatter: ({
            value,
@@ -43,7 +43,7 @@ export const fundingPaymentsProvider = makeDataProvider<
  pagination: {
    getPageInfo,
    append,
-    first: 1000,
+    first: 100,
  },
 });

@@ -1,8 +1,7 @@
 import type { AgGridReact } from 'ag-grid-react';
-import { useCallback, useRef, useState } from 'react';
+import { useRef } from 'react';
 import { t } from '@vegaprotocol/i18n';
 import { FundingPaymentsTable } from './funding-payments-table';
-import { Pagination } from '@vegaprotocol/datagrid';
 import type { useDataGridEvents } from '@vegaprotocol/datagrid';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import { fundingPaymentsWithMarketProvider } from './funding-payments-data-provider';
@@ -21,17 +20,7 @@ export const FundingPaymentsManager = ({
  gridProps,
 }: FundingPaymentsManagerProps) => {
  const gridRef = useRef<AgGridReact | null>(null);
-  const [hasDisplayedRow, setHasDisplayedRow] = useState<boolean | undefined>(
-    undefined
-  );
-  const { onFilterChanged, ...props } = gridProps || {};
-  const onRowDataUpdated = useCallback(
-    ({ api }: { api: AgGridReact['api'] }) => {
-      setHasDisplayedRow(!!api.getDisplayedRowCount());
-    },
-    []
-  );
-  const { data, error, load, pageInfo } = useDataProvider({
+  const { data, error } = useDataProvider({
    dataProvider: fundingPaymentsWithMarketProvider,
    update: ({ data }) => {
      if (data?.length && gridRef.current?.api) {
@@ -44,26 +33,12 @@ export const FundingPaymentsManager = ({
  });

  return (
-    <div className="flex flex-col h-full">
-      <FundingPaymentsTable
-        ref={gridRef}
-        rowData={data}
-        onMarketClick={onMarketClick}
-        onFilterChanged={(event) => {
-          onRowDataUpdated(event);
-          onFilterChanged(event);
-        }}
-        onRowDataUpdated={onRowDataUpdated}
-        overlayNoRowsTemplate={error ? error.message : t('No funding payments')}
-        {...props}
-      />
-      <Pagination
-        count={data?.length || 0}
-        pageInfo={pageInfo}
-        onLoad={load}
-        hasDisplayedRows={hasDisplayedRow || false}
-        showRetentionMessage={true}
-      />
-    </div>
+    <FundingPaymentsTable
+      ref={gridRef}
+      rowData={data}
+      onMarketClick={onMarketClick}
+      overlayNoRowsTemplate={error ? error.message : t('No funding payments')}
+      {...gridProps}
+    />
  );
 };
@@ -4,7 +4,7 @@ fragment LiquidityProvisionFields on LiquidityProvision {
  id
  party {
    id
-    accountsConnection(marketId: $marketId) {
+    accountsConnection(marketId: $marketId, type: ACCOUNT_TYPE_BOND) {
      edges {
        node {
          type
@@ -20,36 +20,12 @@ fragment LiquidityProvisionFields on LiquidityProvision {
  status
 }

-query PaidFees($marketId: ID) {
-  paidLiquidityFees(marketId: $marketId) {
-    edges {
-      node {
-        marketId
-        assetId
-        epoch
-        totalFeesPaid
-      }
-    }
-  }
-}
-
 query LiquidityProvisions($marketId: ID!) {
  market(id: $marketId) {
-    liquiditySLAParameters {
-      priceRange
-      commitmentMinTimeFraction
-      performanceHysteresisEpochs
-      slaCompetitionFactor
-    }
-    liquidityProvisions(live: true) {
+    liquidityProvisionsConnection(live: true) {
      edges {
        node {
-          current {
-            ...LiquidityProvisionFields
-          }
-          pending {
-            ...LiquidityProvisionFields
-          }
+          ...LiquidityProvisionFields
        }
      }
    }
@@ -1,12 +1,10 @@
 fragment MarketNode on Market {
  id
-  liquidityProvisions(live: true) {
+  liquidityProvisionsConnection(live: true) {
    edges {
      node {
-        current {
-          commitmentAmount
-          fee
-        }
+        commitmentAmount
+        fee
      }
    }
  }
@@ -5,19 +5,12 @@ import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
 export type LiquidityProvisionFieldsFragment = { __typename?: 'LiquidityProvision', id: string, createdAt: any, updatedAt?: any | null, commitmentAmount: string, fee: string, status: Types.LiquidityProvisionStatus, party: { __typename?: 'Party', id: string, accountsConnection?: { __typename?: 'AccountsConnection', edges?: Array<{ __typename?: 'AccountEdge', node: { __typename?: 'AccountBalance', type: Types.AccountType, balance: string } } | null> | null } | null } };

-export type PaidFeesQueryVariables = Types.Exact<{
-  marketId?: Types.InputMaybe<Types.Scalars['ID']>;
-}>;
-
-
-export type PaidFeesQuery = { __typename?: 'Query', paidLiquidityFees?: { __typename?: 'PaidLiquidityFeesConnection', edges: Array<{ __typename?: 'PaidLiquidityFeesEdge', node: { __typename?: 'PaidLiquidityFees', marketId: string, assetId: string, epoch: number, totalFeesPaid: string } } | null> } | null };
-
 export type LiquidityProvisionsQueryVariables = Types.Exact<{
  marketId: Types.Scalars['ID'];
 }>;


-export type LiquidityProvisionsQuery = { __typename?: 'Query', market?: { __typename?: 'Market', liquiditySLAParameters?: { __typename?: 'LiquiditySLAParameters', priceRange: string, commitmentMinTimeFraction: string, performanceHysteresisEpochs: number, slaCompetitionFactor: string } | null, liquidityProvisions?: { __typename?: 'LiquidityProvisionsWithPendingConnection', edges?: Array<{ __typename?: 'LiquidityProvisionWithPendingEdge', node: { __typename?: 'LiquidityProvisionWithPending', current: { __typename?: 'LiquidityProvision', id: string, createdAt: any, updatedAt?: any | null, commitmentAmount: string, fee: string, status: Types.LiquidityProvisionStatus, party: { __typename?: 'Party', id: string, accountsConnection?: { __typename?: 'AccountsConnection', edges?: Array<{ __typename?: 'AccountEdge', node: { __typename?: 'AccountBalance', type: Types.AccountType, balance: string } } | null> | null } | null } }, pending?: { __typename?: 'LiquidityProvision', id: string, createdAt: any, updatedAt?: any | null, commitmentAmount: string, fee: string, status: Types.LiquidityProvisionStatus, party: { __typename?: 'Party', id: string, accountsConnection?: { __typename?: 'AccountsConnection', edges?: Array<{ __typename?: 'AccountEdge', node: { __typename?: 'AccountBalance', type: Types.AccountType, balance: string } } | null> | null } | null } } | null } } | null> | null } | null } | null };
+export type LiquidityProvisionsQuery = { __typename?: 'Query', market?: { __typename?: 'Market', liquidityProvisionsConnection?: { __typename?: 'LiquidityProvisionsConnection', edges?: Array<{ __typename?: 'LiquidityProvisionsEdge', node: { __typename?: 'LiquidityProvision', id: string, createdAt: any, updatedAt?: any | null, commitmentAmount: string, fee: string, status: Types.LiquidityProvisionStatus, party: { __typename?: 'Party', id: string, accountsConnection?: { __typename?: 'AccountsConnection', edges?: Array<{ __typename?: 'AccountEdge', node: { __typename?: 'AccountBalance', type: Types.AccountType, balance: string } } | null> | null } | null } } } | null> | null } | null } | null };

 export type LiquidityProviderFeeShareFieldsFragment = { __typename?: 'LiquidityProviderFeeShare', equityLikeShare: string, averageEntryValuation: string, averageScore: string, virtualStake: string };

@@ -37,7 +30,7 @@ export const LiquidityProvisionFieldsFragmentDoc = gql`
  id
  party {
    id
-    accountsConnection(marketId: $marketId) {
+    accountsConnection(marketId: $marketId, type: ACCOUNT_TYPE_BOND) {
      edges {
        node {
          type
@@ -86,66 +79,13 @@ export const LiquidityProviderFieldsFragmentDoc = gql`
 }
    ${LiquidityProviderFeeShareFieldsFragmentDoc}
 ${LiquidityProviderSLAFieldsFragmentDoc}`;
-export const PaidFeesDocument = gql`
-    query PaidFees($marketId: ID) {
-  paidLiquidityFees(marketId: $marketId) {
-    edges {
-      node {
-        marketId
-        assetId
-        epoch
-        totalFeesPaid
-      }
-    }
-  }
-}
-    `;
-
-/**
- * __usePaidFeesQuery__
- *
- * To run a query within a React component, call `usePaidFeesQuery` and pass it any options that fit your needs.
- * When your component renders, `usePaidFeesQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = usePaidFeesQuery({
- *   variables: {
- *      marketId: // value for 'marketId'
- *   },
- * });
- */
-export function usePaidFeesQuery(baseOptions?: Apollo.QueryHookOptions<PaidFeesQuery, PaidFeesQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<PaidFeesQuery, PaidFeesQueryVariables>(PaidFeesDocument, options);
-      }
-export function usePaidFeesLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<PaidFeesQuery, PaidFeesQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<PaidFeesQuery, PaidFeesQueryVariables>(PaidFeesDocument, options);
-        }
-export type PaidFeesQueryHookResult = ReturnType<typeof usePaidFeesQuery>;
-export type PaidFeesLazyQueryHookResult = ReturnType<typeof usePaidFeesLazyQuery>;
-export type PaidFeesQueryResult = Apollo.QueryResult<PaidFeesQuery, PaidFeesQueryVariables>;
 export const LiquidityProvisionsDocument = gql`
    query LiquidityProvisions($marketId: ID!) {
  market(id: $marketId) {
-    liquiditySLAParameters {
-      priceRange
-      commitmentMinTimeFraction
-      performanceHysteresisEpochs
-      slaCompetitionFactor
-    }
-    liquidityProvisions(live: true) {
+    liquidityProvisionsConnection(live: true) {
      edges {
        node {
-          current {
-            ...LiquidityProvisionFields
-          }
-          pending {
-            ...LiquidityProvisionFields
-          }
+          ...LiquidityProvisionFields
        }
      }
    }
@@ -3,23 +3,21 @@ import * as Types from '@vegaprotocol/types';
 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
-export type MarketNodeFragment = { __typename?: 'Market', id: string, liquidityProvisions?: { __typename?: 'LiquidityProvisionsWithPendingConnection', edges?: Array<{ __typename?: 'LiquidityProvisionWithPendingEdge', node: { __typename?: 'LiquidityProvisionWithPending', current: { __typename?: 'LiquidityProvision', commitmentAmount: string, fee: string } } } | null> | null } | null, data?: { __typename?: 'MarketData', targetStake?: string | null } | null };
+export type MarketNodeFragment = { __typename?: 'Market', id: string, liquidityProvisionsConnection?: { __typename?: 'LiquidityProvisionsConnection', edges?: Array<{ __typename?: 'LiquidityProvisionsEdge', node: { __typename?: 'LiquidityProvision', commitmentAmount: string, fee: string } } | null> | null } | null, data?: { __typename?: 'MarketData', targetStake?: string | null } | null };

 export type LiquidityProvisionMarketsQueryVariables = Types.Exact<{ [key: string]: never; }>;


-export type LiquidityProvisionMarketsQuery = { __typename?: 'Query', marketsConnection?: { __typename?: 'MarketConnection', edges: Array<{ __typename?: 'MarketEdge', node: { __typename?: 'Market', id: string, liquidityProvisions?: { __typename?: 'LiquidityProvisionsWithPendingConnection', edges?: Array<{ __typename?: 'LiquidityProvisionWithPendingEdge', node: { __typename?: 'LiquidityProvisionWithPending', current: { __typename?: 'LiquidityProvision', commitmentAmount: string, fee: string } } } | null> | null } | null, data?: { __typename?: 'MarketData', targetStake?: string | null } | null } }> } | null };
+export type LiquidityProvisionMarketsQuery = { __typename?: 'Query', marketsConnection?: { __typename?: 'MarketConnection', edges: Array<{ __typename?: 'MarketEdge', node: { __typename?: 'Market', id: string, liquidityProvisionsConnection?: { __typename?: 'LiquidityProvisionsConnection', edges?: Array<{ __typename?: 'LiquidityProvisionsEdge', node: { __typename?: 'LiquidityProvision', commitmentAmount: string, fee: string } } | null> | null } | null, data?: { __typename?: 'MarketData', targetStake?: string | null } | null } }> } | null };

 export const MarketNodeFragmentDoc = gql`
    fragment MarketNode on Market {
  id
-  liquidityProvisions(live: true) {
+  liquidityProvisionsConnection(live: true) {
    edges {
      node {
-        current {
-          commitmentAmount
-          fee
-        }
+        commitmentAmount
+        fee
      }
    }
  }
@@ -1,12 +1,13 @@
 import { AccountType } from '@vegaprotocol/types';
-import type { LiquidityProvisionFields } from './liquidity-data-provider';
 import { getLiquidityProvision } from './liquidity-data-provider';
-import type { LiquidityProviderFieldsFragment } from './__generated__/MarketLiquidity';
+import type {
+  LiquidityProviderFieldsFragment,
+  LiquidityProvisionFieldsFragment,
+} from './__generated__/MarketLiquidity';

 const input = {
  liquidityProvisions: [
    {
-      id: 'dde288688af2aeb5feb349dd72d3679a7a9be34c7375f6a4a48ef2f6140e7e59',
      party: {
        id: 'dde288688af2aeb5feb349dd72d3679a7a9be34c7375f6a4a48ef2f6140e7e59',
        accountsConnection: {
@@ -30,11 +31,7 @@ const input = {
      fee: '0.001',
      status: 'STATUS_ACTIVE',
      __typename: 'LiquidityProvision',
-      priceRange: '0',
-      commitmentMinTimeFraction: '0.5',
-      performanceHysteresisEpochs: 5678,
-      slaCompetitionFactor: '0',
-    } as unknown as LiquidityProvisionFields,
+    } as LiquidityProvisionFieldsFragment,
  ],
  liquidityProviders: [
    {
@@ -52,12 +49,9 @@ const input = {
 const result = [
  {
    __typename: undefined,
-    balance: 1.8003328918633597e22,
-    earmarkedFees: 0,
+    balance: '1.8003328918633596575e+22',
    commitmentAmount: '18003328918633596575000',
    createdAt: '2022-12-16T09:28:29.071781Z',
-    commitmentMinTimeFraction: '0.5',
-    id: 'dde288688af2aeb5feb349dd72d3679a7a9be34c7375f6a4a48ef2f6140e7e59',
    feeShare: {
      equityLikeShare: '1',
      __typename: 'LiquidityProviderFeeShare',
@@ -65,9 +59,6 @@ const result = [
    },
    fee: '0.001',
    partyId: 'dde288688af2aeb5feb349dd72d3679a7a9be34c7375f6a4a48ef2f6140e7e59',
-    performanceHysteresisEpochs: 5678,
-    priceRange: '0',
-    slaCompetitionFactor: '0',
    party: {
      __typename: 'Party',
      accountsConnection: {
@@ -115,9 +106,7 @@ describe('getLiquidityProvision', () => {
      {
        __typename: 'LiquidityProvision',
        commitmentAmount: '18003328918633596575000',
-        commitmentMinTimeFraction: '0.5',
        createdAt: '2022-12-16T09:28:29.071781Z',
-        id: 'dde288688af2aeb5feb349dd72d3679a7a9be34c7375f6a4a48ef2f6140e7e59',
        fee: '0.001',
        party: {
          __typename: 'Party',
@@ -136,9 +125,6 @@ describe('getLiquidityProvision', () => {
          },
          id: 'dde288688af2aeb5feb349dd72d3679a7a9be34c7375f6a4a48ef2f6140e7e59',
        },
-        performanceHysteresisEpochs: 5678,
-        priceRange: '0',
-        slaCompetitionFactor: '0',
        status: 'STATUS_ACTIVE',
        updatedAt: '2023-01-04T22:13:27.761985Z',
      },
@@ -20,45 +20,20 @@ import type {
  LiquidityProvisionsQueryVariables,
 } from './__generated__/MarketLiquidity';

-export type LiquidityProvisionFields = LiquidityProvisionFieldsFragment &
-  Schema.LiquiditySLAParameters & {
-    currentCommitmentAmount?: string;
-    currentFee?: string;
-  };
-
 export const liquidityProvisionsDataProvider = makeDataProvider<
  LiquidityProvisionsQuery,
-  LiquidityProvisionFields[],
+  LiquidityProvisionFieldsFragment[],
  never,
  never,
  LiquidityProvisionsQueryVariables
 >({
  query: LiquidityProvisionsDocument,
  getData: (responseData: LiquidityProvisionsQuery | null) => {
-    return (responseData?.market?.liquidityProvisions?.edges
-      ?.filter((n) => !!n)
-      .map((e) => {
-        let node;
-        if (!e?.node.pending && e?.node.current) {
-          node = {
-            ...e?.node.current,
-            ...responseData.market?.liquiditySLAParameters,
-          };
-        } else if (!e?.node.current && e?.node.pending) {
-          node = {
-            ...e?.node.pending,
-            ...responseData.market?.liquiditySLAParameters,
-          };
-        } else {
-          node = {
-            ...e?.node.pending,
-            currentCommitmentAmount: e?.node.current.commitmentAmount,
-            currentFee: e?.node.current.fee,
-            ...responseData.market?.liquiditySLAParameters,
-          };
-        }
-        return node;
-      }) ?? []) as LiquidityProvisionFields[];
+    return (
+      responseData?.market?.liquidityProvisionsConnection?.edges?.map(
+        (e) => e?.node
+      ) ?? []
+    ).filter((n) => !!n) as LiquidityProvisionFieldsFragment[];
  },
 });

@@ -106,14 +81,16 @@ export const lpAggregatedDataProvider = makeDerivedDataProvider<
  }
 );

-export const matchFilter = (filter: Filter, lp: LiquidityProvisionData) => {
+export const matchFilter = (
+  filter: Filter,
+  lp: LiquidityProvisionFieldsFragment
+) => {
  if (filter.partyId && lp.party.id !== filter.partyId) {
    return false;
  }
  if (
    filter.active === true &&
-    lp.status !== Schema.LiquidityProvisionStatus.STATUS_ACTIVE &&
-    lp.status !== Schema.LiquidityProvisionStatus.STATUS_PENDING
+    lp.status !== Schema.LiquidityProvisionStatus.STATUS_ACTIVE
  ) {
    return false;
  }
@@ -127,20 +104,16 @@ export const matchFilter = (filter: Filter, lp: LiquidityProvisionData) => {
 };

 export interface LiquidityProvisionData
-  extends Omit<LiquidityProvisionFields, '__typename'>,
-    Partial<LiquidityProviderFieldsFragment>,
-    Omit<Schema.LiquiditySLAParameters, '__typename'> {
+  extends Omit<LiquidityProvisionFieldsFragment, '__typename'> {
  assetDecimalPlaces?: number;
-  balance?: number;
+  balance?: string;
  averageEntryValuation?: string;
  equityLikeShare?: string;
-  earmarkedFees?: number;
-  status: Schema.LiquidityProvisionStatus;
 }

 export const getLiquidityProvision = (
-  liquidityProvisions: LiquidityProvisionFields[],
-  liquidityProviders: LiquidityProviderFieldsFragment[],
+  liquidityProvisions: LiquidityProvisionFieldsFragment[],
+  liquidityProvider: LiquidityProviderFieldsFragment[],
  filter?: Filter
 ): LiquidityProvisionData[] => {
  return liquidityProvisions
@@ -159,40 +132,26 @@ export const getLiquidityProvision = (
      }
      return true;
    })
-    .map((liquidityProvision) => {
-      const liquidityProvider = liquidityProviders.find(
-        (f) => liquidityProvision.party.id === f.partyId
+    .map((lp) => {
+      const lpObj = liquidityProvider.find((f) => lp.party.id === f.partyId);
+      if (!lpObj) return lp;
+      const accounts = compact(lp.party.accountsConnection?.edges).map(
+        (e) => e.node
      );
-      if (!liquidityProvider) return liquidityProvision;
-      const accounts = compact(
-        liquidityProvision.party.accountsConnection?.edges
-      ).map((e) => e.node);
      const bondAccounts = accounts?.filter(
        (a) => a?.type === Schema.AccountType.ACCOUNT_TYPE_BOND
      );
-      const feeAccounts = accounts?.filter(
-        (a) => a?.type === Schema.AccountType.ACCOUNT_TYPE_LP_LIQUIDITY_FEES
-      );
      const balance =
        bondAccounts
          ?.reduce(
            (acc, a) => acc.plus(new BigNumber(a.balance ?? 0)),
            new BigNumber(0)
          )
-          .toNumber() ?? 0;
-
-      const earmarkedFees =
-        feeAccounts
-          ?.reduce(
-            (acc, a) => acc.plus(new BigNumber(a.balance ?? 0)),
-            new BigNumber(0)
-          )
-          .toNumber() ?? 0;
+          .toString() || '0';
      return {
-        ...liquidityProvision,
-        ...liquidityProvider,
+        ...lp,
+        ...lpObj,
        balance,
-        earmarkedFees,
        __typename: undefined,
      };
    });
@@ -55,10 +55,9 @@ describe('LiquidityTable', () => {
      'Adjusted stake share',
      'Share',
      'Live supplied liquidity',
-      'Fees accrued this epoch',
-      'Live time on book',
+      'Live time fraction on book',
      'Live liquidity quality score (%)',
-      'Last time on the book',
+      'Last time fraction on the book',
      'Last fee penalty',
      'Last bond penalty',
      'Status',
@@ -6,10 +6,7 @@ import {
  getDateTimeFormat,
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
-import type {
-  TypedDataAgGrid,
-  VegaValueFormatterParams,
-} from '@vegaprotocol/datagrid';
+import type { TypedDataAgGrid } from '@vegaprotocol/datagrid';
 import { AgGrid } from '@vegaprotocol/datagrid';
 import {
  CopyWithTooltip,
@@ -25,7 +22,7 @@ import type {
  ValueFormatterParams,
 } from 'ag-grid-community';
 import BigNumber from 'bignumber.js';
-import { LiquidityProvisionStatus } from '@vegaprotocol/types';
+import type { LiquidityProvisionStatus } from '@vegaprotocol/types';
 import { LiquidityProvisionStatusMapping } from '@vegaprotocol/types';
 import type { LiquidityProvisionData } from './liquidity-data-provider';

@@ -99,58 +96,6 @@ export const LiquidityTable = ({
      return `${addDecimalsFormatNumber(newValue, assetDecimalPlaces ?? 0)}`;
    };

-    const feesAccruedTooltip = ({ value, data }: ITooltipParams) => {
-      if (!value) return '-';
-      const newValue = new BigNumber(value)
-        .times(Number(stakeToCcyVolume) || 1)
-        .toString();
-      let lessThanFull = false,
-        lessThanMinimum = false;
-      if (data.sla) {
-        lessThanFull =
-          data.sla &&
-          new BigNumber(data.sla.currentEpochFractionOfTimeOnBook).isLessThan(
-            1
-          );
-        lessThanMinimum =
-          data.sla &&
-          new BigNumber(data.sla.currentEpochFractionOfTimeOnBook).isLessThan(
-            data.commitmentMinTimeFraction
-          );
-      }
-      if (lessThanMinimum) {
-        return t(
-          `This LP's time on the book in the current epoch (%s) is less than the minimum required (%s), so they could lose all fee revenue for this epoch.`,
-          [
-            formatNumberPercentage(
-              new BigNumber(data.sla.currentEpochFractionOfTimeOnBook).times(
-                100
-              ),
-              2
-            ),
-            formatNumberPercentage(
-              new BigNumber(data.commitmentMinTimeFraction).times(100),
-              2
-            ),
-          ]
-        );
-      }
-      if (lessThanFull) {
-        return t(
-          `This LP's time on the book in the current epoch (%s) is less than 100%, so they could lose some fees to a better performing LP.`,
-          [
-            formatNumberPercentage(
-              new BigNumber(data.sla.currentEpochFractionOfTimeOnBook).times(
-                100
-              ),
-              2
-            ),
-          ]
-        );
-      }
-      return addDecimalsFormatNumber(newValue, assetDecimalPlaces ?? 0);
-    };
-
    const stakeToCcyVolumeQuantumFormatter = ({
      value,
    }: ValueFormatterParams) => {
@@ -190,32 +135,7 @@ export const LiquidityTable = ({
            headerTooltip: t(
              'The amount committed to the market by this liquidity provider.'
            ),
-            valueFormatter: ({
-              data,
-              value,
-            }: VegaValueFormatterParams<
-              LiquidityProvisionData,
-              'commitmentAmount'
-            >) => {
-              if (!value) return '-';
-              const formattedCommitmentAmount = addDecimalsFormatNumberQuantum(
-                value,
-                assetDecimalPlaces ?? 0,
-                quantum ?? 0
-              );
-              if (
-                data?.currentCommitmentAmount &&
-                data?.currentCommitmentAmount !== value
-              ) {
-                return `${addDecimalsFormatNumberQuantum(
-                  data.currentCommitmentAmount,
-                  assetDecimalPlaces ?? 0,
-                  quantum ?? 0
-                )}/${formattedCommitmentAmount}`;
-              } else {
-                return formattedCommitmentAmount;
-              }
-            },
+            valueFormatter: assetDecimalsQuantumFormatter,
            tooltipValueGetter: assetDecimalsFormatter,
          },
          {
@@ -235,22 +155,7 @@ export const LiquidityTable = ({
            ),
            field: 'fee',
            type: 'rightAligned',
-            valueFormatter: ({
-              data,
-              value,
-            }: ValueFormatterParams<LiquidityProvisionData, 'fee'>) => {
-              if (!value) return '-';
-              const formattedValue =
-                formatNumberPercentage(new BigNumber(value).times(100), 2) ||
-                '-';
-              if (data?.currentFee && data?.currentFee !== value) {
-                return `${formatNumberPercentage(
-                  new BigNumber(data.currentFee).times(100),
-                  2
-                )}/${formattedValue}`;
-              }
-              return formattedValue;
-            },
+            valueFormatter: percentageFormatter,
          },
          {
            headerName: t('Adjusted stake share'),
@@ -273,7 +178,7 @@ export const LiquidityTable = ({
        ],
      },
      {
-        headerName: t('Live liquidity data'),
+        headerName: t('Live liquidity details'),
        marryChildren: true,
        children: [
          {
@@ -287,41 +192,7 @@ export const LiquidityTable = ({
            tooltipValueGetter: stakeToCcyVolumeFormatter,
          },
          {
-            headerName: t('Fees accrued this epoch'),
-            field: 'earmarkedFees',
-            type: 'rightAligned',
-            headerTooltip: t(
-              `The liquidity fees accrued by each provider, which will be distributed at the end of the epoch after applying any penalties.`
-            ),
-            valueFormatter: stakeToCcyVolumeQuantumFormatter,
-            tooltipValueGetter: feesAccruedTooltip,
-            cellClassRules: {
-              'text-warning': ({ data }: { data: LiquidityProvisionData }) => {
-                if (!data.sla) return false;
-                return (
-                  new BigNumber(
-                    data.sla.currentEpochFractionOfTimeOnBook
-                  ).isLessThan(1) &&
-                  new BigNumber(
-                    data.sla.currentEpochFractionOfTimeOnBook
-                  ).isGreaterThan(data.commitmentMinTimeFraction)
-                );
-              },
-              'text-red-500': ({ data }: { data: LiquidityProvisionData }) => {
-                if (!data.sla) return false;
-                return (
-                  new BigNumber(
-                    data.sla.currentEpochFractionOfTimeOnBook
-                  ).isLessThan(data.commitmentMinTimeFraction) &&
-                  new BigNumber(
-                    data.sla.currentEpochFractionOfTimeOnBook
-                  ).isGreaterThan(0)
-                );
-              },
-            },
-          },
-          {
-            headerName: t(`Live time on book`),
+            headerName: t(`Live time fraction on book`),
            field: 'sla.currentEpochFractionOfTimeOnBook',
            type: 'rightAligned',
            headerTooltip: t('Current epoch fraction of time on the book.'),
@@ -341,7 +212,7 @@ export const LiquidityTable = ({
        marryChildren: true,
        children: [
          {
-            headerName: t(`Last time on the book`),
+            headerName: t(`Last time fraction on the book`),
            field: 'sla.lastEpochFractionOfTimeOnBook',
            type: 'rightAligned',
            headerTooltip: t('Last epoch fraction of time on the book.'),
@@ -371,17 +242,8 @@ export const LiquidityTable = ({
            headerName: t('Status'),
            headerTooltip: t('The current status of this liquidity provision.'),
            field: 'status',
-            valueFormatter: ({
-              data,
-              value,
-            }: ValueFormatterParams<LiquidityProvisionData, 'status'>) => {
+            valueFormatter: ({ value }) => {
              if (!value) return value;
-              if (
-                data?.status === LiquidityProvisionStatus.STATUS_PENDING &&
-                (data?.currentCommitmentAmount || data?.currentFee)
-              ) {
-                return t('Updating next epoch');
-              }
              return LiquidityProvisionStatusMapping[
                value as LiquidityProvisionStatus
              ];
@@ -413,9 +275,7 @@ export const LiquidityTable = ({
  return (
    <AgGrid
      overlayNoRowsTemplate={t('No liquidity provisions')}
-      getRowId={({ data }: { data: LiquidityProvisionData }) => {
-        return data.id || '';
-      }}
+      getRowId={({ data }: { data: LiquidityProvisionData }) => data.id || ''}
      tooltipShowDelay={500}
      defaultColDef={defaultColDef}
      {...props}
@@ -12,14 +12,12 @@ export const liquidityProvisionsQuery = (
 ): LiquidityProvisionsQuery => {
  const defaultResult: LiquidityProvisionsQuery = {
    market: {
-      liquidityProvisions: {
-        __typename: 'LiquidityProvisionsWithPendingConnection',
+      liquidityProvisionsConnection: {
+        __typename: 'LiquidityProvisionsConnection',
        edges: liquidityFields.map((node) => {
          return {
-            __typename: 'LiquidityProvisionWithPendingEdge',
-            node: {
-              current: node,
-            },
+            __typename: 'LiquidityProvisionsEdge',
+            node,
          };
        }),
      },
@@ -106,9 +106,10 @@ export const getLiquidityForMarket = (
  markets: LiquidityProvisionMarket[]
 ) => {
  const liquidity =
-    markets.find((m) => m.id === marketId)?.liquidityProvisions?.edges || [];
+    markets.find((m) => m.id === marketId)?.liquidityProvisionsConnection
+      ?.edges || [];

-  return liquidity.map((l) => l?.node.current);
+  return liquidity.map((l) => l?.node);
 };

 export const getTargetStake = (
@@ -1001,7 +1001,7 @@ export const LiquiditySLAParametersInfoPanel = ({

  const { params: networkParams } = useNetworkParams([
    NetworkParams.market_liquidity_bondPenaltyParameter,
-    NetworkParams.market_liquidity_sla_nonPerformanceBondPenaltySlope,
+    NetworkParams.market_liquidity_nonPerformanceBondPenaltySlope,
    NetworkParams.market_liquidity_sla_nonPerformanceBondPenaltyMax,
    NetworkParams.market_liquidity_maximumLiquidityFeeFactorLevel,
    NetworkParams.market_liquidity_stakeToCcyVolume,
@@ -1017,7 +1017,7 @@ export const LiquiditySLAParametersInfoPanel = ({
    bondPenaltyParameter:
      networkParams['market_liquidity_bondPenaltyParameter'],
    nonPerformanceBondPenaltySlope:
-      networkParams['market_liquidity_sla_nonPerformanceBondPenaltySlope'],
+      networkParams['market_liquidity_nonPerformanceBondPenaltySlope'],
    nonPerformanceBondPenaltyMax:
      networkParams['market_liquidity_sla_nonPerformanceBondPenaltyMax'],
    maxLiquidityFeeFactorLevel:
@@ -3,7 +3,6 @@ import type { Market, MarketMaybeWithDataAndCandles } from './markets-provider';
 import {
  calcTradedFactor,
  filterAndSortMarkets,
-  sumFeesFactors,
  totalFeesFactorsPercentage,
 } from './market-utils';
 const { MarketState, MarketTradingMode } = Schema;
@@ -133,15 +132,3 @@ describe('calcTradedFactor', () => {
    expect(fa > fb).toBeTruthy();
  });
 });
-
-describe('sumFeesFactors', () => {
-  it('does not result in flop errors', () => {
-    expect(
-      sumFeesFactors({
-        makerFee: '0.1',
-        infrastructureFee: '0.2',
-        liquidityFee: '0.3',
-      })
-    ).toEqual(0.6);
-  });
-});
@@ -50,19 +50,16 @@ export const getQuoteName = (market: Partial<Market>) => {
 };

 export const sumFeesFactors = (fees: Market['fees']['factors']) => {
-  if (!fees) return;
-
-  return new BigNumber(fees.makerFee)
-    .plus(fees.liquidityFee)
-    .plus(fees.infrastructureFee)
-    .toNumber();
+  return fees
+    ? new BigNumber(fees.makerFee)
+        .plus(fees.liquidityFee)
+        .plus(fees.infrastructureFee)
+    : undefined;
 };

 export const totalFeesFactorsPercentage = (fees: Market['fees']['factors']) => {
  const total = fees && sumFeesFactors(fees);
-  return total
-    ? formatNumberPercentage(new BigNumber(total).times(100))
-    : undefined;
+  return total ? formatNumberPercentage(total.times(100)) : undefined;
 };

 export const filterAndSortMarkets = (markets: MarketMaybeWithData[]) => {
@@ -153,14 +153,12 @@ export const NetworkParams = {
    'spam_protection_minimumWithdrawalQuantumMultiple',
  spam_protection_voting_min_tokens: 'spam_protection_voting_min_tokens',
  spam_protection_proposal_min_tokens: 'spam_protection_proposal_min_tokens',
-  market_fee_factors_infrastructureFee: 'market_fee_factors_infrastructureFee',
-  market_fee_factors_makerFee: 'market_fee_factors_makerFee',
  market_liquidity_targetstake_triggering_ratio:
    'market_liquidity_targetstake_triggering_ratio',
  market_liquidity_bondPenaltyParameter:
    'market_liquidity_bondPenaltyParameter',
-  market_liquidity_sla_nonPerformanceBondPenaltySlope:
-    'market_liquidity_sla_nonPerformanceBondPenaltySlope',
+  market_liquidity_nonPerformanceBondPenaltySlope:
+    'market_liquidity_nonPerformanceBondPenaltySlope',
  market_liquidity_sla_nonPerformanceBondPenaltyMax:
    'market_liquidity_sla_nonPerformanceBondPenaltyMax',
  market_liquidity_maximumLiquidityFeeFactorLevel:
@@ -166,7 +166,7 @@ export const ordersProvider = makeDataProvider<
  pagination: {
    getPageInfo,
    append,
-    first: 1000,
+    first: 5000,
  },
  resetDelay: 1000,
  additionalContext: { isEnlargedTimeout: true },
@@ -27,7 +27,6 @@ describe('OrderListManager', () => {
      flush: jest.fn(),
      reload: jest.fn(),
      load: jest.fn(),
-      pageInfo: null,
    });
    render(generateJsx());

@@ -46,7 +45,6 @@ describe('OrderListManager', () => {
      flush: jest.fn(),
      reload: jest.fn(),
      load: jest.fn(),
-      pageInfo: null,
    });

    render(generateJsx());
@@ -64,7 +62,6 @@ describe('OrderListManager', () => {
      flush: jest.fn(),
      reload: jest.fn(),
      load: jest.fn(),
-      pageInfo: null,
    });

    render(
@@ -1,9 +1,9 @@
 import { t } from '@vegaprotocol/i18n';
 import { useCallback, useRef, useState, useEffect } from 'react';
 import type { AgGridReact } from 'ag-grid-react';
+import type { FilterChangedEvent } from 'ag-grid-community';
 import { OrderListTable } from '../order-list';
 import type { useDataGridEvents } from '@vegaprotocol/datagrid';
-import { Pagination } from '@vegaprotocol/datagrid';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import { ordersWithMarketProvider } from '../order-data-provider/order-data-provider';
 import { normalizeOrderAmendment } from '@vegaprotocol/wallet';
@@ -48,11 +48,33 @@ export const OrderListManager = ({
      ? { partyId, filter: { liveOnly: true } }
      : { partyId };

-  const { data, error, pageInfo, load } = useDataProvider({
+  const { data, error } = useDataProvider({
    dataProvider: ordersWithMarketProvider,
    variables,
+    update: ({ data }) => {
+      if (data && gridRef.current?.api) {
+        gridRef.current.api.setRowData(data);
+        return true;
+      }
+      return false;
+    },
  });

+  const onFilterChanged = useCallback(
+    (event: FilterChangedEvent) => {
+      gridProps?.onFilterChanged?.(event);
+      if (event.api) {
+        const isEmpty = event.api.getDisplayedRowCount() === 0;
+        if (isEmpty) {
+          event.api.showNoRowsOverlay();
+        } else {
+          event.api.hideOverlay();
+        }
+      }
+    },
+    [gridProps]
+  );
+
  useEffect(() => {
    if (!data || !data.length) {
      gridRef.current?.api?.showNoRowsOverlay();
@@ -74,24 +96,13 @@ export const OrderListManager = ({
    [create]
  );

-  const [hasDisplayedRow, setHasDisplayedRow] = useState<boolean | undefined>(
-    undefined
-  );
-  const { onFilterChanged, ...props } = gridProps || {};
-  const onRowDataUpdated = useCallback(
-    ({ api }: { api: AgGridReact['api'] }) => {
-      setHasDisplayedRow(!!api.getDisplayedRowCount());
-    },
-    []
-  );
-
  if (error) {
    return <Splash>{t(`Something went wrong: ${error.message}`)}</Splash>;
  }

  return (
    <>
-      <div className="relative flex flex-col h-full">
+      <div className="h-full relative">
        <OrderListTable
          rowData={data}
          ref={gridRef}
@@ -101,23 +112,10 @@ export const OrderListManager = ({
          onView={setViewOrder}
          onMarketClick={onMarketClick}
          onOrderTypeClick={onOrderTypeClick}
-          onFilterChanged={(event) => {
-            onRowDataUpdated(event);
-            if (onFilterChanged) {
-              onFilterChanged(event);
-            }
-          }}
-          onRowDataUpdated={onRowDataUpdated}
          isReadOnly={isReadOnly}
          overlayNoRowsTemplate={noRowsMessage || t('No orders')}
-          {...props}
-        />
-        <Pagination
-          count={data?.length || 0}
-          pageInfo={pageInfo}
-          onLoad={load}
-          hasDisplayedRows={hasDisplayedRow || false}
-          showRetentionMessage={variables.filter?.liveOnly || true}
+          {...gridProps}
+          onFilterChanged={onFilterChanged}
        />
      </div>
      {editOrder && (
@@ -30,7 +30,6 @@ describe('StopOrdersManager', () => {
      flush: jest.fn(),
      reload: jest.fn(),
      load: jest.fn(),
-      pageInfo: null,
    });
    await act(async () => {
      render(generateJsx());
@@ -3,14 +3,11 @@ import { tradesWithMarketProvider } from './trades-data-provider';
 import { TradesTable } from './trades-table';
 import { useDealTicketFormValues } from '@vegaprotocol/deal-ticket';
 import { t } from '@vegaprotocol/i18n';
-import { Pagination } from '@vegaprotocol/datagrid';
 import type { useDataGridEvents } from '@vegaprotocol/datagrid';
-import { useCallback, useState } from 'react';
-import type { AgGridReact } from 'ag-grid-react';

 interface TradesContainerProps {
  marketId: string;
-  gridProps: ReturnType<typeof useDataGridEvents>;
+  gridProps?: ReturnType<typeof useDataGridEvents>;
 }

 export const TradesManager = ({
@@ -19,43 +16,19 @@ export const TradesManager = ({
 }: TradesContainerProps) => {
  const update = useDealTicketFormValues((state) => state.updateAll);

-  const { data, error, load, pageInfo } = useDataProvider({
+  const { data, error } = useDataProvider({
    dataProvider: tradesWithMarketProvider,
    variables: { marketId },
  });
-  const [hasDisplayedRow, setHasDisplayedRow] = useState<boolean | undefined>(
-    undefined
-  );
-  const { onFilterChanged, ...props } = gridProps || {};
-  const onRowDataUpdated = useCallback(
-    ({ api }: { api: AgGridReact['api'] }) => {
-      setHasDisplayedRow(!!api.getDisplayedRowCount());
-    },
-    []
-  );

  return (
-    <div className="flex flex-col h-full">
-      <TradesTable
-        rowData={data}
-        onClick={(price?: string) => {
-          update(marketId, { price });
-        }}
-        onFilterChanged={(event) => {
-          onRowDataUpdated(event);
-          onFilterChanged(event);
-        }}
-        onRowDataUpdated={onRowDataUpdated}
-        overlayNoRowsTemplate={error ? error.message : t('No trades')}
-        {...props}
-      />
-      <Pagination
-        count={data?.length || 0}
-        pageInfo={pageInfo}
-        onLoad={load}
-        hasDisplayedRows={hasDisplayedRow || false}
-        showRetentionMessage={true}
-      />
-    </div>
+    <TradesTable
+      rowData={data}
+      onClick={(price?: string) => {
+        update(marketId, { price });
+      }}
+      overlayNoRowsTemplate={error ? error.message : t('No trades')}
+      {...gridProps}
+    />
  );
 };
@@ -813,7 +813,7 @@ export type DispatchStrategy = {
  /** Minimum notional time-weighted averaged position required for a party to be considered eligible */
  notionalTimeWeightedAveragePositionRequirement: Scalars['String'];
  /** Ascending order list of start rank and corresponding share ratio */
-  rankTable?: Maybe<Array<Maybe<RankTable>>>;
+  rankTable?: Maybe<RankTable>;
  /** Minimum number of governance tokens, e.g. VEGA, staked for a party to be considered eligible */
  stakingRequirement: Scalars['String'];
  /** The teams in scope for the reward, if the entity is teams */
@@ -3624,8 +3624,6 @@ export type PartyVestingStats = {
  __typename?: 'PartyVestingStats';
  /** Epoch for which the statistics are valid */
  epochSeq: Scalars['Int'];
-  /** The balance of the party, in quantum. */
-  quantumBalance: Scalars['String'];
  /** The reward bonus multiplier */
  rewardBonusMultiplier: Scalars['String'];
 };
@@ -4833,7 +4831,7 @@ export type QueryprotocolUpgradeProposalsArgs = {

 /** Queries allow a caller to read data and filter data via GraphQL. */
 export type QueryreferralSetRefereesArgs = {
-  aggregationEpochs?: InputMaybe<Scalars['Int']>;
+  aggregationDays?: InputMaybe<Scalars['Int']>;
  id?: InputMaybe<Scalars['ID']>;
  pagination?: InputMaybe<Pagination>;
  referee?: InputMaybe<Scalars['ID']>;
@@ -5090,8 +5088,6 @@ export type ReferralSetStats = {
  partyId: Scalars['ID'];
  /** Running volume for the set based on the window length of the current referral program. */
  referralSetRunningNotionalTakerVolume: Scalars['String'];
-  /** The referrer's taker volume */
-  referrerTakerVolume: Scalars['String'];
  /** Reward factor applied to the party. */
  rewardFactor: Scalars['String'];
  /** The proportion of the referees taker fees to be rewarded to the referrer. */
@@ -1,68 +1,77 @@
 import { render, screen } from '@testing-library/react';
+
 import { Sparkline } from './sparkline';
-import type { SparklineProps } from './sparkline';

-describe('Sparkline', () => {
-  let props: SparklineProps = {
-    data: [],
-  };
+const props = {
+  data: [
+    1, 2, 3, 4, 5, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 6, 7, 8, 9,
+    10, 11, 12,
+  ],
+  muted: true,
+};

-  beforeEach(() => {
-    props = {
-      data: [
-        1, 2, 3, 4, 5, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 6, 7, 8,
-        9, 10, 11, 12,
-      ],
-    };
-  });
+it('Renders an svg with a single path', () => {
+  render(<Sparkline {...props} />);
+  expect(screen.getByTestId('sparkline-svg')).toBeInTheDocument();
+  const paths = screen.getAllByTestId('sparkline-path');
+  const path = paths[0];
+  expect(path).toBeInTheDocument();
+  expect(path).toHaveAttribute('d', expect.any(String));
+  expect(path).toHaveAttribute('stroke', expect.any(String));
+  expect(path).toHaveAttribute('stroke-width', '1');
+  expect(path).toHaveAttribute('fill', 'transparent');
+});

-  it('Renders an svg with a single path', () => {
-    render(<Sparkline {...props} />);
-    expect(screen.getByTestId('sparkline-svg')).toBeInTheDocument();
-    const paths = screen.getAllByTestId('sparkline-path');
-    const path = paths[0];
-    expect(path).toBeInTheDocument();
-    expect(path).toHaveAttribute('d', expect.any(String));
-    expect(path).toHaveAttribute('stroke-width', '1');
-  });
+it('Requires a data prop but width and height are optional', () => {
+  render(<Sparkline {...props} />);
+  const svg = screen.getByTestId('sparkline-svg');
+  expect(svg).toHaveAttribute('width', '60');
+  expect(svg).toHaveAttribute('height', '15');
+});

-  it('Requires a data prop but width and height are optional', () => {
-    render(<Sparkline {...props} />);
-    const svg = screen.getByTestId('sparkline-svg');
-    expect(svg).toHaveAttribute('width', '60');
-    expect(svg).toHaveAttribute('height', '15');
-  });
+it('Renders a red line if the last value is less than the first', () => {
+  props.data[0] = 10;
+  props.data[props.data.length - 1] = 5;
+  render(<Sparkline {...props} />);
+  const paths = screen.getAllByTestId('sparkline-path');
+  const path = paths[0];
+  expect(path).toHaveClass(
+    '[vector-effect:non-scaling-stroke] stroke-market-red dark:stroke-market-red'
+  );
+});

-  it('Renders a red line if the last value is less than the first', () => {
-    props.data[0] = 10;
-    props.data[props.data.length - 1] = 5;
-    render(<Sparkline {...props} />);
-    const paths = screen.getAllByTestId('sparkline-path');
-    const path = paths[0];
-    expect(path).toHaveClass(
-      '[vector-effect:non-scaling-stroke] stroke-market-red dark:stroke-market-red'
-    );
-  });
+it('Renders a green line if the last value is greater than the first', () => {
+  props.data[0] = 5;
+  props.data[props.data.length - 1] = 10;
+  props.muted = true;
+  render(<Sparkline {...props} />);
+  const paths = screen.getAllByTestId('sparkline-path');
+  const path = paths[0];
+  expect(path).toHaveClass(
+    '[vector-effect:non-scaling-stroke] stroke-market-green-600 dark:stroke-market-green'
+  );
+});

-  it('Renders a green line if the last value is greater than the first', () => {
-    props.data[0] = 5;
-    props.data[props.data.length - 1] = 10;
-    render(<Sparkline {...props} />);
-    const paths = screen.getAllByTestId('sparkline-path');
-    const path = paths[0];
-    expect(path).toHaveClass(
-      '[vector-effect:non-scaling-stroke] stroke-market-green-600 dark:stroke-market-green'
-    );
-  });
+it('Renders a white line if the first and last values are equal', () => {
+  props.data[0] = 5;
+  props.data[props.data.length - 1] = 5;
+  render(<Sparkline {...props} />);
+  const paths = screen.getAllByTestId('sparkline-path');
+  const path = paths[0];
+  expect(path).toHaveClass(
+    '[vector-effect:non-scaling-stroke] stroke-black/40 dark:stroke-white/40'
+  );
+});

-  it('Renders a white line if the first and last values are equal', () => {
-    props.data[0] = 5;
-    props.data[props.data.length - 1] = 5;
-    render(<Sparkline {...props} />);
-    const paths = screen.getAllByTestId('sparkline-path');
-    const path = paths[0];
-    expect(path).toHaveClass(
-      '[vector-effect:non-scaling-stroke] stroke-black/40 dark:stroke-white/40'
-    );
-  });
+it('Renders a gray line if there are not 24 values', () => {
+  props.data = [
+    1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
+    22, 23,
+  ];
+  render(<Sparkline {...props} />);
+  const paths = screen.queryAllByTestId('sparkline-path');
+  expect(paths).toHaveLength(2);
+  expect(paths[0]).toHaveClass(
+    '[vector-effect:non-scaling-stroke] stroke-black/40 dark:stroke-white/40'
+  );
 });
@@ -8,49 +8,39 @@ export default {

 const Template: Story = (args) => <Sparkline data={args['data']} {...args} />;

+export const Grey = Template.bind({});
+Grey.args = {
+  data: [
+    1, 2, 3, 4, 5, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 6, 7, 8,
+  ],
+  width: 60,
+  height: 30,
+  points: 25,
+  className: 'w-[113px]',
+};
+
 export const Equal = Template.bind({});
 Equal.args = {
  data: [
    12, 2, 3, 4, 5, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 6, 7, 8, 9,
    10, 11, 12,
  ],
-  width: 110,
+  width: 60,
  height: 30,
+  points: 25,
+  className: 'w-[113px]',
 };

 export const Increase = Template.bind({});
 Increase.args = {
  data: [
-    22,
-    22,
-    22, // extra values should be ignored, this should still render an increase
-    0,
-    2,
-    3,
-    4,
-    5,
-    13,
-    14,
-    15,
-    16,
-    17,
-    18,
-    19,
-    20,
-    21,
-    22,
-    23,
-    24,
-    6,
-    7,
-    8,
-    9,
-    10,
-    11,
-    12,
+    1, 2, 3, 4, 5, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 6, 7, 8, 9,
+    10, 11, 12,
  ],
-  width: 110,
+  width: 60,
  height: 30,
+  points: 25,
+  className: 'w-[113px]',
 };

 export const Decrease = Template.bind({});
@@ -59,27 +49,8 @@ Decrease.args = {
    12, 2, 3, 4, 5, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 6, 7, 8, 9,
    10, 11, 1,
  ],
-  width: 110,
-  height: 30,
-};
-
-export const LessThan24HoursIncrease = Template.bind({});
-LessThan24HoursIncrease.args = {
-  data: [20, 21, 22, 25, 24, 24, 22, 19, 20, 22, 23, 27],
-  width: 110,
-  height: 30,
-};
-
-export const LessThan24HoursDecrease = Template.bind({});
-LessThan24HoursDecrease.args = {
-  data: [20990000, 20939973, 20980130],
-  width: 110,
-  height: 30,
-};
-
-export const NoData = Template.bind({});
-NoData.args = {
-  data: [],
-  width: 110,
+  width: 60,
  height: 30,
+  points: 25,
+  className: 'w-[113px]',
 };
@@ -1,25 +1,15 @@
 import { extent } from 'd3-array';
 import { scaleLinear } from 'd3-scale';
-import { area, line } from 'd3-shape';
+import { line } from 'd3-shape';
 import isEqual from 'lodash/isEqual';
 import React from 'react';

 function colorByChange(a: number, b: number) {
-  if (a < b) {
-    return 'stroke-market-green-600 dark:stroke-market-green';
-  } else if (a > b) {
-    return 'stroke-market-red dark:stroke-market-red';
-  }
-  return 'stroke-black/40 dark:stroke-white/40';
-}
-
-function shadedColor(a: number, b: number) {
-  if (a < b) {
-    return 'fill-market-green-600';
-  } else if (a > b) {
-    return 'fill-market-red';
-  }
-  return 'fill-black dark:fill-white';
+  return a === b
+    ? 'stroke-black/40 dark:stroke-white/40'
+    : a < b
+    ? 'stroke-market-green-600 dark:stroke-market-green'
+    : 'stroke-market-red dark:stroke-market-red';
 }

 export interface SparklineProps {
@@ -28,58 +18,75 @@ export interface SparklineProps {
  height?: number;
  points?: number;
  className?: string;
+  muted?: boolean;
 }

 export const SparklineView = ({
  data,
  width = 60,
  height = 15,
-  points = 24,
+  points = 25,
+  muted = false,
  className,
 }: SparklineProps) => {
+  // How many points are missing. If market is 12 hours old the 25 - 12
+  const preMarketLength = points - data.length;
+
+  // Create two dimensional array for sparkline points [x, y]
+  const marketData: [number, number][] = data.map((d, i) => [
+    preMarketLength + i,
+    d,
+  ]);
+  // Empty two dimensional array for gray, 'no data' line
+  let preMarketData: [number, number][] = [];
+
  // Get the extent for our y value
-  const [min, max] = extent(data, (d) => d);
+  const [min, max] = extent(marketData, (d) => d[1]);

  if (typeof min !== 'number' || typeof max !== 'number') {
    return null;
  }

-  // Market may be less than 24hr old so padd the data array
-  // with values that is the mid value (avg of min and max).
-  // This will rendera  horizontal line until the real data shifts the line
-  const trimmedData = data.slice(-points);
-  const padCount = data.length < points ? points - data.length : 0;
-  const padArr = new Array(padCount).fill(trimmedData[0]);
+  // Create a second set of data to render a gray line for any
+  // missing points if the market is less than 24 hours old
+  if (marketData.length < points) {
+    // Populate preMarketData with the average of our extents
+    // so that the line renders centered vertically
+    const fillValue = (min + max) / 2;
+    preMarketData = new Array(points - marketData.length)
+      .fill(fillValue)
+      .map((d: number, i) => [i, d] as [number, number]);

-  // Get the last 24 values if data has more than needed
-  const lineData: [number, number][] = [...padArr, ...trimmedData].map(
-    (d, i) => {
-      return [i, d];
-    }
-  );
+    // Add the first point of or market data so that the two
+    // lines join up
+    preMarketData.push(marketData[0] as [number, number]);
+  }

-  const xScale = scaleLinear().domain([0, points]).range([0, width]);
-  const yScale = scaleLinear().domain([min, max]).range([height, 0]);
+  const xScale = scaleLinear().domain([0, points]).range([0, 100]);
+  const yScale = scaleLinear().domain([min, max]).range([100, 0]);

  const lineSeries = line()
    .x((d) => xScale(d[0]))
    .y((d) => yScale(d[1]));

-  const areaSeries = area()
-    .x((d) => xScale(d[0]))
-    .y0(height)
-    .y1((d) => yScale(d[1]));
-
-  const firstVal = trimmedData[0];
-  const lastVal = trimmedData[trimmedData.length - 1];
-
-  // Get the color of the marketData line depending on market movement
-  const strokeClassName = colorByChange(firstVal, lastVal);
-  const areaClassName = shadedColor(firstVal, lastVal);
+  // Get the color of the marketData line
+  const [firstVal, lastVal] = [data[0], data[data.length - 1]];
+  const strokeClassName = muted
+    ? data.length >= 24
+      ? colorByChange(firstVal, lastVal)
+      : 'stroke-black/40 dark:stroke-white/40'
+    : colorByChange(firstVal, lastVal);

  // Create paths
-  const linePath = lineSeries(lineData);
-  const areaPath = areaSeries(lineData);
+  const preMarketCreationPath = lineSeries(preMarketData);
+  const mainPath = lineSeries(marketData);
+  const pathProps = {
+    'data-testid': 'sparkline-path',
+    className: `[vector-effect:non-scaling-stroke] ${strokeClassName}`,
+    stroke: 'strokeCurrent',
+    strokeWidth: 1,
+    fill: 'transparent',
+  };

  return (
    <svg
@@ -87,25 +94,13 @@ export const SparklineView = ({
      className={className}
      width={width}
      height={height}
-      viewBox={`0 0 ${width} ${height}`}
+      viewBox="0 0 100 100"
      preserveAspectRatio="none"
    >
-      {linePath && (
-        <path
-          d={linePath}
-          data-testid="sparkline-path"
-          className={`[vector-effect:non-scaling-stroke] fill-transparent ${strokeClassName}`}
-          strokeWidth={1}
-        />
-      )}
-      {areaPath && (
-        <path
-          className={areaClassName}
-          fillOpacity={0.2}
-          stroke="none"
-          d={areaPath}
-        />
+      {preMarketCreationPath && (
+        <path {...pathProps} d={preMarketCreationPath} />
      )}
+      {mainPath && <path {...pathProps} d={mainPath} />}
    </svg>
  );
 };
@@ -179,33 +179,3 @@ export const toNumberParts = (
 export const isNumeric = (
  value?: string | number | BigNumber | bigint | null
 ): value is NonNullable<number | string> => /^-?\d*\.?\d+$/.test(String(value));
-
-/**
- * Format a number greater than 1 million with m for million, b for billion
- * and t for trillion
- */
-export const formatNumberRounded = (num: BigNumber) => {
-  let value = '';
-
-  const format = (divisor: string) => {
-    const result = num.dividedBy(divisor);
-    return result.isInteger() ? result.toString() : result.toFixed(1);
-  };
-
-  if (num.isGreaterThan(new BigNumber('1e14'))) {
-    value = '>100t';
-  } else if (num.isGreaterThanOrEqualTo(new BigNumber('1e12'))) {
-    // Trillion
-    value = `${format('1e12')}t`;
-  } else if (num.isGreaterThanOrEqualTo(new BigNumber('1e9'))) {
-    // Billion
-    value = `${format('1e9')}b`;
-  } else if (num.isGreaterThanOrEqualTo(new BigNumber('1e6'))) {
-    // Million
-    value = `${format('1e6')}m`;
-  } else {
-    value = formatNumber(num);
-  }
-
-  return value;
-};
@@ -1,4 +1,2 @@
-[[redirects]]
-  from = "/*"
-  to = "/index.html"
-  status = 200
+[functions]
+  included_files = ["!node_modules/@sentry/cli/sentry-cli"]
				`@@ -1 +0,0 @@`
				`export * from './proposal-update-benefit-tiers-details';`
				`@@ -1 +0,0 @@`
				`export { FeesContainer } from './fees-container';`