fix: missing space in e2e tests

.gitignore

@@ -59,4 +59,5 @@ apps/trading/e2e/logs/
 apps/trading/e2e/.pytest_cache/
 apps/trading/e2e/traces/
 
-.nx/
+.nx/cache
+

apps/explorer/src/app/components/assets/assets-table.tsx

@@ -12,8 +12,7 @@ import { type VegaICellRendererParams } from '@vegaprotocol/datagrid';
 import { useRef, useLayoutEffect } from 'react';
 import { BREAKPOINT_MD } from '../../config/breakpoints';
 import { useNavigate } from 'react-router-dom';
-import { type ColDef } from 'ag-grid-community';
-import type { RowClickedEvent } from 'ag-grid-community';
+import { type RowClickedEvent, ColDef } from 'ag-grid-community';
 
 type AssetsTableProps = {
   data: AssetFieldsFragment[] | null;

apps/explorer/src/app/components/proposals/proposals-table.tsx

@@ -8,8 +8,7 @@ import {
   type VegaValueFormatterParams,
 } from '@vegaprotocol/datagrid';
 import { useLayoutEffect, useMemo, useRef, useState } from 'react';
-import { type ColDef } from 'ag-grid-community';
-import type { RowClickedEvent } from 'ag-grid-community';
+import { type RowClickedEvent, ColDef } from 'ag-grid-community';
 import { getDateTimeFormat } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import {

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

@@ -1,59 +0,0 @@
-import { useState } from 'react';
-import type { BlockExplorerTransactionResult } from '../../routes/types/block-explorer-response';
-import {
-  CopyWithTooltip,
-  VegaIcon,
-  VegaIconNames,
-} from '@vegaprotocol/ui-toolkit';
-import { t } from '@vegaprotocol/i18n';
-
-interface SignatureProps {
-  signature: BlockExplorerTransactionResult['signature'];
-}
-
-const valueClass =
-  'font-mono px-2.5 py-0.5 text-xs max-w-[200px] cursor-pointer';
-const valueClassClosed = 'text-ellipsis overflow-hidden';
-const valueClassOpen = 'break-words text-left';
-
-/**
- * Viewer component for a vega signature. Featuers copy and pasting, truncation
- *
- * @param signature
- */
-export const Signature = ({ signature }: SignatureProps) => {
-  const [isOpen, setIsOpen] = useState(false);
-
-  if (!signature || !signature.value || !signature.version || !signature.algo) {
-    return null;
-  }
-
-  return (
-    <div className="inline-flex border rounded signature-component relative pr-[20px]">
-      <span
-        className="bg-gray-100 px-2.5 py-0.5 text-xs text-gray-500 select-none cursor-default"
-        title={`Version ${signature.version}`}
-      >
-        {signature.algo}
-      </span>
-      <div
-        className={
-          isOpen
-            ? `${valueClass} ${valueClassOpen}`
-            : `${valueClass} ${valueClassClosed}`
-        }
-      >
-        <CopyWithTooltip text={signature.value}>
-          <span title={signature.value}>{signature.value}</span>
-        </CopyWithTooltip>
-      </div>
-      <button
-        onClick={() => setIsOpen(!isOpen)}
-        className="absolute top-[-3px] right-0 pr-2"
-        title={t('Show full signature')}
-      >
-        <VegaIcon name={isOpen ? VegaIconNames.EYE_OFF : VegaIconNames.EYE} />
-      </button>
-    </div>
-  );
-};

apps/explorer/src/app/components/txs/details/shared/tx-details-shared.tsx

@@ -9,7 +9,6 @@ import { Time } from '../../../time';
 import { ChainResponseCode } from '../chain-response-code/chain-reponse.code';
 import { TxDataView } from '../../tx-data-view';
 import Hash from '../../../links/hash';
-import { Signature } from '../../../signature/signature';
 
 interface TxDetailsSharedProps {
   txData: BlockExplorerTransactionResult | undefined;
@@ -76,12 +75,6 @@ export const TxDetailsShared = ({
           <BlockLink height={height} />
         </TableCell>
       </TableRow>
-      <TableRow modifier="bordered">
-        <TableCell {...sharedHeaderProps}>{t('Signature')}</TableCell>
-        <TableCell>
-          <Signature signature={txData.signature} />
-        </TableCell>
-      </TableRow>
       <TableRow modifier="bordered">
         <TableCell {...sharedHeaderProps}>{t('Time')}</TableCell>
         <TableCell>

apps/explorer/src/app/components/txs/tx-transfer.spec.tsx

@@ -98,8 +98,6 @@ describe('TxDetailsTransfer', () => {
       },
     },
     signature: {
-      version: '1',
-      algo: 'vega/ed25519',
       value:
         '610c2e196a7d4fed4413b9e82af267b1ff3e30e943df3a3d28096fd60604d430d752fbaf6dd4f84d496be78885bb6118f40560bff7832c06bd7a3d67b718b700',
     },

apps/explorer/src/app/components/txs/txs-infinite-list.spec.tsx

@@ -20,8 +20,6 @@ const generateTxs = (number: number): BlockExplorerTransactionResult[] => {
       '4b782482f587d291e8614219eb9a5ee9280fa2c58982dee71d976782a9be1964',
     type: 'Submit Order',
     signature: {
-      version: '1',
-      algo: 'vega/ed25519',
       value: '123',
     },
     code: 0,

apps/explorer/src/app/routes/txs/id/tx-details.spec.tsx

@@ -23,8 +23,6 @@ const txData: BlockExplorerTransactionResult = {
   type: 'type',
   command: {} as ValidatorHeartbeat,
   signature: {
-    version: '1',
-    algo: 'vega/ed25519',
     value: '123',
   },
 };

apps/explorer/src/app/routes/types/block-explorer-response.d.ts

@@ -11,8 +11,6 @@ export interface BlockExplorerTransactionResult {
   cursor: string;
   command: components['schemas']['blockexplorerv1transaction'];
   signature: {
-    version: string;
-    algo: string;
     value: string;
   };
   error?: string;

apps/governance/src/components/heading/heading.tsx

@@ -23,13 +23,10 @@ export const Heading = ({
       })}
     >
       <h1
-        className={classNames(
-          'font-alpha calt text-5xl [word-break:break-word]',
-          {
-            'mt-0': !marginTop,
-            'mb-0': !marginBottom,
-          }
-        )}
+        className={classNames('font-alpha calt text-5xl break-words', {
+          'mt-0': !marginTop,
+          'mb-0': !marginBottom,
+        })}
       >
         {title}
       </h1>

apps/governance/src/routes/proposals/components/proposal-asset-details/proposal-asset-details.tsx

@@ -7,10 +7,8 @@ import type { AssetFieldsFragment } from '@vegaprotocol/assets';
 
 export const ProposalAssetDetails = ({
   asset,
-  originalAsset,
 }: {
   asset: AssetFieldsFragment;
-  originalAsset?: AssetFieldsFragment;
 }) => {
   const { t } = useTranslation();
   const [showAssetDetails, setShowAssetDetails] = useState(false);
@@ -29,7 +27,6 @@ export const ProposalAssetDetails = ({
         <div className="mb-10 pb-4">
           <AssetDetailsTable
             asset={asset}
-            originalAsset={originalAsset}
             omitRows={[
               AssetDetail.STATUS,
               AssetDetail.INFRASTRUCTURE_FEE_ACCOUNT_BALANCE,

apps/governance/src/routes/proposals/components/proposal/proposal.tsx

@@ -65,13 +65,10 @@ export const Proposal = ({
     ? removePaginationWrapper(assetData.assetsConnection?.edges)[0]
     : undefined;
 
-  const originalAsset = asset;
-
   if (proposal.terms.change.__typename === 'UpdateAsset' && asset) {
     asset = {
       ...asset,
       quantum: proposal.terms.change.quantum,
-      source: { ...asset.source },
     };
 
     if (asset.source.__typename === 'ERC20') {
@@ -231,7 +228,7 @@ export const Proposal = ({
         proposal.terms.change.__typename === 'UpdateAsset') &&
         asset && (
           <div className="mb-4">
-            <ProposalAssetDetails asset={asset} originalAsset={originalAsset} />
+            <ProposalAssetDetails asset={asset} />
           </div>
         )}
 

apps/trading-e2e/src/integration/market-summary.cy.ts

@@ -0,0 +1,182 @@
+import * as Schema from '@vegaprotocol/types';
+
+const expirtyTooltip = 'expiry-tooltip';
+const externalLink = 'external-link';
+const itemHeader = 'item-header';
+const itemValue = 'item-value';
+const link = 'link';
+const liquidityLink = 'view-liquidity-link';
+const liquiditySupplied = 'liquidity-supplied';
+const liquiditySuppliedTooltip = 'liquidity-supplied-tooltip';
+const marketChange = 'market-change';
+const marketExpiry = 'market-expiry';
+const marketMode = 'market-trading-mode';
+const marketName = 'header-title';
+const marketPrice = 'market-price';
+const marketSettlement = 'market-settlement-asset';
+const marketSummaryBlock = 'header-summary';
+const marketVolume = 'market-volume';
+const percentageValue = 'price-change-percentage';
+const priceChangeValue = 'price-change';
+const tradingModeTooltip = 'trading-mode-tooltip';
+
+describe('Market trading page', () => {
+  before(() => {
+    cy.clearAllLocalStorage();
+    cy.mockTradingPage(
+      Schema.MarketState.STATE_ACTIVE,
+      Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
+      Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
+    );
+    cy.mockSubscription();
+    cy.setOnBoardingViewed();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@MarketData');
+    cy.getByTestId(marketSummaryBlock).should('be.visible');
+  });
+
+  describe('Market summary', { tags: '@smoke' }, () => {
+    // 7002-SORD-001
+    // 7002-SORD-002
+    it('must display market name', () => {
+      // 6002-MDET-001
+      cy.getByTestId(marketName).should('not.be.empty');
+    });
+
+    it('must see market expiry', () => {
+      // 6002-MDET-002
+      cy.getByTestId(marketSummaryBlock).within(() => {
+        cy.getByTestId(marketExpiry).within(() => {
+          cy.getByTestId(itemHeader).should('have.text', 'Expiry');
+          cy.getByTestId(itemValue).should('not.be.empty');
+        });
+      });
+    });
+
+    it('must see market price', () => {
+      // 6002-MDET-003
+      cy.getByTestId(marketSummaryBlock).within(() => {
+        cy.getByTestId(marketPrice).within(() => {
+          cy.getByTestId(itemHeader).should('have.text', 'Mark Price');
+          cy.getByTestId(itemValue).should('not.be.empty');
+        });
+      });
+    });
+
+    it('must see market change', () => {
+      // 6002-MDET-004
+      cy.getByTestId(marketSummaryBlock).within(() => {
+        cy.getByTestId(marketChange).within(() => {
+          cy.getByTestId(itemHeader).should('have.text', 'Change (24h)');
+          cy.getByTestId(percentageValue).should('not.be.empty');
+          cy.getByTestId(priceChangeValue).should('not.be.empty');
+        });
+      });
+    });
+
+    it('must see market volume', () => {
+      // 6002-MDET-005
+      cy.getByTestId(marketSummaryBlock).within(() => {
+        cy.getByTestId(marketVolume).within(() => {
+          cy.getByTestId(itemHeader).should('have.text', 'Volume (24h)');
+          cy.getByTestId(itemValue).should('not.be.empty');
+        });
+      });
+    });
+
+    it('must see market settlement', () => {
+      // 6002-MDET-008
+      cy.getByTestId(marketSummaryBlock).within(() => {
+        cy.getByTestId(marketSettlement).within(() => {
+          cy.getByTestId(itemHeader).should('have.text', 'Settlement asset');
+          cy.getByTestId(itemValue).should('not.be.empty');
+        });
+      });
+    });
+  });
+
+  describe('Market tooltips', { tags: '@smoke' }, () => {
+    it('should see expiry tooltip', () => {
+      cy.getByTestId(marketSummaryBlock).within(() => {
+        cy.getByTestId(marketExpiry).within(() => {
+          cy.getByTestId(itemValue)
+            .should('have.text', 'Not time-based')
+            .realHover();
+        });
+      });
+      cy.getByTestId(expirtyTooltip)
+        .eq(0)
+        .should(
+          'contain.text',
+          'This market expires when triggered by its oracle, not on a set date.'
+        )
+        .within(() => {
+          cy.getByTestId(link)
+            .should('have.attr', 'href')
+            .and('include', Cypress.env('EXPLORER_URL'));
+        });
+    });
+
+    it('should see trading conditions tooltip', () => {
+      const toolTipLabel = 'tooltip-label';
+      const toolTipValue = 'tooltip-value';
+      const auctionToolTipLabels = [
+        'Auction start',
+        'Est. auction end',
+        'Target liquidity',
+        'Current liquidity',
+        'Est. uncrossing price',
+        'Est. uncrossing vol',
+      ];
+
+      cy.getByTestId(marketSummaryBlock).within(() => {
+        cy.getByTestId(marketMode).within(() => {
+          cy.getByTestId(itemValue)
+            .should('contain.text', 'Monitoring auction')
+            .and('contain.text', 'liquidity')
+            .realHover();
+        });
+      });
+      cy.getByTestId(tradingModeTooltip)
+        .should(
+          'contain.text',
+          'This market is in auction until it reaches sufficient liquidity.'
+        )
+        .eq(0)
+        .within(() => {
+          cy.getByTestId(externalLink)
+            .should('have.attr', 'href')
+            .and('include', Cypress.env('TRADING_MODE_LINK'));
+
+          for (let i = 0; i < 6; i++) {
+            cy.getByTestId(toolTipLabel)
+              .eq(i)
+              .should('have.text', auctionToolTipLabels[i]);
+            cy.getByTestId(toolTipValue).eq(i).should('not.be.empty');
+          }
+        });
+    });
+
+    it('should see liquidity supplied tooltip', () => {
+      cy.getByTestId(marketSummaryBlock).within(() => {
+        cy.getByTestId(liquiditySupplied).within(() => {
+          cy.getByTestId(itemValue).realHover();
+        });
+      });
+      cy.getByTestId(liquiditySuppliedTooltip)
+        .should('contain.text', 'Supplied stake')
+        .and('contain.text', 'Target stake')
+        .first()
+        .within(() => {
+          cy.getByTestId(liquidityLink).should(
+            'have.text',
+            'View liquidity provision table'
+          );
+          cy.getByTestId(externalLink).should(
+            'have.text',
+            'Learn about providing liquidity'
+          );
+        });
+    });
+  });
+});

apps/trading-e2e/src/integration/vega-wallet-prompt.cy.ts

@@ -0,0 +1,103 @@
+import * as Schema from '@vegaprotocol/types';
+import type { OrderSubmission } from '@vegaprotocol/wallet';
+import { createOrder } from '../support/create-order';
+
+describe(
+  'vega wallet - prompt',
+  { tags: '@regression', testIsolation: true },
+  () => {
+    describe('must submit order', { tags: '@smoke' }, () => {
+      // 7002-SORD-039
+      beforeEach(() => {
+        cy.setVegaWallet();
+        cy.mockTradingPage();
+        cy.mockSubscription();
+        cy.visit('/#/markets/market-0');
+        cy.wait('@Markets');
+      });
+
+      it('must see a prompt to check connected vega wallet to approve transaction', () => {
+        // 0003-WTXN-002
+        cy.mockVegaWalletTransaction(1000);
+        const order: OrderSubmission = {
+          marketId: 'market-0',
+          type: Schema.OrderType.TYPE_MARKET,
+          side: Schema.Side.SIDE_BUY,
+          timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
+          size: '100',
+        };
+        createOrder(order);
+        cy.getByTestId('toast-content').should(
+          'contain.text',
+          'Please go to your Vega wallet application and approve or reject the transaction.'
+        );
+      });
+
+      it('must show error returned by wallet ', () => {
+        // 0003-WTXN-009
+        // 0003-WTXN-011
+        // 0002-WCON-016
+        // 0003-WTXN-008
+
+        //trigger error from the wallet
+        cy.intercept('POST', 'http://localhost:1789/api/v2/requests', (req) => {
+          req.on('response', (res) => {
+            res.send({
+              jsonrpc: '2.0',
+              id: '1',
+            });
+          });
+        });
+
+        const order: OrderSubmission = {
+          marketId: 'market-0',
+          type: Schema.OrderType.TYPE_MARKET,
+          side: Schema.Side.SIDE_BUY,
+          timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
+          size: '100',
+        };
+        createOrder(order);
+        cy.getByTestId('toast-content').should(
+          'contain.text',
+          'The connection to your Vega Wallet has been lost.'
+        );
+        cy.getByTestId('connect-vega-wallet').click();
+        cy.getByTestId('dialog-content').should('be.visible');
+      });
+
+      it('must see that the order was rejected by the connected wallet', () => {
+        // 0003-WTXN-007
+
+        //trigger rejection error from the wallet
+        cy.intercept('POST', 'http://localhost:1789/api/v2/requests', (req) => {
+          req.alias = 'client.send_transaction';
+          req.reply({
+            statusCode: 400,
+            body: {
+              jsonrpc: '2.0',
+              error: {
+                code: 3001,
+                data: 'the user rejected the wallet connection',
+                message: 'User error',
+              },
+              id: '0',
+            },
+          });
+        });
+
+        const order: OrderSubmission = {
+          marketId: 'market-0',
+          type: Schema.OrderType.TYPE_MARKET,
+          side: Schema.Side.SIDE_BUY,
+          timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
+          size: '100',
+        };
+        createOrder(order);
+        cy.getByTestId('toast-content').should(
+          'contain.text',
+          'Error occurredthe user rejected the wallet connection'
+        );
+      });
+    });
+  }
+);

apps/trading-e2e/src/integration/wallet-eth.cy.ts

@@ -26,6 +26,18 @@ describe('ethereum wallet', { tags: '@smoke', testIsolation: true }, () => {
     cy.getByTestId('tab-deposits').should('not.be.empty');
   });
 
+  it.skip('should see QR code modal for WalletConnect', () => {
+    // 0004-EWAL-003
+
+    cy.getByTestId('Deposits').click();
+    cy.getByTestId('deposit-button').click();
+    cy.getByTestId('connect-eth-wallet-btn').click();
+    cy.getByTestId('web3-connector-list').should('exist');
+    cy.getByTestId('web3-connector-WalletConnect').click();
+    // testing if exists rather than visible because of the long loading time
+    cy.get('#w3m-modal').should('exist');
+  });
+
   it('able to disconnect eth wallet', () => {
     // 0004-EWAL-004
     // 0004-EWAL-005

apps/trading-e2e/src/integration/wallet-vega.cy.ts

@@ -0,0 +1,91 @@
+import {
+  mockConnectWallet,
+  mockConnectWalletWithUserError,
+} from '@vegaprotocol/cypress';
+
+const connectVegaBtn = 'connect-vega-wallet';
+const manageVegaBtn = 'manage-vega-wallet';
+const dialogContent = 'dialog-content';
+
+describe('connect vega wallet', { tags: '@smoke', testIsolation: true }, () => {
+  beforeEach(() => {
+    // Using portfolio page as it requires vega wallet connection
+    cy.mockTradingPage();
+    cy.mockSubscription();
+    cy.setOnBoardingViewed();
+    cy.visit('/#/portfolio');
+    cy.get('[data-testid="pathname-/portfolio"]').should('exist');
+  });
+
+  it('can connect', () => {
+    // 0002-WCON-002
+    // 0002-WCON-005
+    // 0002-WCON-007
+    // 0002-WCON-009
+
+    mockConnectWallet();
+    cy.getByTestId(connectVegaBtn).click();
+    cy.getByTestId('connectors-list')
+      .find('[data-testid="connector-jsonRpc"]')
+      .click();
+    cy.wait('@walletReq');
+    cy.getByTestId(dialogContent).should(
+      'contain.text',
+      'Approve the connection from your Vega wallet app.'
+    );
+    cy.getByTestId(dialogContent).should('not.exist');
+    cy.getByTestId(manageVegaBtn).should('exist');
+  });
+
+  it('can not connect', () => {
+    // 0002-WCON-002
+    // 0002-WCON-005
+    // 0002-WCON-007
+    // 0002-WCON-015
+
+    mockConnectWalletWithUserError();
+    cy.getByTestId(connectVegaBtn).click();
+    cy.getByTestId('connectors-list')
+      .find('[data-testid="connector-jsonRpc"]')
+      .click();
+    cy.getByTestId('dialog-content')
+      .should('contain.text', 'User error')
+      .and('contain.text', 'the user rejected the wallet connection');
+  });
+
+  it('can change selected public key and disconnect', () => {
+    // 0002-WCON-022
+    // 0002-WCON-023
+    // 0002-WCON-025
+    // 0002-WCON-026
+    // 0002-WCON-021
+    // 0002-WCON-027
+    // 0002-WCON-030
+    // 0002-WCON-029
+    // 0002-WCON-008
+    // 0002-WCON-035
+    // 0002-WCON-014
+    // 0002-WCON-010
+    // 0003-WTXN-004
+
+    mockConnectWallet();
+    const key2 = Cypress.env('VEGA_PUBLIC_KEY2');
+    const truncatedKey2 = Cypress.env('TRUNCATED_VEGA_PUBLIC_KEY2');
+    cy.connectVegaWallet();
+    cy.getByTestId('manage-vega-wallet').click();
+    cy.getByTestId('keypair-list').should('exist');
+    cy.getByTestId(`key-${key2}`).should('contain.text', truncatedKey2);
+    cy.getByTestId(`key-${key2}`)
+      .find('[data-testid="copy-vega-public-key"]')
+      .should('be.visible');
+    cy.get(`[data-testid="key-${key2}"] > .mr-2`).click();
+    cy.getByTestId('keypair-list')
+      .find('[data-state="checked"]')
+      .should('be.visible');
+    cy.getByTestId('disconnect').click();
+    cy.getByTestId('connect-vega-wallet').should('exist');
+    cy.getByTestId('manage-vega-wallet').should('not.exist');
+    cy.getByTestId('connect-vega-wallet').click();
+    cy.contains('Enter a custom wallet location');
+  });
+});

apps/trading/.env.mainnet

@@ -28,4 +28,3 @@ NX_REFERRALS=false
 
 NX_TENDERMINT_URL=https://be.vega.community
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket
-NX_DISABLE_CLOSE_POSITION=true

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

@@ -1,11 +1,34 @@
+import { useEffect } from 'react';
+import { useNavigate } from 'react-router-dom';
 import { Loader, Splash } from '@vegaprotocol/ui-toolkit';
-import { useNavigateToLastMarket } from '../../lib/hooks/use-navigate-to-last-market';
+import { useGlobalStore } from '../../stores';
+import { useTopTradedMarkets } from '../../lib/hooks/use-top-traded-markets';
+import { Links } from '../../lib/links';
 
 // The home pages only purpose is to redirect to the users last market,
 // the top traded if they are new, or fall back to the list of markets.
 // Thats why we just render a loader here
 export const Home = () => {
-  useNavigateToLastMarket();
+  const navigate = useNavigate();
+  const { data } = useTopTradedMarkets();
+  const marketId = useGlobalStore((store) => store.marketId);
+
+  useEffect(() => {
+    if (marketId) {
+      navigate(Links.MARKET(marketId), {
+        replace: true,
+      });
+    } else if (data) {
+      const marketDataId = data[0]?.id;
+      if (marketDataId) {
+        navigate(Links.MARKET(marketDataId), {
+          replace: true,
+        });
+      } else {
+        navigate(Links.MARKETS());
+      }
+    }
+  }, [marketId, data, navigate]);
 
   return (
     <Splash>

apps/trading/client-pages/market/market-header-stats.tsx

@@ -1,6 +1,7 @@
 import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
 import { DocsLinks, useEnvironment } from '@vegaprotocol/environment';
 import { ButtonLink, ExternalLink, Link } from '@vegaprotocol/ui-toolkit';
+import { MarketProposalNotification } from '@vegaprotocol/proposals';
 import type { Market } from '@vegaprotocol/markets';
 import {
   addDecimalsFormatNumber,
@@ -144,6 +145,7 @@ export const MarketHeaderStats = ({ market }: MarketHeaderStatsProps) => {
           />
         </HeaderStat>
       )}
+      <MarketProposalNotification marketId={market.id} />
     </>
   );
 };

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

@@ -2,7 +2,7 @@ import React, { useEffect, useMemo } from 'react';
 import { addDecimalsFormatNumber, titlefy } from '@vegaprotocol/utils';
 import { useScreenDimensions } from '@vegaprotocol/react-helpers';
 import { useThrottledDataProvider } from '@vegaprotocol/data-provider';
-import { Link, Loader, Splash } from '@vegaprotocol/ui-toolkit';
+import { ExternalLink, Loader, Splash } from '@vegaprotocol/ui-toolkit';
 import { getAsset, marketDataProvider, useMarket } from '@vegaprotocol/markets';
 import { useGlobalStore, usePageTitleStore } from '../../stores';
 import { TradeGrid } from './trade-grid';
@@ -117,13 +117,12 @@ export const MarketPage = () => {
               defaults="Please choose another market from the <0>market list</0>"
               ns={ns}
               components={[
-                <Link
-                  className="underline underline-offset-4 "
+                <ExternalLink
                   onClick={() => navigate(Links.MARKETS())}
                   key="link"
                 >
                   market list
-                </Link>,
+                </ExternalLink>,
               ]}
             />
           </p>

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

@@ -1,5 +1,4 @@
 import { act, render, screen, waitFor, within } from '@testing-library/react';
-// import userEvent from '@testing-library/user-event';
 import { MemoryRouter } from 'react-router-dom';
 import { Closed } from './closed';
 import { MarketStateMapping, PropertyKeyType } from '@vegaprotocol/types';
@@ -27,7 +26,6 @@ import {
   marketsDataQuery,
   createMarketsDataFragment,
 } from '@vegaprotocol/mock';
-import userEvent from '@testing-library/user-event';
 
 describe('Closed', () => {
   let originalNow: typeof Date.now;
@@ -170,11 +168,14 @@ describe('Closed', () => {
     Date.now = originalNow;
   });
 
-  const renderComponent = async (mocks: MockedResponse[]) => {
+  // eslint-disable-next-line jest/no-disabled-tests
+  it.skip('renders correctly formatted and filtered rows', async () => {
     await act(async () => {
       render(
         <MemoryRouter>
-          <MockedProvider mocks={mocks}>
+          <MockedProvider
+            mocks={[marketsMock, marketsDataMock, oracleDataMock]}
+          >
             <VegaWalletContext.Provider
               value={{ pubKey } as VegaWalletContextShape}
             >
@@ -184,10 +185,6 @@ describe('Closed', () => {
         </MemoryRouter>
       );
     });
-  };
-
-  it('renders correct headers', async () => {
-    await renderComponent([marketsMock, marketsDataMock, oracleDataMock]);
 
     const headers = screen.getAllByRole('columnheader');
     const expectedHeaders = [
@@ -203,10 +200,6 @@ describe('Closed', () => {
     ];
     expect(headers).toHaveLength(expectedHeaders.length);
     expect(headers.map((h) => h.textContent?.trim())).toEqual(expectedHeaders);
-  });
-
-  it('renders correctly formatted and filtered rows', async () => {
-    await renderComponent([marketsMock, marketsDataMock, oracleDataMock]);
 
     const assetSymbol = getAsset(market).symbol;
 
@@ -280,8 +273,21 @@ describe('Closed', () => {
         },
       },
     };
-
-    await renderComponent([mixedMarketsMock, marketsDataMock, oracleDataMock]);
+    await act(async () => {
+      render(
+        <MemoryRouter>
+          <MockedProvider
+            mocks={[mixedMarketsMock, marketsDataMock, oracleDataMock]}
+          >
+            <VegaWalletContext.Provider
+              value={{ pubKey } as VegaWalletContextShape}
+            >
+              <Closed />
+            </VegaWalletContext.Provider>
+          </MockedProvider>
+        </MemoryRouter>
+      );
+    });
 
     // check that the number of rows in datagrid is 2
     const container = within(
@@ -313,67 +319,8 @@ describe('Closed', () => {
     );
   });
 
-  it('display market actions', async () => {
-    // Use market with a succcessor Id as the actions dropdown will optionally
-    // show a link to the successor market
-    const marketsWithSuccessorAndParent = [
-      {
-        __typename: 'MarketEdge' as const,
-        node: createMarketFragment({
-          id: 'include-0',
-          state: MarketState.STATE_SETTLED,
-          successorMarketID: 'successor',
-          parentMarketID: 'parent',
-        }),
-      },
-    ];
-    const mockWithSuccessorAndParent: MockedResponse<MarketsQuery> = {
-      request: {
-        query: MarketsDocument,
-      },
-      result: {
-        data: {
-          marketsConnection: {
-            __typename: 'MarketConnection',
-            edges: marketsWithSuccessorAndParent,
-          },
-        },
-      },
-    };
-    await renderComponent([
-      mockWithSuccessorAndParent,
-      marketsDataMock,
-      oracleDataMock,
-    ]);
-
-    const actionCell = screen
-      .getAllByRole('gridcell')
-      .find((el) => el.getAttribute('col-id') === 'market-actions');
-
-    await userEvent.click(
-      within(actionCell as HTMLElement).getByTestId('dropdown-menu')
-    );
-
-    expect(screen.getByRole('menu')).toBeInTheDocument();
-
-    expect(
-      screen.getByRole('menuitem', { name: 'Copy Market ID' })
-    ).toBeInTheDocument();
-    expect(
-      screen.getByRole('menuitem', { name: 'View on Explorer' })
-    ).toBeInTheDocument();
-    expect(
-      screen.getByRole('menuitem', { name: 'View settlement asset details' })
-    ).toBeInTheDocument();
-    expect(
-      screen.getByRole('menuitem', { name: 'View parent market' })
-    ).toBeInTheDocument();
-    expect(
-      screen.getByRole('menuitem', { name: 'View successor market' })
-    ).toBeInTheDocument();
-  });
-
-  it('successor market should be visible', async () => {
+  // eslint-disable-next-line jest/no-disabled-tests
+  it.skip('successor marked should be visible', async () => {
     const marketsWithSuccessorID = [
       {
         __typename: 'MarketEdge' as const,
@@ -398,11 +345,21 @@ describe('Closed', () => {
       },
     };
 
-    await renderComponent([
-      mockWithSuccessors,
-      marketsDataMock,
-      oracleDataMock,
-    ]);
+    await act(async () => {
+      render(
+        <MemoryRouter>
+          <MockedProvider
+            mocks={[mockWithSuccessors, marketsDataMock, oracleDataMock]}
+          >
+            <VegaWalletContext.Provider
+              value={{ pubKey } as VegaWalletContextShape}
+            >
+              <Closed />
+            </VegaWalletContext.Provider>
+          </MockedProvider>
+        </MemoryRouter>
+      );
+    });
 
     const container = within(
       document.querySelector('.ag-center-cols-container') as HTMLElement

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

@@ -1,145 +0,0 @@
-import { act, render, screen, within } from '@testing-library/react';
-import { MemoryRouter } from 'react-router-dom';
-import { OpenMarkets } from './open-markets';
-import { Interval } from '@vegaprotocol/types';
-import type { MockedResponse } from '@apollo/client/testing';
-import { MockedProvider } from '@apollo/client/testing';
-import type {
-  MarketsDataQuery,
-  MarketsQuery,
-  MarketCandlesQuery,
-  MarketFieldsFragment,
-} from '@vegaprotocol/markets';
-import {
-  MarketsDataDocument,
-  MarketsDocument,
-  MarketsCandlesDocument,
-} from '@vegaprotocol/markets';
-import type { VegaWalletContextShape } from '@vegaprotocol/wallet';
-import { VegaWalletContext } from '@vegaprotocol/wallet';
-import {
-  marketsQuery,
-  marketsDataQuery,
-  marketsCandlesQuery,
-} from '@vegaprotocol/mock';
-import userEvent from '@testing-library/user-event';
-
-describe('Open', () => {
-  let originalNow: typeof Date.now;
-  const mockNowTimestamp = 1672531200000;
-  const pubKey = 'pubKey';
-
-  const marketsQueryData = marketsQuery();
-  const marketsMock: MockedResponse<MarketsQuery> = {
-    request: {
-      query: MarketsDocument,
-    },
-    result: {
-      data: marketsQueryData,
-    },
-  };
-
-  const marketsCandlesQueryData = marketsCandlesQuery();
-  const marketsCandlesMock: MockedResponse<MarketCandlesQuery> = {
-    request: {
-      query: MarketsCandlesDocument,
-      variables: {
-        interval: Interval.INTERVAL_I1H,
-        since: '2022-12-31T00:00:00.000Z',
-      },
-    },
-    result: {
-      data: marketsCandlesQueryData,
-    },
-  };
-
-  const marketsDataQueryData = marketsDataQuery();
-
-  const marketsDataMock: MockedResponse<MarketsDataQuery> = {
-    request: {
-      query: MarketsDataDocument,
-    },
-    result: {
-      data: marketsDataQueryData,
-    },
-  };
-
-  beforeAll(() => {
-    originalNow = Date.now;
-    Date.now = jest.fn().mockReturnValue(mockNowTimestamp);
-  });
-
-  afterAll(() => {
-    Date.now = originalNow;
-  });
-
-  const renderComponent = async () => {
-    await act(async () => {
-      render(
-        <MemoryRouter>
-          <MockedProvider
-            mocks={[marketsMock, marketsCandlesMock, marketsDataMock]}
-          >
-            <VegaWalletContext.Provider
-              value={{ pubKey } as VegaWalletContextShape}
-            >
-              <OpenMarkets />
-            </VegaWalletContext.Provider>
-          </MockedProvider>
-        </MemoryRouter>
-      );
-    });
-  };
-
-  it('renders correct headers', async () => {
-    await renderComponent();
-
-    const headers = screen.getAllByRole('columnheader');
-    const expectedHeaders = [
-      'Market',
-      'Description',
-      'Settlement asset',
-      'Trading mode',
-      'Status',
-      'Mark price',
-      '24h volume',
-      'Open Interest',
-      'Spread',
-      '', // Action row
-    ];
-    expect(headers).toHaveLength(expectedHeaders.length);
-    expect(headers.map((h) => h.textContent?.trim())).toEqual(expectedHeaders);
-  });
-
-  it('sort columns', async () => {
-    await renderComponent();
-
-    const headers = screen.getAllByRole('columnheader');
-    const marketHeader = headers.find(
-      (h) => h.getAttribute('col-id') === 'tradableInstrument.instrument.code'
-    );
-    if (!marketHeader) {
-      throw new Error('No market header found');
-    }
-    expect(marketHeader).toHaveAttribute('aria-sort', 'none');
-    await userEvent.click(within(marketHeader).getByText(/market/i));
-    // 6001-MARK-064
-    expect(marketHeader).toHaveAttribute('aria-sort', 'ascending');
-  });
-
-  // eslint-disable-next-line jest/no-disabled-tests, jest/expect-expect
-  it('renders row', async () => {
-    await renderComponent();
-
-    const container = within(
-      document.querySelector('.ag-center-cols-container') as HTMLElement
-    );
-
-    const markets = marketsQueryData.marketsConnection?.edges.map(
-      (e) => e.node
-    ) as MarketFieldsFragment[];
-
-    const rows = container.getAllByRole('row');
-    expect(rows).toHaveLength(markets.length);
-  });
-});

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

@@ -43,7 +43,7 @@ export const OpenMarkets = () => {
         if (!data) return;
 
         // prevent navigating to the market page if any of the below cells are clicked
-        // event.preventDefault or event.stopPropagation do not seem to apply for ag-grid
+        // event.preventDefault or event.stopPropagation dont seem to apply for aggird
         const colId = column.getColId();
 
         if (

apps/trading/client-pages/referrals/apply-code-form.tsx

@@ -10,7 +10,7 @@ import { useForm } from 'react-hook-form';
 import classNames from 'classnames';
 import { Navigate, useNavigate, useSearchParams } from 'react-router-dom';
 import type { ButtonHTMLAttributes, MouseEventHandler } from 'react';
-import { useCallback, useEffect, useRef, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
 import { RainbowButton } from './buttons';
 import { useVegaWallet, useVegaWalletDialogStore } from '@vegaprotocol/wallet';
 import { useReferral } from './hooks/use-referral';
@@ -32,19 +32,6 @@ const validateCode = (value: string, t: ReturnType<typeof useT>) => {
   return true;
 };
 
-export const ApplyCodeFormContainer = () => {
-  const { pubKey } = useVegaWallet();
-  const { data: referee } = useReferral({ pubKey, role: 'referee' });
-  const { data: referrer } = useReferral({ pubKey, role: 'referrer' });
-
-  // go to main page if the current pubkey is already a referrer or referee
-  if (referee || referrer) {
-    return <Navigate to={Routes.REFERRALS} />;
-  }
-
-  return <ApplyCodeForm />;
-};
-
 export const ApplyCodeForm = () => {
   const t = useT();
   const program = useReferralProgram();
@@ -68,29 +55,14 @@ export const ApplyCodeForm = () => {
   } = useForm();
   const [params] = useSearchParams();
 
+  const { data: referee } = useReferral({ pubKey, role: 'referee' });
+  const { data: referrer } = useReferral({ pubKey, role: 'referrer' });
+
   const codeField = watch('code');
   const { data: previewData, loading: previewLoading } = useReferral({
     code: validateCode(codeField, t) ? codeField : undefined,
   });
 
-  /**
-   * Validates the set a user tries to apply to.
-   */
-  const validateSet = useCallback(() => {
-    if (
-      codeField &&
-      !previewLoading &&
-      previewData &&
-      !previewData.isEligible
-    ) {
-      return t('The code is no longer valid.');
-    }
-    if (codeField && !previewLoading && !previewData) {
-      return t('The code is invalid');
-    }
-    return true;
-  }, [codeField, previewData, previewLoading, t]);
-
   useEffect(() => {
     const code = params.get('code');
     if (code) setValue('code', code);
@@ -172,6 +144,11 @@ export const ApplyCodeForm = () => {
     }
   }, [navigate, status]);
 
+  // go to main page if the current pubkey is already a referrer or referee
+  if (referee || referrer) {
+    return <Navigate to={Routes.REFERRALS} />;
+  }
+
   // show "code applied" message when successfully applied
   if (status === 'successful') {
     return (
@@ -228,10 +205,7 @@ export const ApplyCodeForm = () => {
 
   return (
     <>
-      <div
-        data-testid="referral-apply-code-form"
-        className="bg-vega-clight-800 dark:bg-vega-cdark-800 mx-auto w-2/3 max-w-md rounded-lg p-8"
-      >
+      <div className="bg-vega-clight-800 dark:bg-vega-cdark-800 mx-auto w-2/3 max-w-md rounded-lg p-8">
         <h3 className="calt mb-4 text-center text-2xl">
           {t('Apply a referral code')}
         </h3>
@@ -250,11 +224,7 @@ export const ApplyCodeForm = () => {
               hasError={Boolean(errors.code)}
               {...register('code', {
                 required: t('You have to provide a code to apply it.'),
-                validate: (value) => {
-                  const err = validateCode(value, t);
-                  if (err !== true) return err;
-                  return validateSet();
-                },
+                validate: (value) => validateCode(value, t),
               })}
               placeholder="Enter a code"
               className="bg-vega-clight-900 dark:bg-vega-cdark-700 mb-2"
@@ -268,17 +238,15 @@ export const ApplyCodeForm = () => {
           </InputError>
         )}
       </div>
-      {validateCode(codeField, t) === true && previewLoading && !previewData ? (
+      {previewLoading && !previewData ? (
         <div className="mt-10">
           <Loader />
         </div>
       ) : null}
-      {/* TODO: Re-check plural forms once i18n is updated */}
-      {previewData && previewData.isEligible ? (
+      {previewData ? (
         <div className="mt-10">
           <h2 className="mb-5 text-2xl">
             {t(
-              'youAreJoiningTheGroup',
               'You are joining the group shown, but will not have access to benefits until you have completed at least {{count}} epochs.',
               { count: nextBenefitTierEpochsValue }
             )}

apps/trading/client-pages/referrals/create-code-form.tsx

@@ -39,10 +39,7 @@ export const CreateCodeForm = () => {
   const { pubKey, isReadOnly } = useVegaWallet();
 
   return (
-    <div
-      data-testid="referral-create-code-form"
-      className="w-2/3 max-w-md mx-auto bg-vega-clight-800 dark:bg-vega-cdark-800 p-8 rounded-lg"
-    >
+    <div className="w-2/3 max-w-md mx-auto bg-vega-clight-800 dark:bg-vega-cdark-800 p-8 rounded-lg">
       <h3 className="mb-4 text-2xl text-center calt">
         {t('Create a referral code')}
       </h3>

apps/trading/client-pages/referrals/hooks/ReferralSetStats.graphql

@@ -11,7 +11,6 @@ query ReferralSetStats($code: ID!, $epoch: Int) {
         rewardsMultiplier
         rewardsFactorMultiplier
         referrerTakerVolume
-        wasEligible
       }
     }
   }

apps/trading/client-pages/referrals/hooks/StakeAvailable.graphql

@@ -1,10 +0,0 @@
-query StakeAvailable($partyId: ID!) {
-  party(id: $partyId) {
-    stakingSummary {
-      currentStakeAvailable
-    }
-  }
-  networkParameter(key: "referralProgram.minStakedVegaTokens") {
-    value
-  }
-}

apps/trading/client-pages/referrals/hooks/__generated__/ReferralSetStats.ts

@@ -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, wasEligible: boolean } } | 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, referrerTakerVolume: string } } | null> } };
 
 
 export const ReferralSetStatsDocument = gql`
@@ -26,7 +26,6 @@ export const ReferralSetStatsDocument = gql`
         rewardsMultiplier
         rewardsFactorMultiplier
         referrerTakerVolume
-        wasEligible
       }
     }
   }

apps/trading/client-pages/referrals/hooks/__generated__/StakeAvailable.ts

@@ -1,53 +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 StakeAvailableQueryVariables = Types.Exact<{
-  partyId: Types.Scalars['ID'];
-}>;
-
-
-export type StakeAvailableQuery = { __typename?: 'Query', party?: { __typename?: 'Party', stakingSummary: { __typename?: 'StakingSummary', currentStakeAvailable: string } } | null, networkParameter?: { __typename?: 'NetworkParameter', value: string } | null };
-
-
-export const StakeAvailableDocument = gql`
-    query StakeAvailable($partyId: ID!) {
-  party(id: $partyId) {
-    stakingSummary {
-      currentStakeAvailable
-    }
-  }
-  networkParameter(key: "referralProgram.minStakedVegaTokens") {
-    value
-  }
-}
-    `;
-
-/**
- * __useStakeAvailableQuery__
- *
- * To run a query within a React component, call `useStakeAvailableQuery` and pass it any options that fit your needs.
- * When your component renders, `useStakeAvailableQuery` 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 } = useStakeAvailableQuery({
- *   variables: {
- *      partyId: // value for 'partyId'
- *   },
- * });
- */
-export function useStakeAvailableQuery(baseOptions: Apollo.QueryHookOptions<StakeAvailableQuery, StakeAvailableQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<StakeAvailableQuery, StakeAvailableQueryVariables>(StakeAvailableDocument, options);
-      }
-export function useStakeAvailableLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<StakeAvailableQuery, StakeAvailableQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<StakeAvailableQuery, StakeAvailableQueryVariables>(StakeAvailableDocument, options);
-        }
-export type StakeAvailableQueryHookResult = ReturnType<typeof useStakeAvailableQuery>;
-export type StakeAvailableLazyQueryHookResult = ReturnType<typeof useStakeAvailableLazyQuery>;
-export type StakeAvailableQueryResult = Apollo.QueryResult<StakeAvailableQuery, StakeAvailableQueryVariables>;

apps/trading/client-pages/referrals/hooks/use-referral-program.ts

@@ -75,20 +75,22 @@ export const useReferralProgram = () => {
 
   const benefitTiers = sortBy(data.currentReferralProgram.benefitTiers, (t) =>
     Number(t.referralRewardFactor)
-  ).map((t, i) => {
-    return {
-      tier: i + 1, // sorted in asc order, hence first is the lowest tier
-      rewardFactor: Number(t.referralRewardFactor),
-      commission: Number(t.referralRewardFactor) * 100 + '%',
-      discountFactor: Number(t.referralDiscountFactor),
-      discount: Number(t.referralDiscountFactor) * 100 + '%',
-      minimumVolume: Number(t.minimumRunningNotionalTakerVolume),
-      volume: getNumberFormat(0).format(
-        Number(t.minimumRunningNotionalTakerVolume)
-      ),
-      epochs: Number(t.minimumEpochs),
-    };
-  });
+  )
+    .reverse()
+    .map((t, i) => {
+      return {
+        tier: i + 1,
+        rewardFactor: Number(t.referralRewardFactor),
+        commission: Number(t.referralRewardFactor) * 100 + '%',
+        discountFactor: Number(t.referralDiscountFactor),
+        discount: Number(t.referralDiscountFactor) * 100 + '%',
+        minimumVolume: Number(t.minimumRunningNotionalTakerVolume),
+        volume: getNumberFormat(0).format(
+          Number(t.minimumRunningNotionalTakerVolume)
+        ),
+        epochs: Number(t.minimumEpochs),
+      };
+    });
 
   const stakingTiers = sortBy(
     data.currentReferralProgram.stakingTiers,

apps/trading/client-pages/referrals/hooks/use-referral-toasts.tsx

@@ -1,111 +0,0 @@
-import {
-  Intent,
-  type Toast,
-  useToasts,
-  ToastHeading,
-  Button,
-} from '@vegaprotocol/ui-toolkit';
-import { useReferral } from './use-referral';
-import { useVegaWallet } from '@vegaprotocol/wallet';
-import { useEffect } from 'react';
-import { useT } from '../../../lib/use-t';
-import { matchPath, useLocation, useNavigate } from 'react-router-dom';
-import { Routes } from '../../../lib/links';
-import { useCurrentEpochInfoQuery } from './__generated__/Epoch';
-
-const REFETCH_INTERVAL = 60 * 60 * 1000; // 1h
-const NON_ELIGIBLE_REFERRAL_SET_TOAST_ID = 'non-eligible-referral-set';
-
-const useNonEligibleReferralSet = () => {
-  const { pubKey } = useVegaWallet();
-  const { data, loading, refetch } = useReferral({ pubKey, role: 'referee' });
-  const {
-    data: epochData,
-    loading: epochLoading,
-    refetch: epochRefetch,
-  } = useCurrentEpochInfoQuery();
-
-  useEffect(() => {
-    const interval = setInterval(() => {
-      refetch();
-      epochRefetch();
-    }, REFETCH_INTERVAL);
-
-    return () => {
-      clearInterval(interval);
-    };
-  }, [epochRefetch, refetch]);
-
-  return { data, epoch: epochData?.epoch.id, loading: loading || epochLoading };
-};
-
-export const useReferralToasts = () => {
-  const navigate = useNavigate();
-  const { pathname } = useLocation();
-  const t = useT();
-  const [setToast, hasToast, updateToast] = useToasts((store) => [
-    store.setToast,
-    store.hasToast,
-    store.update,
-  ]);
-
-  const { data, epoch, loading } = useNonEligibleReferralSet();
-
-  useEffect(() => {
-    if (
-      data &&
-      epoch &&
-      !loading &&
-      !data.isEligible &&
-      !hasToast(NON_ELIGIBLE_REFERRAL_SET_TOAST_ID + epoch)
-    ) {
-      const nonEligibleReferralToast: Toast = {
-        id: NON_ELIGIBLE_REFERRAL_SET_TOAST_ID + epoch,
-        intent: Intent.Warning,
-        content: (
-          <>
-            <ToastHeading>{t('Referral code no longer valid')}</ToastHeading>
-            <p>
-              {t(
-                'Your referral code is no longer valid as the referrer no longer meets the minimum requirements.'
-              )}
-            </p>
-            <p className="mt-2">
-              <Button
-                data-testid="toast-apply-code"
-                size="xs"
-                onClick={() => {
-                  const matched = matchPath(
-                    Routes.REFERRALS_APPLY_CODE,
-                    pathname
-                  );
-                  if (!matched) navigate(Routes.REFERRALS_APPLY_CODE);
-                  updateToast(NON_ELIGIBLE_REFERRAL_SET_TOAST_ID + epoch, {
-                    hidden: true,
-                  });
-                }}
-              >
-                {t('Apply a new code')}
-              </Button>
-            </p>
-          </>
-        ),
-        onClose: () =>
-          updateToast(NON_ELIGIBLE_REFERRAL_SET_TOAST_ID + epoch, {
-            hidden: true,
-          }),
-      };
-      setToast(nonEligibleReferralToast);
-    }
-  }, [
-    data,
-    epoch,
-    hasToast,
-    loading,
-    navigate,
-    pathname,
-    setToast,
-    t,
-    updateToast,
-  ]);
-};

apps/trading/client-pages/referrals/hooks/use-referral.ts

@@ -4,7 +4,6 @@ import { useRefereesQuery } from './__generated__/Referees';
 import compact from 'lodash/compact';
 import type { ReferralSetsQueryVariables } from './__generated__/ReferralSets';
 import { useReferralSetsQuery } from './__generated__/ReferralSets';
-import { useStakeAvailable } from './use-stake-available';
 
 export const DEFAULT_AGGREGATION_DAYS = 30;
 
@@ -63,8 +62,6 @@ export const useReferral = (args: UseReferralArgs) => {
       ? referralData.referralSets.edges[0]?.node
       : undefined;
 
-  const { isEligible } = useStakeAvailable(referralSet?.referrer);
-
   const {
     data: refereesData,
     loading: refereesLoading,
@@ -106,7 +103,6 @@ export const useReferral = (args: UseReferralArgs) => {
           referee: referee,
           referrerId: referralSet.referrer,
           createdAt: referralSet.createdAt,
-          isEligible,
           referees,
         }
       : undefined;

apps/trading/client-pages/referrals/hooks/use-stake-available.ts

@@ -1,35 +1,34 @@
+import { gql, useQuery } from '@apollo/client';
 import { useVegaWallet } from '@vegaprotocol/wallet';
-import { useStakeAvailableQuery } from './__generated__/StakeAvailable';
 
-/**
- * Gets the current stake available for given public key and required stake for
- * the referral program.
- *
- * (Uses currently connected public key if left empty)
- */
-export const useStakeAvailable = (pubKey?: string) => {
-  const { pubKey: currentPubKey } = useVegaWallet();
-  const partyId = pubKey || currentPubKey;
-  const { data } = useStakeAvailableQuery({
-    variables: { partyId: partyId || '' },
-    skip: !partyId,
+const STAKE_QUERY = gql`
+  query CreateCode($partyId: ID!) {
+    party(id: $partyId) {
+      stakingSummary {
+        currentStakeAvailable
+      }
+    }
+    networkParameter(key: "referralProgram.minStakedVegaTokens") {
+      value
+    }
+  }
+`;
+
+export const useStakeAvailable = () => {
+  const { pubKey } = useVegaWallet();
+  const { data } = useQuery(STAKE_QUERY, {
+    variables: { partyId: pubKey || '' },
+    skip: !pubKey,
     // TODO: remove when network params available
     errorPolicy: 'ignore',
   });
 
-  const stakeAvailable = data
-    ? BigInt(data.party?.stakingSummary.currentStakeAvailable || '0')
-    : undefined;
-  const requiredStake = data
-    ? BigInt(data.networkParameter?.value || '0')
-    : undefined;
-
   return {
-    stakeAvailable,
-    requiredStake,
-    isEligible:
-      stakeAvailable != null &&
-      requiredStake != null &&
-      stakeAvailable >= requiredStake,
+    stakeAvailable: data
+      ? BigInt(data.party?.stakingSummary.currentStakeAvailable || '0')
+      : undefined,
+    requiredStake: data
+      ? BigInt(data.networkParameter?.value || '0')
+      : undefined,
   };
 };

apps/trading/client-pages/referrals/referral-statistics.spec.tsx

@@ -1,374 +0,0 @@
-import { MockedProvider, type MockedResponse } from '@apollo/react-testing';
-import { render, waitFor } from '@testing-library/react';
-import { type VegaWalletContextShape } from '@vegaprotocol/wallet';
-import { ReferralStatistics } from './referral-statistics';
-import {
-  ReferralProgramDocument,
-  type ReferralProgramQuery,
-} from './hooks/__generated__/CurrentReferralProgram';
-import {
-  ReferralSetsDocument,
-  type ReferralSetsQueryVariables,
-  type ReferralSetsQuery,
-} from './hooks/__generated__/ReferralSets';
-import {
-  StakeAvailableDocument,
-  type StakeAvailableQueryVariables,
-  type StakeAvailableQuery,
-} from './hooks/__generated__/StakeAvailable';
-import {
-  RefereesDocument,
-  type RefereesQueryVariables,
-  type RefereesQuery,
-} from './hooks/__generated__/Referees';
-import { MemoryRouter } from 'react-router-dom';
-
-const MOCK_PUBKEY =
-  '1234567890123456789012345678901234567890123456789012345678901234';
-
-const MOCK_STAKE_AVAILABLE: StakeAvailableQuery = {
-  networkParameter: {
-    __typename: 'NetworkParameter',
-    value: '1',
-  },
-  party: {
-    __typename: 'Party',
-    stakingSummary: {
-      __typename: 'StakingSummary',
-      currentStakeAvailable: '1',
-    },
-  },
-};
-
-const MOCK_NON_ELIGIBILE_STAKE_AVAILABLE: StakeAvailableQuery = {
-  networkParameter: {
-    __typename: 'NetworkParameter',
-    value: '1',
-  },
-  party: {
-    __typename: 'Party',
-    stakingSummary: {
-      __typename: 'StakingSummary',
-      currentStakeAvailable: '0',
-    },
-  },
-};
-
-const MOCK_REFERRAL_PROGRAM: ReferralProgramQuery = {
-  currentReferralProgram: {
-    __typename: 'CurrentReferralProgram',
-    benefitTiers: [
-      {
-        __typename: 'BenefitTier',
-        minimumEpochs: 1,
-        minimumRunningNotionalTakerVolume: '0',
-        referralDiscountFactor: '0.01',
-        referralRewardFactor: '0.01',
-      },
-      {
-        __typename: 'BenefitTier',
-        minimumEpochs: 2,
-        minimumRunningNotionalTakerVolume: '10',
-        referralDiscountFactor: '0.02',
-        referralRewardFactor: '0.02',
-      },
-    ],
-    endOfProgramTimestamp: '202411012023-11-26T05:58:24.045158Z',
-    id: '123',
-    stakingTiers: [
-      {
-        __typename: 'StakingTier',
-        minimumStakedTokens: '100',
-        referralRewardMultiplier: '1',
-      },
-      {
-        __typename: 'StakingTier',
-        minimumStakedTokens: '1000',
-        referralRewardMultiplier: '2',
-      },
-    ],
-    version: 2,
-    windowLength: 3,
-    endedAt: null,
-  },
-};
-
-const MOCK_REFERRER_SET: ReferralSetsQuery = {
-  referralSets: {
-    __typename: 'ReferralSetConnection',
-    edges: [
-      {
-        __typename: 'ReferralSetEdge',
-        node: {
-          __typename: 'ReferralSet',
-          createdAt: '2023-11-26T05:58:24.045158Z',
-          id: '3772e570fbab89e50e563036b01dd949c554e5b5fe7908449672dfce9a8adffa',
-          referrer: MOCK_PUBKEY,
-          updatedAt: '2023-11-26T05:58:24.045158Z',
-        },
-      },
-    ],
-  },
-};
-
-const MOCK_REFERREE_SET: ReferralSetsQuery = {
-  referralSets: {
-    __typename: 'ReferralSetConnection',
-    edges: [
-      {
-        __typename: 'ReferralSetEdge',
-        node: {
-          __typename: 'ReferralSet',
-          createdAt: '2023-11-26T05:58:24.045158Z',
-          id: '3772e570fbab89e50e563036b01dd949c554e5b5fe7908449672dfce9a8adffa',
-          referrer:
-            '1111111111111111111111111111111111111111111111111111111111111111',
-          updatedAt: '2023-11-26T05:58:24.045158Z',
-        },
-      },
-    ],
-  },
-};
-
-const MOCK_REFEREES: RefereesQuery = {
-  referralSetReferees: {
-    __typename: 'ReferralSetRefereeConnection',
-    edges: [
-      {
-        node: {
-          atEpoch: 1,
-          joinedAt: '2023-11-21T14:17:09.257235Z',
-          refereeId:
-            '0987654321098765432109876543210987654321098765432109876543219876',
-          referralSetId:
-            '3772e570fbab89e50e563036b01dd949c554e5b5fe7908449672dfce9a8adffa',
-          totalRefereeGeneratedRewards: '1234',
-          totalRefereeNotionalTakerVolume: '5678',
-          __typename: 'ReferralSetReferee',
-        },
-      },
-    ],
-  },
-};
-
-const programMock: MockedResponse<ReferralProgramQuery> = {
-  request: {
-    query: ReferralProgramDocument,
-  },
-  result: { data: MOCK_REFERRAL_PROGRAM },
-};
-
-const referralSetAsReferrerMock: MockedResponse<
-  ReferralSetsQuery,
-  ReferralSetsQueryVariables
-> = {
-  request: {
-    query: ReferralSetsDocument,
-    variables: {
-      referrer: MOCK_PUBKEY,
-    },
-  },
-  result: {
-    data: MOCK_REFERRER_SET,
-  },
-};
-
-const noReferralSetAsReferrerMock: MockedResponse<
-  ReferralSetsQuery,
-  ReferralSetsQueryVariables
-> = {
-  request: {
-    query: ReferralSetsDocument,
-    variables: {
-      referrer: MOCK_PUBKEY,
-    },
-  },
-  result: {
-    data: { referralSets: { edges: [] } },
-  },
-};
-
-const referralSetAsRefereeMock: MockedResponse<
-  ReferralSetsQuery,
-  ReferralSetsQueryVariables
-> = {
-  request: {
-    query: ReferralSetsDocument,
-    variables: {
-      referee: MOCK_PUBKEY,
-    },
-  },
-  result: {
-    data: MOCK_REFERREE_SET,
-  },
-};
-
-const noReferralSetAsRefereeMock: MockedResponse<
-  ReferralSetsQuery,
-  ReferralSetsQueryVariables
-> = {
-  request: {
-    query: ReferralSetsDocument,
-    variables: {
-      referee: MOCK_PUBKEY,
-    },
-  },
-  result: {
-    data: { referralSets: { edges: [] } },
-  },
-};
-
-const stakeAvailableMock: MockedResponse<
-  StakeAvailableQuery,
-  StakeAvailableQueryVariables
-> = {
-  request: {
-    query: StakeAvailableDocument,
-    variables: {
-      partyId: MOCK_PUBKEY,
-    },
-  },
-  result: {
-    data: MOCK_STAKE_AVAILABLE,
-  },
-};
-
-const nonEligibleStakeAvailableMock: MockedResponse<
-  StakeAvailableQuery,
-  StakeAvailableQueryVariables
-> = {
-  request: {
-    query: StakeAvailableDocument,
-    variables: {
-      partyId: MOCK_PUBKEY,
-    },
-  },
-  result: {
-    data: MOCK_NON_ELIGIBILE_STAKE_AVAILABLE,
-  },
-};
-
-const refereesMock: MockedResponse<RefereesQuery, RefereesQueryVariables> = {
-  request: {
-    query: RefereesDocument,
-    variables: {
-      code: MOCK_REFERRER_SET.referralSets.edges[0]?.node.id as string,
-      aggregationEpochs:
-        MOCK_REFERRAL_PROGRAM.currentReferralProgram?.windowLength,
-    },
-  },
-  result: {
-    data: MOCK_REFEREES,
-  },
-};
-
-jest.mock('@vegaprotocol/wallet', () => {
-  return {
-    ...jest.requireActual('@vegaprotocol/wallet'),
-    useVegaWallet: () => {
-      const ctx: Partial<VegaWalletContextShape> = {
-        pubKey: MOCK_PUBKEY,
-      };
-      return ctx;
-    },
-  };
-});
-
-describe('ReferralStatistics', () => {
-  it('displays create code when no data has been found for given pubkey', () => {
-    const { queryByTestId } = render(
-      <MockedProvider mocks={[]} showWarnings={false}>
-        <ReferralStatistics />
-      </MockedProvider>
-    );
-
-    expect(queryByTestId('referral-create-code-form')).toBeInTheDocument();
-  });
-
-  it('displays referrer stats when given pubkey is a referrer', async () => {
-    const { queryByTestId } = render(
-      <MockedProvider
-        mocks={[
-          programMock,
-          referralSetAsReferrerMock,
-          noReferralSetAsRefereeMock,
-          stakeAvailableMock,
-          refereesMock,
-        ]}
-        showWarnings={false}
-      >
-        <ReferralStatistics />
-      </MockedProvider>
-    );
-
-    await waitFor(() => {
-      expect(
-        queryByTestId('referral-create-code-form')
-      ).not.toBeInTheDocument();
-      expect(queryByTestId('referral-statistics')).toBeInTheDocument();
-      expect(queryByTestId('referral-statistics')?.dataset.as).toEqual(
-        'referrer'
-      );
-    });
-  });
-
-  it('displays referee stats when given pubkey is a referee', async () => {
-    const { queryByTestId } = render(
-      <MemoryRouter>
-        <MockedProvider
-          mocks={[
-            programMock,
-            noReferralSetAsReferrerMock,
-            referralSetAsRefereeMock,
-            stakeAvailableMock,
-            refereesMock,
-          ]}
-          showWarnings={false}
-        >
-          <ReferralStatistics />
-        </MockedProvider>
-      </MemoryRouter>
-    );
-
-    await waitFor(() => {
-      expect(
-        queryByTestId('referral-create-code-form')
-      ).not.toBeInTheDocument();
-      expect(queryByTestId('referral-statistics')).toBeInTheDocument();
-      expect(queryByTestId('referral-statistics')?.dataset.as).toEqual(
-        'referee'
-      );
-    });
-  });
-
-  it('displays eligibility warning when the set is no longer valid due to the referrers stake', async () => {
-    const { queryByTestId } = render(
-      <MemoryRouter>
-        <MockedProvider
-          mocks={[
-            programMock,
-            noReferralSetAsReferrerMock,
-            referralSetAsRefereeMock,
-            nonEligibleStakeAvailableMock,
-            refereesMock,
-          ]}
-          showWarnings={false}
-        >
-          <ReferralStatistics />
-        </MockedProvider>
-      </MemoryRouter>
-    );
-
-    await waitFor(() => {
-      expect(
-        queryByTestId('referral-create-code-form')
-      ).not.toBeInTheDocument();
-      expect(queryByTestId('referral-statistics')).toBeInTheDocument();
-      expect(queryByTestId('referral-statistics')?.dataset.as).toEqual(
-        'referee'
-      );
-      expect(queryByTestId('referral-eligibility-warning')).toBeInTheDocument();
-      expect(queryByTestId('referral-apply-code-form')).toBeInTheDocument();
-    });
-  });
-});

apps/trading/client-pages/referrals/referral-statistics.tsx

@@ -1,4 +1,3 @@
-import minBy from 'lodash/minBy';
 import { CodeTile, StatTile } from './tile';
 import {
   VegaIcon,
@@ -29,10 +28,10 @@ import sortBy from 'lodash/sortBy';
 import { useLayoutEffect, useMemo, useRef, useState } from 'react';
 import { useCurrentEpochInfoQuery } from './hooks/__generated__/Epoch';
 import BigNumber from 'bignumber.js';
+import maxBy from 'lodash/maxBy';
 import { DocsLinks } from '@vegaprotocol/environment';
 import { useT, ns } from '../../lib/use-t';
 import { Trans } from 'react-i18next';
-import { ApplyCodeForm } from './apply-code-form';
 
 export const ReferralStatistics = () => {
   const { pubKey } = useVegaWallet();
@@ -51,21 +50,11 @@ export const ReferralStatistics = () => {
   });
 
   if (referee?.code) {
-    return (
-      <>
-        <Statistics data={referee} program={program} as="referee" />;
-        {!referee.isEligible && <ApplyCodeForm />}
-      </>
-    );
+    return <Statistics data={referee} program={program} as="referee" />;
   }
 
   if (referrer?.code) {
-    return (
-      <>
-        <Statistics data={referrer} program={program} as="referrer" />;
-        <RefereesTable data={referrer} program={program} />
-      </>
-    );
+    return <Statistics data={referrer} program={program} as="referrer" />;
   }
 
   return <CreateCodeContainer />;
@@ -127,8 +116,8 @@ export const useStats = ({
       t.discountFactor === discountFactorValue
   );
   const nextBenefitTierValue = currentBenefitTierValue
-    ? benefitTiers.find((t) => t.tier === currentBenefitTierValue.tier + 1)
-    : minBy(benefitTiers, (bt) => bt.tier); //  min tier number is lowest tier
+    ? benefitTiers.find((t) => t.tier === currentBenefitTierValue.tier - 1)
+    : maxBy(benefitTiers, (bt) => bt.tier); // max tier number is lowest tier
   const epochsValue =
     !isNaN(currentEpoch) && refereeInfo?.atEpoch
       ? currentEpoch - refereeInfo?.atEpoch
@@ -185,7 +174,7 @@ export const Statistics = ({
 
   const { benefitTiers } = useReferralProgram();
 
-  const { stakeAvailable, isEligible } = useStakeAvailable();
+  const { stakeAvailable } = useStakeAvailable();
   const { details } = program;
 
   const compactNumFormat = new Intl.NumberFormat(getUserLocale(), {
@@ -211,24 +200,12 @@ export const Statistics = ({
       {baseCommissionValue * 100}%
     </StatTile>
   );
-
   const stakingMultiplierTile = (
     <StatTile
       title={t('Staking multiplier')}
-      description={
-        <span
-          className={classNames({
-            'text-vega-red': !isEligible,
-          })}
-        >
-          {t('{{amount}} $VEGA staked', {
-            amount: addDecimalsFormatNumber(
-              stakeAvailable?.toString() || 0,
-              18
-            ),
-          })}
-        </span>
-      }
+      description={t('{{amount}} $VEGA staked', {
+        amount: addDecimalsFormatNumber(stakeAvailable?.toString() || 0, 18),
+      })}
     >
       {multiplier || t('None')}
     </StatTile>
@@ -261,7 +238,7 @@ export const Statistics = ({
 
   const referrerVolumeTile = (
     <StatTile
-      title={t('myVolume', 'My volume (last {{count}} epochs)', {
+      title={t('My volume (last {{count}} epochs)', {
         count: details?.windowLength || DEFAULT_AGGREGATION_DAYS,
       })}
     >
@@ -274,7 +251,7 @@ export const Statistics = ({
     .reduce((all, r) => all.plus(r), new BigNumber(0));
   const totalCommissionTile = (
     <StatTile
-      title={t('totalCommission', 'Total commission (last {{count}}} epochs)', {
+      title={t('Total commission (last {{count}}} epochs)', {
         count: details?.windowLength || DEFAULT_AGGREGATION_DAYS,
       })}
       description={<QUSDTooltip />}
@@ -317,13 +294,9 @@ export const Statistics = ({
   );
   const runningVolumeTile = (
     <StatTile
-      title={t(
-        'runningNotionalOverEpochs',
-        'Combined volume (last {{count}} epochs)',
-        {
-          count: details?.windowLength,
-        }
-      )}
+      title={t('Combined volume (last {{count}} epochs)', {
+        count: details?.windowLength,
+      })}
     >
       {compactNumFormat.format(runningVolumeValue)}
     </StatTile>
@@ -360,60 +333,28 @@ export const Statistics = ({
     </>
   );
 
-  const eligibilityWarning = as === 'referee' && !isEligible && (
-    <div
-      data-testid="referral-eligibility-warning"
-      className="absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 text-center w-1/2 lg:w-1/3"
-    >
-      <h2 className="text-2xl mb-2">{t('Referral code no longer valid')}</h2>
-      <p>
-        {t(
-          'Your referral code is no longer valid as the referrer no longer meets the minimum requirements. Apply a new code to continue receiving discounts.'
-        )}
-      </p>
-    </div>
-  );
-
-  return (
-    <div
-      data-testid="referral-statistics"
-      data-as={as}
-      className="relative mx-auto mb-20"
-    >
-      <div
-        className={classNames('grid grid-cols-1 grid-rows-1 gap-5', {
-          'opacity-20 pointer-events-none': as === 'referee' && !isEligible,
-        })}
-      >
-        {as === 'referrer' && referrerTiles}
-        {as === 'referee' && refereeTiles}
-      </div>
-
-      {eligibilityWarning}
-    </div>
-  );
-};
-
-export const RefereesTable = ({
-  data,
-  program,
-}: {
-  data: NonNullable<ReturnType<typeof useReferral>['data']>;
-  program: ReturnType<typeof useReferralProgram>;
-}) => {
-  const t = useT();
   const [collapsed, setCollapsed] = useState(false);
   const tableRef = useRef<HTMLTableElement>(null);
-  const { details } = program;
   useLayoutEffect(() => {
     if ((tableRef.current?.getBoundingClientRect().height || 0) > 384) {
       setCollapsed(true);
     }
   }, []);
+
   return (
     <>
+      {/* Stats tiles */}
+      <div
+        className={classNames(
+          'grid grid-cols-1 grid-rows-1 gap-5 mx-auto mb-20'
+        )}
+      >
+        {as === 'referrer' && referrerTiles}
+        {as === 'referee' && refereeTiles}
+      </div>
+
       {/* Referees (only for referrer view) */}
-      {data.referees.length > 0 && (
+      {as === 'referrer' && data.referees.length > 0 && (
         <div className="mt-20 mb-20">
           <h2 className="mb-5 text-2xl">{t('Referees')}</h2>
           <div
@@ -443,19 +384,15 @@ export const RefereesTable = ({
                 { name: 'joined', displayName: t('Date Joined') },
                 {
                   name: 'volume',
-                  displayName: t(
-                    'volumeLastEpochs',
-                    'Volume (last {{count}} epochs)',
-                    {
-                      count: details?.windowLength || DEFAULT_AGGREGATION_DAYS,
-                    }
-                  ),
+                  displayName: t('Volume (last {{count}} epochs)', {
+                    count: details?.windowLength || DEFAULT_AGGREGATION_DAYS,
+                  }),
                 },
                 {
                   name: 'commission',
                   displayName: (
                     <Trans
-                      i18nKey="referralStatisticsCommission"
+                      i18nKey="referral-statistics-commission"
                       defaults="Commission earned in <0>qUSD</0> (last {{count}} epochs)"
                       values={{
                         count:

apps/trading/client-pages/referrals/tiers.tsx

@@ -208,13 +208,9 @@ const TiersTable = ({
         { name: 'discount', displayName: t('Referrer trading discount') },
         {
           name: 'volume',
-          displayName: t(
-            'minTradingVolume',
-            'Min. trading volume (last {{count}} epochs)',
-            {
-              count: windowLength,
-            }
-          ),
+          displayName: t('Min. trading volume (last {{count}} epochs)', {
+            count: windowLength,
+          }),
         },
         { name: 'epochs', displayName: t('Min. epochs') },
       ]}
@@ -222,13 +218,13 @@ const TiersTable = ({
         ...d,
         className: classNames({
           'from-vega-pink-400 dark:from-vega-pink-600 to-20%  bg-highlight':
-            d.tier >= 3,
+            d.tier === 1,
           'from-vega-purple-400 dark:from-vega-purple-600 to-20%  bg-highlight':
             d.tier === 2,
           'from-vega-blue-400 dark:from-vega-blue-600 to-20%  bg-highlight':
-            d.tier === 1,
+            d.tier === 3,
           'from-vega-orange-400 dark:from-vega-orange-600 to-20%  bg-highlight':
-            d.tier == 0,
+            d.tier > 3,
         }),
       }))}
     />

apps/trading/components/fees-container/Fees.graphql

@@ -16,11 +16,18 @@ query DiscountPrograms {
   }
 }
 
-query Fees($partyId: ID!) {
+query Fees(
+  $partyId: ID!
+  $volumeDiscountEpochs: Int!
+  $referralDiscountEpochs: Int!
+) {
   epoch {
     id
   }
-  volumeDiscountStats(partyId: $partyId, pagination: { last: 1 }) {
+  volumeDiscountStats(
+    partyId: $partyId
+    pagination: { last: $volumeDiscountEpochs }
+  ) {
     edges {
       node {
         atEpoch
@@ -52,7 +59,10 @@ query Fees($partyId: ID!) {
       }
     }
   }
-  referralSetStats(partyId: $partyId, pagination: { last: 1 }) {
+  referralSetStats(
+    partyId: $partyId
+    pagination: { last: $referralDiscountEpochs }
+  ) {
     edges {
       node {
         atEpoch

apps/trading/components/fees-container/__generated__/Fees.ts

@@ -10,6 +10,8 @@ export type DiscountProgramsQuery = { __typename?: 'Query', currentReferralProgr
 
 export type FeesQueryVariables = Types.Exact<{
   partyId: Types.Scalars['ID'];
+  volumeDiscountEpochs: Types.Scalars['Int'];
+  referralDiscountEpochs: Types.Scalars['Int'];
 }>;
 
 
@@ -63,11 +65,14 @@ export type DiscountProgramsQueryHookResult = ReturnType<typeof useDiscountProgr
 export type DiscountProgramsLazyQueryHookResult = ReturnType<typeof useDiscountProgramsLazyQuery>;
 export type DiscountProgramsQueryResult = Apollo.QueryResult<DiscountProgramsQuery, DiscountProgramsQueryVariables>;
 export const FeesDocument = gql`
-    query Fees($partyId: ID!) {
+    query Fees($partyId: ID!, $volumeDiscountEpochs: Int!, $referralDiscountEpochs: Int!) {
   epoch {
     id
   }
-  volumeDiscountStats(partyId: $partyId, pagination: {last: 1}) {
+  volumeDiscountStats(
+    partyId: $partyId
+    pagination: {last: $volumeDiscountEpochs}
+  ) {
     edges {
       node {
         atEpoch
@@ -99,7 +104,7 @@ export const FeesDocument = gql`
       }
     }
   }
-  referralSetStats(partyId: $partyId, pagination: {last: 1}) {
+  referralSetStats(partyId: $partyId, pagination: {last: $referralDiscountEpochs}) {
     edges {
       node {
         atEpoch
@@ -124,6 +129,8 @@ export const FeesDocument = gql`
  * const { data, loading, error } = useFeesQuery({
  *   variables: {
  *      partyId: // value for 'partyId'
+ *      volumeDiscountEpochs: // value for 'volumeDiscountEpochs'
+ *      referralDiscountEpochs: // value for 'referralDiscountEpochs'
  *   },
  * });
  */

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

@@ -36,25 +36,25 @@ export const FeesContainer = () => {
   const { data: markets, loading: marketsLoading } = useMarketList();
 
   const { data: programData, loading: programLoading } =
-    useDiscountProgramsQuery({ errorPolicy: 'ignore' });
+    useDiscountProgramsQuery();
 
   const volumeDiscountWindowLength =
     programData?.currentVolumeDiscountProgram?.windowLength || 1;
   const referralDiscountWindowLength =
     programData?.currentReferralProgram?.windowLength || 1;
+
   const { data: feesData, loading: feesLoading } = useFeesQuery({
     variables: {
       partyId: pubKey || '',
+      volumeDiscountEpochs: volumeDiscountWindowLength,
+      referralDiscountEpochs: referralDiscountWindowLength,
     },
-    skip: !pubKey,
+    skip: !pubKey || !programData,
   });
 
-  const previousEpoch = (Number(feesData?.epoch.id) || 0) - 1;
-
   const { volumeDiscount, volumeTierIndex, volumeInWindow, volumeTiers } =
     useVolumeStats(
-      previousEpoch,
-      feesData?.volumeDiscountStats.edges?.[0]?.node,
+      feesData?.volumeDiscountStats,
       programData?.currentVolumeDiscountProgram
     );
 
@@ -67,12 +67,12 @@ export const FeesContainer = () => {
     code,
     isReferrer,
   } = useReferralStats(
-    previousEpoch,
-    feesData?.referralSetStats.edges?.[0]?.node,
-    feesData?.referralSetReferees.edges?.[0]?.node,
+    feesData?.referralSetStats,
+    feesData?.referralSetReferees,
     programData?.currentReferralProgram,
-    feesData?.referrer.edges?.[0]?.node,
-    feesData?.referee.edges?.[0]?.node
+    feesData?.epoch,
+    feesData?.referrer,
+    feesData?.referee
   );
 
   const loading = paramsLoading || feesLoading || programLoading;
@@ -317,7 +317,7 @@ export const CurrentVolume = ({
     <div className="flex flex-col gap-3 pt-4">
       <CardStat
         value={formatNumberRounded(new BigNumber(windowLengthVolume))}
-        text={t('pastEpochs', 'Past {{count}} epochs', { count: windowLength })}
+        text={t('Past {{count}} epochs', { count: windowLength })}
       />
       {requiredForNextTier > 0 && (
         <CardStat
@@ -344,13 +344,9 @@ const ReferralBenefits = ({
       <CardStat
         // all sets volume (not just current party)
         value={formatNumber(setRunningNotionalTakerVolume)}
-        text={t(
-          'runningNotionalOverEpochs',
-          'Combined running notional over the {{count}} epochs',
-          {
-            count: epochs,
-          }
-        )}
+        text={t('Combined running notional over the {{count}} epochs', {
+          count: epochs,
+        })}
       />
       <CardStat value={epochsInSet} text={t('epochs in referral set')} />
     </div>
@@ -457,27 +453,31 @@ const VolumeTiers = ({
             <Th>{t('Discount')}</Th>
             <Th>{t('Min. trading volume')}</Th>
             <Th>
-              {t('myVolume', 'My volume (last {{count}} epochs)', {
-                count: windowLength,
-              })}
+              {t('My volume (last {{count}} epochs)', { count: windowLength })}
             </Th>
             <Th />
           </tr>
         </THead>
         <tbody>
-          {Array.from(tiers).map((tier, i) => {
-            const isUserTier = tierIndex === i;
+          {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>
-            );
-          })}
+              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>
@@ -520,33 +520,37 @@ const ReferralTiers = ({
           </tr>
         </THead>
         <tbody>
-          {Array.from(tiers).map((t, i) => {
-            const isUserTier = tierIndex === i;
+          {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>
+              const requiredVolume = Number(
+                t.minimumRunningNotionalTakerVolume
               );
-            }
+              let unlocksIn = null;
 
-            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>
-            );
-          })}
+              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>

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

@@ -2,15 +2,46 @@ import { renderHook } from '@testing-library/react';
 import { useReferralStats } from './use-referral-stats';
 
 describe('useReferralStats', () => {
-  const stat = {
-    __typename: 'ReferralSetStats' as const,
-    atEpoch: 9,
-    discountFactor: '0.01',
-    referralSetRunningNotionalTakerVolume: '100',
+  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 set = {
-    atEpoch: 4,
+  const sets = {
+    edges: [
+      {
+        node: {
+          atEpoch: 3,
+        },
+      },
+      {
+        node: {
+          atEpoch: 4,
+        },
+      },
+    ],
+  };
+
+  const epoch = {
+    id: '10',
   };
 
   const program = {
@@ -47,36 +78,102 @@ describe('useReferralStats', () => {
     });
   });
 
-  it('returns default values if set is not from previous epoch', () => {
-    const { result } = renderHook(() =>
-      useReferralStats(10, stat, set, program)
-    );
-    expect(result.current).toEqual({
-      referralDiscount: 0,
-      referralVolumeInWindow: 0,
-      referralTierIndex: -1,
-      referralTiers: program.benefitTiers,
-      epochsInSet: 0,
-      code: undefined,
-      isReferrer: false,
-    });
-  });
-
   it('returns formatted data and tiers', () => {
     const { result } = renderHook(() =>
-      useReferralStats(9, stat, set, program)
+      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(stat.discountFactor),
+      referralDiscount: Number(stats.discountFactor),
       referralVolumeInWindow: Number(
-        stat.referralSetRunningNotionalTakerVolume
+        stats.referralSetRunningNotionalTakerVolume
       ),
-      referralTierIndex: 0,
+      referralTierIndex: 1,
       referralTiers: program.benefitTiers,
-      epochsInSet: stat.atEpoch - set.atEpoch,
+      epochsInSet: Number(epoch.id) - set.atEpoch,
       code: undefined,
       isReferrer: false,
     });
   });
+
+  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);
+  });
 });

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

@@ -1,24 +1,20 @@
+import compact from 'lodash/compact';
+import maxBy from 'lodash/maxBy';
+import { getReferralBenefitTier } from './utils';
 import type { DiscountProgramsQuery, FeesQuery } from './__generated__/Fees';
+import { first } from 'lodash';
+
 export const useReferralStats = (
-  previousEpoch?: number,
-  referralStats?: NonNullable<
-    FeesQuery['referralSetStats']['edges']['0']
-  >['node'],
-  setReferees?: NonNullable<
-    FeesQuery['referralSetReferees']['edges']['0']
-  >['node'],
+  setStats?: FeesQuery['referralSetStats'],
+  setReferees?: FeesQuery['referralSetReferees'],
   program?: DiscountProgramsQuery['currentReferralProgram'],
-  setIfReferrer?: NonNullable<FeesQuery['referrer']['edges']['0']>['node'],
-  setIfReferee?: NonNullable<FeesQuery['referee']['edges']['0']>['node']
+  epoch?: FeesQuery['epoch'],
+  setIfReferrer?: FeesQuery['referrer'],
+  setIfReferee?: FeesQuery['referee']
 ) => {
   const referralTiers = program?.benefitTiers || [];
 
-  if (
-    !previousEpoch ||
-    referralStats?.atEpoch !== previousEpoch ||
-    !program ||
-    !setReferees
-  ) {
+  if (!setStats || !setReferees || !program || !epoch) {
     return {
       referralDiscount: 0,
       referralVolumeInWindow: 0,
@@ -30,22 +26,41 @@ export const useReferralStats = (
     };
   }
 
+  const setIfReferrerData = first(
+    compact(setIfReferrer?.edges).map((e) => e.node)
+  );
+  const setIfRefereeData = first(
+    compact(setIfReferee?.edges).map((e) => e.node)
+  );
+
+  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 = referralTiers.findIndex(
-    (tier) => tier.referralDiscountFactor === referralStats?.discountFactor
-  );
+  const referralTierIndex = referralStats
+    ? getReferralBenefitTier(
+        epochsInSet,
+        Number(referralStats.referralSetRunningNotionalTakerVolume),
+        referralTiers
+      )
+    : -1;
 
   return {
     referralDiscount,
     referralVolumeInWindow,
     referralTierIndex,
     referralTiers,
-    epochsInSet: referralStats.atEpoch - setReferees.atEpoch,
-    code: (setIfReferrer || setIfReferee)?.id,
-    isReferrer: Boolean(setIfReferrer),
+    epochsInSet,
+    code: (setIfReferrerData || setIfRefereeData)?.id,
+    isReferrer: Boolean(setIfReferrerData),
   };
 };

apps/trading/components/fees-container/use-volume-stats.spec.ts

@@ -2,11 +2,27 @@ import { renderHook } from '@testing-library/react';
 import { useVolumeStats } from './use-volume-stats';
 
 describe('useReferralStats', () => {
-  const stats = {
-    __typename: 'VolumeDiscountStats' as const,
-    atEpoch: 10,
-    discountFactor: '0.05',
-    runningVolume: '200',
+  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 = {
@@ -28,7 +44,7 @@ describe('useReferralStats', () => {
   };
 
   it('returns correct default values', () => {
-    const { result } = renderHook(() => useVolumeStats(10));
+    const { result } = renderHook(() => useVolumeStats());
     expect(result.current).toEqual({
       volumeDiscount: 0,
       volumeInWindow: 0,
@@ -37,18 +53,11 @@ describe('useReferralStats', () => {
     });
   });
 
-  it('returns default values if no stat is not from previous epoch', () => {
-    const { result } = renderHook(() => useVolumeStats(11, stats, program));
-    expect(result.current).toEqual({
-      volumeDiscount: 0,
-      volumeInWindow: 0,
-      volumeTierIndex: -1,
-      volumeTiers: program.benefitTiers,
-    });
-  });
-
   it('returns formatted data and tiers', () => {
-    const { result } = renderHook(() => useVolumeStats(10, stats, program));
+    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),
@@ -57,4 +66,30 @@ describe('useReferralStats', () => {
       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);
+  });
 });

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

@@ -1,15 +1,15 @@
+import compact from 'lodash/compact';
+import maxBy from 'lodash/maxBy';
+import { getVolumeTier } from './utils';
 import type { DiscountProgramsQuery, FeesQuery } from './__generated__/Fees';
 
 export const useVolumeStats = (
-  previousEpoch: number,
-  lastEpochStats?: NonNullable<
-    FeesQuery['volumeDiscountStats']['edges']['0']
-  >['node'],
+  stats?: FeesQuery['volumeDiscountStats'],
   program?: DiscountProgramsQuery['currentVolumeDiscountProgram']
 ) => {
   const volumeTiers = program?.benefitTiers || [];
 
-  if (!lastEpochStats || lastEpochStats.atEpoch !== previousEpoch || !program) {
+  if (!stats || !program) {
     return {
       volumeDiscount: 0,
       volumeTierIndex: -1,
@@ -18,11 +18,11 @@ export const useVolumeStats = (
     };
   }
 
+  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 = volumeTiers.findIndex(
-    (tier) => tier.volumeDiscountFactor === lastEpochStats?.discountFactor
-  );
+  const volumeTierIndex = getVolumeTier(volumeInWindow, volumeTiers);
 
   return {
     volumeDiscount,

apps/trading/components/fees-container/utils.ts

@@ -20,6 +20,73 @@ export const formatPercentage = (num: number) => {
   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

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

@@ -65,7 +65,7 @@ export const FundingContainer = ({ marketId }: { marketId: string }) => {
           if (edge.node.endTime) {
             acc?.push({
               endTime: fromNanoSeconds(edge.node.endTime),
-              fundingRate: Number(edge.node.fundingRate),
+              fundingRate: Number(edge.node.fundingRate) * 100,
             });
           }
           return acc;
@@ -82,8 +82,7 @@ export const FundingContainer = ({ marketId }: { marketId: string }) => {
     <LineChart
       data={values}
       theme={theme}
-      priceFormat={(fundingRate) => `${(fundingRate * 100).toFixed(4)}%`}
-      yAxisTickFormat="%"
+      priceFormat={(fundingRate) => `${fundingRate.toFixed(4)}%`}
     />
   );
 };

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

@@ -16,12 +16,15 @@ export const LedgerContainer = () => {
   });
 
   const assets = (data?.party?.accountsConnection?.edges ?? [])
-    .map((item) => item?.node?.asset)
-    .filter((asset): asset is PartyAssetFieldsFragment => !!asset?.id)
-    .reduce(
-      (aggr, item) => Object.assign(aggr, { [item.id]: item.symbol }),
-      {} as Record<string, string>
-    );
+    .map<PartyAssetFieldsFragment>(
+      (item) => item?.node?.asset ?? ({} as PartyAssetFieldsFragment)
+    )
+    .reduce((aggr, item) => {
+      if ('id' in item && 'symbol' in item) {
+        aggr[item.id as string] = item.symbol as string;
+      }
+      return aggr;
+    }, {} as Record<string, string>);
 
   if (!pubKey) {
     return (

apps/trading/components/navbar/navbar.spec.tsx

@@ -172,20 +172,4 @@ describe('Navbar', () => {
     expect(mockDisconnect).toHaveBeenCalled();
     expect(screen.queryByTestId(navbarContent)).not.toBeInTheDocument();
   });
-
-  it('does not render the language selector until we have more languages', () => {
-    renderComponent();
-    expect(screen.queryByTestId('icon-globe')).not.toBeInTheDocument();
-  });
-
-  it('renders the theme switcher', async () => {
-    renderComponent();
-    await userEvent.click(screen.getByTestId('icon-moon'));
-    expect(screen.queryByTestId('icon-moon')).not.toBeInTheDocument();
-    expect(screen.getByTestId('icon-sun')).toBeInTheDocument();
-
-    await userEvent.click(screen.getByTestId('icon-sun'));
-    expect(screen.queryByTestId('icon-sun')).not.toBeInTheDocument();
-    expect(screen.getByTestId('icon-moon')).toBeInTheDocument();
-  });
 });

apps/trading/components/navbar/navbar.tsx

@@ -11,13 +11,7 @@ import {
 } from '@vegaprotocol/environment';
 import { useGlobalStore } from '../../stores';
 import { VegaWalletConnectButton } from '../vega-wallet-connect-button';
-import {
-  VegaIconNames,
-  VegaIcon,
-  VLogo,
-  LanguageSelector,
-  ThemeSwitcher,
-} from '@vegaprotocol/ui-toolkit';
+import { VegaIconNames, VegaIcon, VLogo } from '@vegaprotocol/ui-toolkit';
 import * as N from '@radix-ui/react-navigation-menu';
 import * as D from '@radix-ui/react-dialog';
 import { NavLink } from 'react-router-dom';
@@ -28,8 +22,7 @@ import { VegaWalletMenu } from '../vega-wallet';
 import { useVegaWallet, useVegaWalletDialogStore } from '@vegaprotocol/wallet';
 import { WalletIcon } from '../icons/wallet';
 import { ProtocolUpgradeCountdown } from '@vegaprotocol/proposals';
-import { useT, useI18n } from '../../lib/use-t';
-import { supportedLngs } from '../../lib/i18n';
+import { useT } from '../../lib/use-t';
 
 type MenuState = 'wallet' | 'nav' | null;
 type Theme = 'system' | 'yellow';
@@ -41,7 +34,6 @@ export const Navbar = ({
   children?: ReactNode;
   theme?: Theme;
 }) => {
-  const i18n = useI18n();
   const t = useT();
   // menu state for small screens
   const [menu, setMenu] = useState<MenuState>(null);
@@ -85,15 +77,6 @@ export const Navbar = ({
       {/* Right section */}
       <div className="ml-auto flex items-center justify-end gap-2">
         <ProtocolUpgradeCountdown />
-        <div className="flex">
-          <ThemeSwitcher />
-          {supportedLngs.length > 1 ? (
-            <LanguageSelector
-              languages={supportedLngs}
-              onSelect={(language) => i18n.changeLanguage(language)}
-            />
-          ) : null}
-        </div>
         <NavbarMobileButton
           onClick={() => {
             if (isConnected) {

apps/trading/e2e/.env

@@ -1,2 +1,2 @@
 CONSOLE_IMAGE_NAME=vegaprotocol/trading:latest
-VEGA_VERSION=v0.73.6
+VEGA_VERSION=v0.73.5

apps/trading/e2e/.env.develop

@@ -1,2 +1,2 @@
 CONSOLE_IMAGE_NAME=vegaprotocol/trading:develop
-VEGA_VERSION=v0.73.6
+VEGA_VERSION=v0.73.5

apps/trading/e2e/.env.main

@@ -1,2 +1,2 @@
 CONSOLE_IMAGE_NAME=vegaprotocol/trading:main
-VEGA_VERSION=v0.73.6
+VEGA_VERSION=v0.73.5

apps/trading/e2e/conftest.py

@@ -12,7 +12,6 @@ from contextlib import contextmanager
 from vega_sim.null_service import VegaServiceNull
 from playwright.sync_api import Browser, Page
 from config import console_image_name, vega_version
-from datetime import datetime, timedelta
 from fixtures.market import (
     setup_simple_market,
     setup_opening_auction_market,
@@ -79,7 +78,6 @@ def init_vega(request=None):
         store_transactions=True,
         transactions_per_block=1000,
         seconds_per_block=seconds_per_block,
-        genesis_time= datetime.now() - timedelta(days=1),
     ) as vega:
         try:
             container = docker_client.containers.run(

apps/trading/e2e/poetry.lock

@@ -1161,7 +1161,7 @@ profile = ["pytest-profiling", "snakeviz"]
 type = "git"
 url = "https://github.com/vegaprotocol/vega-market-sim.git"
 reference = "HEAD"
-resolved_reference = "fbcb974b2055bbc80169cdfd69987f087f9969fb"
+resolved_reference = "e93f7dfa8463c59cfd0e299362b845511cebeef6"
 
 [[package]]
 name = "websocket-client"

apps/trading/e2e/pyproject.toml

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

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

@@ -58,6 +58,7 @@ class TestSettledMarket:
     def test_settled_rows(self, page: Page, create_settled_market):
         page.goto(f"/#/markets/all")
         page.get_by_test_id("Closed markets").click()
+
         row_selector = page.locator(
             '[data-testid="tab-closed-markets"] .ag-center-cols-container .ag-row'
         ).first
@@ -71,7 +72,7 @@ class TestSettledMarket:
         # 6001-MARK-009
         # 6001-MARK-008
         # 6001-MARK-010
-        pattern = r"(\d+)\s+(months|hours|days)\s+ago"
+        pattern = r"(\d+)\s+months\s+ago"
         date_text = row_selector.locator('[col-id="settlementDate"]').inner_text()
         assert re.match(pattern, date_text), f"Expected text to match pattern but got {date_text}"
        

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

@@ -0,0 +1,160 @@
+import pytest
+from playwright.sync_api import Page, expect
+from fixtures.market import setup_continuous_market
+
+from conftest import init_vega
+
+market_names = ["ETHBTC.QM21", "BTCUSD.MF21", "SOLUSD", "AAPL.MF21"]
+
+
+@pytest.fixture(scope="module")
+def vega():
+    with init_vega() as vega:
+        yield vega
+
+
+@pytest.fixture(scope="module")
+def create_markets(vega):
+    for market_name in market_names:
+        setup_continuous_market(vega, custom_market_name=market_name)
+
+
+@pytest.mark.usefixtures("risk_accepted")
+def test_table_headers(page: Page, create_markets):
+    page.goto(f"/#/markets/all")
+    headers = [
+        "Market",
+        "Description",
+        "Settlement asset",
+        "Trading mode",
+        "Status",
+        "Mark price",
+        "24h volume",
+        "Open Interest",
+        "Spread",
+        "",
+    ]
+    page.wait_for_selector('[data-testid="tab-open-markets"]', state="visible")
+    page_headers = (
+        page.get_by_test_id("tab-open-markets").locator(".ag-header-cell-text").all()
+    )
+    for i, header in enumerate(headers):
+        expect(page_headers[i]).to_have_text(header)
+
+
+@pytest.mark.usefixtures("risk_accepted")
+def test_markets_tab(page: Page, create_markets):
+    page.goto(f"/#/markets/all")
+    expect(page.get_by_test_id("Open markets")).to_have_attribute(
+        "data-state", "active"
+    )
+    expect(page.get_by_test_id("Proposed markets")).to_have_attribute(
+        "data-state", "inactive"
+    )
+    expect(page.get_by_test_id("Closed markets")).to_have_attribute(
+        "data-state", "inactive"
+    )
+
+
+@pytest.mark.usefixtures("risk_accepted")
+def test_markets_content(page: Page, create_markets):
+    page.goto(f"/#/markets/all")
+    row_selector = page.locator(
+        '[data-testid="tab-open-markets"] .ag-center-cols-container .ag-row'
+    ).first
+    instrument_code_locator = '[col-id="tradableInstrument.instrument.code"] [data-testid="stack-cell-primary"]'
+    # 6001-MARK-035
+    expect(row_selector.locator(instrument_code_locator)).to_have_text("ETHBTC.QM21")
+
+    # 6001-MARK-073
+    expect(row_selector.locator('[title="Future"]')).to_have_text("Futr")
+
+    #  6001-MARK-036
+    expect(
+        row_selector.locator('[col-id="tradableInstrument.instrument.name"]')
+    ).to_have_text("ETHBTC.QM21")
+
+    #  6001-MARK-037
+    expect(row_selector.locator('[col-id="tradingMode"]')).to_have_text("Continuous")
+
+    #  6001-MARK-038
+    expect(row_selector.locator('[col-id="state"]')).to_have_text("Active")
+
+    #  6001-MARK-039
+    expect(row_selector.locator('[col-id="data.markPrice"]')).to_have_text("107.50")
+
+    #  6001-MARK-040
+    expect(row_selector.locator('[col-id="data.candles"]')).to_have_text("0.00")
+
+    #  6001-MARK-042
+    expect(
+        row_selector.locator(
+            '[col-id="tradableInstrument.instrument.product.settlementAsset.symbol"]'
+        )
+    ).to_have_text("tDAI")
+
+    expect(row_selector.locator('[col-id="data.bestBidPrice"]')).to_have_text("2")
+
+    # 6001-MARK-043
+    row_selector.locator(
+        '[col-id="tradableInstrument.instrument.product.settlementAsset.symbol"] button'
+    ).click()
+    expect(page.get_by_test_id("dialog-title")).to_have_text("Asset details - tDAI")
+    # 6001-MARK-019
+    page.get_by_test_id("close-asset-details-dialog").click()
+
+
+@pytest.mark.usefixtures("risk_accepted")
+def test_market_actions(page: Page, create_markets):
+    # 6001-MARK-044
+    # 6001-MARK-045
+    # 6001-MARK-046
+    # 6001-MARK-047
+    page.goto(f"/#/markets/all")
+    page.locator(
+        '.ag-pinned-right-cols-container [col-id="market-actions"]'
+    ).first.locator("button").click()
+
+    actions = [
+        "Copy Market ID",
+        "View on Explorer",
+        "View settlement asset details",
+    ]
+    action_elements = (
+        page.get_by_test_id("market-actions-content").get_by_role("menuitem").all()
+    )
+
+    for i, action in enumerate(actions):
+        expect(action_elements[i]).to_have_text(action)
+
+
+@pytest.mark.usefixtures("risk_accepted")
+def test_sort_markets(page: Page, create_markets):
+    # 6001-MARK-064
+
+    page.goto(f"/#/markets/all")
+    sorted_market_names = [
+        "AAPL.MF21",
+        "BTCUSD.MF21",
+        "ETHBTC.QM21",
+        "SOLUSD",
+    ]
+    page.locator('.ag-header-row [col-id="tradableInstrument.instrument.code"]').click()
+    for i, market_name in enumerate(sorted_market_names):
+        expect(
+            page.locator(
+                f'[row-index="{i}"] [col-id="tradableInstrument.instrument.name"]'
+            )
+        ).to_have_text(market_name)
+
+
+@pytest.mark.usefixtures("risk_accepted")
+def test_drag_and_drop_column(page: Page, create_markets):
+    # 6001-MARK-065
+    page.goto(f"/#/markets/all")
+    col_instrument_code = '.ag-header-row [col-id="tradableInstrument.instrument.code"]'
+
+    page.locator(col_instrument_code).drag_to(
+        page.locator('.ag-header-row [col-id="data.bestBidPrice"]')
+    )
+    expect(page.locator(col_instrument_code)).to_have_attribute("aria-colindex", "9")

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

@@ -1,5 +1,4 @@
 import pytest
-import re
 import vega_sim.api.governance as governance
 from playwright.sync_api import Page, expect
 from vega_sim.service import VegaService, PeggedOrder
@@ -11,8 +10,6 @@ from wallet_config import MM_WALLET, MM_WALLET2, GOVERNANCE_WALLET
 
 @pytest.mark.usefixtures("vega", "page", "proposed_market", "risk_accepted")
 def test_market_lifecycle(proposed_market, vega: VegaService, page: Page):
-    # 7002-SORD-001
-    # 7002-SORD-002
     trading_mode = page.get_by_test_id("market-trading-mode").get_by_test_id(
         "item-value"
     )
@@ -21,32 +18,12 @@ def test_market_lifecycle(proposed_market, vega: VegaService, page: Page):
     # setup market in proposed step, without liquidity provided
     market_id = proposed_market
     page.goto(f"/#/markets/{market_id}")
-    # 6002-MDET-001
-    expect(page.get_by_test_id("header-title")).to_have_text("BTC:DAI_2023Futr")
-    # 6002-MDET-002
-    expect(page.get_by_test_id("market-expiry")).to_have_text("ExpiryNot time-based")
-    page.get_by_test_id("market-expiry").hover()
-    expect(page.get_by_test_id("expiry-tooltip").first).to_have_text("This market expires when triggered by its oracle, not on a set date.View oracle specification")
-    expect(page.get_by_test_id("expiry-tooltip").first.get_by_test_id("link")).to_have_attribute("href", re.compile('.*'))
-    # 6002-MDET-003
-    expect(page.get_by_test_id("market-price")).to_have_text("Mark Price0.00")
-    # 6002-MDET-004
-    expect(page.get_by_test_id("market-change")).to_have_text("Change (24h)0.00%0.00")
-    # 6002-MDET-005
-    expect(page.get_by_test_id("market-volume")).to_have_text("Volume (24h)-")
-    # 6002-MDET-008
-    expect(page.get_by_test_id("market-settlement-asset")).to_have_text("Settlement assettDAI")
-    expect(page.get_by_test_id("liquidity-supplied")).to_have_text("Liquidity supplied 0.00 (0.00%)")
-    page.get_by_test_id("liquidity-supplied").hover()
-    expect(page.get_by_test_id("liquidity-supplied-tooltip").first).to_have_text("Supplied stake0.00Target stake0.00View liquidity provision tableLearn about providing liquidity")
-    expect(page.get_by_test_id("liquidity-supplied-tooltip").first.get_by_test_id("link").first).to_have_text("View liquidity provision table")
+
     # check that market is in proposed state
     # 6002-MDET-006
     # 6002-MDET-007
     # 7002-SORD-061
     expect(trading_mode).to_have_text("No trading")
-    trading_mode.hover()
-    expect(page.get_by_test_id("trading-mode-tooltip").first).to_have_text("No trading enabled for this market.")
     expect(market_state).to_have_text("Proposed")
 
     # approve market

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

@@ -1,138 +0,0 @@
-import pytest
-import re
-from playwright.sync_api import Page, expect
-from vega_sim.service import VegaService
-from vega_sim.service import MarketStateUpdateType
-from datetime import datetime, timedelta
-from conftest import init_vega
-from actions.utils import change_keys
-from actions.vega import submit_multiple_orders
-from fixtures.market import setup_perps_market
-from wallet_config import MM_WALLET, MM_WALLET2, TERMINATE_WALLET
-
-row_selector = '[data-testid="tab-funding-payments"] .ag-center-cols-container .ag-row'
-col_amount = '[col-id="amount"]'
-
-class TestPerpetuals:
-
-    @pytest.fixture(scope="class")
-    def vega(self, request):
-        with init_vega(request) as vega:
-            yield vega
-
-    @pytest.fixture(scope="class")
-    def perps_market(self, vega: VegaService):
-        perps_market = setup_perps_market(vega)
-        submit_multiple_orders(
-            vega, MM_WALLET.name, perps_market, "SIDE_SELL", [[1, 110], [1, 105]]
-        )
-        submit_multiple_orders(
-            vega, MM_WALLET2.name, perps_market, "SIDE_BUY", [[1, 90], [1, 95]]
-        )
-        vega.submit_settlement_data(
-            settlement_key=TERMINATE_WALLET.name,
-            settlement_price=110,
-            market_id=perps_market,
-        )
-        vega.forward("10s")
-        vega.wait_fn(1)
-        vega.wait_for_total_catchup()
-        submit_multiple_orders(
-            vega, MM_WALLET.name, perps_market, "SIDE_SELL", [[1, 110], [1, 105]]
-        )
-        submit_multiple_orders(
-            vega, MM_WALLET2.name, perps_market, "SIDE_BUY", [[1, 112], [1, 115]]
-        )
-        vega.submit_settlement_data(
-            settlement_key=TERMINATE_WALLET.name,
-            settlement_price=110,
-            market_id=perps_market,
-        )
-        vega.forward("10s")
-        vega.wait_fn(1)
-        vega.wait_for_total_catchup()
-        return perps_market
-
-    @pytest.mark.usefixtures("page","risk_accepted", "auth")
-    def test_funding_payment_profit(self, perps_market, page: Page):
-        page.goto(f"/#/markets/{perps_market}")    
-        page.get_by_test_id("Funding payments").click()
-        row = page.locator(row_selector)
-        expect(row.locator(col_amount)).to_have_text("9.00 tDAI")
-
-    @pytest.mark.usefixtures("page","risk_accepted", "auth")
-    def test_funding_payment_loss(self, perps_market, page: Page, vega):
-        page.goto(f"/#/markets/{perps_market}")   
-        change_keys(page, vega, "market_maker")
-        page.get_by_test_id("Funding payments").click()
-        row = page.locator(row_selector)
-        expect(row.locator(col_amount)).to_have_text("-27.00 tDAI")
-        
-    @pytest.mark.usefixtures("page","risk_accepted", "auth")
-    def test_funding_header(self, perps_market, page: Page):
-        page.goto(f"/#/markets/{perps_market}")
-        expect(page.get_by_test_id("market-funding")).to_contain_text("Funding Rate / Countdown-8.1818%")
-        expect(page.get_by_test_id("index-price")).to_have_text("Index Price110.00")
-
-    @pytest.mark.skip("Skipped due to issue #5421")
-    @pytest.mark.usefixtures("page","risk_accepted", "auth")
-    def test_funding_payment_history(perps_market, page: Page, vega):
-        page.goto(f"/#/markets/{perps_market}")   
-        change_keys(page, vega, "market_maker")
-        page.get_by_test_id("Funding history").click()
-        element = page.get_by_test_id("tab-funding-history")
-        # Get the bounding box of the element
-        bounding_box = element.bounding_box()
-        if bounding_box:
-            bottom_right_x = bounding_box["x"] + bounding_box["width"]
-            bottom_right_y = bounding_box["y"] + bounding_box["height"]
-
-            # Hover over the bottom-right corner of the element
-            element.hover(position={"x": bottom_right_x, "y": bottom_right_y})
-        else:
-            print("Bounding box not found for the element")
-
-@pytest.mark.usefixtures("page","risk_accepted", "auth")
-def test_perps_market_termination_proposed(page: Page, vega: VegaService):
-    perpetual_market = setup_perps_market(vega)
-    page.goto(f"/#/markets/{perpetual_market}") 
-    vega.update_market_state(
-        proposal_key=MM_WALLET.name,
-        market_id=perpetual_market,
-        market_state=MarketStateUpdateType.Terminate,
-        price=100,
-        vote_closing_time = datetime.now() + timedelta(seconds=15),
-        vote_enactment_time = datetime.now() + timedelta(seconds=60),
-        approve_proposal = True,
-        forward_time_to_enactment = False,
-    )
-    vega.forward("10s")
-    vega.wait_fn(1)
-    vega.wait_for_total_catchup()
-    banner_text = page.get_by_test_id(f"termination-warning-banner-{perpetual_market}").text_content()
-    pattern = re.compile(
-    r"Trading on Market BTC:DAI_Perpetual may stop on \d{2} [A-Za-z]+\. There is open proposal to close this market\.Proposed final price is 100\.00 BTC\.View proposal"
-    )
-    assert pattern.search(banner_text), f"Text did not match pattern. Text was: {banner_text}"
-
-@pytest.mark.usefixtures("page","risk_accepted", "auth" )
-def test_perps_market_terminated(page: Page, vega: VegaService):
-    perpetual_market = setup_perps_market(vega)
-    page.goto(f"/#/markets/{perpetual_market}") 
-    vega.update_market_state(
-        proposal_key=MM_WALLET.name,
-        market_id=perpetual_market,
-        market_state=MarketStateUpdateType.Terminate,
-        price=100,
-        approve_proposal = True,
-        forward_time_to_enactment = True,
-    )
-    expect(page.get_by_test_id("market-price")).to_have_text("Mark Price100.00")
-    expect(page.get_by_test_id("market-change")).to_have_text("Change (24h)-")
-    expect(page.get_by_test_id("market-volume")).to_have_text("Volume (24h)-")
-    expect(page.get_by_test_id("market-trading-mode")).to_have_text("Trading modeNo trading")
-    expect(page.get_by_test_id("market-state")).to_have_text("StatusClosed")
-    expect(page.get_by_test_id("liquidity-supplied")).to_have_text("Liquidity supplied 0.00 (0.00%)")
-    expect(page.get_by_test_id("market-funding")).to_have_text("Funding Rate / Countdown-Unknown")
-    expect(page.get_by_test_id("index-price")).to_have_text("Index Price-")
-    expect(page.get_by_test_id("deal-ticket-error-message-summary")).to_have_text("This market is closed and not accepting orders")

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

@@ -29,7 +29,7 @@ def test_transfer_submit(continuous_market, vega: VegaService, page: Page):
     page.select_option('[data-testid=transfer-form] [name="toVegaKey"]', index=2)
     page.select_option('[data-testid=transfer-form] [name="fromAccount"]', index=1)
 
-    expected_asset_text = re.compile(r"tDAI tDAI999991.49731 tDAI.{6}….{4}")
+    expected_asset_text = re.compile(r"tDAI tDAI999,991.49731 tDAI.{6}….{4}")
     actual_asset_text = page.get_by_test_id('select-asset').text_content().strip()
 
     assert expected_asset_text.search(actual_asset_text), f"Expected pattern not found in {actual_asset_text}"
@@ -42,7 +42,7 @@ def test_transfer_submit(continuous_market, vega: VegaService, page: Page):
     vega.forward("10s")
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
-    expected_confirmation_text = re.compile(r"Transfer completeYour transaction has been confirmedView in block explorerTransferTo .{6}….{6}1\.00 tDAI")
+    expected_confirmation_text = re.compile(r"Transfer completeYour transaction has been confirmed View in block explorerTransferTo .{6}….{6}1\.00 tDAI")
     actual_confirmation_text = page.get_by_test_id('toast-content').text_content()
     assert expected_confirmation_text.search(actual_confirmation_text), f"Expected pattern not found in {actual_confirmation_text}"
 
@@ -127,6 +127,6 @@ def test_transfer_vesting_below_minimum(continuous_market, vega: VegaService, pa
     vega.forward("10s")
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
-    expected_confirmation_text = re.compile(r"Transfer completeYour transaction has been confirmedView in block explorerTransferTo .{6}….{6}0\.00001 tDAI")
+    expected_confirmation_text = re.compile(r"Transfer completeYour transaction has been confirmed View in block explorerTransferTo .{6}….{6}0\.00001 tDAI")
     actual_confirmation_text = page.get_by_test_id('toast-content').text_content()
     assert expected_confirmation_text.search(actual_confirmation_text), f"Expected pattern not found in {actual_confirmation_text}"

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

@@ -1,116 +0,0 @@
-import pytest
-import re
-import json
-from playwright.sync_api import Page, expect, Route
-from vega_sim.service import VegaService
-from conftest import init_vega
-from fixtures.market import setup_continuous_market
-
-order_size = "order-size"
-order_price = "order-price"
-place_order = "place-order"
-order_side_sell = "order-side-SIDE_SELL"
-market_order = "order-type-Market"
-tif = "order-tif"
-expire = "expire"
-api_request_match = r"http://localhost:\d+/api/v2/requests"
-
-@pytest.fixture(scope="module")
-def vega(request):
-    with init_vega(request) as vega:
-        yield vega
-
-
-@pytest.fixture(scope="module")
-def continuous_market(vega):
-    return setup_continuous_market(vega)
-
-def handle_route_connection_lost(route: Route, request):
-        if request.method == "POST" and re.match(api_request_match, request.url):
-            route.fulfill(
-                status=200,
-                headers={"Content-Type": "application/json"},
-                body='{"jsonrpc": "2.0", "id": "1"}'
-            )
-        else:
-            route.continue_()
-
-def handle_route_connection_rejected(route: Route, request):
-        if request.method == "POST" and re.match(api_request_match, request.url):
-            custom_response = {
-                "jsonrpc": "2.0",
-                "error": {
-                    "code": 3001,
-                    "data": "the user rejected the wallet connection",
-                    "message": "User error"
-                },
-                "id": "0"
-            }
-            route.fulfill(
-                status=400,
-                headers={"Content-Type": "application/json"},
-                body=json.dumps(custom_response)
-            )
-        else:
-            route.continue_()
-
-def assert_connection_approve(route: Route, request, page:Page):
-        if request.method == "POST" and re.match(api_request_match, request.url):
-            expect(page.get_by_test_id("toast-content")).to_have_text("Please go to your Vega wallet application and approve or reject the transaction.")
-        else:
-            route.continue_()
-
-@pytest.mark.usefixtures("page", "auth", "risk_accepted")
-def test_wallet_connection_error(continuous_market, page: Page):
-    page.goto(f"/#/markets/{continuous_market}")
-    page.route("**/*", handle_route_connection_lost)
-    page.get_by_test_id("connect-vega-wallet").click()
-    page.get_by_test_id("connector-jsonRpc").click()
-    expect(page.get_by_test_id("wallet-dialog-title")).to_have_text("Something went wrong")
-
-@pytest.mark.usefixtures("page", "risk_accepted")
-def test_wallet_connection_rejected(continuous_market, page: Page):
-    # 0002-WCON-002
-    # 0002-WCON-005
-    # 0002-WCON-007
-    # 0002-WCON-015
-    page.goto(f"/#/markets/{continuous_market}")
-    page.route("**/*", handle_route_connection_rejected)
-    page.get_by_test_id("connect-vega-wallet").click()
-    page.get_by_test_id("connector-jsonRpc").click()
-    expect(page.get_by_test_id("dialog-content").nth(1)).to_have_text("User errorthe user rejected the wallet connectionTry againAbout the Vega wallet  | Supported browsers ")
-
-
-@pytest.mark.usefixtures("page", "auth", "risk_accepted")
-def test_wallet_connection_error_transaction(continuous_market, vega: VegaService, page: Page):
-    # 0003-WTXN-009
-    # 0003-WTXN-011
-    # 0002-WCON-016
-    # 0003-WTXN-008
-    page.goto(f"/#/markets/{continuous_market}")
-    page.get_by_test_id(order_size).fill("10")
-    page.get_by_test_id(order_price).fill("120")
-    page.route("**/*", handle_route_connection_lost)
-    page.get_by_test_id(place_order).click()
-    expect(page.get_by_test_id("toast-content")).to_have_text("Wallet disconnectedThe connection to your Vega Wallet has been lost.Connect vega wallet")
-    
-@pytest.mark.usefixtures("page", "auth", "risk_accepted")
-def test_wallet_transaction_rejected(continuous_market, vega: VegaService, page: Page):
-    # 0003-WTXN-007
-    page.goto(f"/#/markets/{continuous_market}")
-    page.get_by_test_id(order_size).fill("10")
-    page.get_by_test_id(order_price).fill("120")
-    page.route("**/*", handle_route_connection_rejected)
-    page.get_by_test_id(place_order).click()
-    expect(page.get_by_test_id("toast-content")).to_have_text("Error occurredthe user rejected the wallet connection")
-    
-@pytest.mark.usefixtures("page", "auth", "risk_accepted")
-def test_wallet_connection_approve(continuous_market, vega: VegaService, page: Page):
-    # 0002-WCON-005
-    # 0002-WCON-007
-    # 0002-WCON-009
-    page.goto(f"/#/markets/{continuous_market}")
-    page.get_by_test_id(order_size).fill("10")
-    page.get_by_test_id(order_price).fill("120")
-    page.route("**/*", assert_connection_approve)
-    page.get_by_test_id(place_order).click()

apps/trading/lib/hooks/use-navigate-to-last-market.spec.ts

@@ -1,60 +0,0 @@
-import * as router from 'react-router';
-import { useNavigateToLastMarket } from './use-navigate-to-last-market';
-import { useGlobalStore } from '../../stores';
-import { renderHook } from '@testing-library/react';
-import { useTopTradedMarkets } from './use-top-traded-markets';
-import { Links } from '../links';
-
-const mockLastMarketId = 'LAST';
-
-jest.mock('../../stores', () => {
-  const original = jest.requireActual('../../stores');
-  return {
-    ...original,
-    useGlobalStore: jest.fn(),
-  };
-});
-
-jest.mock('./use-top-traded-markets', () => {
-  return {
-    useTopTradedMarkets: jest.fn(),
-  };
-});
-
-describe('useNavigateToLastMarket', () => {
-  const navigate = jest.fn();
-  beforeAll(() => {
-    jest.spyOn(router, 'useNavigate').mockImplementation(() => navigate);
-  });
-
-  it('navigates to the last market when it is active', () => {
-    (useGlobalStore as unknown as jest.Mock).mockReturnValue(mockLastMarketId);
-    (useTopTradedMarkets as jest.Mock).mockReturnValue({
-      data: [{ id: mockLastMarketId }],
-    });
-    renderHook(() => useNavigateToLastMarket());
-    expect(navigate).toHaveBeenCalledWith(Links.MARKET(mockLastMarketId), {
-      replace: true,
-    });
-  });
-
-  it('navigates to the top traded market if the last one is not active', () => {
-    (useGlobalStore as unknown as jest.Mock).mockReturnValue(mockLastMarketId);
-    (useTopTradedMarkets as jest.Mock).mockReturnValue({
-      data: [{ id: 'TOP' }],
-    });
-    renderHook(() => useNavigateToLastMarket());
-    expect(navigate).toHaveBeenCalledWith(Links.MARKET('TOP'), {
-      replace: true,
-    });
-  });
-
-  it('navigates to the list of markets when all of the markets are not active', () => {
-    (useGlobalStore as unknown as jest.Mock).mockReturnValue(mockLastMarketId);
-    (useTopTradedMarkets as jest.Mock).mockReturnValue({
-      data: [],
-    });
-    renderHook(() => useNavigateToLastMarket());
-    expect(navigate).toHaveBeenCalledWith(Links.MARKETS());
-  });
-});

apps/trading/lib/hooks/use-navigate-to-last-market.ts

@@ -1,40 +0,0 @@
-import { useGlobalStore } from '../../stores';
-import { useNavigate } from 'react-router-dom';
-import { useTopTradedMarkets } from './use-top-traded-markets';
-import { useEffect } from 'react';
-import { Links } from '../links';
-
-export const useNavigateToLastMarket = () => {
-  const navigate = useNavigate();
-
-  // this returns a list of active markets ordered by traded factor
-  // hence there's no need to pull markets again or find out in separate
-  // query of the state of last market
-  const { data } = useTopTradedMarkets();
-  const lastMarketId = useGlobalStore((store) => store.marketId);
-  const isLastMarketActive = data?.some((m) => m.id === lastMarketId);
-
-  useEffect(() => {
-    if (!data) return;
-
-    // if last market id is set and it is active, navigate to that market
-    if (lastMarketId && isLastMarketActive) {
-      navigate(Links.MARKET(lastMarketId), {
-        replace: true,
-      });
-      return;
-    }
-
-    // otherwise if there's a top traded market, navigate to that market
-    const marketDataId = data[0]?.id;
-    if (marketDataId) {
-      navigate(Links.MARKET(marketDataId), {
-        replace: true,
-      });
-      return;
-    }
-
-    // otherwise navigate to the list of all markets
-    navigate(Links.MARKETS());
-  }, [lastMarketId, data, navigate, isLastMarketActive]);
-};

apps/trading/lib/i18n/index.ts

@@ -6,8 +6,6 @@ import type { HttpBackendOptions, RequestCallback } from 'i18next-http-backend';
 import LanguageDetector from 'i18next-browser-languagedetector';
 import { initReactI18next } from 'react-i18next';
 
-export const supportedLngs = ['en'];
-
 const isInDev = process.env.NODE_ENV === 'development';
 const useLocize = isInDev && !!process.env.NX_USE_LOCIZE;
 
@@ -53,8 +51,9 @@ i18n
   .use(LanguageDetector)
   .use(initReactI18next)
   .init({
+    lng: 'en',
     fallbackLng: 'en',
-    supportedLngs,
+    supportedLngs: ['en'],
     load: 'languageOnly',
     // have a common namespace used around the full app
     ns: [

apps/trading/lib/use-t.ts

@@ -1,4 +1,3 @@
 import { useTranslation } from 'react-i18next';
 export const ns = 'trading';
 export const useT = () => useTranslation('trading').t;
-export const useI18n = () => useTranslation('trading').i18n;

apps/trading/pages/_app.page.tsx

@@ -32,6 +32,7 @@ import { SSRLoader } from './ssr-loader';
 import { PartyActiveOrdersHandler } from './party-active-orders-handler';
 import { MaybeConnectEagerly } from './maybe-connect-eagerly';
 import { TransactionHandlers } from './transaction-handlers';
+import '../lib/i18n';
 import { useT } from '../lib/use-t';
 
 const Title = () => {

apps/trading/pages/client-router.tsx

@@ -18,7 +18,7 @@ import { Routes as AppRoutes } from '../lib/links';
 import { LayoutWithSky } from '../client-pages/referrals/layout';
 import { Referrals } from '../client-pages/referrals/referrals';
 import { ReferralStatistics } from '../client-pages/referrals/referral-statistics';
-import { ApplyCodeFormContainer } from '../client-pages/referrals/apply-code-form';
+import { ApplyCodeForm } from '../client-pages/referrals/apply-code-form';
 import { CreateCodeContainer } from '../client-pages/referrals/create-code-form';
 import { NotFound as ReferralNotFound } from '../client-pages/referrals/error-boundary';
 import { compact } from 'lodash';
@@ -79,7 +79,7 @@ export const routerConfig: RouteObject[] = compact([
               },
               {
                 path: AppRoutes.REFERRALS_APPLY_CODE,
-                element: <ApplyCodeFormContainer />,
+                element: <ApplyCodeForm />,
               },
             ],
           },

apps/trading/pages/styles.css

@@ -170,7 +170,7 @@ html [data-theme='dark'] {
 
 .ag-theme-balham,
 .ag-theme-balham-dark {
-  --ag-grid-size: 3px; /* Used for compactness */
+  --ag-grid-size: 2px; /* Used for compactness */
   --ag-row-height: 36px;
   --ag-header-height: 28px;
 }
@@ -184,7 +184,7 @@ html [data-theme='dark'] {
 
 /* Light variables */
 .ag-theme-balham {
-  --ag-background-color: theme(colors.vega.clight.900);
+  --ag-background-color: transparent;
   --ag-border-color: theme(colors.vega.clight.600);
   --ag-header-background-color: theme(colors.vega.clight.700);
   --ag-odd-row-background-color: transparent;
@@ -196,7 +196,7 @@ html [data-theme='dark'] {
 
 /* Dark variables */
 .ag-theme-balham-dark {
-  --ag-background-color: theme(colors.vega.cdark.900);
+  --ag-background-color: transparent;
   --ag-border-color: theme(colors.vega.cdark.600);
   --ag-header-background-color: theme(colors.vega.cdark.700);
   --ag-odd-row-background-color: transparent;

apps/trading/pages/toasts-manager.tsx

@@ -5,7 +5,6 @@ import { useEthereumTransactionToasts } from '@vegaprotocol/web3';
 import { useEthereumWithdrawApprovalsToasts } from '@vegaprotocol/web3';
 import { useReadyToWithdrawalToasts } from '@vegaprotocol/withdraws';
 import { Links } from '../lib/links';
-import { useReferralToasts } from '../client-pages/referrals/hooks/use-referral-toasts';
 
 export const ToastsManager = () => {
   useProposalToasts();
@@ -15,7 +14,6 @@ export const ToastsManager = () => {
   useReadyToWithdrawalToasts({
     withdrawalsLink: Links.PORTFOLIO(),
   });
-  useReferralToasts();
 
   const toasts = useToasts((store) => store.toasts);
   return <ToastsContainer order="desc" toasts={toasts} />;

libs/accounts/src/lib/accounts-data-provider.ts

@@ -13,10 +13,10 @@ import { type IterableElement } from 'type-fest';
 import {
   AccountEventsDocument,
   AccountsDocument,
-  type AccountFieldsFragment,
-  type AccountsQuery,
-  type AccountEventsSubscription,
-  type AccountsQueryVariables,
+  AccountFieldsFragment,
+  AccountsQuery,
+  AccountEventsSubscription,
+  AccountsQueryVariables,
 } from './__generated__/Accounts';
 import { type Asset } from '@vegaprotocol/assets';
 

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

@@ -23,7 +23,7 @@ export const ALLOWED_ACCOUNTS = [
 
 export const TransferContainer = ({ assetId }: { assetId?: string }) => {
   const t = useT();
-  const { pubKey, pubKeys, isReadOnly } = useVegaWallet();
+  const { pubKey, pubKeys } = useVegaWallet();
   const { params } = useNetworkParams([
     NetworkParams.transfer_fee_factor,
     NetworkParams.transfer_minTransferQuantumMultiple,
@@ -70,7 +70,6 @@ export const TransferContainer = ({ assetId }: { assetId?: string }) => {
       <TransferForm
         pubKey={pubKey}
         pubKeys={pubKeys ? pubKeys?.map((pk) => pk.publicKey) : null}
-        isReadOnly={isReadOnly}
         assetId={assetId}
         feeFactor={params.transfer_fee_factor}
         minQuantumMultiple={params.transfer_minTransferQuantumMultiple}

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

@@ -73,28 +73,6 @@ describe('TransferForm', () => {
     minQuantumMultiple: '1',
   };
 
-  const propsNoAssets = {
-    pubKey,
-    pubKeys: [
-      pubKey,
-      'a4b6e3de5d7ef4e31ae1b090be49d1a2ef7bcefff60cccf7658a0d4922651cce',
-    ],
-    feeFactor: '0.001',
-    submitTransfer: jest.fn(),
-    accounts: [],
-    minQuantumMultiple: '1',
-  };
-
-  it('renders no assets', async () => {
-    renderComponent(propsNoAssets);
-    expect(screen.getByTestId('no-assets-available')).toBeVisible();
-  });
-
-  it('renders no accounts', async () => {
-    renderComponent(propsNoAssets);
-    expect(screen.getByTestId('no-accounts-available')).toBeVisible();
-  });
-
   it.each([
     {
       targetText: 'Include transfer fee',

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

@@ -45,7 +45,6 @@ interface Asset {
 export interface TransferFormProps {
   pubKey: string | null;
   pubKeys: string[] | null;
-  isReadOnly?: boolean;
   accounts: Array<{
     type: AccountType;
     balance: string;
@@ -60,7 +59,6 @@ export interface TransferFormProps {
 export const TransferForm = ({
   pubKey,
   pubKeys,
-  isReadOnly,
   assetId: initialAssetId,
   feeFactor,
   submitTransfer,
@@ -203,36 +201,27 @@ export const TransferForm = ({
         <Controller
           control={control}
           name="asset"
-          render={({ field }) =>
-            assets.length > 0 ? (
-              <TradingRichSelect
-                data-testid="select-asset"
-                id={field.name}
-                name={field.name}
-                onValueChange={(value) => {
-                  field.onChange(value);
-                  setValue('fromAccount', '');
-                }}
-                placeholder={t('Please select an asset')}
-                value={field.value}
-              >
-                {assets.map((a) => (
-                  <AssetOption
-                    key={a.key}
-                    asset={a}
-                    balance={<Balance balance={a.balance} symbol={a.symbol} />}
-                  />
-                ))}
-              </TradingRichSelect>
-            ) : (
-              <span
-                data-testid="no-assets-available"
-                className="text-xs text-vega-clight-100 dark:text-vega-cdark-100"
-              >
-                {t('No assets available')}
-              </span>
-            )
-          }
+          render={({ field }) => (
+            <TradingRichSelect
+              data-testid="select-asset"
+              id={field.name}
+              name={field.name}
+              onValueChange={(value) => {
+                field.onChange(value);
+                setValue('fromAccount', '');
+              }}
+              placeholder={t('Please select an asset')}
+              value={field.value}
+            >
+              {assets.map((a) => (
+                <AssetOption
+                  key={a.key}
+                  asset={a}
+                  balance={<Balance balance={a.balance} symbol={a.symbol} />}
+                />
+              ))}
+            </TradingRichSelect>
+          )}
         />
         {errors.asset?.message && (
           <TradingInputError forInput="asset">
@@ -260,57 +249,48 @@ export const TransferForm = ({
               },
             },
           }}
-          render={({ field }) =>
-            accounts.length > 0 ? (
-              <TradingSelect
-                id="fromAccount"
-                defaultValue=""
-                {...field}
-                onChange={(e) => {
-                  field.onChange(e);
+          render={({ field }) => (
+            <TradingSelect
+              id="fromAccount"
+              defaultValue=""
+              {...field}
+              onChange={(e) => {
+                field.onChange(e);
 
-                  const [type] = parseFromAccount(e.target.value);
+                const [type] = parseFromAccount(e.target.value);
 
-                  // Enforce that if transferring from a vested rewards account it must go to
-                  // the current connected general account
-                  if (
-                    type === AccountType.ACCOUNT_TYPE_VESTED_REWARDS &&
-                    pubKey
-                  ) {
-                    setValue('toVegaKey', pubKey);
-                    setToVegaKeyMode('select');
-                    setIncludeFee(false);
-                  }
-                }}
-              >
-                <option value="" disabled={true}>
-                  {t('Please select')}
-                </option>
-                {accounts
-                  .filter((a) => {
-                    if (!selectedAssetId) return true;
-                    return selectedAssetId === a.asset.id;
-                  })
-                  .map((a) => {
-                    const id = `${a.type}-${a.asset.id}`;
-                    return (
-                      <option value={id} key={id}>
-                        {AccountTypeMapping[a.type]} (
-                        {addDecimal(a.balance, a.asset.decimals)}{' '}
-                        {a.asset.symbol})
-                      </option>
-                    );
-                  })}
-              </TradingSelect>
-            ) : (
-              <span
-                data-testid="no-accounts-available"
-                className="text-xs text-vega-clight-100 dark:text-vega-cdark-100"
-              >
-                {t('No accounts available')}
-              </span>
-            )
-          }
+                // Enforce that if transferring from a vested rewards account it must go to
+                // the current connected general account
+                if (
+                  type === AccountType.ACCOUNT_TYPE_VESTED_REWARDS &&
+                  pubKey
+                ) {
+                  setValue('toVegaKey', pubKey);
+                  setToVegaKeyMode('select');
+                  setIncludeFee(false);
+                }
+              }}
+            >
+              <option value="" disabled={true}>
+                {t('Please select')}
+              </option>
+              {accounts
+                .filter((a) => {
+                  if (!selectedAssetId) return true;
+                  return selectedAssetId === a.asset.id;
+                })
+                .map((a) => {
+                  const id = `${a.type}-${a.asset.id}`;
+                  return (
+                    <option value={id} key={id}>
+                      {AccountTypeMapping[a.type]} (
+                      {addDecimal(a.balance, a.asset.decimals)} {a.asset.symbol}
+                      )
+                    </option>
+                  );
+                })}
+            </TradingSelect>
+          )}
         />
         {errors.fromAccount?.message && (
           <TradingInputError forInput="fromAccount">
@@ -474,7 +454,7 @@ export const TransferForm = ({
           decimals={asset?.decimals}
         />
       )}
-      <TradingButton type="submit" fill={true} disabled={isReadOnly}>
+      <TradingButton type="submit" fill={true}>
         {t('Confirm transfer')}
       </TradingButton>
     </form>

libs/assets/src/lib/asset-details-table.tsx

@@ -18,7 +18,7 @@ type Rows = {
   key: AssetDetail;
   label: string;
   tooltip: string;
-  value: (asset: Asset, orignalAsset?: Asset) => ReactNode | undefined;
+  value: (asset: Asset) => ReactNode | undefined;
   valueTooltip?: (asset: Asset) => string | null | undefined;
 }[];
 
@@ -52,21 +52,6 @@ const num = (asset: Asset, n: string | undefined | null) => {
   return addDecimalsFormatNumber(n, asset.decimals);
 };
 
-const Diff = ({
-  oldValue,
-  newValue,
-}: {
-  oldValue: ReactNode;
-  newValue: ReactNode;
-}) => (
-  <span className="flex gap-1">
-    <span className="line-through bg-vega-red-300 dark:bg-vega-red-600">
-      {oldValue}
-    </span>
-    <span className="bg-vega-green-300 dark:bg-vega-green-600">{newValue}</span>
-  </span>
-);
-
 export const useRows = () => {
   const t = useT();
   const AssetTypeMapping = useAssetTypeMapping();
@@ -118,14 +103,7 @@ export const useRows = () => {
         key: AssetDetail.QUANTUM,
         label: t('Quantum'),
         tooltip: t('The minimum economically meaningful amount of the asset'),
-        value: (asset, originalAsset) => {
-          const value = num(asset, asset.quantum);
-          if (originalAsset && originalAsset.quantum !== asset.quantum) {
-            const original = num(originalAsset, originalAsset.quantum);
-            return <Diff oldValue={original} newValue={value} />;
-          }
-          return value;
-        },
+        value: (asset) => num(asset, asset.quantum),
       },
       {
         key: AssetDetail.STATUS,
@@ -165,24 +143,8 @@ export const useRows = () => {
         tooltip: t('WITHDRAW_THRESHOLD_TOOLTIP_TEXT', {
           defaultValue: WITHDRAW_THRESHOLD_TOOLTIP_TEXT,
         }),
-        value: (asset, originalAsset) => {
-          const value = num(
-            asset,
-            (asset.source as Schema.ERC20).withdrawThreshold
-          );
-          if (
-            originalAsset &&
-            (originalAsset.source as Schema.ERC20).withdrawThreshold !==
-              (asset.source as Schema.ERC20).withdrawThreshold
-          ) {
-            const original = num(
-              asset,
-              (originalAsset.source as Schema.ERC20).withdrawThreshold
-            );
-            return <Diff oldValue={original} newValue={value} />;
-          }
-          return value;
-        },
+        value: (asset) =>
+          num(asset, (asset.source as Schema.ERC20).withdrawThreshold),
       },
       {
         key: AssetDetail.LIFETIME_LIMIT,
@@ -190,26 +152,8 @@ export const useRows = () => {
         tooltip: t(
           'The lifetime deposit limit per address. Note: this is a temporary measure that can be changed or removed through governance'
         ),
-        value: (asset, originalAsset) => {
-          const value = num(
-            asset,
-            (asset.source as Schema.ERC20).lifetimeLimit
-          );
-
-          if (
-            originalAsset &&
-            (originalAsset.source as Schema.ERC20).lifetimeLimit !==
-              (asset.source as Schema.ERC20).lifetimeLimit
-          ) {
-            const original = num(
-              asset,
-              (originalAsset.source as Schema.ERC20).lifetimeLimit
-            );
-            return <Diff oldValue={original} newValue={value} />;
-          }
-
-          return value;
-        },
+        value: (asset) =>
+          num(asset, (asset.source as Schema.ERC20).lifetimeLimit),
       },
       {
         key: AssetDetail.MAX_FAUCET_AMOUNT_MINT,
@@ -317,13 +261,10 @@ export const testId = (detail: AssetDetail, field: 'label' | 'value') =>
 
 export type AssetDetailsTableProps = {
   asset: Asset;
-  originalAsset?: Asset;
-
   omitRows?: AssetDetail[];
 } & Omit<KeyValueTableRowProps, 'children'>;
 export const AssetDetailsTable = ({
   asset,
-  originalAsset,
   omitRows = [],
   ...props
 }: AssetDetailsTableProps) => {
@@ -334,7 +275,7 @@ export const AssetDetailsTable = ({
 
   const details = useRows().map((r) => ({
     ...r,
-    value: r.value(asset, originalAsset),
+    value: r.value(asset),
     valueTooltip: r.valueTooltip?.(asset),
   }));
 

libs/data-provider/src/generic-data-provider.spec.ts

@@ -25,7 +25,7 @@ import {
 import { ApolloError } from '@apollo/client';
 import type { GraphQLErrors } from '@apollo/client/errors';
 import { GraphQLError } from 'graphql';
-import { type Subscription, type Observable } from 'zen-observable-ts';
+import { Subscription, Observable } from 'zen-observable-ts';
 import { waitFor } from '@testing-library/react';
 
 type Item = {

libs/datagrid/__mocks__/react-i18next.ts

@@ -0,0 +1,15 @@
+export const useTranslation = () => ({
+  t: (label: string, replacements?: Record<string, string>) => {
+    const replace =
+      replacements?.['replace'] && typeof replacements === 'object'
+        ? replacements?.['replace']
+        : replacements;
+    let translatedLabel = replacements?.['defaultValue'] || label;
+    if (typeof replace === 'object' && replace !== null) {
+      Object.keys(replace).forEach((key) => {
+        translatedLabel = translatedLabel.replace(`{{${key}}}`, replace[key]);
+      });
+    }
+    return translatedLabel;
+  },
+});

libs/datagrid/src/lib/ag-grid/ag-grid-themed.tsx

@@ -36,10 +36,10 @@ export const AgGridThemed = ({
     <div className={wrapperClasses}>
       <AgGridReact
         defaultColDef={defaultColDef}
+        ref={gridRef}
         overlayLoadingTemplate={t('Loading...')}
         overlayNoRowsTemplate={t('No data')}
         suppressDragLeaveHidesColumns
-        ref={gridRef}
         {...defaultProps}
         {...props}
       />

libs/datagrid/src/lib/pagination.spec.tsx

@@ -25,7 +25,7 @@ describe('Pagination', () => {
     const mockOnLoad = jest.fn();
     const count = 10;
     render(<Pagination {...props} count={count} onLoad={mockOnLoad} />);
-    expect(screen.getByText('10 rows loaded')).toBeInTheDocument();
+    expect(screen.getByText(`${count} rows loaded`)).toBeInTheDocument();
     await userEvent.click(screen.getByRole('button', { name: 'Load more' }));
     expect(mockOnLoad).toHaveBeenCalled();
   });

libs/datagrid/src/lib/pagination.tsx

@@ -18,15 +18,19 @@ export const Pagination = ({
   let rowMessage = '';
 
   if (count && !pageInfo?.hasNextPage) {
-    rowMessage = t('paginationAllLoaded', 'all {{count}} rows loaded', {
-      count,
+    rowMessage = t('paginationAllLoaded', {
+      replace: { count },
+      defaultValue: 'All {{count}} rows loaded',
     });
   } else {
-    rowMessage = t('paginationLoaded', '{{count}} rows loaded', { count });
+    rowMessage = t('paginationLoaded', {
+      replace: { count },
+      defaultValue: '{{count}} rows loaded',
+    });
   }
 
   return (
-    <div className="border-default flex items-center justify-between border-t p-1">
+    <div className="flex items-center justify-between p-1 border-t border-default">
       <div className="text-xs">
         {false}
         {showRetentionMessage &&
@@ -43,7 +47,7 @@ export const Pagination = ({
         ) : null}
       </div>
       {count && hasDisplayedRows === false ? (
-        <div className="absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2 transform text-xs">
+        <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}

libs/datagrid/src/setup-tests.ts

@@ -1,18 +1,4 @@
 import '@testing-library/jest-dom';
 import ResizeObserver from 'resize-observer-polyfill';
 
-import { locales } from '@vegaprotocol/i18n';
-import i18n from 'i18next';
-import { initReactI18next } from 'react-i18next';
-
-// Set up i18n instance so that components have the correct default
-// en translations
-i18n.use(initReactI18next).init({
-  // we init with resources
-  resources: locales,
-  fallbackLng: 'en',
-  ns: ['datagrid'],
-  defaultNS: 'datagrid',
-});
-
 global.ResizeObserver = ResizeObserver;

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

@@ -1,5 +1,5 @@
 import { useCallback, useState } from 'react';
-import { getAsset, getQuoteName } from '@vegaprotocol/markets';
+import { getAsset, getProductType, getQuoteName } from '@vegaprotocol/markets';
 import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 
@@ -77,10 +77,12 @@ export const DealTicketFeeDetails = ({
       label={
         <>
           {t('Fees')}
-          {totalDiscountFactor !== '0' ? (
+          {totalDiscountFactor ? (
             <Pill size="xxs" intent={Intent.Info} className="ml-1">
+              -
               {formatNumberPercentage(
-                new BigNumber(totalDiscountFactor).multipliedBy(100)
+                new BigNumber(totalDiscountFactor).multipliedBy(100),
+                2
               )}
             </Pill>
           ) : null}
@@ -103,7 +105,10 @@ export const DealTicketFeeDetails = ({
             )}
           </p>
           <FeesBreakdown
-            feeEstimate={feeEstimate}
+            totalFeeAmount={feeEstimate?.totalFeeAmount}
+            referralDiscountFactor={feeEstimate?.referralDiscountFactor}
+            volumeDiscountFactor={feeEstimate?.volumeDiscountFactor}
+            fees={feeEstimate?.fees}
             feeFactors={market.fees.factors}
             symbol={assetSymbol}
             decimals={assetDecimals}
@@ -292,120 +297,134 @@ export const DealTicketMarginDetails = ({
   );
 
   const quoteName = getQuoteName(market);
+  const productType = getProductType(market);
 
   return (
     <div className="flex flex-col w-full gap-2 pt-2">
-      <Accordion>
-        <AccordionPanel
-          itemId="margin"
-          trigger={
-            <AccordionPrimitive.Trigger
-              data-testid="accordion-toggle"
-              className={classNames(
-                'w-full',
-                'flex items-center gap-2 text-xs',
-                'group'
-              )}
-            >
-              <div
-                data-testid={`deal-ticket-fee-margin-required`}
-                key={'value-dropdown'}
-                className="flex items-center justify-between w-full gap-2"
-              >
-                <div className="flex items-center text-left gap-1">
-                  <Tooltip
-                    description={t(
-                      'MARGIN_DIFF_TOOLTIP_TEXT',
-                      MARGIN_DIFF_TOOLTIP_TEXT,
-                      { assetSymbol }
-                    )}
-                  >
-                    <span className="text-muted">{t('Margin required')}</span>
-                  </Tooltip>
+      {/*
+      TODO: remove this conditional check once the following PRs are deployed
+      and the estimatePosition query is working for perps
 
-                  <AccordionChevron size={10} />
-                </div>
-                <Tooltip
-                  description={
-                    formatRange(
-                      marginRequiredBestCase,
-                      marginRequiredWorstCase,
-                      assetDecimals
-                    ) ?? '-'
-                  }
+      - https://github.com/vegaprotocol/vega/pull/10119
+      - https://github.com/vegaprotocol/vega/pull/10122
+      */}
+      {productType === 'Future' && (
+        <>
+          <Accordion>
+            <AccordionPanel
+              itemId="margin"
+              trigger={
+                <AccordionPrimitive.Trigger
+                  data-testid="accordion-toggle"
+                  className={classNames(
+                    'w-full',
+                    'flex items-center gap-2 text-xs',
+                    'group'
+                  )}
                 >
-                  <div className="font-mono text-right">
-                    {formatValue(
-                      marginRequiredWorstCase,
-                      assetDecimals,
-                      quantum
-                    )}{' '}
-                    {assetSymbol || ''}
+                  <div
+                    data-testid={`deal-ticket-fee-margin-required`}
+                    key={'value-dropdown'}
+                    className="flex items-center justify-between w-full gap-2"
+                  >
+                    <div className="flex items-center text-left gap-1">
+                      <Tooltip
+                        description={t(
+                          'MARGIN_DIFF_TOOLTIP_TEXT',
+                          MARGIN_DIFF_TOOLTIP_TEXT,
+                          { assetSymbol }
+                        )}
+                      >
+                        <span className="text-muted">
+                          {t('Margin required')}
+                        </span>
+                      </Tooltip>
+
+                      <AccordionChevron size={10} />
+                    </div>
+                    <Tooltip
+                      description={
+                        formatRange(
+                          marginRequiredBestCase,
+                          marginRequiredWorstCase,
+                          assetDecimals
+                        ) ?? '-'
+                      }
+                    >
+                      <div className="font-mono text-right">
+                        {formatValue(
+                          marginRequiredWorstCase,
+                          assetDecimals,
+                          quantum
+                        )}{' '}
+                        {assetSymbol || ''}
+                      </div>
+                    </Tooltip>
                   </div>
-                </Tooltip>
-              </div>
-            </AccordionPrimitive.Trigger>
-          }
-        >
-          <div className="flex flex-col w-full gap-2">
-            <KeyValue
-              label={t('Total margin available')}
-              indent
-              value={formatValue(totalMarginAvailable, assetDecimals)}
-              formattedValue={formatValue(
-                totalMarginAvailable,
-                assetDecimals,
-                quantum
-              )}
-              symbol={assetSymbol}
-              labelDescription={t(
-                'TOTAL_MARGIN_AVAILABLE',
-                TOTAL_MARGIN_AVAILABLE,
-                {
-                  generalAccountBalance: formatValue(
-                    generalAccountBalance,
+                </AccordionPrimitive.Trigger>
+              }
+            >
+              <div className="flex flex-col w-full gap-2">
+                <KeyValue
+                  label={t('Total margin available')}
+                  indent
+                  value={formatValue(totalMarginAvailable, assetDecimals)}
+                  formattedValue={formatValue(
+                    totalMarginAvailable,
                     assetDecimals,
                     quantum
-                  ),
-                  marginAccountBalance: formatValue(
+                  )}
+                  symbol={assetSymbol}
+                  labelDescription={t(
+                    'TOTAL_MARGIN_AVAILABLE',
+                    TOTAL_MARGIN_AVAILABLE,
+                    {
+                      generalAccountBalance: formatValue(
+                        generalAccountBalance,
+                        assetDecimals,
+                        quantum
+                      ),
+                      marginAccountBalance: formatValue(
+                        marginAccountBalance,
+                        assetDecimals,
+                        quantum
+                      ),
+                      marginMaintenance: formatValue(
+                        currentMargins?.maintenanceLevel,
+                        assetDecimals,
+                        quantum
+                      ),
+                      assetSymbol,
+                    }
+                  )}
+                />
+                {deductionFromCollateral}
+                <KeyValue
+                  label={t('Current margin allocation')}
+                  indent
+                  onClick={
+                    generalAccountBalance
+                      ? () => setBreakdownDialog(true)
+                      : undefined
+                  }
+                  value={formatValue(marginAccountBalance, assetDecimals)}
+                  symbol={assetSymbol}
+                  labelDescription={t(
+                    'MARGIN_ACCOUNT_TOOLTIP_TEXT',
+                    MARGIN_ACCOUNT_TOOLTIP_TEXT
+                  )}
+                  formattedValue={formatValue(
                     marginAccountBalance,
                     assetDecimals,
                     quantum
-                  ),
-                  marginMaintenance: formatValue(
-                    currentMargins?.maintenanceLevel,
-                    assetDecimals,
-                    quantum
-                  ),
-                  assetSymbol,
-                }
-              )}
-            />
-            {deductionFromCollateral}
-            <KeyValue
-              label={t('Current margin allocation')}
-              indent
-              onClick={
-                generalAccountBalance
-                  ? () => setBreakdownDialog(true)
-                  : undefined
-              }
-              value={formatValue(marginAccountBalance, assetDecimals)}
-              symbol={assetSymbol}
-              labelDescription={t(
-                'MARGIN_ACCOUNT_TOOLTIP_TEXT',
-                MARGIN_ACCOUNT_TOOLTIP_TEXT
-              )}
-              formattedValue={formatValue(
-                marginAccountBalance,
-                assetDecimals,
-                quantum
-              )}
-            />
-          </div>
-        </AccordionPanel>
-      </Accordion>
-      {projectedMargin}
+                  )}
+                />
+              </div>
+            </AccordionPanel>
+          </Accordion>
+          {projectedMargin}
+        </>
+      )}
       <KeyValue
         label={t('Liquidation')}
         value={liquidationPriceEstimateRange}

libs/deal-ticket/src/components/deal-ticket/time-in-force-selector.tsx

@@ -59,7 +59,9 @@ export const TimeInForceSelector = ({
             components={[
               <Tooltip
                 description={
-                  <SimpleGrid grid={compileGridData(t, market, marketData)} />
+                  <SimpleGrid
+                    grid={compileGridData(t, market, marketData, t)}
+                  />
                 }
               >
                 sufficient liquidity
@@ -81,7 +83,9 @@ export const TimeInForceSelector = ({
             components={[
               <Tooltip
                 description={
-                  <SimpleGrid grid={compileGridData(t, market, marketData)} />
+                  <SimpleGrid
+                    grid={compileGridData(t, market, marketData, t)}
+                  />
                 }
               >
                 high price volatility

libs/deal-ticket/src/components/discounts.spec.ts

@@ -6,19 +6,16 @@ describe('getDiscountedFee', () => {
       discountedFee: '100',
       volumeDiscount: '0',
       referralDiscount: '0',
-      totalDiscount: '0',
     });
     expect(getDiscountedFee('100', undefined, '0.1')).toEqual({
       discountedFee: '90',
       volumeDiscount: '10',
       referralDiscount: '0',
-      totalDiscount: '10',
     });
     expect(getDiscountedFee('100', '0.1', undefined)).toEqual({
       discountedFee: '90',
       volumeDiscount: '0',
       referralDiscount: '10',
-      totalDiscount: '10',
     });
   });
 
@@ -27,7 +24,6 @@ describe('getDiscountedFee', () => {
       discountedFee: '',
       volumeDiscount: '0',
       referralDiscount: '0',
-      totalDiscount: '0',
     });
   });
 });
@@ -39,7 +35,7 @@ describe('getTotalDiscountFactor', () => {
         volumeDiscountFactor: '0',
         referralDiscountFactor: '0',
       })
-    ).toEqual('0');
+    ).toEqual(0);
   });
 
   it('returns volumeDiscountFactor if referralDiscountFactor is 0', () => {
@@ -48,7 +44,7 @@ describe('getTotalDiscountFactor', () => {
         volumeDiscountFactor: '0.1',
         referralDiscountFactor: '0',
       })
-    ).toEqual('-0.1');
+    ).toEqual(0.1);
   });
   it('returns referralDiscountFactor if volumeDiscountFactor is 0', () => {
     expect(
@@ -56,7 +52,7 @@ describe('getTotalDiscountFactor', () => {
         volumeDiscountFactor: '0',
         referralDiscountFactor: '0.1',
       })
-    ).toEqual('-0.1');
+    ).toEqual(0.1);
   });
 
   it('calculates discount using referralDiscountFactor and volumeDiscountFactor', () => {
@@ -65,6 +61,6 @@ describe('getTotalDiscountFactor', () => {
         volumeDiscountFactor: '0.2',
         referralDiscountFactor: '0.1',
       })
-    ).toBe('-0.28');
+    ).toBeCloseTo(0.28);
   });
 });

libs/deal-ticket/src/components/discounts.ts

@@ -15,7 +15,6 @@ export const getDiscountedFee = (
       discountedFee: feeAmount,
       volumeDiscount: '0',
       referralDiscount: '0',
-      totalDiscount: '0',
     };
   }
   const referralDiscount = new BigNumber(referralDiscountFactor || '0')
@@ -24,14 +23,12 @@ export const getDiscountedFee = (
   const volumeDiscount = new BigNumber(volumeDiscountFactor || '0')
     .multipliedBy((BigInt(feeAmount) - BigInt(referralDiscount)).toString())
     .toFixed(0, BigNumber.ROUND_FLOOR);
-  const totalDiscount = (
-    BigInt(referralDiscount) + BigInt(volumeDiscount)
-  ).toString();
   const discountedFee = (
-    BigInt(feeAmount || '0') - BigInt(totalDiscount)
+    BigInt(feeAmount || '0') -
+    BigInt(referralDiscount) -
+    BigInt(volumeDiscount)
   ).toString();
   return {
-    totalDiscount,
     referralDiscount,
     volumeDiscount,
     discountedFee,
@@ -42,28 +39,16 @@ export const getTotalDiscountFactor = (feeEstimate?: {
   volumeDiscountFactor?: string;
   referralDiscountFactor?: string;
 }) => {
-  if (
-    !feeEstimate ||
-    (feeEstimate.referralDiscountFactor === '0' &&
-      feeEstimate.volumeDiscountFactor === '0')
-  ) {
-    return '0';
+  if (!feeEstimate) {
+    return 0;
   }
-  const volumeFactor = new BigNumber(
-    feeEstimate?.volumeDiscountFactor || 0
-  ).minus(1);
-  const referralFactor = new BigNumber(
-    feeEstimate?.referralDiscountFactor || 0
-  ).minus(1);
-  if (volumeFactor.isZero()) {
-    return feeEstimate.referralDiscountFactor
-      ? `-${feeEstimate.referralDiscountFactor}`
-      : '0';
+  const volumeFactor = Number(feeEstimate?.volumeDiscountFactor) || 0;
+  const referralFactor = Number(feeEstimate?.referralDiscountFactor) || 0;
+  if (!volumeFactor) {
+    return referralFactor;
   }
-  if (referralFactor.isZero()) {
-    return feeEstimate.volumeDiscountFactor
-      ? `-${feeEstimate.volumeDiscountFactor}`
-      : '0';
+  if (!referralFactor) {
+    return volumeFactor;
   }
-  return volumeFactor.multipliedBy(referralFactor).minus(1).toString();
+  return 1 - (1 - volumeFactor) * (1 - referralFactor);
 };

libs/deal-ticket/src/components/fees-breakdown/fees-breakdown.spec.tsx

@@ -14,16 +14,13 @@ describe('FeesBreakdown', () => {
       liquidityFee: '100',
     };
     const props = {
+      totalFeeAmount: '100',
+      fees,
       feeFactors,
       symbol: 'USD',
       decimals: 2,
-
-      feeEstimate: {
-        referralDiscountFactor: '0.01',
-        volumeDiscountFactor: '0.01',
-        totalFeeAmount: '100',
-        fees,
-      },
+      referralDiscountFactor: '0.01',
+      volumeDiscountFactor: '0.01',
     };
     render(<FeesBreakdown {...props} />);
     expect(screen.getByText('Maker fee').nextElementSibling).toHaveTextContent(

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

@@ -1,13 +1,12 @@
 import { sumFeesFactors } from '@vegaprotocol/markets';
-import type { FeeFactors } from '@vegaprotocol/types';
+import type { TradeFee, FeeFactors } from '@vegaprotocol/types';
 import {
   addDecimalsFormatNumber,
   formatNumberPercentage,
 } from '@vegaprotocol/utils';
 import BigNumber from 'bignumber.js';
-import { getDiscountedFee, getTotalDiscountFactor } from '../discounts';
+import { getDiscountedFee } from '../discounts';
 import { useT } from '../../use-t';
-import { type useEstimateFees } from '../../hooks/use-estimate-fees';
 
 const formatValue = (
   value: string | number | null | undefined,
@@ -25,16 +24,18 @@ const FeesBreakdownItem = ({
   decimals,
 }: {
   label: string;
-  factor?: string | number;
+  factor?: string;
   value: string;
   symbol?: string;
   decimals: number;
 }) => (
   <>
     <dt className="col-span-2">{label}</dt>
-    <dd className="text-right col-span-1">
-      {factor ? formatNumberPercentage(new BigNumber(factor).times(100)) : ''}
-    </dd>
+    {factor && (
+      <dd className="text-right col-span-1">
+        {formatNumberPercentage(new BigNumber(factor).times(100))}
+      </dd>
+    )}
     <dd className="text-right col-span-3">
       {formatValue(value, decimals)} {symbol || ''}
     </dd>
@@ -42,35 +43,59 @@ const FeesBreakdownItem = ({
 );
 
 export const FeesBreakdown = ({
-  feeEstimate,
+  totalFeeAmount,
+  fees,
   feeFactors,
   symbol,
   decimals,
+  referralDiscountFactor,
+  volumeDiscountFactor,
 }: {
-  feeEstimate: ReturnType<typeof useEstimateFees>;
+  totalFeeAmount?: string;
+  fees?: TradeFee;
   feeFactors?: FeeFactors;
   symbol?: string;
   decimals: number;
+  referralDiscountFactor?: string;
+  volumeDiscountFactor?: string;
 }) => {
   const t = useT();
-  const { fees, totalFeeAmount, referralDiscountFactor, volumeDiscountFactor } =
-    feeEstimate || {};
   if (!fees || !totalFeeAmount || totalFeeAmount === '0') return null;
 
-  const totalDiscountFactor = getTotalDiscountFactor(feeEstimate);
-  const { discountedFee: discountedTotalFeeAmount, totalDiscount } =
-    getDiscountedFee(
-      totalFeeAmount,
-      referralDiscountFactor,
-      volumeDiscountFactor
-    );
+  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 {
+    discountedFee: discountedTotalFeeAmount,
+    volumeDiscount,
+    referralDiscount,
+  } = getDiscountedFee(
+    totalFeeAmount,
+    referralDiscountFactor,
+    volumeDiscountFactor
+  );
 
   return (
     <dl className="grid grid-cols-6">
       <FeesBreakdownItem
         label={t('Infrastructure fee')}
         factor={feeFactors?.infrastructureFee}
-        value={fees.infrastructureFee}
+        value={discountedInfrastructureFee}
         symbol={symbol}
         decimals={decimals}
       />
@@ -78,7 +103,7 @@ export const FeesBreakdown = ({
       <FeesBreakdownItem
         label={t('Liquidity fee')}
         factor={feeFactors?.liquidityFee}
-        value={fees.liquidityFee}
+        value={discountedLiquidityFee}
         symbol={symbol}
         decimals={decimals}
       />
@@ -86,50 +111,35 @@ export const FeesBreakdown = ({
       <FeesBreakdownItem
         label={t('Maker fee')}
         factor={feeFactors?.makerFee}
-        value={fees.makerFee}
+        value={discountedMakerFee}
         symbol={symbol}
         decimals={decimals}
       />
-      {totalDiscount && totalDiscount !== '0' ? (
-        <>
-          <FeesBreakdownItem
-            label={t('Subtotal')}
-            value={totalFeeAmount}
-            factor={
-              feeFactors ? sumFeesFactors(feeFactors)?.toString() : undefined
-            }
-            symbol={symbol}
-            decimals={decimals}
-          />
-          <div className="col-span-6 mt-2"></div>
-          <FeesBreakdownItem
-            label={t('Discount')}
-            factor={totalDiscountFactor}
-            value={`-${totalDiscount}`}
-            symbol={symbol}
-            decimals={decimals}
-          />
-          <FeesBreakdownItem
-            label={t('Total')}
-            value={discountedTotalFeeAmount}
-            symbol={symbol}
-            decimals={decimals}
-          />
-        </>
-      ) : (
-        <>
-          <div className="col-span-6 mt-2"></div>
-          <FeesBreakdownItem
-            label={t('Total')}
-            factor={
-              feeFactors ? sumFeesFactors(feeFactors)?.toString() : undefined
-            }
-            value={totalFeeAmount}
-            symbol={symbol}
-            decimals={decimals}
-          />
-        </>
+      {volumeDiscountFactor && volumeDiscount !== '0' && (
+        <FeesBreakdownItem
+          label={t('Volume discount')}
+          factor={volumeDiscountFactor}
+          value={volumeDiscount}
+          symbol={symbol}
+          decimals={decimals}
+        />
       )}
+      {referralDiscountFactor && referralDiscount !== '0' && (
+        <FeesBreakdownItem
+          label={t('Referral discount')}
+          factor={referralDiscountFactor}
+          value={referralDiscount}
+          symbol={symbol}
+          decimals={decimals}
+        />
+      )}
+      <FeesBreakdownItem
+        label={t('Total fees')}
+        factor={feeFactors ? sumFeesFactors(feeFactors)?.toString() : undefined}
+        value={discountedTotalFeeAmount}
+        symbol={symbol}
+        decimals={decimals}
+      />
     </dl>
   );
 };

libs/deal-ticket/src/utils/map-form-values-to-submission.ts

@@ -32,19 +32,15 @@ export const mapFormValuesToOrderSubmission = (
       ? toNanoSeconds(order.expiresAt)
       : undefined,
   postOnly:
-    order.type === Schema.OrderType.TYPE_MARKET ||
-    [
+    order.type === Schema.OrderType.TYPE_MARKET ? false : order.postOnly,
+  reduceOnly:
+    order.type === Schema.OrderType.TYPE_LIMIT &&
+    ![
       Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
       Schema.OrderTimeInForce.TIME_IN_FORCE_IOC,
     ].includes(order.timeInForce)
       ? false
-      : order.postOnly,
-  reduceOnly: ![
-    Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
-    Schema.OrderTimeInForce.TIME_IN_FORCE_IOC,
-  ].includes(order.timeInForce)
-    ? false
-    : order.reduceOnly,
+      : order.reduceOnly,
   icebergOpts:
     order.type === Schema.OrderType.TYPE_LIMIT &&
     isPersistentOrder(order.timeInForce) &&

libs/deal-ticket/src/utils/map-form-values-to-submisstion.spec.ts

@@ -98,91 +98,4 @@ describe('mapFormValuesToOrderSubmission', () => {
       ).size
     ).toEqual('1000');
   });
-
-  it.each([
-    { timeInForce: OrderTimeInForce.TIME_IN_FORCE_FOK, postOnly: false },
-    { timeInForce: OrderTimeInForce.TIME_IN_FORCE_GFA, postOnly: true },
-    { timeInForce: OrderTimeInForce.TIME_IN_FORCE_GFN, postOnly: true },
-    { timeInForce: OrderTimeInForce.TIME_IN_FORCE_GTC, postOnly: true },
-    { timeInForce: OrderTimeInForce.TIME_IN_FORCE_GTT, postOnly: true },
-    { timeInForce: OrderTimeInForce.TIME_IN_FORCE_IOC, postOnly: false },
-  ])(
-    'sets postOnly correctly when TIF is $timeInForce',
-    ({
-      timeInForce,
-      postOnly,
-    }: {
-      timeInForce: OrderTimeInForce;
-      postOnly: boolean;
-    }) => {
-      expect(
-        mapFormValuesToOrderSubmission(
-          {
-            type: OrderType.TYPE_LIMIT,
-            timeInForce,
-            postOnly: true,
-          } as OrderFormValues,
-          'marketId',
-          2,
-          2
-        ).postOnly
-      ).toEqual(postOnly);
-      // sets always false if type is market
-      expect(
-        mapFormValuesToOrderSubmission(
-          {
-            type: OrderType.TYPE_MARKET,
-            timeInForce,
-            postOnly: true,
-          } as OrderFormValues,
-          'marketId',
-          2,
-          2
-        ).postOnly
-      ).toEqual(false);
-    }
-  );
-
-  it.each([
-    { timeInForce: OrderTimeInForce.TIME_IN_FORCE_FOK, reduceOnly: true },
-    { timeInForce: OrderTimeInForce.TIME_IN_FORCE_GFA, reduceOnly: false },
-    { timeInForce: OrderTimeInForce.TIME_IN_FORCE_GFN, reduceOnly: false },
-    { timeInForce: OrderTimeInForce.TIME_IN_FORCE_GTC, reduceOnly: false },
-    { timeInForce: OrderTimeInForce.TIME_IN_FORCE_GTT, reduceOnly: false },
-    { timeInForce: OrderTimeInForce.TIME_IN_FORCE_IOC, reduceOnly: true },
-  ])(
-    'sets reduceOnly correctly when TIF is $timeInForce',
-    ({
-      timeInForce,
-      reduceOnly,
-    }: {
-      timeInForce: OrderTimeInForce;
-      reduceOnly: boolean;
-    }) => {
-      expect(
-        mapFormValuesToOrderSubmission(
-          {
-            type: OrderType.TYPE_MARKET,
-            timeInForce,
-            reduceOnly: true,
-          } as OrderFormValues,
-          'marketId',
-          2,
-          2
-        ).reduceOnly
-      ).toEqual(reduceOnly);
-      expect(
-        mapFormValuesToOrderSubmission(
-          {
-            type: OrderType.TYPE_LIMIT,
-            timeInForce,
-            reduceOnly: true,
-          } as OrderFormValues,
-          'marketId',
-          2,
-          2
-        ).reduceOnly
-      ).toEqual(reduceOnly);
-    }
-  );
 });

libs/deposits/src/lib/approve-notification.tsx

@@ -216,10 +216,12 @@ const ApprovalTxFeedback = ({
               <p>
                 {t(
                   'You approved deposits of up to {{assetSymbol}} {{approvedAllowanceValue}}.',
-                  {
-                    assetSymbol: selectedAsset?.symbol,
-                    approvedAllowanceValue,
-                  }
+                  [
+                    {
+                      assetSymbol: selectedAsset?.symbol,
+                      approvedAllowanceValue,
+                    },
+                  ]
                 )}
               </p>
               {txLink && <p>{txLink}</p>}

libs/environment/__mocks__/react-i18next.ts

@@ -0,0 +1,15 @@
+export const useTranslation = () => ({
+  t: (label: string, replacements?: Record<string, string>) => {
+    const replace =
+      replacements?.replace && typeof replacements === 'object'
+        ? replacements?.replace
+        : replacements;
+    let translatedLabel = replacements?.defaultValue || label;
+    if (typeof replace === 'object' && replace !== null) {
+      Object.keys(replace).forEach((key) => {
+        translatedLabel = translatedLabel.replace(`{{${key}}}`, replace[key]);
+      });
+    }
+    return translatedLabel;
+  },
+});

libs/environment/src/hooks/mocks/apollo-client.tsx

@@ -5,10 +5,7 @@ import {
   type NodeCheckTimeUpdateSubscription,
 } from '../../utils/__generated__/NodeCheck';
 import { Networks } from '../../types';
-import {
-  createMockClient,
-  type RequestHandlerResponse,
-} from 'mock-apollo-client';
+import { createMockClient, RequestHandlerResponse } from 'mock-apollo-client';
 
 export type MockRequestConfig = {
   hasError?: boolean;

libs/environment/src/hooks/use-environment.ts

@@ -150,7 +150,7 @@ export const useEnvironment = create<EnvStore>()((set, get) => ({
  * Initialize Vega app to dynamically select a node from the
  * VEGA_CONFIG_URL
  *
- * This can be omitted if you intend to only use a single node,
+ * This can be ommitted if you intend to only use a single node,
  * in those cases be sure to set NX_VEGA_URL
  */
 export const useInitializeEnv = () => {
@@ -415,12 +415,6 @@ function compileFeatureFlags(): FeatureFlags {
     REFERRALS: TRUTHY.includes(
       windowOrDefault('NX_REFERRALS', process.env['NX_REFERRALS']) as string
     ),
-    DISABLE_CLOSE_POSITION: TRUTHY.includes(
-      windowOrDefault(
-        'NX_DISABLE_CLOSE_POSITION',
-        process.env['NX_DISABLE_CLOSE_POSITION']
-      ) as string
-    ),
     UPDATE_MARKET_STATE: TRUTHY.includes(
       windowOrDefault(
         'NX_UPDATE_MARKET_STATE',

libs/environment/src/hooks/use-node-health.ts

@@ -70,7 +70,10 @@ export const useNodeHealth = () => {
       );
       intent = Intent.Danger;
     } else if (blockDiff >= BLOCK_THRESHOLD) {
-      text = t('blocksBehind', '{{count}} Blocks behind', { count: blockDiff });
+      text = t('blocksBehind', {
+        defaultValue: '{{count}} Blocks behind',
+        replace: { count: blockDiff },
+      });
       intent = Intent.Warning;
     } else if (blockUpdateMsLatency > WARNING_LATENCY) {
       text = t(

libs/environment/src/setup-tests.ts

@@ -5,20 +5,6 @@
 import '@testing-library/jest-dom';
 import ResizeObserver from 'resize-observer-polyfill';
 
-import { locales } from '@vegaprotocol/i18n';
-import i18n from 'i18next';
-import { initReactI18next } from 'react-i18next';
-
-// Set up i18n instance so that components have the correct default
-// en translations
-i18n.use(initReactI18next).init({
-  // we init with resources
-  resources: locales,
-  fallbackLng: 'en',
-  ns: ['environment'],
-  defaultNS: 'environment',
-});
-
 global.ResizeObserver = ResizeObserver;
 
 // Required by radix-ui/react-dropdown-menu

libs/environment/src/types.ts

@@ -27,7 +27,6 @@ export type CosmicElevatorFlags = Pick<
   | 'UPDATE_MARKET_STATE'
   | 'GOVERNANCE_TRANSFERS'
   | 'VOLUME_DISCOUNTS'
-  | 'DISABLE_CLOSE_POSITION'
 >;
 export type Configuration = z.infer<typeof tomlConfigSchema>;
 export const CUSTOM_NODE_KEY = 'custom' as const;

libs/environment/src/utils/validate-environment.ts

@@ -81,7 +81,6 @@ const COSMIC_ELEVATOR_FLAGS = {
   UPDATE_MARKET_STATE: z.optional(z.boolean()),
   GOVERNANCE_TRANSFERS: z.optional(z.boolean()),
   VOLUME_DISCOUNTS: z.optional(z.boolean()),
-  DISABLE_CLOSE_POSITION: z.optional(z.boolean()),
 };
 
 const EXPLORER_FLAGS = {

libs/fills/src/lib/fills-table.spec.tsx

@@ -4,8 +4,14 @@ import { getDateTimeFormat } from '@vegaprotocol/utils';
 import * as Schema from '@vegaprotocol/types';
 import type { PartialDeep } from 'type-fest';
 import type { Trade } from './fills-data-provider';
-import { FeesDiscountBreakdownTooltip, FillsTable } from './fills-table';
+import {
+  FeesDiscountBreakdownTooltip,
+  FillsTable,
+  getFeesBreakdown,
+  getTotalFeesDiscounts,
+} from './fills-table';
 import { generateFill } from './test-helpers';
+import type { TradeFeeFieldsFragment } from './__generated__/Fills';
 
 const partyId = 'party-id';
 const defaultFill: PartialDeep<Trade> = {
@@ -29,7 +35,6 @@ const defaultFill: PartialDeep<Trade> = {
   },
   createdAt: new Date('2022-02-02T14:00:00').toISOString(),
 };
-
 describe('FillsTable', () => {
   it('correct columns are rendered', async () => {
     // 7005-FILL-001
@@ -60,7 +65,7 @@ describe('FillsTable', () => {
     expect(headers.map((h) => h.textContent?.trim())).toEqual(expectedHeaders);
   });
 
-  it('formats cells correctly for buyer fill for maker', async () => {
+  it('formats cells correctly for buyer fill', async () => {
     const buyerFill = generateFill({
       ...defaultFill,
       buyer: {
@@ -84,7 +89,7 @@ describe('FillsTable', () => {
       '3.00 BTC',
       'Maker',
       '2.00 BTC',
-      '0.09 BTC',
+      '0.27 BTC',
       getDateTimeFormat().format(new Date(buyerFill.createdAt)),
       '', // action column
     ];
@@ -266,48 +271,96 @@ describe('FillsTable', () => {
       .find((c) => c.getAttribute('col-id') === 'size');
     expect(sizeCell).toHaveTextContent('3,000,000,000');
   });
+});
 
-  describe('FeesDiscountBreakdownTooltip', () => {
-    it('shows all discounts', () => {
-      const data = generateFill({
-        ...defaultFill,
-        buyer: {
-          id: partyId,
-        },
-      });
-      const props = {
-        data,
-        partyId,
-        value: data.market,
-      } as Parameters<typeof FeesDiscountBreakdownTooltip>['0'];
-      const { container } = render(<FeesDiscountBreakdownTooltip {...props} />);
-      const dt = container.querySelectorAll('dt');
-      const dd = container.querySelectorAll('dd');
-      const expectedDt = [
-        'Infrastructure Fee',
-        'Referral Discount',
-        'Volume Discount',
-        'Liquidity Fee',
-        'Referral Discount',
-        'Volume Discount',
-        'Maker Fee',
-        'Referral Discount',
-        'Volume Discount',
-      ];
-      const expectedDD = [
-        '0.05 BTC',
-        '0.06 BTC',
-        '0.01 BTC',
-        '0.02 BTC',
-        '0.03 BTC',
-        '0.04 BTC',
-      ];
-      expectedDt.forEach((label, i) => {
-        expect(dt[i]).toHaveTextContent(label);
-      });
-      expectedDD.forEach((label, i) => {
-        expect(dd[i]).toHaveTextContent(label);
-      });
+describe('FeesDiscountBreakdownTooltip', () => {
+  it('shows all discounts', () => {
+    const data = generateFill({
+      ...defaultFill,
+      buyer: {
+        id: partyId,
+      },
+    });
+    const props = {
+      data,
+      partyId,
+      value: data.market,
+    } as Parameters<typeof FeesDiscountBreakdownTooltip>['0'];
+    const { container } = render(<FeesDiscountBreakdownTooltip {...props} />);
+    const dt = container.querySelectorAll('dt');
+    const dd = container.querySelectorAll('dd');
+    const expectedDt = [
+      'Infrastructure Fee',
+      'Referral Discount',
+      'Volume Discount',
+      'Liquidity Fee',
+      'Referral Discount',
+      'Volume Discount',
+      'Maker Fee',
+      'Referral Discount',
+      'Volume Discount',
+    ];
+    const expectedDD = [
+      '0.05 BTC',
+      '0.06 BTC',
+      '0.01 BTC',
+      '0.02 BTC',
+      '0.03 BTC',
+      '0.04 BTC',
+    ];
+    expectedDt.forEach((label, i) => {
+      expect(dt[i]).toHaveTextContent(label);
+    });
+    expectedDD.forEach((label, i) => {
+      expect(dd[i]).toHaveTextContent(label);
     });
   });
 });
+
+describe('getFeesBreakdown', () => {
+  it('should return correct fees breakdown for a taker', () => {
+    const fees = {
+      makerFee: '1000',
+      infrastructureFee: '2000',
+      liquidityFee: '3000',
+    };
+    const expectedBreakdown = {
+      infrastructureFee: '2000',
+      liquidityFee: '3000',
+      makerFee: '1000',
+      totalFee: '6000',
+    };
+    expect(getFeesBreakdown('Taker', fees)).toEqual(expectedBreakdown);
+  });
+
+  it('should return correct fees breakdown for a maker', () => {
+    const fees = {
+      makerFee: '1000',
+      infrastructureFee: '2000',
+      liquidityFee: '3000',
+    };
+    const expectedBreakdown = {
+      infrastructureFee: '2000',
+      liquidityFee: '3000',
+      makerFee: '-1000',
+      totalFee: '4000',
+    };
+    expect(getFeesBreakdown('Maker', fees)).toEqual(expectedBreakdown);
+  });
+});
+
+describe('getTotalFeesDiscounts', () => {
+  it('should return correct total value', () => {
+    const fees = {
+      infrastructureFeeReferralDiscount: '1',
+      infrastructureFeeVolumeDiscount: '2',
+      liquidityFeeReferralDiscount: '3',
+      liquidityFeeVolumeDiscount: '4',
+      makerFeeReferralDiscount: '5',
+      makerFeeVolumeDiscount: '6',
+    };
+    expect(getTotalFeesDiscounts(fees as TradeFeeFieldsFragment)).toEqual(
+      (1 + 2 + 3 + 4 + 5 + 6).toString()
+    );
+  });
+});

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

@@ -28,12 +28,20 @@ import {
 import { forwardRef } from 'react';
 import BigNumber from 'bignumber.js';
 import { type Trade } from './fills-data-provider';
+import {
+  type FillFieldsFragment,
+  type TradeFeeFieldsFragment,
+} from './__generated__/Fills';
 import { FillActionsDropdown } from './fill-actions-dropdown';
 import { getAsset } from '@vegaprotocol/markets';
 import { useT } from './use-t';
-import { MAKER, TAKER, getFeesBreakdown, getRoleAndFees } from './fills-utils';
 
-type Props = (AgGridReactProps | AgReactUiProps) & {
+const TAKER = 'Taker';
+const MAKER = 'Maker';
+
+export type Role = typeof TAKER | typeof MAKER | '-';
+
+export type Props = (AgGridReactProps | AgReactUiProps) & {
   partyId: string;
   onMarketClick?: (marketId: string, metaKey?: boolean) => void;
 };
@@ -254,13 +262,63 @@ const formatFeeDiscount = (partyId: string) => {
   }: VegaValueFormatterParams<Trade, 'market'>) => {
     if (!market || !data) return '-';
     const asset = getAsset(market);
-    const { fees: roleFees, role } = getRoleAndFees({ data, partyId });
-    if (!roleFees) return '-';
-    const { totalFeeDiscount } = getFeesBreakdown(role, roleFees);
-    return addDecimalsFormatNumber(totalFeeDiscount, asset.decimals);
+    const { fees } = getRoleAndFees({ data, partyId });
+    if (!fees) return '-';
+
+    const total = getTotalFeesDiscounts(fees);
+    return addDecimalsFormatNumber(total, asset.decimals);
   };
 };
 
+export const isEmptyFeeObj = (feeObj: Schema.TradeFee) => {
+  if (!feeObj) return true;
+  return (
+    feeObj.liquidityFee === '0' &&
+    feeObj.makerFee === '0' &&
+    feeObj.infrastructureFee === '0'
+  );
+};
+
+export const getRoleAndFees = ({
+  data,
+  partyId,
+}: {
+  data: Pick<
+    FillFieldsFragment,
+    'buyerFee' | 'sellerFee' | 'buyer' | 'seller' | 'aggressor'
+  >;
+  partyId?: string;
+}) => {
+  let role: Role;
+  let fees;
+  if (data?.buyer.id === partyId) {
+    if (data.aggressor === Schema.Side.SIDE_BUY) {
+      role = TAKER;
+      fees = data?.buyerFee;
+    } else if (data.aggressor === Schema.Side.SIDE_SELL) {
+      role = MAKER;
+      fees = data?.sellerFee;
+    } else {
+      role = '-';
+      fees = !isEmptyFeeObj(data?.buyerFee) ? data.buyerFee : data.sellerFee;
+    }
+  } else if (data?.seller.id === partyId) {
+    if (data.aggressor === Schema.Side.SIDE_SELL) {
+      role = TAKER;
+      fees = data?.sellerFee;
+    } else if (data.aggressor === Schema.Side.SIDE_BUY) {
+      role = MAKER;
+      fees = data?.buyerFee;
+    } else {
+      role = '-';
+      fees = !isEmptyFeeObj(data.sellerFee) ? data.sellerFee : data.buyerFee;
+    }
+  } else {
+    return { role: '-', fees: undefined };
+  }
+  return { role, fees };
+};
+
 const FeesBreakdownTooltip = ({
   data,
   value: market,
@@ -273,23 +331,16 @@ const FeesBreakdownTooltip = ({
 
   const asset = getAsset(market);
 
-  const { role, fees, marketState } = getRoleAndFees({ data, partyId }) ?? {};
+  const { role, fees } = getRoleAndFees({ data, partyId }) ?? {};
   if (!fees) return null;
   const { infrastructureFee, liquidityFee, makerFee, totalFee } =
-    getFeesBreakdown(role, fees, marketState);
+    getFeesBreakdown(role, fees);
 
   return (
     <div
       data-testid="fee-breakdown-tooltip"
-      className="bg-vega-light-100 dark:bg-vega-dark-100 border-vega-light-200 dark:border-vega-dark-200 break-word z-20 max-w-sm rounded border px-4 py-2 text-xs text-black dark:text-white"
+      className="bg-vega-light-100 dark:bg-vega-dark-100 border-vega-light-200 dark:border-vega-dark-200 break-word z-20 max-w-sm rounded border px-4 py-2 text-sm text-black dark:text-white"
     >
-      {marketState && (
-        <p className="mb-1 italic">
-          {t('If the market was {{state}}', {
-            state: Schema.MarketStateMapping[marketState].toLowerCase(),
-          })}
-        </p>
-      )}
       {role === MAKER && (
         <>
           <p className="mb-1">{t('The maker will receive the maker fee.')}</p>
@@ -303,7 +354,7 @@ const FeesBreakdownTooltip = ({
       {role === TAKER && (
         <p className="mb-1">{t('Fees to be paid by the taker.')}</p>
       )}
-      {(role === '-' || marketState === Schema.MarketState.STATE_SUSPENDED) && (
+      {role === '-' && (
         <p className="mb-1">
           {t(
             'If the market is in monitoring auction, half of the infrastructure and liquidity fees will be paid.'
@@ -344,8 +395,8 @@ const FeesDiscountBreakdownTooltipItem = ({
 }) =>
   value && value !== '0' ? (
     <>
-      <dt className="col-span-2">{label}</dt>
-      <dd className="col-span-2 text-right">
+      <dt className="col-span-1">{label}</dt>
+      <dd className="col-span-1 text-right">
         {addDecimalsFormatNumber(value, asset.decimals)} {asset.symbol}
       </dd>
     </>
@@ -361,19 +412,15 @@ export const FeesDiscountBreakdownTooltip = ({
   }
   const asset = getAsset(data.market);
 
-  const {
-    fees: roleFees,
-    marketState,
-    role,
-  } = getRoleAndFees({ data, partyId }) ?? {};
-  if (!roleFees) return null;
-  const fees = getFeesBreakdown(role, roleFees, marketState);
+  const { fees } = getRoleAndFees({ data, partyId }) ?? {};
+  if (!fees) return null;
+
   return (
     <div
       data-testid="fee-discount-breakdown-tooltip"
       className="bg-vega-light-100 dark:bg-vega-dark-100 border-vega-light-200 dark:border-vega-dark-200 break-word z-20 max-w-sm rounded border px-4 py-2 text-sm text-black dark:text-white"
     >
-      <dl className="grid grid-cols-6 gap-x-1 text-xs">
+      <dl className="grid grid-cols-2 gap-x-1">
         {(fees.infrastructureFeeReferralDiscount || '0') !== '0' ||
         (fees.infrastructureFeeVolumeDiscount || '0') !== '0' ? (
           <dt className="col-span-2">{t('Infrastructure Fee')}</dt>
@@ -417,14 +464,42 @@ export const FeesDiscountBreakdownTooltip = ({
           label={t('Volume Discount')}
           asset={asset}
         />
-
-        <dt className="col-span-2">{t('Total Fee Discount')}</dt>
-        <FeesDiscountBreakdownTooltipItem
-          value={fees.totalFeeDiscount}
-          label={''}
-          asset={asset}
-        />
       </dl>
     </div>
   );
 };
+
+export const getTotalFeesDiscounts = (fees: TradeFeeFieldsFragment) => {
+  return (
+    BigInt(fees.infrastructureFeeReferralDiscount || '0') +
+    BigInt(fees.infrastructureFeeVolumeDiscount || '0') +
+    BigInt(fees.liquidityFeeReferralDiscount || '0') +
+    BigInt(fees.liquidityFeeVolumeDiscount || '0') +
+    BigInt(fees.makerFeeReferralDiscount || '0') +
+    BigInt(fees.makerFeeVolumeDiscount || '0')
+  ).toString();
+};
+
+export const getFeesBreakdown = (
+  role: Role,
+  feesObj: TradeFeeFieldsFragment
+) => {
+  const makerFee =
+    role === MAKER
+      ? new BigNumber(feesObj.makerFee).times(-1).toString()
+      : feesObj.makerFee;
+
+  const infrastructureFee = feesObj.infrastructureFee;
+  const liquidityFee = feesObj.liquidityFee;
+
+  const totalFee = new BigNumber(infrastructureFee)
+    .plus(makerFee)
+    .plus(liquidityFee)
+    .toString();
+  return {
+    infrastructureFee,
+    liquidityFee,
+    makerFee,
+    totalFee,
+  };
+};

libs/fills/src/lib/fills-utils.spec.ts

@@ -1,183 +0,0 @@
-import { getFeesBreakdown } from './fills-utils';
-import * as Schema from '@vegaprotocol/types';
-
-describe('getFeesBreakdown', () => {
-  it('should return correct fees breakdown for a taker', () => {
-    const fees = {
-      makerFee: '1000',
-      infrastructureFee: '2000',
-      liquidityFee: '3000',
-    };
-    const expectedBreakdown = {
-      infrastructureFee: '2000',
-      liquidityFee: '3000',
-      makerFee: '1000',
-      totalFee: '6000',
-      totalFeeDiscount: '0',
-    };
-    expect(getFeesBreakdown('Taker', fees)).toEqual(expectedBreakdown);
-  });
-
-  it('should return correct fees breakdown for a maker if market is active', () => {
-    const fees = {
-      makerFee: '1000',
-      infrastructureFee: '2000',
-      liquidityFee: '3000',
-    };
-    const expectedBreakdown = {
-      infrastructureFee: '0',
-      liquidityFee: '0',
-      makerFee: '-1000',
-      totalFee: '-1000',
-      totalFeeDiscount: '0',
-    };
-    expect(
-      getFeesBreakdown('Maker', fees, Schema.MarketState.STATE_ACTIVE)
-    ).toEqual(expectedBreakdown);
-  });
-
-  it('should return correct fees breakdown for a maker if the market is suspended', () => {
-    const fees = {
-      infrastructureFee: '2000',
-      liquidityFee: '3000',
-      makerFee: '0',
-    };
-    const expectedBreakdown = {
-      infrastructureFee: '1000',
-      liquidityFee: '1500',
-      makerFee: '0',
-      totalFee: '2500',
-      totalFeeDiscount: '0',
-    };
-    expect(
-      getFeesBreakdown('Maker', fees, Schema.MarketState.STATE_SUSPENDED)
-    ).toEqual(expectedBreakdown);
-  });
-
-  it('should return correct fees breakdown for a taker if the market is suspended', () => {
-    const fees = {
-      infrastructureFee: '2000',
-      liquidityFee: '3000',
-      makerFee: '0',
-    };
-    const expectedBreakdown = {
-      infrastructureFee: '1000',
-      liquidityFee: '1500',
-      makerFee: '0',
-      totalFee: '2500',
-      totalFeeDiscount: '0',
-    };
-    expect(
-      getFeesBreakdown('Taker', fees, Schema.MarketState.STATE_SUSPENDED)
-    ).toEqual(expectedBreakdown);
-  });
-
-  it('should return correct fees breakdown for a taker if market is active', () => {
-    const fees = {
-      makerFee: '1000',
-      infrastructureFee: '2000',
-      liquidityFee: '3000',
-    };
-    const expectedBreakdown = {
-      infrastructureFee: '2000',
-      liquidityFee: '3000',
-      makerFee: '1000',
-      totalFee: '6000',
-      totalFeeDiscount: '0',
-    };
-    expect(
-      getFeesBreakdown('Taker', fees, Schema.MarketState.STATE_ACTIVE)
-    ).toEqual(expectedBreakdown);
-  });
-
-  it('should return correct fees breakdown for a maker', () => {
-    const fees = {
-      makerFee: '1000',
-      infrastructureFee: '2000',
-      liquidityFee: '3000',
-    };
-    const expectedBreakdown = {
-      infrastructureFee: '0',
-      liquidityFee: '0',
-      makerFee: '-1000',
-      totalFee: '-1000',
-      totalFeeDiscount: '0',
-    };
-    expect(getFeesBreakdown('Maker', fees)).toEqual(expectedBreakdown);
-  });
-
-  it('should return correct total fees discount value for a taker (if the market is active - default)', () => {
-    const fees = {
-      infrastructureFeeReferralDiscount: '1',
-      infrastructureFeeVolumeDiscount: '2',
-      liquidityFeeReferralDiscount: '3',
-      liquidityFeeVolumeDiscount: '4',
-      makerFeeReferralDiscount: '5',
-      makerFeeVolumeDiscount: '6',
-      infrastructureFee: '1000',
-      liquidityFee: '2000',
-      makerFee: '3000',
-    };
-    const { totalFeeDiscount } = getFeesBreakdown('Taker', fees);
-    expect(totalFeeDiscount).toEqual((1 + 2 + 3 + 4 + 5 + 6).toString());
-  });
-
-  it('should return correct total fees discount value for a maker (if the market is active - default)', () => {
-    const fees = {
-      infrastructureFeeReferralDiscount: '1',
-      infrastructureFeeVolumeDiscount: '2',
-      liquidityFeeReferralDiscount: '3',
-      liquidityFeeVolumeDiscount: '4',
-      makerFeeReferralDiscount: '5',
-      makerFeeVolumeDiscount: '6',
-      infrastructureFee: '1000',
-      liquidityFee: '2000',
-      makerFee: '3000',
-    };
-    const { totalFeeDiscount } = getFeesBreakdown('Maker', fees);
-    // makerFeeReferralDiscount and makerFeeVolumeDiscount are added, infra and liq. fees are zeroed
-    expect(totalFeeDiscount).toEqual((5 + 6).toString());
-  });
-
-  it('should return correct total fees discount value for a maker (if the market is suspended)', () => {
-    const fees = {
-      infrastructureFeeReferralDiscount: '1',
-      infrastructureFeeVolumeDiscount: '2',
-      liquidityFeeReferralDiscount: '3',
-      liquidityFeeVolumeDiscount: '4',
-      makerFeeReferralDiscount: '5',
-      makerFeeVolumeDiscount: '6',
-      infrastructureFee: '1000',
-      liquidityFee: '2000',
-      makerFee: '3000',
-    };
-    const { totalFeeDiscount } = getFeesBreakdown(
-      'Maker',
-      fees,
-      Schema.MarketState.STATE_SUSPENDED
-    );
-    // makerFeeReferralDiscount and makerFeeVolumeDiscount are zeroed, infra and liq. fees are halved
-    expect(totalFeeDiscount).toEqual(((1 + 2 + 3 + 4) / 2).toString());
-  });
-
-  it('should return correct total fees discount value for a taker (if the market is suspended)', () => {
-    const fees = {
-      infrastructureFeeReferralDiscount: '1',
-      infrastructureFeeVolumeDiscount: '2',
-      liquidityFeeReferralDiscount: '3',
-      liquidityFeeVolumeDiscount: '4',
-      makerFeeReferralDiscount: '5',
-      makerFeeVolumeDiscount: '6',
-      infrastructureFee: '1000',
-      liquidityFee: '2000',
-      makerFee: '3000',
-    };
-    const { totalFeeDiscount } = getFeesBreakdown(
-      'Taker',
-      fees,
-      Schema.MarketState.STATE_SUSPENDED
-    );
-    // makerFeeReferralDiscount and makerFeeVolumeDiscount are zeroed, infra and liq. fees are halved
-    expect(totalFeeDiscount).toEqual(((1 + 2 + 3 + 4) / 2).toString());
-  });
-});

libs/fills/src/lib/fills-utils.ts

@@ -1,164 +0,0 @@
-import BigNumber from 'bignumber.js';
-import type {
-  FillFieldsFragment,
-  TradeFeeFieldsFragment,
-} from './__generated__/Fills';
-import * as Schema from '@vegaprotocol/types';
-
-export const TAKER = 'Taker';
-export const MAKER = 'Maker';
-
-export type Role = typeof TAKER | typeof MAKER | '-';
-
-export const getRoleAndFees = ({
-  data,
-  partyId,
-}: {
-  data: Pick<
-    FillFieldsFragment,
-    'buyerFee' | 'sellerFee' | 'buyer' | 'seller' | 'aggressor'
-  >;
-  partyId?: string;
-}): {
-  role: Role;
-  fees?: TradeFeeFieldsFragment;
-  marketState?: Schema.MarketState;
-} => {
-  let role: Role;
-  let fees;
-
-  if (data?.buyer.id === partyId) {
-    if (data.aggressor === Schema.Side.SIDE_BUY) {
-      role = TAKER;
-      fees = data?.buyerFee;
-    } else if (data.aggressor === Schema.Side.SIDE_SELL) {
-      role = MAKER;
-      fees = data?.sellerFee;
-    } else {
-      role = '-';
-      fees = !isEmptyFeeObj(data?.buyerFee) ? data.buyerFee : data.sellerFee;
-    }
-  } else if (data?.seller.id === partyId) {
-    if (data.aggressor === Schema.Side.SIDE_SELL) {
-      role = TAKER;
-      fees = data?.sellerFee;
-    } else if (data.aggressor === Schema.Side.SIDE_BUY) {
-      role = MAKER;
-      fees = data?.buyerFee;
-    } else {
-      role = '-';
-      fees = !isEmptyFeeObj(data.sellerFee) ? data.sellerFee : data.buyerFee;
-    }
-  } else {
-    return { role: '-', fees: undefined };
-  }
-
-  // We make the assumption that the market state is active if the maker fee is zero on both sides
-  // This needs to be updated when we have a way to get the correct market state when that fill happened from the API
-  // because the maker fee factor can be set to 0 via governance
-  const marketState =
-    data?.buyerFee.makerFee === data.sellerFee.makerFee &&
-    new BigNumber(data?.buyerFee.makerFee).isZero()
-      ? Schema.MarketState.STATE_SUSPENDED
-      : Schema.MarketState.STATE_ACTIVE;
-  return { role, fees, marketState };
-};
-
-export const getFeesBreakdown = (
-  role: Role,
-  fees: TradeFeeFieldsFragment,
-  marketState: Schema.MarketState = Schema.MarketState.STATE_ACTIVE
-) => {
-  // If market is in auction we assume maker fee is zero
-  const isMarketActive = marketState === Schema.MarketState.STATE_ACTIVE;
-
-  // If role is taker, then these are the fees to be paid
-  let { makerFee, infrastructureFee, liquidityFee } = fees;
-  // If role is taker, then these are the fees discounts to be applied
-  let {
-    makerFeeVolumeDiscount,
-    makerFeeReferralDiscount,
-    infrastructureFeeVolumeDiscount,
-    infrastructureFeeReferralDiscount,
-    liquidityFeeVolumeDiscount,
-    liquidityFeeReferralDiscount,
-  } = fees;
-
-  if (isMarketActive) {
-    if (role === MAKER) {
-      makerFee = new BigNumber(fees.makerFee).times(-1).toString();
-      infrastructureFee = '0';
-      liquidityFee = '0';
-
-      // discounts are also zero or we can leave them undefined
-      infrastructureFeeReferralDiscount =
-        infrastructureFeeReferralDiscount && '0';
-      infrastructureFeeVolumeDiscount = infrastructureFeeVolumeDiscount && '0';
-      liquidityFeeReferralDiscount = liquidityFeeReferralDiscount && '0';
-      liquidityFeeVolumeDiscount = liquidityFeeVolumeDiscount && '0';
-
-      // we leave maker discount fees as they are defined
-    }
-  } else {
-    // If market is suspended (in monitoring auction), then half of the fees are paid
-    infrastructureFee = new BigNumber(infrastructureFee)
-      .dividedBy(2)
-      .toString();
-    liquidityFee = new BigNumber(liquidityFee).dividedBy(2).toString();
-    // maker fee is already zero
-    makerFee = '0';
-
-    // discounts are also halved
-    infrastructureFeeReferralDiscount =
-      infrastructureFeeReferralDiscount &&
-      new BigNumber(infrastructureFeeReferralDiscount).dividedBy(2).toString();
-    infrastructureFeeVolumeDiscount =
-      infrastructureFeeVolumeDiscount &&
-      new BigNumber(infrastructureFeeVolumeDiscount).dividedBy(2).toString();
-    liquidityFeeReferralDiscount =
-      liquidityFeeReferralDiscount &&
-      new BigNumber(liquidityFeeReferralDiscount).dividedBy(2).toString();
-    liquidityFeeVolumeDiscount =
-      liquidityFeeVolumeDiscount &&
-      new BigNumber(liquidityFeeVolumeDiscount).dividedBy(2).toString();
-    // maker discount fees should already be zero
-    makerFeeReferralDiscount = makerFeeReferralDiscount && '0';
-    makerFeeVolumeDiscount = makerFeeVolumeDiscount && '0';
-  }
-
-  const totalFee = new BigNumber(infrastructureFee)
-    .plus(makerFee)
-    .plus(liquidityFee)
-    .toString();
-
-  const totalFeeDiscount = new BigNumber(makerFeeVolumeDiscount || '0')
-    .plus(makerFeeReferralDiscount || '0')
-    .plus(infrastructureFeeReferralDiscount || '0')
-    .plus(infrastructureFeeVolumeDiscount || '0')
-    .plus(liquidityFeeReferralDiscount || '0')
-    .plus(liquidityFeeVolumeDiscount || '0')
-    .toString();
-
-  return {
-    infrastructureFee,
-    infrastructureFeeReferralDiscount,
-    infrastructureFeeVolumeDiscount,
-    liquidityFee,
-    liquidityFeeReferralDiscount,
-    liquidityFeeVolumeDiscount,
-    makerFee,
-    makerFeeReferralDiscount,
-    makerFeeVolumeDiscount,
-    totalFee,
-    totalFeeDiscount,
-  };
-};
-
-export const isEmptyFeeObj = (feeObj: Schema.TradeFee) => {
-  if (!feeObj) return true;
-  return (
-    feeObj.liquidityFee === '0' &&
-    feeObj.makerFee === '0' &&
-    feeObj.infrastructureFee === '0'
-  );
-};

libs/i18n/src/locales/en/deal-ticket.json

@@ -21,7 +21,6 @@
   "DEDUCTION_FROM_COLLATERAL_TOOLTIP_TEXT": "To cover the required margin, this amount will be drawn from your general ({{assetSymbol}}) account.",
   "Deposit {{assetSymbol}}": "Deposit {{assetSymbol}}",
   "Devnet": "Devnet",
-  "Discount": "Discount",
   "EST_TOTAL_MARGIN_TOOLTIP_TEXT": "Estimated total margin that will cover open positions, active orders and this order.",
   "Est. uncrossing price": "Est. uncrossing price",
   "Est. uncrossing vol": "Est. uncrossing vol",
@@ -79,7 +78,6 @@
   "Size": "Size",
   "Size cannot be lower than {{sizeStep}}": "Size cannot be lower than {{sizeStep}}",
   "sizeAtPrice-market": "market",
-  "Subtotal": "Subtotal",
   "Stagnet": "Stagnet",
   "Stop": "Stop",
   "Stop Limit": "Stop Limit",
@@ -106,7 +104,7 @@
   "Time in force": "Time in force",
   "TIME_IN_FORCE_SELECTOR_LIQUIDITY_MONITORING_AUCTION": "This market is in auction until it reaches <0>sufficient liquidity</0>. Until the auction ends, you can only place GFA, GTT, or GTC limit orders.",
   "TIME_IN_FORCE_SELECTOR_PRICE_MONITORING_AUCTION": "This market is in auction due to <0>high price volatility</0>. Until the auction ends, you can only place GFA, GTT, or GTC limit orders.",
-  "Total": "Total",
+  "Total fees": "Total fees",
   "Total margin available": "Total margin available",
   "TOTAL_MARGIN_AVAILABLE": "Total margin available = general {{assetSymbol}} balance ({{generalAccountBalance}} {{assetSymbol}}) + margin balance ({{marginAccountBalance}} {{assetSymbol}}) - maintenance level ({{marginMaintenance}} {{assetSymbol}}).",
   "Trading terminated": "Trading terminated",