feat(trading): add tooltips for iceberg and post or reduce only

2023-10-25 09:44:24 +01:00
47 changed files with 548 additions and 1666 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');
@@ -48,8 +48,8 @@ describe('capsule - without MultiSign', { tags: '@slow' }, () => {
    cy.get('@markets').then((markets) => {
      cy.wrap(markets[0]).as('market');
    });
-    cy.setOnBoardingViewed();
    cy.visit('/#/portfolio');
+    cy.connectVegaWallet();
  });

  it('can deposit', function () {
@@ -70,8 +70,6 @@ describe('capsule - without MultiSign', { tags: '@slow' }, () => {
    cy.getByTestId('deposit-button').click();
    connectEthereumWallet('Unknown');
    selectAsset(btcName);
-    cy.get('[data-testid="rich-select-option"]').eq(btcName).click();
-
    cy.getByTestId('approve-default').should(
      'contain.text',
      `Before you can make a deposit of your chosen asset, ${btcSymbol}, you need to approve its use in your Ethereum wallet`
@@ -122,7 +120,7 @@ describe('capsule - without MultiSign', { tags: '@slow' }, () => {
    cy.get('[data-testid="pathname-/portfolio"]').should('exist');

    cy.getByTestId(collateralTab).click();
-    cy.getByTestId('open-transfer').eq(1).click();
+    cy.getByTestId('open-transfer').click();
    cy.getByTestId('transfer-form').should('be.visible');
    cy.getByTestId('transfer-form').find('[name="toAddress"]').select(1);
    cy.get('select option')
@@ -149,8 +147,7 @@ describe('capsule - without MultiSign', { tags: '@slow' }, () => {
    // 0003-WTXN-011
    cy.getByTestId('Withdrawals').click();
    cy.getByTestId('withdraw-dialog-button').click();
-    selectAsset(btcName);
-    cy.get('[data-testid="rich-select-option"]').eq(btcName).click();
+    selectAsset(0);
    cy.get(amountField).focus();
    cy.get(amountField).clear().type('1');
    cy.getByTestId('submit-withdrawal').click();
@@ -183,21 +180,24 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {
    cy.get('@markets').then((markets) => {
      cy.wrap(markets[0]).as('market');
    });
-    cy.setOnBoardingViewed();
    cy.setVegaWallet();
  });

  it('shows node health', function () {
    // 0006-NETW-010
-    const regex = /^Operational\d+$/;
    const market = this.market;
    cy.visit(`/#/markets/${market.id}`);
    cy.getByTestId('node-health-trigger').realHover();
    cy.getByTestId('node-health')
      .children()
      .first()
-      .invoke('text')
-      .should('match', regex);
+      .should('contain.text', 'Operational')
+      .then(($el) => {
+        const blockHeight = parseInt($el.text());
+        // block height will increase over the course of the test run so best
+        // we can do here is check that its showing something sensible
+        expect(blockHeight).to.be.greaterThan(0);
+      });
    cy.getByTestId('node-health')
      .children()
      .eq(1)
@@ -239,6 +239,7 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {
      .should('contain.text', order.size);

    cy.getByTestId(openOrdersTab).click();
+    cy.getByTestId('edit', txTimeout).should('contain.text', 'Edit');
    cy.getByTestId('tab-open-orders').within(() => {
      cy.get('.ag-center-cols-container')
        .children()
@@ -279,7 +280,8 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {
    cy.visit(`/#/markets/${market.id}`);
    cy.getByTestId(toastCloseBtn, txTimeout).click();
    cy.getByTestId(openOrdersTab).click();
-    cy.getByTestId('edit').first().click();
+    cy.getByTestId('edit', txTimeout).should('be.visible');
+    cy.getByTestId('edit').first().should('be.visible').click();
    cy.getByTestId('dialog-title').should('contain.text', 'Edit order');
    cy.get('#limitPrice').focus().clear().type(newPrice);
    cy.getByTestId('edit-order').find('[type="submit"]').click();
@@ -348,7 +350,6 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {
    cy.getByTestId('withdraw-dialog-button').click();
    connectEthereumWallet('Unknown');
    selectAsset(btcName);
-    cy.get('[data-testid="rich-select-option"]').eq(btcName).click();
    cy.get(amountField).clear().type('1');
    cy.getByTestId('submit-withdrawal').click();
    cy.getByTestId(toastContent, txTimeout).should(
@@ -436,7 +437,6 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {
    cy.getByTestId('deposit-button').click();
    connectEthereumWallet('Unknown');
    selectAsset(btcName);
-    cy.get('[data-testid="rich-select-option"]').eq(btcName).click();
    cy.contains('Deposits of tBTC not approved').should('not.exist');
    cy.contains('Use maximum').should('be.visible');
    cy.get(amountField).clear().type('20000000');
@@ -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');
+    });
+  }
+);
@@ -0,0 +1,131 @@
+import { connectEthereumWallet } from '../support/ethereum-wallet';
+import { selectAsset } from '../support/helpers';
+
+const formFieldError = 'input-error-text';
+const toAddressField = 'input[name="to"]';
+const amountField = 'input[name="amount"]';
+const useMaximumAmount = 'use-maximum';
+const submitWithdrawBtn = 'submit-withdrawal';
+const ethAddressValue = Cypress.env('ETHEREUM_WALLET_ADDRESS');
+
+const ASSET_SEPOLIA_TBTC = 2;
+const ASSET_EURO = 1;
+
+describe('withdraw form validation', { tags: '@smoke' }, () => {
+  before(() => {
+    cy.mockWeb3Provider();
+    cy.mockTradingPage();
+    cy.mockSubscription();
+    cy.setVegaWallet();
+
+    cy.visit('/#/portfolio');
+    cy.getByTestId('Withdrawals').click();
+
+    cy.getByTestId('Withdraw').click(); // sidebar item
+
+    // It also requires connection Ethereum wallet
+    connectEthereumWallet('MetaMask');
+
+    cy.wait('@Accounts');
+    cy.wait('@Assets');
+  });
+
+  it('empty fields', () => {
+    cy.getByTestId(submitWithdrawBtn).click();
+
+    cy.getByTestId(formFieldError).should('contain.text', 'Required');
+    // only 2 despite 3 fields because the ethereum address will be auto populated
+    cy.getByTestId(formFieldError).should('have.length', 2);
+
+    // Test for Ethereum address
+    cy.get(toAddressField).should('have.value', ethAddressValue);
+  });
+  it('min amount', () => {
+    // 1002-WITH-010
+    selectAsset(ASSET_SEPOLIA_TBTC);
+    cy.get(amountField).clear().type('0');
+    cy.getByTestId(submitWithdrawBtn).click();
+    cy.get('[data-testid="input-error-text"]').should(
+      'contain.text',
+      'Value is below minimum'
+    );
+  });
+  it('max amount', () => {
+    // 1002-WITH-005
+    // 1002-WITH-008
+    selectAsset(ASSET_EURO); // Will be above maximum because the vega wallet doesn't have any collateral
+    cy.get(amountField).clear().type('1001', { delay: 100 });
+    cy.getByTestId(submitWithdrawBtn).click();
+    cy.get('[data-testid="input-error-text"]').should(
+      'contain.text',
+      'Insufficient amount in account'
+    );
+  });
+
+  it('can set amount using use maximum button', () => {
+    // 1002-WITH-004
+    selectAsset(ASSET_SEPOLIA_TBTC);
+    cy.getByTestId(useMaximumAmount).click();
+    cy.get(amountField).should('have.value', '1000.00001');
+  });
+});
+
+describe(
+  'withdraw actions',
+  { tags: '@regression', testIsolation: true },
+  () => {
+    // this is extremely ugly hack, but setting it properly in contract is too much effort for such simple validation
+
+    // 1002-WITH-018
+
+    const withdrawalThreshold =
+      Cypress.env('VEGA_ENV') === 'CUSTOM' ? '0.00' : '100.00';
+    before(() => {
+      cy.mockWeb3Provider();
+      cy.mockTradingPage();
+      cy.mockSubscription();
+      cy.setVegaWallet();
+
+      cy.visit('/#/portfolio');
+
+      cy.wait('@Accounts');
+      cy.wait('@Assets');
+
+      cy.getByTestId('Withdrawals').click();
+
+      cy.getByTestId('Withdraw').click();
+
+      // It also requires connection Ethereum wallet
+      connectEthereumWallet('MetaMask');
+
+      cy.mockVegaWalletTransaction();
+    });
+
+    it('triggers transaction when submitted', () => {
+      // 1002-WITH-002
+      // 1002-WITH-003
+      selectAsset(ASSET_SEPOLIA_TBTC);
+      cy.getByTestId('BALANCE_AVAILABLE_label').should(
+        'contain.text',
+        'Balance available'
+      );
+      cy.getByTestId('BALANCE_AVAILABLE_value').should(
+        'have.text',
+        '1,000.00001'
+      );
+      cy.getByTestId('WITHDRAWAL_THRESHOLD_label').should(
+        'contain.text',
+        'Delayed withdrawal threshold'
+      );
+      cy.getByTestId('WITHDRAWAL_THRESHOLD_value').should(
+        'contain.text',
+        withdrawalThreshold
+      );
+      cy.getByTestId('DELAY_TIME_label').should('contain.text', 'Delay time');
+      cy.getByTestId('DELAY_TIME_value').should('have.text', 'None');
+      cy.get(amountField).clear().type('10');
+      cy.getByTestId(submitWithdrawBtn).click();
+      cy.getByTestId('toast').should('contain.text', 'Awaiting confirmation');
+    });
+  }
+);
@@ -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>
  );
 };
@@ -8,17 +8,22 @@ export const LandingBanner = () => {
      <div className="">
        <div
          aria-hidden
-          className="absolute top-20 right-[120px] md:right-[240px] max-sm:hidden"
+          className="absolute top-64 right-[220px] md:right-[340px] max-sm:hidden"
        >
          <AnimatedDudeWithWire />
        </div>
-        <div className="pt-20 sm:w-[50%]">
+        <div className="pt-32 sm:w-[50%]">
          <h1 className="text-6xl font-alpha calt mb-10">
            {t('Earn commission & stake rewards')}
          </h1>
          <p className="text-lg mb-10">
            {t(
-              'Invite friends and earn rewards from the trading fees they pay. Stake those rewards to earn multipliers on future rewards.'
+              'Invite friends and earn commission in the form of Vega rewards from the trading fees they pay. Stake those rewards to earn multipliers on future rewards.'
+            )}
+          </p>
+          <p className="text-lg">
+            {t(
+              'Any friends that join using the code will receive discounts off trading fees.'
            )}
          </p>
        </div>
@@ -2,7 +2,6 @@ import classNames from 'classnames';
 import type { HTMLAttributes } from 'react';
 import { SKY_BACKGROUND } from './constants';
 import { Outlet } from 'react-router-dom';
-import { TinyScroll } from '@vegaprotocol/ui-toolkit';

 export const Layout = ({
  className,
@@ -29,10 +28,8 @@ export const LayoutWithSky = ({
  ...props
 }: HTMLAttributes<HTMLDivElement>) => {
  return (
-    <TinyScroll
-      className={classNames('max-h-full overflow-auto', SKY_BACKGROUND)}
-    >
+    <div className={classNames('h-full overflow-auto', SKY_BACKGROUND)}>
      <Layout className={className} {...props} />
-    </TinyScroll>
+    </div>
  );
 };
@@ -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 } 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={formatNumber(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,90 +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';
-
-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 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 {
-      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}
-        defaultColDef={feesTableDefaultColDef}
-        domLayout="autoHeight"
-        components={components}
-        rowHeight={45}
-      />
-    </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,101 +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
- */
-export const getAdjustedFee = (fees: BigNumber[], discounts: BigNumber[]) => {
-  const totalFee = fees.reduce((sum, f) => sum.plus(f), new BigNumber(0));
-  const totalDiscount = discounts.reduce(
-    (sum, d) => sum.plus(d),
-    new BigNumber(0)
-  );
-  return totalFee
-    .times(BigNumber.max(0, new BigNumber(1).minus(totalDiscount)))
-    .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', {
          'lg:col-end-3': !sidebarOpen,
          'hidden lg:block lg:col-end-2': sidebarOpen,
        })}
@@ -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';
@@ -56,14 +55,10 @@ export const routerConfig: RouteObject[] = compact([
  FLAGS.REFERRALS
    ? {
        path: AppRoutes.REFERRALS,
-        element: <LayoutWithSidebar sidebar={<PortfolioSidebar />} />,
+        element: <LayoutWithSky />,
        children: [
          {
-            element: (
-              <LayoutWithSky>
-                <Referrals />
-              </LayoutWithSky>
-            ),
+            element: <Referrals />,
            children: [
              {
                index: true,
@@ -86,16 +81,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);
@@ -33,7 +33,7 @@ import BigNumber from 'bignumber.js';
 import classNames from 'classnames';
 import { AccountsActionsDropdown } from './accounts-actions-dropdown';

-const colorClass = (percentageUsed: number) => {
+const colorClass = (percentageUsed: number, neutral = false) => {
  return classNames('text-right', {
    'text-vega-orange': percentageUsed >= 75 && percentageUsed < 90,
    'text-vega-red': percentageUsed >= 90,
@@ -210,7 +210,7 @@ export const AccountTable = ({
        },
        cellClass: ({ data }) => {
          const percentageUsed = percentageValue(data?.used, data?.total);
-          return colorClass(percentageUsed);
+          return colorClass(percentageUsed, true);
        },
        valueFormatter: ({
          value,
@@ -270,8 +270,7 @@ export const AccountTable = ({
                    onClickDeposit && onClickDeposit(assetId);
                  }}
                >
-                  <VegaIcon name={VegaIconNames.DEPOSIT} size={14} />{' '}
-                  {t('Deposit')}
+                  <VegaIcon name={VegaIconNames.DEPOSIT} /> {t('Deposit')}
                </TradingButton>
              </CenteredGridCellWrapper>
            );
@@ -259,9 +259,11 @@ export const DealTicketMarginDetails = ({
        ? liquidationEstimateWorstCaseIncludingBuyOrders
        : liquidationEstimateWorstCaseIncludingSellOrders;

+    // The estimate order query API gives us the liquidation price in formatted by asset decimals.
+    // We need to calculate it with asset decimals, but display it with market decimals precision until the API changes.
    liquidationPriceEstimate = formatValue(
      liquidationEstimateWorstCase.toString(),
-      market.decimalPlaces,
+      assetDecimals,
      undefined,
      market.decimalPlaces
    );
@@ -274,7 +276,7 @@ export const DealTicketMarginDetails = ({
        ? liquidationEstimateBestCase
        : liquidationEstimateWorstCase
      ).toString(),
-      market.decimalPlaces,
+      assetDecimals,
      undefined,
      market.decimalPlaces
    );
@@ -306,7 +308,7 @@ export const DealTicketMarginDetails = ({
                key={'value-dropdown'}
                className="flex items-center justify-between w-full gap-2"
              >
-                <div className="flex items-center text-left gap-1">
+                <div className="flex items-center gap-1 text-left">
                  <Tooltip description={MARGIN_DIFF_TOOLTIP_TEXT(assetSymbol)}>
                    <span className="text-muted">{t('Margin required')}</span>
                  </Tooltip>
@@ -275,9 +275,7 @@ export const DealTicket = ({

  const assetSymbol = getAsset(market).symbol;

-  const baseQuote = getBaseQuoteUnit(
-    market.tradableInstrument.instrument.metadata.tags
-  );
+  const assetUnit = getQuoteName(market);

  const summaryError = useMemo(() => {
    if (!pubKey) {
@@ -416,7 +414,7 @@ export const DealTicket = ({
                id="order-size"
                className="w-full"
                type="number"
-                appendElement={baseQuote && <Pill size="xs">{baseQuote}</Pill>}
+                appendElement={assetUnit && <Pill size="xs">{assetUnit}</Pill>}
                step={sizeStep}
                min={sizeStep}
                data-testid="order-size"
@@ -685,7 +683,7 @@ export const DealTicket = ({
        subLabel={`${formatValue(
          normalizedOrder.size,
          market.positionDecimalPlaces
-        )} ${baseQuote} @ ${
+        )} ${assetUnit} @ ${
          type === Schema.OrderType.TYPE_MARKET
            ? 'market'
            : `${formatValue(
@@ -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()]} />);
    });
@@ -153,8 +153,6 @@ 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:
@@ -49,11 +49,6 @@ query EstimatePosition(
    openVolume: $openVolume
    orders: $orders
    collateralAvailable: $collateralAvailable
-    # Everywhere in the codebase we expect price values of the underlying to have the right
-    # number of digits for formatting with market.decimalPlaces. By default the estimatePosition
-    # query will return a full value requiring formatting using asset.decimals. For consistency
-    # we can set this variable to true so that we can format with market.decimalPlaces
-    scaleLiquidationPriceToMarketDecimals: true
  ) {
    margin {
      worstCase {
@@ -130,7 +130,6 @@ export const EstimatePositionDocument = gql`
    openVolume: $openVolume
    orders: $orders
    collateralAvailable: $collateralAvailable
-    scaleLiquidationPriceToMarketDecimals: true
  ) {
    margin {
      worstCase {
@@ -1,85 +0,0 @@
-import { MockedProvider } from '@apollo/client/testing';
-import type { MockedResponse } from '@apollo/client/testing';
-import { render, screen, within } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import { EstimatePositionDocument } from './__generated__/Positions';
-import type { EstimatePositionQuery } from './__generated__/Positions';
-import { LiquidationPrice } from './liquidation-price';
-import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
-
-describe('LiquidationPrice', () => {
-  const props = {
-    marketId: 'market-id',
-    openVolume: '100',
-    collateralAvailable: '1000',
-    decimalPlaces: 2,
-  };
-  const worstCaseOpenVolume = '200';
-  const bestCaseOpenVolume = '100';
-  const mock: MockedResponse<EstimatePositionQuery> = {
-    request: {
-      query: EstimatePositionDocument,
-      variables: {
-        marketId: props.marketId,
-        openVolume: props.openVolume,
-        collateralAvailable: props.collateralAvailable,
-      },
-    },
-    result: {
-      data: {
-        estimatePosition: {
-          margin: {
-            worstCase: {
-              maintenanceLevel: '100',
-              searchLevel: '100',
-              initialLevel: '100',
-              collateralReleaseLevel: '100',
-            },
-            bestCase: {
-              maintenanceLevel: '100',
-              searchLevel: '100',
-              initialLevel: '100',
-              collateralReleaseLevel: '100',
-            },
-          },
-          liquidation: {
-            worstCase: {
-              open_volume_only: worstCaseOpenVolume,
-              including_buy_orders: '100',
-              including_sell_orders: '100',
-            },
-            bestCase: {
-              open_volume_only: bestCaseOpenVolume,
-              including_buy_orders: '100',
-              including_sell_orders: '100',
-            },
-          },
-        },
-      },
-    },
-  };
-
-  it('correctly formats best and worst case values for the tooltip', async () => {
-    render(
-      <MockedProvider mocks={[mock]}>
-        <LiquidationPrice {...props} />
-      </MockedProvider>
-    );
-
-    expect(screen.getByText('-')).toBeInTheDocument();
-    const el = await screen.findByTestId('liquidation-price');
-    expect(el).toHaveTextContent(
-      addDecimalsFormatNumber(worstCaseOpenVolume, props.decimalPlaces)
-    );
-    await userEvent.hover(el);
-    const tooltip = within(await screen.findByRole('tooltip'));
-    expect(
-      tooltip.getByText('Worst case').nextElementSibling
-    ).toHaveTextContent(
-      addDecimalsFormatNumber(worstCaseOpenVolume, props.decimalPlaces)
-    );
-    expect(tooltip.getByText('Best case').nextElementSibling).toHaveTextContent(
-      addDecimalsFormatNumber(bestCaseOpenVolume, props.decimalPlaces)
-    );
-  });
-});
@@ -8,12 +8,20 @@ export const LiquidationPrice = ({
  openVolume,
  collateralAvailable,
  decimalPlaces,
+  formatDecimals,
 }: {
  marketId: string;
  openVolume: string;
  collateralAvailable: string;
  decimalPlaces: number;
+  formatDecimals: number;
 }) => {
+  // NOTE!
+  //
+  // The estimate order query API gives us the liquidation price unformatted but expecting to be converted
+  // using asset decimal placse.
+  //
+  // We need to convert it with asset decimals, but display it formatted with market decimals precision until the API changes.
  const { data: currentData, previousData } = useEstimatePositionQuery({
    variables: {
      marketId,
@@ -30,11 +38,21 @@ export const LiquidationPrice = ({
    return <span>-</span>;
  }

-  let bestCase = data.estimatePosition.liquidation.bestCase.open_volume_only;
-  let worstCase = data.estimatePosition.liquidation.worstCase.open_volume_only;
+  let bestCase = '-';
+  let worstCase = '-';

-  worstCase = addDecimalsFormatNumber(worstCase, decimalPlaces, decimalPlaces);
-  bestCase = addDecimalsFormatNumber(bestCase, decimalPlaces, decimalPlaces);
+  bestCase =
+    data.estimatePosition?.liquidation?.bestCase.open_volume_only.replace(
+      /\..*/,
+      ''
+    );
+  worstCase =
+    data.estimatePosition?.liquidation?.worstCase.open_volume_only.replace(
+      /\..*/,
+      ''
+    );
+  worstCase = addDecimalsFormatNumber(worstCase, decimalPlaces, formatDecimals);
+  bestCase = addDecimalsFormatNumber(bestCase, decimalPlaces, formatDecimals);

  return (
    <Tooltip
@@ -339,12 +339,16 @@ export const PositionsTable = ({
              if (!data) {
                return '-';
              }
+              // The estimate order query API gives us the liquidation price unformatted but expecting
+              // conversion using asset decimals. We need to convert it with asset decimals, but format
+              // it with market decimals precision until the API changes.
              return (
                <LiquidationPrice
                  marketId={data.marketId}
                  openVolume={data.openVolume}
                  collateralAvailable={data.totalBalance}
-                  decimalPlaces={data.marketDecimalPlaces}
+                  decimalPlaces={data.assetDecimals}
+                  formatDecimals={data.marketDecimalPlaces}
                />
              );
            },
@@ -1,4 +1,4 @@
-import { render, screen } from '@testing-library/react';
+import { act, fireEvent, render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { generateAccount, generateAsset } from './test-helpers';
 import type { WithdrawManagerProps } from './withdraw-manager';
@@ -57,18 +57,10 @@ describe('WithdrawManager', () => {
  );

  it('calls submit if valid form submission', async () => {
-    // 1002-WITH-002
-    // 1002-WITH-003
    const { container } = render(generateJsx(props));
-    const select = container.querySelector('select[name="asset"]') as Element;
-    await userEvent.selectOptions(select, props.assets[0].id);
-    await userEvent.clear(screen.getByLabelText('To (Ethereum address)'));
-    await userEvent.type(
-      screen.getByLabelText('To (Ethereum address)'),
-      ethereumAddress
-    );
-    await userEvent.type(screen.getByLabelText('Amount'), '0.01');
-    await userEvent.click(screen.getByTestId('submit-withdrawal'));
+    await act(async () => {
+      await submitValid(container);
+    });
    expect(props.submit).toHaveBeenCalledWith({
      amount: '1000',
      asset: props.assets[0].id,
@@ -78,56 +70,58 @@ describe('WithdrawManager', () => {
  });

  it('validates correctly', async () => {
-    // 1002-WITH-010
-    // 1002-WITH-005
-    // 1002-WITH-008
-    // 1002-WITH-018
-    const { container } = render(generateJsx(props));
+    render(generateJsx(props));

    // Set other fields to be valid
-    const select = container.querySelector('select[name="asset"]') as Element;
-    await userEvent.selectOptions(select, props.assets[0].id);
-    expect(screen.getByTestId('connect-eth-wallet-btn')).toBeInTheDocument();
-
-    await userEvent.type(
-      screen.getByLabelText('To (Ethereum address)'),
-      ethereumAddress
-    );
+    fireEvent.change(screen.getByLabelText('Asset'), {
+      target: { value: props.assets[0].id },
+    });
+    fireEvent.change(screen.getByLabelText('To (Ethereum address)'), {
+      target: { value: ethereumAddress },
+    });

    // Min amount
-    await userEvent.clear(screen.getByLabelText('Amount'));
-    await userEvent.type(screen.getByLabelText('Amount'), '0.00000001');
-    await userEvent.click(screen.getByTestId('submit-withdrawal'));
-
+    fireEvent.change(screen.getByLabelText('Amount'), {
+      target: { value: '0.00000001' },
+    });
+    fireEvent.submit(screen.getByTestId('withdraw-form'));
    expect(
      await screen.findByText('Value is below minimum')
    ).toBeInTheDocument();
    expect(props.submit).not.toBeCalled();

-    await userEvent.clear(screen.getByLabelText('Amount'));
-    await userEvent.type(screen.getByLabelText('Amount'), '0.00001');
+    fireEvent.change(screen.getByLabelText('Amount'), {
+      target: { value: '0.00001' },
+    });

    // Max amount (balance is 1)
-    await userEvent.clear(screen.getByLabelText('Amount'));
-    await userEvent.type(screen.getByLabelText('Amount'), '2');
-
-    await userEvent.click(screen.getByTestId('submit-withdrawal'));
+    fireEvent.change(screen.getByLabelText('Amount'), {
+      target: { value: '2' },
+    });
+    fireEvent.submit(screen.getByTestId('withdraw-form'));
    expect(
      await screen.findByText('Insufficient amount in account')
    ).toBeInTheDocument();
    expect(props.submit).not.toBeCalled();
  });
-  it('can set amount using use maximum button', async () => {
-    // 1002-WITH-004
-    render(generateJsx(props));

-    await userEvent.click(screen.getByTestId('use-maximum'));
-    expect(screen.getByTestId('amount-input')).toHaveValue(1);
-  });
+  const submitValid = async (container: HTMLElement) => {
+    const select = container.querySelector('select[name="asset"]') as Element;
+    await userEvent.selectOptions(select, props.assets[0].id);
+    fireEvent.change(screen.getByLabelText('To (Ethereum address)'), {
+      target: { value: ethereumAddress },
+    });
+    fireEvent.change(screen.getByLabelText('Amount'), {
+      target: { value: '0.01' },
+    });
+    fireEvent.submit(screen.getByTestId('withdraw-form'));
+  };

  it('shows withdraw delay notification if amount greater than threshold', async () => {
    render(generateJsx(props));
-    await userEvent.type(screen.getByLabelText('Amount'), '1001');
+    fireEvent.change(screen.getByLabelText('Amount'), {
+      target: { value: '1001' },
+    });
    expect(
      await screen.findByTestId('amount-withdrawal-delay-notification')
    ).toBeInTheDocument();
@@ -136,7 +130,9 @@ describe('WithdrawManager', () => {
  it('shows withdraw delay notification if threshold is 0', async () => {
    withdrawAsset.threshold = new BigNumber(0);
    render(generateJsx(props));
-    await userEvent.type(screen.getByLabelText('Amount'), '0.01');
+    fireEvent.change(screen.getByLabelText('Amount'), {
+      target: { value: '0.01' },
+    });
    expect(
      await screen.findByTestId('withdrawals-delay-notification')
    ).toBeInTheDocument();
@@ -71,7 +71,7 @@
    "jsondiffpatch": "^0.4.1",
    "lodash": "^4.17.21",
    "next": "13.3.0",
-    "pennant": "1.14.0",
+    "pennant": "1.13.4",
    "react": "18.2.0",
    "react-copy-to-clipboard": "^5.0.4",
    "react-dom": "18.2.0",
@@ -20500,10 +20500,10 @@ pend@~1.2.0:
  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
  integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==

-pennant@1.14.0:
-  version "1.14.0"
-  resolved "https://registry.yarnpkg.com/pennant/-/pennant-1.14.0.tgz#4100c25a6d836d6f0ff425181fb6f812f9fe5778"
-  integrity sha512-9H0zWzFUSbD1BlDXnHFmKwkAxXGb1xTxjkUD+RwaMygtSwPXzQEyk2ScVyMqxdcz0RuJmI5HCVmZTOjdr1NwuA==
+pennant@1.13.4:
+  version "1.13.4"
+  resolved "https://registry.yarnpkg.com/pennant/-/pennant-1.13.4.tgz#33a5f3413634a2341a7b91c917f023c59ecc44c7"
+  integrity sha512-sqwkUiYHxmS97RY8jToMfgR9ePcEr5PWVQu9BPrhdUIa1Q/NztE36SWM5tVIsPPTx3pPIHYTNEVJm02Ubl8cZQ==
  dependencies:
    "@babel/runtime" "^7.13.10"
    "@d3fc/d3fc-technical-indicator" "^8.0.1"
				`@@ -1 +0,0 @@`
				`export { FeesContainer } from './fees-container';`