fix: live time fraction zero redundant check

chore(accounts): no assets avaiable in transfer form (#5358 )
chore(trading): merge main back in develop (fees discounts, discount stats from prev epoch) (#5415 )
2023-12-02 11:26:09 +00:00 · 2023-12-01 17:05:22 +00:00 · 2023-12-01 17:03:41 +00:00 · 2023-12-01 16:38:32 +00:00 · 2023-12-01 14:42:26 +01:00 · 2023-11-30 11:54:18 +00:00
84 changed files with 1343 additions and 1299 deletions
@@ -12,7 +12,8 @@ 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 RowClickedEvent, ColDef } from 'ag-grid-community';
+import { type ColDef } from 'ag-grid-community';
+import type { RowClickedEvent } from 'ag-grid-community';

 type AssetsTableProps = {
  data: AssetFieldsFragment[] | null;
@@ -8,7 +8,8 @@ import {
  type VegaValueFormatterParams,
 } from '@vegaprotocol/datagrid';
 import { useLayoutEffect, useMemo, useRef, useState } from 'react';
-import { type RowClickedEvent, ColDef } from 'ag-grid-community';
+import { type ColDef } from 'ag-grid-community';
+import type { RowClickedEvent } from 'ag-grid-community';
 import { getDateTimeFormat } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import {
@@ -0,0 +1,59 @@
+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>
+  );
+};
@@ -9,6 +9,7 @@ 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;
@@ -75,6 +76,12 @@ 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>
@@ -98,6 +98,8 @@ describe('TxDetailsTransfer', () => {
      },
    },
    signature: {
+      version: '1',
+      algo: 'vega/ed25519',
      value:
        '610c2e196a7d4fed4413b9e82af267b1ff3e30e943df3a3d28096fd60604d430d752fbaf6dd4f84d496be78885bb6118f40560bff7832c06bd7a3d67b718b700',
    },
@@ -20,6 +20,8 @@ const generateTxs = (number: number): BlockExplorerTransactionResult[] => {
      '4b782482f587d291e8614219eb9a5ee9280fa2c58982dee71d976782a9be1964',
    type: 'Submit Order',
    signature: {
+      version: '1',
+      algo: 'vega/ed25519',
      value: '123',
    },
    code: 0,
@@ -23,6 +23,8 @@ const txData: BlockExplorerTransactionResult = {
  type: 'type',
  command: {} as ValidatorHeartbeat,
  signature: {
+    version: '1',
+    algo: 'vega/ed25519',
    value: '123',
  },
 };
@@ -11,6 +11,8 @@ export interface BlockExplorerTransactionResult {
  cursor: string;
  command: components['schemas']['blockexplorerv1transaction'];
  signature: {
+    version: string;
+    algo: string;
    value: string;
  };
  error?: string;
@@ -1,182 +0,0 @@
-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'
-          );
-        });
-    });
-  });
-});
@@ -1,103 +0,0 @@
-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'
-        );
-      });
-    });
-  }
-);
@@ -26,18 +26,6 @@ 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
@@ -1,91 +0,0 @@
-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');
-  });
-});
@@ -28,3 +28,4 @@ NX_REFERRALS=false

 NX_TENDERMINT_URL=https://be.vega.community
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket
+NX_DISABLE_CLOSE_POSITION=true
@@ -1,34 +1,11 @@
-import { useEffect } from 'react';
-import { useNavigate } from 'react-router-dom';
 import { Loader, Splash } from '@vegaprotocol/ui-toolkit';
-import { useGlobalStore } from '../../stores';
-import { useTopTradedMarkets } from '../../lib/hooks/use-top-traded-markets';
-import { Links } from '../../lib/links';
+import { useNavigateToLastMarket } from '../../lib/hooks/use-navigate-to-last-market';

 // 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 = () => {
-  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]);
+  useNavigateToLastMarket();

  return (
    <Splash>
@@ -1,7 +1,6 @@
 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,
@@ -145,7 +144,6 @@ export const MarketHeaderStats = ({ market }: MarketHeaderStatsProps) => {
          />
        </HeaderStat>
      )}
-      <MarketProposalNotification marketId={market.id} />
    </>
  );
 };
@@ -276,10 +276,12 @@ export const ApplyCodeForm = () => {
      {/* TODO: Re-check plural forms once i18n is updated */}
      {previewData && previewData.isEligible ? (
        <div className="mt-10">
-          <h2 className="text-2xl mb-5">
-            {t('referralApplyPreviewMessage', {
-              count: nextBenefitTierEpochsValue,
-            })}
+          <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 }
+            )}
          </h2>
          <Statistics data={previewData} program={program} as="referee" />
        </div>
@@ -75,22 +75,20 @@ export const useReferralProgram = () => {

  const benefitTiers = sortBy(data.currentReferralProgram.benefitTiers, (t) =>
    Number(t.referralRewardFactor)
-  )
-    .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),
-      };
-    });
+  ).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),
+    };
+  });

  const stakingTiers = sortBy(
    data.currentReferralProgram.stakingTiers,
@@ -1,3 +1,4 @@
+import minBy from 'lodash/minBy';
 import { CodeTile, StatTile } from './tile';
 import {
  VegaIcon,
@@ -28,7 +29,6 @@ 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';
@@ -127,8 +127,8 @@ export const useStats = ({
      t.discountFactor === discountFactorValue
  );
  const nextBenefitTierValue = currentBenefitTierValue
-    ? benefitTiers.find((t) => t.tier === currentBenefitTierValue.tier - 1)
-    : maxBy(benefitTiers, (bt) => bt.tier); // max tier number is lowest tier
+    ? benefitTiers.find((t) => t.tier === currentBenefitTierValue.tier + 1)
+    : minBy(benefitTiers, (bt) => bt.tier); //  min tier number is lowest tier
  const epochsValue =
    !isNaN(currentEpoch) && refereeInfo?.atEpoch
      ? currentEpoch - refereeInfo?.atEpoch
@@ -261,7 +261,7 @@ export const Statistics = ({

  const referrerVolumeTile = (
    <StatTile
-      title={t('My volume (last {{count}} epochs)', {
+      title={t('myVolume', 'My volume (last {{count}} epochs)', {
        count: details?.windowLength || DEFAULT_AGGREGATION_DAYS,
      })}
    >
@@ -274,7 +274,7 @@ export const Statistics = ({
    .reduce((all, r) => all.plus(r), new BigNumber(0));
  const totalCommissionTile = (
    <StatTile
-      title={t('Total commission (last {{count}}} epochs)', {
+      title={t('totalCommission', 'Total commission (last {{count}}} epochs)', {
        count: details?.windowLength || DEFAULT_AGGREGATION_DAYS,
      })}
      description={<QUSDTooltip />}
@@ -317,9 +317,13 @@ export const Statistics = ({
  );
  const runningVolumeTile = (
    <StatTile
-      title={t('Combined volume (last {{count}} epochs)', {
-        count: details?.windowLength,
-      })}
+      title={t(
+        'runningNotionalOverEpochs',
+        'Combined volume (last {{count}} epochs)',
+        {
+          count: details?.windowLength,
+        }
+      )}
    >
      {compactNumFormat.format(runningVolumeValue)}
    </StatTile>
@@ -439,15 +443,19 @@ export const RefereesTable = ({
                { name: 'joined', displayName: t('Date Joined') },
                {
                  name: 'volume',
-                  displayName: t('Volume (last {{count}} epochs)', {
-                    count: details?.windowLength || DEFAULT_AGGREGATION_DAYS,
-                  }),
+                  displayName: t(
+                    'volumeLastEpochs',
+                    'Volume (last {{count}} epochs)',
+                    {
+                      count: details?.windowLength || DEFAULT_AGGREGATION_DAYS,
+                    }
+                  ),
                },
                {
                  name: 'commission',
                  displayName: (
                    <Trans
-                      i18nKey="referral-statistics-commission"
+                      i18nKey="referralStatisticsCommission"
                      defaults="Commission earned in <0>qUSD</0> (last {{count}} epochs)"
                      values={{
                        count:
@@ -208,9 +208,13 @@ const TiersTable = ({
        { name: 'discount', displayName: t('Referrer trading discount') },
        {
          name: 'volume',
-          displayName: t('Min. trading volume (last {{count}} epochs)', {
-            count: windowLength,
-          }),
+          displayName: t(
+            'minTradingVolume',
+            'Min. trading volume (last {{count}} epochs)',
+            {
+              count: windowLength,
+            }
+          ),
        },
        { name: 'epochs', displayName: t('Min. epochs') },
      ]}
@@ -218,13 +222,13 @@ const TiersTable = ({
        ...d,
        className: classNames({
          'from-vega-pink-400 dark:from-vega-pink-600 to-20%  bg-highlight':
-            d.tier === 1,
+            d.tier >= 3,
          '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 === 3,
+            d.tier === 1,
          'from-vega-orange-400 dark:from-vega-orange-600 to-20%  bg-highlight':
-            d.tier > 3,
+            d.tier == 0,
        }),
      }))}
    />
@@ -16,18 +16,11 @@ query DiscountPrograms {
  }
 }

-query Fees(
-  $partyId: ID!
-  $volumeDiscountEpochs: Int!
-  $referralDiscountEpochs: Int!
-) {
+query Fees($partyId: ID!) {
  epoch {
    id
  }
-  volumeDiscountStats(
-    partyId: $partyId
-    pagination: { last: $volumeDiscountEpochs }
-  ) {
+  volumeDiscountStats(partyId: $partyId, pagination: { last: 1 }) {
    edges {
      node {
        atEpoch
@@ -59,10 +52,7 @@ query Fees(
      }
    }
  }
-  referralSetStats(
-    partyId: $partyId
-    pagination: { last: $referralDiscountEpochs }
-  ) {
+  referralSetStats(partyId: $partyId, pagination: { last: 1 }) {
    edges {
      node {
        atEpoch
@@ -10,8 +10,6 @@ export type DiscountProgramsQuery = { __typename?: 'Query', currentReferralProgr

 export type FeesQueryVariables = Types.Exact<{
  partyId: Types.Scalars['ID'];
-  volumeDiscountEpochs: Types.Scalars['Int'];
-  referralDiscountEpochs: Types.Scalars['Int'];
 }>;


@@ -65,14 +63,11 @@ 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!, $volumeDiscountEpochs: Int!, $referralDiscountEpochs: Int!) {
+    query Fees($partyId: ID!) {
  epoch {
    id
  }
-  volumeDiscountStats(
-    partyId: $partyId
-    pagination: {last: $volumeDiscountEpochs}
-  ) {
+  volumeDiscountStats(partyId: $partyId, pagination: {last: 1}) {
    edges {
      node {
        atEpoch
@@ -104,7 +99,7 @@ export const FeesDocument = gql`
      }
    }
  }
-  referralSetStats(partyId: $partyId, pagination: {last: $referralDiscountEpochs}) {
+  referralSetStats(partyId: $partyId, pagination: {last: 1}) {
    edges {
      node {
        atEpoch
@@ -129,8 +124,6 @@ export const FeesDocument = gql`
 * const { data, loading, error } = useFeesQuery({
 *   variables: {
 *      partyId: // value for 'partyId'
- *      volumeDiscountEpochs: // value for 'volumeDiscountEpochs'
- *      referralDiscountEpochs: // value for 'referralDiscountEpochs'
 *   },
 * });
 */
@@ -36,25 +36,25 @@ export const FeesContainer = () => {
  const { data: markets, loading: marketsLoading } = useMarketList();

  const { data: programData, loading: programLoading } =
-    useDiscountProgramsQuery();
+    useDiscountProgramsQuery({ errorPolicy: 'ignore' });

  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 || !programData,
+    skip: !pubKey,
  });

+  const previousEpoch = (Number(feesData?.epoch.id) || 0) - 1;
+
  const { volumeDiscount, volumeTierIndex, volumeInWindow, volumeTiers } =
    useVolumeStats(
-      feesData?.volumeDiscountStats,
+      previousEpoch,
+      feesData?.volumeDiscountStats.edges?.[0]?.node,
      programData?.currentVolumeDiscountProgram
    );

@@ -67,12 +67,12 @@ export const FeesContainer = () => {
    code,
    isReferrer,
  } = useReferralStats(
-    feesData?.referralSetStats,
-    feesData?.referralSetReferees,
+    previousEpoch,
+    feesData?.referralSetStats.edges?.[0]?.node,
+    feesData?.referralSetReferees.edges?.[0]?.node,
    programData?.currentReferralProgram,
-    feesData?.epoch,
-    feesData?.referrer,
-    feesData?.referee
+    feesData?.referrer.edges?.[0]?.node,
+    feesData?.referee.edges?.[0]?.node
  );

  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('Past {{count}} epochs', { count: windowLength })}
+        text={t('pastEpochs', 'Past {{count}} epochs', { count: windowLength })}
      />
      {requiredForNextTier > 0 && (
        <CardStat
@@ -344,9 +344,13 @@ const ReferralBenefits = ({
      <CardStat
        // all sets volume (not just current party)
        value={formatNumber(setRunningNotionalTakerVolume)}
-        text={t('Combined running notional over the {{count}} epochs', {
-          count: epochs,
-        })}
+        text={t(
+          'runningNotionalOverEpochs',
+          'Combined running notional over the {{count}} epochs',
+          {
+            count: epochs,
+          }
+        )}
      />
      <CardStat value={epochsInSet} text={t('epochs in referral set')} />
    </div>
@@ -453,31 +457,27 @@ const VolumeTiers = ({
            <Th>{t('Discount')}</Th>
            <Th>{t('Min. trading volume')}</Th>
            <Th>
-              {t('My volume (last {{count}} epochs)', { count: windowLength })}
+              {t('myVolume', 'My volume (last {{count}} epochs)', {
+                count: windowLength,
+              })}
            </Th>
            <Th />
          </tr>
        </THead>
        <tbody>
-          {Array.from(tiers)
-            .reverse()
-            .map((tier, i) => {
-              const isUserTier = tiers.length - 1 - tierIndex === i;
+          {Array.from(tiers).map((tier, i) => {
+            const isUserTier = 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,37 +520,33 @@ const ReferralTiers = ({
          </tr>
        </THead>
        <tbody>
-          {Array.from(tiers)
-            .reverse()
-            .map((t, i) => {
-              const isUserTier = tiers.length - 1 - tierIndex === i;
+          {Array.from(tiers).map((t, i) => {
+            const isUserTier = tierIndex === i;

-              const requiredVolume = Number(
-                t.minimumRunningNotionalTakerVolume
+            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>
              );
-              let unlocksIn = null;
+            }

-              if (
-                referralVolumeInWindow >= requiredVolume &&
-                epochsInSet < t.minimumEpochs
-              ) {
-                unlocksIn = (
-                  <span className="text-muted">
-                    Unlocks in {t.minimumEpochs - epochsInSet} epochs
-                  </span>
-                );
-              }
-
-              return (
-                <Tr key={i}>
-                  <Td>{i + 1}</Td>
-                  <Td>{formatPercentage(Number(t.referralDiscountFactor))}%</Td>
-                  <Td>{formatNumber(t.minimumRunningNotionalTakerVolume)}</Td>
-                  <Td>{t.minimumEpochs}</Td>
-                  <Td>{isUserTier ? <YourTier /> : unlocksIn}</Td>
-                </Tr>
-              );
-            })}
+            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>
@@ -2,46 +2,15 @@ import { renderHook } from '@testing-library/react';
 import { useReferralStats } from './use-referral-stats';

 describe('useReferralStats', () => {
-  const setStats = {
-    edges: [
-      {
-        __typename: 'ReferralSetStatsEdge' as const,
-        node: {
-          __typename: 'ReferralSetStats' as const,
-          atEpoch: 9,
-          discountFactor: '0.2',
-          referralSetRunningNotionalTakerVolume: '100',
-        },
-      },
-      {
-        __typename: 'ReferralSetStatsEdge' as const,
-        node: {
-          __typename: 'ReferralSetStats' as const,
-          atEpoch: 10,
-          discountFactor: '0.3',
-          referralSetRunningNotionalTakerVolume: '200',
-        },
-      },
-    ],
+  const stat = {
+    __typename: 'ReferralSetStats' as const,
+    atEpoch: 9,
+    discountFactor: '0.01',
+    referralSetRunningNotionalTakerVolume: '100',
  };

-  const sets = {
-    edges: [
-      {
-        node: {
-          atEpoch: 3,
-        },
-      },
-      {
-        node: {
-          atEpoch: 4,
-        },
-      },
-    ],
-  };
-
-  const epoch = {
-    id: '10',
+  const set = {
+    atEpoch: 4,
  };

  const program = {
@@ -78,102 +47,36 @@ describe('useReferralStats', () => {
    });
  });

-  it('returns formatted data and tiers', () => {
+  it('returns default values if set is not from previous epoch', () => {
    const { result } = renderHook(() =>
-      useReferralStats(setStats, sets, program, epoch)
+      useReferralStats(10, stat, set, program)
    );
-
-    // should use stats from latest epoch
-    const stats = setStats.edges[1].node;
-    const set = sets.edges[1].node;
-
    expect(result.current).toEqual({
-      referralDiscount: Number(stats.discountFactor),
-      referralVolumeInWindow: Number(
-        stats.referralSetRunningNotionalTakerVolume
-      ),
-      referralTierIndex: 1,
+      referralDiscount: 0,
+      referralVolumeInWindow: 0,
+      referralTierIndex: -1,
      referralTiers: program.benefitTiers,
-      epochsInSet: Number(epoch.id) - set.atEpoch,
+      epochsInSet: 0,
      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,
-          },
-        },
-      ],
-    };
+  it('returns formatted data and tiers', () => {
    const { result } = renderHook(() =>
-      useReferralStats(statsA, setsA, program, epoch)
+      useReferralStats(9, stat, set, program)
    );

-    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);
+    expect(result.current).toEqual({
+      referralDiscount: Number(stat.discountFactor),
+      referralVolumeInWindow: Number(
+        stat.referralSetRunningNotionalTakerVolume
+      ),
+      referralTierIndex: 0,
+      referralTiers: program.benefitTiers,
+      epochsInSet: stat.atEpoch - set.atEpoch,
+      code: undefined,
+      isReferrer: false,
+    });
  });
 });
@@ -1,20 +1,24 @@
-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 = (
-  setStats?: FeesQuery['referralSetStats'],
-  setReferees?: FeesQuery['referralSetReferees'],
+  previousEpoch?: number,
+  referralStats?: NonNullable<
+    FeesQuery['referralSetStats']['edges']['0']
+  >['node'],
+  setReferees?: NonNullable<
+    FeesQuery['referralSetReferees']['edges']['0']
+  >['node'],
  program?: DiscountProgramsQuery['currentReferralProgram'],
-  epoch?: FeesQuery['epoch'],
-  setIfReferrer?: FeesQuery['referrer'],
-  setIfReferee?: FeesQuery['referee']
+  setIfReferrer?: NonNullable<FeesQuery['referrer']['edges']['0']>['node'],
+  setIfReferee?: NonNullable<FeesQuery['referee']['edges']['0']>['node']
 ) => {
  const referralTiers = program?.benefitTiers || [];

-  if (!setStats || !setReferees || !program || !epoch) {
+  if (
+    !previousEpoch ||
+    referralStats?.atEpoch !== previousEpoch ||
+    !program ||
+    !setReferees
+  ) {
    return {
      referralDiscount: 0,
      referralVolumeInWindow: 0,
@@ -26,41 +30,22 @@ 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 = referralStats
-    ? getReferralBenefitTier(
-        epochsInSet,
-        Number(referralStats.referralSetRunningNotionalTakerVolume),
-        referralTiers
-      )
-    : -1;
+  const referralTierIndex = referralTiers.findIndex(
+    (tier) => tier.referralDiscountFactor === referralStats?.discountFactor
+  );

  return {
    referralDiscount,
    referralVolumeInWindow,
    referralTierIndex,
    referralTiers,
-    epochsInSet,
-    code: (setIfReferrerData || setIfRefereeData)?.id,
-    isReferrer: Boolean(setIfReferrerData),
+    epochsInSet: referralStats.atEpoch - setReferees.atEpoch,
+    code: (setIfReferrer || setIfReferee)?.id,
+    isReferrer: Boolean(setIfReferrer),
  };
 };
@@ -2,27 +2,11 @@ import { renderHook } from '@testing-library/react';
 import { useVolumeStats } from './use-volume-stats';

 describe('useReferralStats', () => {
-  const statsList = {
-    edges: [
-      {
-        __typename: 'VolumeDiscountStatsEdge' as const,
-        node: {
-          __typename: 'VolumeDiscountStats' as const,
-          atEpoch: 9,
-          discountFactor: '0.1',
-          runningVolume: '100',
-        },
-      },
-      {
-        __typename: 'VolumeDiscountStatsEdge' as const,
-        node: {
-          __typename: 'VolumeDiscountStats' as const,
-          atEpoch: 10,
-          discountFactor: '0.3',
-          runningVolume: '200',
-        },
-      },
-    ],
+  const stats = {
+    __typename: 'VolumeDiscountStats' as const,
+    atEpoch: 10,
+    discountFactor: '0.05',
+    runningVolume: '200',
  };

  const program = {
@@ -44,7 +28,7 @@ describe('useReferralStats', () => {
  };

  it('returns correct default values', () => {
-    const { result } = renderHook(() => useVolumeStats());
+    const { result } = renderHook(() => useVolumeStats(10));
    expect(result.current).toEqual({
      volumeDiscount: 0,
      volumeInWindow: 0,
@@ -53,11 +37,18 @@ describe('useReferralStats', () => {
    });
  });

-  it('returns formatted data and tiers', () => {
-    const { result } = renderHook(() => useVolumeStats(statsList, program));
+  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,
+    });
+  });

-    // should use stats from latest epoch
-    const stats = statsList.edges[1].node;
+  it('returns formatted data and tiers', () => {
+    const { result } = renderHook(() => useVolumeStats(10, stats, program));

    expect(result.current).toEqual({
      volumeDiscount: Number(stats.discountFactor),
@@ -66,30 +57,4 @@ 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);
-  });
 });
@@ -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 = (
-  stats?: FeesQuery['volumeDiscountStats'],
+  previousEpoch: number,
+  lastEpochStats?: NonNullable<
+    FeesQuery['volumeDiscountStats']['edges']['0']
+  >['node'],
  program?: DiscountProgramsQuery['currentVolumeDiscountProgram']
 ) => {
  const volumeTiers = program?.benefitTiers || [];

-  if (!stats || !program) {
+  if (!lastEpochStats || lastEpochStats.atEpoch !== previousEpoch || !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 = getVolumeTier(volumeInWindow, volumeTiers);
+  const volumeTierIndex = volumeTiers.findIndex(
+    (tier) => tier.volumeDiscountFactor === lastEpochStats?.discountFactor
+  );

  return {
    volumeDiscount,
@@ -20,73 +20,6 @@ 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
@@ -1,2 +1,2 @@
 CONSOLE_IMAGE_NAME=vegaprotocol/trading:latest
-VEGA_VERSION=v0.73.5
+VEGA_VERSION=v0.73.6
@@ -1,2 +1,2 @@
 CONSOLE_IMAGE_NAME=vegaprotocol/trading:develop
-VEGA_VERSION=v0.73.5
+VEGA_VERSION=v0.73.6
@@ -1,2 +1,2 @@
 CONSOLE_IMAGE_NAME=vegaprotocol/trading:main
-VEGA_VERSION=v0.73.5
+VEGA_VERSION=v0.73.6
@@ -1,4 +1,5 @@
 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
@@ -10,6 +11,8 @@ 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"
    )
@@ -18,12 +21,32 @@ 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
@@ -0,0 +1,116 @@
+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()
@@ -0,0 +1,60 @@
+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());
+  });
+});
@@ -0,0 +1,40 @@
+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]);
+};
@@ -13,10 +13,10 @@ import { type IterableElement } from 'type-fest';
 import {
  AccountEventsDocument,
  AccountsDocument,
-  AccountFieldsFragment,
-  AccountsQuery,
-  AccountEventsSubscription,
-  AccountsQueryVariables,
+  type AccountFieldsFragment,
+  type AccountsQuery,
+  type AccountEventsSubscription,
+  type AccountsQueryVariables,
 } from './__generated__/Accounts';
 import { type Asset } from '@vegaprotocol/assets';

@@ -23,7 +23,7 @@ export const ALLOWED_ACCOUNTS = [

 export const TransferContainer = ({ assetId }: { assetId?: string }) => {
  const t = useT();
-  const { pubKey, pubKeys } = useVegaWallet();
+  const { pubKey, pubKeys, isReadOnly } = useVegaWallet();
  const { params } = useNetworkParams([
    NetworkParams.transfer_fee_factor,
    NetworkParams.transfer_minTransferQuantumMultiple,
@@ -70,6 +70,7 @@ 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}
@@ -73,6 +73,28 @@ 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',
@@ -45,6 +45,7 @@ interface Asset {
 export interface TransferFormProps {
  pubKey: string | null;
  pubKeys: string[] | null;
+  isReadOnly?: boolean;
  accounts: Array<{
    type: AccountType;
    balance: string;
@@ -59,6 +60,7 @@ export interface TransferFormProps {
 export const TransferForm = ({
  pubKey,
  pubKeys,
+  isReadOnly,
  assetId: initialAssetId,
  feeFactor,
  submitTransfer,
@@ -201,27 +203,36 @@ export const TransferForm = ({
        <Controller
          control={control}
          name="asset"
-          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>
-          )}
+          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>
+            )
+          }
        />
        {errors.asset?.message && (
          <TradingInputError forInput="asset">
@@ -249,48 +260,57 @@ export const TransferForm = ({
              },
            },
          }}
-          render={({ field }) => (
-            <TradingSelect
-              id="fromAccount"
-              defaultValue=""
-              {...field}
-              onChange={(e) => {
-                field.onChange(e);
+          render={({ field }) =>
+            accounts.length > 0 ? (
+              <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>
-          )}
+                  // 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>
+            )
+          }
        />
        {errors.fromAccount?.message && (
          <TradingInputError forInput="fromAccount">
@@ -454,7 +474,7 @@ export const TransferForm = ({
          decimals={asset?.decimals}
        />
      )}
-      <TradingButton type="submit" fill={true}>
+      <TradingButton type="submit" fill={true} disabled={isReadOnly}>
        {t('Confirm transfer')}
      </TradingButton>
    </form>
@@ -25,7 +25,7 @@ import {
 import { ApolloError } from '@apollo/client';
 import type { GraphQLErrors } from '@apollo/client/errors';
 import { GraphQLError } from 'graphql';
-import { Subscription, Observable } from 'zen-observable-ts';
+import { type Subscription, type Observable } from 'zen-observable-ts';
 import { waitFor } from '@testing-library/react';

 type Item = {
@@ -1,15 +0,0 @@
-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;
-  },
-});
@@ -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}
      />
@@ -25,7 +25,7 @@ describe('Pagination', () => {
    const mockOnLoad = jest.fn();
    const count = 10;
    render(<Pagination {...props} count={count} onLoad={mockOnLoad} />);
-    expect(screen.getByText(`${count} rows loaded`)).toBeInTheDocument();
+    expect(screen.getByText('10 rows loaded')).toBeInTheDocument();
    await userEvent.click(screen.getByRole('button', { name: 'Load more' }));
    expect(mockOnLoad).toHaveBeenCalled();
  });
@@ -18,19 +18,15 @@ export const Pagination = ({
  let rowMessage = '';

  if (count && !pageInfo?.hasNextPage) {
-    rowMessage = t('paginationAllLoaded', {
-      replace: { count },
-      defaultValue: 'All {{count}} rows loaded',
+    rowMessage = t('paginationAllLoaded', 'all {{count}} rows loaded', {
+      count,
    });
  } else {
-    rowMessage = t('paginationLoaded', {
-      replace: { count },
-      defaultValue: '{{count}} rows loaded',
-    });
+    rowMessage = t('paginationLoaded', '{{count}} rows loaded', { count });
  }

  return (
-    <div className="flex items-center justify-between p-1 border-t border-default">
+    <div className="border-default flex items-center justify-between border-t p-1">
      <div className="text-xs">
        {false}
        {showRetentionMessage &&
@@ -47,7 +43,7 @@ export const Pagination = ({
        ) : null}
      </div>
      {count && hasDisplayedRows === false ? (
-        <div className="absolute text-xs top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2">
+        <div className="absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2 transform text-xs">
          {t('No rows matching selected filters')}
        </div>
      ) : null}
@@ -1,4 +1,18 @@
 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;
@@ -59,9 +59,7 @@ export const TimeInForceSelector = ({
            components={[
              <Tooltip
                description={
-                  <SimpleGrid
-                    grid={compileGridData(t, market, marketData, t)}
-                  />
+                  <SimpleGrid grid={compileGridData(t, market, marketData)} />
                }
              >
                sufficient liquidity
@@ -83,9 +81,7 @@ export const TimeInForceSelector = ({
            components={[
              <Tooltip
                description={
-                  <SimpleGrid
-                    grid={compileGridData(t, market, marketData, t)}
-                  />
+                  <SimpleGrid grid={compileGridData(t, market, marketData)} />
                }
              >
                high price volatility
@@ -32,15 +32,19 @@ export const mapFormValuesToOrderSubmission = (
      ? toNanoSeconds(order.expiresAt)
      : undefined,
  postOnly:
-    order.type === Schema.OrderType.TYPE_MARKET ? false : order.postOnly,
-  reduceOnly:
-    order.type === Schema.OrderType.TYPE_LIMIT &&
-    ![
+    order.type === Schema.OrderType.TYPE_MARKET ||
+    [
      Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
      Schema.OrderTimeInForce.TIME_IN_FORCE_IOC,
    ].includes(order.timeInForce)
      ? false
-      : order.reduceOnly,
+      : order.postOnly,
+  reduceOnly: ![
+    Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
+    Schema.OrderTimeInForce.TIME_IN_FORCE_IOC,
+  ].includes(order.timeInForce)
+    ? false
+    : order.reduceOnly,
  icebergOpts:
    order.type === Schema.OrderType.TYPE_LIMIT &&
    isPersistentOrder(order.timeInForce) &&
@@ -98,4 +98,91 @@ 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);
+    }
+  );
 });
@@ -216,12 +216,10 @@ 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>}
@@ -1,15 +0,0 @@
-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;
-  },
-});
@@ -5,7 +5,10 @@ import {
  type NodeCheckTimeUpdateSubscription,
 } from '../../utils/__generated__/NodeCheck';
 import { Networks } from '../../types';
-import { createMockClient, RequestHandlerResponse } from 'mock-apollo-client';
+import {
+  createMockClient,
+  type RequestHandlerResponse,
+} from 'mock-apollo-client';

 export type MockRequestConfig = {
  hasError?: boolean;
@@ -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 ommitted if you intend to only use a single node,
+ * This can be omitted if you intend to only use a single node,
 * in those cases be sure to set NX_VEGA_URL
 */
 export const useInitializeEnv = () => {
@@ -415,6 +415,12 @@ 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',
@@ -70,10 +70,7 @@ export const useNodeHealth = () => {
      );
      intent = Intent.Danger;
    } else if (blockDiff >= BLOCK_THRESHOLD) {
-      text = t('blocksBehind', {
-        defaultValue: '{{count}} Blocks behind',
-        replace: { count: blockDiff },
-      });
+      text = t('blocksBehind', '{{count}} Blocks behind', { count: blockDiff });
      intent = Intent.Warning;
    } else if (blockUpdateMsLatency > WARNING_LATENCY) {
      text = t(
@@ -5,6 +5,20 @@
 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
@@ -27,6 +27,7 @@ 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;
@@ -81,6 +81,7 @@ 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 = {
@@ -4,14 +4,8 @@ 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,
-  getFeesBreakdown,
-  getTotalFeesDiscounts,
-} from './fills-table';
+import { FeesDiscountBreakdownTooltip, FillsTable } from './fills-table';
 import { generateFill } from './test-helpers';
-import type { TradeFeeFieldsFragment } from './__generated__/Fills';

 const partyId = 'party-id';
 const defaultFill: PartialDeep<Trade> = {
@@ -35,6 +29,7 @@ const defaultFill: PartialDeep<Trade> = {
  },
  createdAt: new Date('2022-02-02T14:00:00').toISOString(),
 };
+
 describe('FillsTable', () => {
  it('correct columns are rendered', async () => {
    // 7005-FILL-001
@@ -65,7 +60,7 @@ describe('FillsTable', () => {
    expect(headers.map((h) => h.textContent?.trim())).toEqual(expectedHeaders);
  });

-  it('formats cells correctly for buyer fill', async () => {
+  it('formats cells correctly for buyer fill for maker', async () => {
    const buyerFill = generateFill({
      ...defaultFill,
      buyer: {
@@ -89,7 +84,7 @@ describe('FillsTable', () => {
      '3.00 BTC',
      'Maker',
      '2.00 BTC',
-      '0.27 BTC',
+      '0.09 BTC',
      getDateTimeFormat().format(new Date(buyerFill.createdAt)),
      '', // action column
    ];
@@ -271,96 +266,48 @@ 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()
-    );
-  });
-});
@@ -28,20 +28,12 @@ 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';

-const TAKER = 'Taker';
-const MAKER = 'Maker';
-
-export type Role = typeof TAKER | typeof MAKER | '-';
-
-export type Props = (AgGridReactProps | AgReactUiProps) & {
+type Props = (AgGridReactProps | AgReactUiProps) & {
  partyId: string;
  onMarketClick?: (marketId: string, metaKey?: boolean) => void;
 };
@@ -262,63 +254,13 @@ const formatFeeDiscount = (partyId: string) => {
  }: VegaValueFormatterParams<Trade, 'market'>) => {
    if (!market || !data) return '-';
    const asset = getAsset(market);
-    const { fees } = getRoleAndFees({ data, partyId });
-    if (!fees) return '-';
-
-    const total = getTotalFeesDiscounts(fees);
-    return addDecimalsFormatNumber(total, asset.decimals);
+    const { fees: roleFees, role } = getRoleAndFees({ data, partyId });
+    if (!roleFees) return '-';
+    const { totalFeeDiscount } = getFeesBreakdown(role, roleFees);
+    return addDecimalsFormatNumber(totalFeeDiscount, 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,
@@ -331,16 +273,23 @@ const FeesBreakdownTooltip = ({

  const asset = getAsset(market);

-  const { role, fees } = getRoleAndFees({ data, partyId }) ?? {};
+  const { role, fees, marketState } = getRoleAndFees({ data, partyId }) ?? {};
  if (!fees) return null;
  const { infrastructureFee, liquidityFee, makerFee, totalFee } =
-    getFeesBreakdown(role, fees);
+    getFeesBreakdown(role, fees, marketState);

  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-sm 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-xs 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>
@@ -354,7 +303,7 @@ const FeesBreakdownTooltip = ({
      {role === TAKER && (
        <p className="mb-1">{t('Fees to be paid by the taker.')}</p>
      )}
-      {role === '-' && (
+      {(role === '-' || marketState === Schema.MarketState.STATE_SUSPENDED) && (
        <p className="mb-1">
          {t(
            'If the market is in monitoring auction, half of the infrastructure and liquidity fees will be paid.'
@@ -395,8 +344,8 @@ const FeesDiscountBreakdownTooltipItem = ({
 }) =>
  value && value !== '0' ? (
    <>
-      <dt className="col-span-1">{label}</dt>
-      <dd className="col-span-1 text-right">
+      <dt className="col-span-2">{label}</dt>
+      <dd className="col-span-2 text-right">
        {addDecimalsFormatNumber(value, asset.decimals)} {asset.symbol}
      </dd>
    </>
@@ -412,15 +361,19 @@ export const FeesDiscountBreakdownTooltip = ({
  }
  const asset = getAsset(data.market);

-  const { fees } = getRoleAndFees({ data, partyId }) ?? {};
-  if (!fees) return null;
-
+  const {
+    fees: roleFees,
+    marketState,
+    role,
+  } = getRoleAndFees({ data, partyId }) ?? {};
+  if (!roleFees) return null;
+  const fees = getFeesBreakdown(role, roleFees, marketState);
  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-2 gap-x-1">
+      <dl className="grid grid-cols-6 gap-x-1 text-xs">
        {(fees.infrastructureFeeReferralDiscount || '0') !== '0' ||
        (fees.infrastructureFeeVolumeDiscount || '0') !== '0' ? (
          <dt className="col-span-2">{t('Infrastructure Fee')}</dt>
@@ -464,42 +417,14 @@ 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,
-  };
-};
@@ -0,0 +1,183 @@
+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());
+  });
+});
@@ -0,0 +1,164 @@
+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'
+  );
+};
@@ -2,6 +2,7 @@
  "A release candidate for the staging environment": "A release candidate for the staging environment",
  "Advanced": "Advanced",
  "Block": "Block",
+  "blocksBehind": "{{count}} Blocks behind",
  "blocksBehind_one": "{{count}} Block behind",
  "blocksBehind_other": "{{count}} Blocks behind",
  "Change node": "Change node",
@@ -32,6 +32,7 @@
  "Insurance pool": "Insurance pool",
  "Internal conditions": "Internal conditions",
  "Invalid data source": "Invalid data source",
+  "involvedInMarkets": "Involved in {{count}} markets",
  "involvedInMarkets_other": "Involved in {{count}} markets",
  "involvedInMarkets_one": "Involved in {{count}} market",
  "Key": "Key",
@@ -53,6 +54,7 @@
  "Maximum fraction of an LP's accrued fees that an LP would lose to liquidity providers that achieved a higher SLA performance than them. This is a market parameter.": "Maximum fraction of an LP's accrued fees that an LP would lose to liquidity providers that achieved a higher SLA performance than them. This is a market parameter.",
  "Maximum value that a proposed fee amount can be, which is submitted as part of the LP commitment transaction. Note that a value of 0.05 = 5%. This is a network parameter.": "Maximum value that a proposed fee amount can be, which is submitted as part of the LP commitment transaction. Note that a value of 0.05 = 5%. This is a network parameter.",
  "Metadata": "Metadata",
+  "moreProofs": "And {{count}} more proofs",
  "moreProofs_one": "And {{count}} more proof",
  "moreProofs_other": "And {{count}} more proofs",
  "Multiplier used to translate an LP's commitment amount to their liquidity obligation. This is a network parameter.": "Multiplier used to translate an LP's commitment amount to their liquidity obligation. This is a network parameter.",
@@ -67,12 +69,14 @@
  "Oracle repository": "Oracle repository",
  "Oracle status for this market is <0>{{status}}</0>. {{description}} <1>Show more</1>": "Oracle status for this market is <0>{{status}}</0>. {{description}} <1>Show more</1>",
  "Oracle status: {{status}}. {{description}}": "Oracle status: {{status}}. {{description}}",
+  "oracleInMarkets": "Oracle in {{count}} markets",
  "oracleInMarkets_one": "Oracle in {{count}} market",
  "oracleInMarkets_other": "Oracle in {{count}} markets",
  "Price monitoring bounds {{index}}": "Price monitoring bounds {{index}}",
  "Probability level for price projection, e.g. value of 0.95 will result in a price range such that over the specified projection horizon, the prices observed in the market should be in that range 95% of the time.": "Probability level for price projection, e.g. value of 0.95 will result in a price range such that over the specified projection horizon, the prices observed in the market should be in that range 95% of the time.",
  "Probability level used in <0>Expected Shortfall</0> calculation when obtaining Risk Factor Long and Risk Factor Short": "Probability level used in <0>Expected Shortfall</0> calculation when obtaining Risk Factor Long and Risk Factor Short",
  "Projection horizon measured as a year fraction used in <0>Expected Shortfall</0> calculation when obtaining Risk Factor Long and Risk Factor Short": "Projection horizon measured as a year fraction used in <0>Expected Shortfall</0> calculation when obtaining Risk Factor Long and Risk Factor Short",
+  "proofsOfOwnership": "{{count}} proofs of ownership",
  "proofsOfOwnership_one": "{{count}} proof of ownership",
  "proofsOfOwnership_other": "{{count}} proofs of ownership",
  "Proposal": "Proposal",
@@ -131,6 +135,7 @@
  "Updated": "Updated",
  "Used to calculate the penalty to liquidity providers when they cannot support their open position with the assets in their margin and general accounts. This is a network parameter.": "Used to calculate the penalty to liquidity providers when they cannot support their open position with the assets in their margin and general accounts. This is a network parameter.",
  "Verified since {{lastVerified}}": "Verified since {{lastVerified}}",
+  "verifyProofs": "Verify {{count}} proofs of ownership",
  "verifyProofs_one": "Verify {{count}} proof of ownership",
  "verifyProofs_other": "Verify {{count}} proofs of ownership",
  "View governance proposal": "View governance proposal",
@@ -1,7 +1,6 @@
 {
  "[This is {{network}} transaction only]": "[This is {{network}} transaction only]",
  "{{proposalChange}} proposal {{proposalState}}": "{{proposalChange}} proposal {{proposalState}}",
-  "<0>{{count}}</0> blocks": "<0>{{count}}</0> blocks",
  "Awaiting network confirmation": "Awaiting network confirmation",
  "blocks": "blocks",
  "Changes have been proposed for this asset.": "Changes have been proposed for this asset.",
@@ -15,6 +14,9 @@
  "Market": "Market",
  "Network upgrade in {{countdown}}": "Network upgrade in {{countdown}}",
  "No proposed markets": "No proposed markets",
+  "numberOfBlocks": "<0>{{count}}</0> blocks",
+  "numberOfBlocks_one": "<0>{{count}}</0> block",
+  "numberOfBlocks_other": "<0>{{count}}</0> blocks",
  "Parent market": "Parent market",
  "Please open your wallet application and confirm or reject the transaction": "Please open your wallet application and confirm or reject the transaction",
  "Please wait for your transaction to be confirmed": "Please wait for your transaction to be confirmed",
@@ -38,8 +38,6 @@
  "Code must be 64 characters in length": "Code must be 64 characters in length",
  "Code must be be valid hex": "Code must be be valid hex",
  "Collateral": "Collateral",
-  "Combined running notional over the {{count}} epochs": "Combined running notional over the {{count}} epochs",
-  "Combined volume (last {{count}} epochs)": "Combined volume (last {{count}} epochs)",
  "Conduct your own due diligence and consult your financial advisor before making any investment decisions.": "Conduct your own due diligence and consult your financial advisor before making any investment decisions.",
  "Confirm in wallet...": "Confirm in wallet...",
  "Connect": "Connect",
@@ -55,6 +53,9 @@
  "Countdown": "Countdown",
  "Create a referral code": "Create a referral code",
  "Current tier": "Current tier",
+  "combinedVolume": "Combined volume (last {{count}} epochs)",
+  "combinedVolume_one": "Combined volume (last {{count}} epoch)",
+  "combinedVolume_other": "Combined volume (last {{count}} epochs)",
  "Dark mode": "Dark mode",
  "Date Joined": "Date Joined",
  "Deposit": "Deposit",
@@ -143,11 +144,15 @@
  "Menu": "Menu",
  "Min. epochs": "Min. epochs",
  "Min. trading volume": "Min. trading volume",
-  "Min. trading volume (last {{count}} epochs)": "Min. trading volume (last {{count}} epochs)",
  "My current volume": "My current volume",
  "My liquidity provision": "My liquidity provision",
  "My trading fees": "My trading fees",
-  "My volume (last {{count}} epochs)": "My volume (last {{count}} epochs)",
+  "minTradingVolume": "Min. trading volume (last {{count}} epochs)",
+  "minTradingVolume_one": "Min. trading volume (last {{count}} epoch)",
+  "minTradingVolume_other": "Min. trading volume (last {{count}} epochs)",
+  "myVolume": "My volume (last {{count}} epochs)",
+  "myVolume_one": "My volume (last {{count}} epoch)",
+  "myVolume_other": "My volume (last {{count}} epochs)",
  "Name": "Name",
  "No closed orders": "No closed orders",
  "No data": "No data",
@@ -183,7 +188,6 @@
  "Orders": "Orders",
  "Page not found": "Page not found",
  "Parent of a market": "Parent of a market",
-  "Past {{count}} epochs": "Past {{count}} epochs",
  "Perpetuals": "Perpetuals",
  "Please choose another market from the <0>market list</0>": "Please choose another market from the <0>market list</0>",
  "Please connect Vega wallet": "Please connect Vega wallet",
@@ -197,17 +201,17 @@
  "Proposed markets": "Proposed markets",
  "Providing liquidity": "Providing liquidity",
  "Purpose built proof of stake blockchain": "Purpose built proof of stake blockchain",
+  "pastEpochs": "Past {{count}} epochs",
+  "pastEpochs_one": "Past {{count}} epoch",
+  "pastEpochs_other": "Past {{count}} epochs",
  "qUSD": "qUSD",
  "qUSD provides a rough USD equivalent of balances across all assets using the value of \"Quantum\" for that asset": "qUSD provides a rough USD equivalent of balances across all assets using the value of \"Quantum\" for that asset",
  "Read the terms": "Read the terms",
  "Ready to trade": "Ready to trade",
  "Ready to trade with real funds? <0>Switch to Mainnet</0>": "Ready to trade with real funds? <0>Switch to Mainnet</0>",
  "Redeem rewards": "Redeem rewards",
-  "referralApplyPreviewMessage": "You are joining the group shown, but will not have access to benefits until you have completed at least {{count}} epoch.",
-  "referralApplyPreviewMessage_plural": "You are joining the group shown, but will not have access to benefits until you have completed at least {{count}} epochs.",
  "Referral benefits": "Referral benefits",
  "Referral discount": "Referral discount",
-  "referral-statistics-commission": "Commission earned in <0>qUSD</0> (last {{count}} epochs)",
  "Referrals": "Referrals",
  "Referrer commission": "Referrer commission",
  "Referrer trading discount": "Referrer trading discount",
@@ -220,6 +224,12 @@
  "Rewards": "Rewards",
  "Rewards history": "Rewards history",
  "Rewards multipliers": "Rewards multipliers",
+  "referralStatisticsCommission": "Commission earned in <0>qUSD</0> (last {{count}} epochs)",
+  "referralStatisticsCommission_one": "Commission earned in <0>qUSD</0> (last {{count}} epoch)",
+  "referralStatisticsCommission_other": "Commission earned in <0>qUSD</0> (last {{count}} epochs)",
+  "runningNotionalOverEpochs": "Combined running notional over the {{count}} epochs",
+  "runningNotionalOverEpochs_one": "Combined running notional over the {{count}} epoch",
+  "runningNotionalOverEpochs_other": "Combined running notional over the {{count}} epochs",
  "SCCR": "SCCR",
  "Search": "Search",
  "See all markets": "See all markets",
@@ -269,7 +279,6 @@
  "This timestamp is user curated metadata and does not drive any on-chain functionality.": "This timestamp is user curated metadata and does not drive any on-chain functionality.",
  "Tier": "Tier",
  "Toast location": "Toast location",
-  "Total commission (last {{count}}} epochs)": "Total commission (last {{count}}} epochs)",
  "Total discount": "Total discount",
  "Total distributed": "Total distributed",
  "Total fee after discount": "Total fee after discount",
@@ -283,6 +292,9 @@
  "Trading on Market {{name}} may stop. There are open proposals to close this market": "Trading on Market {{name}} may stop. There are open proposals to close this market",
  "Trading on Market {{name}} will stop on {{date}}": "Trading on Market {{name}} will stop on {{date}}",
  "Transfer": "Transfer",
+  "totalCommission": "Total commission (last {{count}}} epochs)",
+  "totalCommission_one": "Total commission (last {{count}}} epoch)",
+  "totalCommission_other": "Total commission (last {{count}}} epochs)",
  "Unknown": "Unknown",
  "Unknown settlement date": "Unknown settlement date",
  "Vega Reward pot": "Vega Reward pot",
@@ -299,14 +311,15 @@
  "View successor market": "View successor market",
  "Volume": "Volume",
  "Volume (24h)": "Volume (24h)",
-  "Volume (last {{count}} epochs)": "Volume (last {{count}} epochs)",
  "Volume discount": "Volume discount",
  "Volume to next tier": "Volume to next tier",
+  "volumeLastEpochs": "Volume (last {{count}} epochs)",
+  "volumeLastEpochs_one": "Volume (last {{count}} epoch)",
+  "volumeLastEpochs_other": "Volume (last {{count}} epochs)",
  "Wallet": "Wallet",
  "We're sorry but we don't have an active referral programme currently running. You can propose a new programme <0>here</0>.": "We're sorry but we don't have an active referral programme currently running. You can propose a new programme <0>here</0>.",
  "Welcome to Vega trading!": "Welcome to Vega trading!",
  "Withdraw": "Withdraw",
-  "You are joining the group shown, but will not have access to benefits until you have completed at least {{count}} epochs.": "You are joining the group shown, but will not have access to benefits until you have completed at least {{count}} epochs.",
  "You can opt out any time via settings": "You can opt out any time via settings",
  "You may encounter bugs, loss of functionality or loss of assets.": "You may encounter bugs, loss of functionality or loss of assets.",
  "You must be connected to the Vega wallet.": "You must be connected to the Vega wallet.",
@@ -316,5 +329,8 @@
  "Your code has been rejected": "Your code has been rejected",
  "Your identity is always anonymous on Vega": "Your identity is always anonymous on Vega",
  "Your referral code": "Your referral code",
-  "Your tier": "Your tier"
+  "Your tier": "Your tier",
+  "youAreJoiningTheGroup": "You are joining the group shown, but will not have access to benefits until you have completed at least {{count}} epochs.",
+  "youAreJoiningTheGroup_one": "You are joining the group shown, but will not have access to benefits until you have completed at least {{count}} epoch.",
+  "youAreJoiningTheGroup_other": "You are joining the group shown, but will not have access to benefits until you have completed at least {{count}} epochs."
 }
@@ -6,7 +6,7 @@
  "Approved": "Approved",
  "Await Ethereum transaction": "Await Ethereum transaction",
  "Awaiting confirmation": "Awaiting confirmation",
-  "Awaiting confirmations {{confirmations}}/{[requiredConfirmations}}": "Awaiting confirmations {{confirmations}}/{[requiredConfirmations}}",
+  "Awaiting confirmations {{confirmations}}/{{requiredConfirmations}}": "Awaiting confirmations {{confirmations}}/{{requiredConfirmations}}",
  "Awaiting Ethereum transaction {{confirmations}}/{{requiredConfirmations}} confirmations...": "Awaiting Ethereum transaction {{confirmations}}/{{requiredConfirmations}} confirmations...",
  "Batch market instruction": "Batch market instruction",
  "Cancel all orders": "Cancel all orders",
@@ -5,7 +5,9 @@
  "Available to withdraw in {{availableTimestamp}}": "Available to withdraw in {{availableTimestamp}}",
  "Balance available": "Balance available",
  "Complete the withdrawal to release your funds": "Complete the withdrawal to release your funds",
-  "Complete these {{count}} withdrawals to release your funds": "Complete these {{count}} withdrawals to release your funds",
+  "completeWithdrawals": "Complete these {{count}} withdrawals to release your funds",
+  "completeWithdrawals_one": "Complete these {{count}} withdrawal to release your funds",
+  "completeWithdrawals_other": "Complete these {{count}} withdrawals to release your funds",
  "Complete withdrawal": "Complete withdrawal",
  "Completed": "Completed",
  "Connect Ethereum wallet to complete": "Connect Ethereum wallet to complete",
@@ -107,9 +107,6 @@ export const LiquidityTable = ({

    const feesAccruedTooltip = ({ value, data }: ITooltipParams) => {
      if (!value) return '-';
-      const newValue = new BigNumber(value)
-        .times(Number(stakeToCcyVolume) || 1)
-        .toString();
      let lessThanFull = false,
        lessThanMinimum = false;
      if (data.sla) {
@@ -154,7 +151,7 @@ export const LiquidityTable = ({
          }
        );
      }
-      return addDecimalsFormatNumber(newValue, assetDecimalPlaces ?? 0);
+      return addDecimalsFormatNumber(value, assetDecimalPlaces ?? 0);
    };

    const stakeToCcyVolumeQuantumFormatter = ({
@@ -416,14 +413,9 @@ export const LiquidityTable = ({
              },
              'text-red-500': ({ data }: { data: LiquidityProvisionData }) => {
                if (!data.sla) return false;
-                return (
-                  new BigNumber(
-                    data.sla.currentEpochFractionOfTimeOnBook
-                  ).isLessThan(data.commitmentMinTimeFraction) &&
-                  new BigNumber(
-                    data.sla.currentEpochFractionOfTimeOnBook
-                  ).isGreaterThan(0)
-                );
+                return new BigNumber(
+                  data.sla.currentEpochFractionOfTimeOnBook
+                ).isLessThan(data.commitmentMinTimeFraction);
              },
            },
          },
@@ -7,7 +7,11 @@ import {
 } from '@vegaprotocol/data-provider';
 import { type Market } from '@vegaprotocol/markets';
 import { marketsMapProvider } from '@vegaprotocol/markets';
-import { Cursor, type PageInfo, type Edge } from '@vegaprotocol/data-provider';
+import {
+  type Cursor,
+  type PageInfo,
+  type Edge,
+} from '@vegaprotocol/data-provider';
 import { OrderStatus } from '@vegaprotocol/types';
 import {
  OrdersDocument,
@@ -1,6 +1,6 @@
 import { memo, forwardRef, useMemo, type ForwardedRef } from 'react';
 import {
-  MAXGOINT64,
+  HALFMAXGOINT64,
  addDecimalsFormatNumber,
  getDateTimeFormat,
  isNumeric,
@@ -151,7 +151,7 @@ export const OrderListTable = memo<
                : '';

              if (
-                data.size === MAXGOINT64 &&
+                data.size >= HALFMAXGOINT64 &&
                data.timeInForce ===
                  Schema.OrderTimeInForce.TIME_IN_FORCE_IOC &&
                data.reduceOnly
@@ -3,7 +3,7 @@ import { PositionsManager } from './positions-manager';
 import { positionsMarketsProvider } from './positions-data-providers';
 import { singleRow } from './positions.mock';
 import { MockedProvider } from '@apollo/client/testing';
-import { MAXGOINT64 } from '@vegaprotocol/utils';
+import { HALFMAXGOINT64 } from '@vegaprotocol/utils';

 const mockCreate = jest.fn();

@@ -31,9 +31,7 @@ jest.mock('@vegaprotocol/data-provider', () => ({
 }));

 describe('PositionsManager', () => {
-  // TODO: Close position temporarily disabled in https://github.com/vegaprotocol/frontend-monorepo/pull/5350
-  // eslint-disable-next-line jest/no-disabled-tests
-  it.skip('should close position with max uint64', async () => {
+  it('should close position with half of max uint64', async () => {
    render(<PositionsManager partyIds={['partyId']} isReadOnly={false} />, {
      wrapper: MockedProvider,
    });
@@ -43,6 +41,6 @@ describe('PositionsManager', () => {

    expect(
      mockCreate.mock.lastCall[0].batchMarketInstructions.submissions[0].size
-    ).toEqual(MAXGOINT64);
+    ).toEqual(HALFMAXGOINT64);
  });
 });
@@ -7,13 +7,11 @@ import {
 } from './positions-data-providers';
 import type { useDataGridEvents } from '@vegaprotocol/datagrid';
 import { useT } from '../use-t';
-
-// TODO: Close position temporarily disabled in https://github.com/vegaprotocol/frontend-monorepo/pull/5350
-//
-// import { useCallback } from 'react';
-// import * as Schema from '@vegaprotocol/types';
-// import { useVegaTransactionStore } from '@vegaprotocol/web3';
-// import { MAXGOINT64 } from '@vegaprotocol/utils';
+import { useCallback } from 'react';
+import * as Schema from '@vegaprotocol/types';
+import { useVegaTransactionStore } from '@vegaprotocol/web3';
+import { HALFMAXGOINT64 } from '@vegaprotocol/utils';
+import { FLAGS } from '@vegaprotocol/environment';

 interface PositionsManagerProps {
  partyIds: string[];
@@ -32,37 +30,35 @@ export const PositionsManager = ({
 }: PositionsManagerProps) => {
  const t = useT();
  const { pubKeys, pubKey } = useVegaWallet();
+  const create = useVegaTransactionStore((store) => store.create);
+  const disableClosePositionsButton = FLAGS.DISABLE_CLOSE_POSITION;

-  // TODO: Close position temporarily disabled in https://github.com/vegaprotocol/frontend-monorepo/pull/5350
-  //
-  // const create = useVegaTransactionStore((store) => store.create);
-  //
-  // const onClose = useCallback(
-  //   ({ marketId, openVolume }: { marketId: string; openVolume: string }) =>
-  //     create({
-  //       batchMarketInstructions: {
-  //         cancellations: [
-  //           {
-  //             marketId,
-  //             orderId: '', // omit order id to cancel all active orders
-  //           },
-  //         ],
-  //         submissions: [
-  //           {
-  //             marketId: marketId,
-  //             type: Schema.OrderType.TYPE_MARKET as const,
-  //             timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_IOC as const,
-  //             side: openVolume.startsWith('-')
-  //               ? Schema.Side.SIDE_BUY
-  //               : Schema.Side.SIDE_SELL,
-  //             size: MAXGOINT64, // improvement for avoiding leftovers filled in the meantime when close request has been sent
-  //             reduceOnly: true,
-  //           },
-  //         ],
-  //       },
-  //     }),
-  //   [create]
-  // );
+  const onClose = useCallback(
+    ({ marketId, openVolume }: { marketId: string; openVolume: string }) =>
+      create({
+        batchMarketInstructions: {
+          cancellations: [
+            {
+              marketId,
+              orderId: '', // omit order id to cancel all active orders
+            },
+          ],
+          submissions: [
+            {
+              marketId: marketId,
+              type: Schema.OrderType.TYPE_MARKET as const,
+              timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_IOC as const,
+              side: openVolume.startsWith('-')
+                ? Schema.Side.SIDE_BUY
+                : Schema.Side.SIDE_SELL,
+              size: HALFMAXGOINT64, // improvement for avoiding leftovers filled in the meantime when close request has been sent
+              reduceOnly: true,
+            },
+          ],
+        },
+      }),
+    [create]
+  );

  const { data: marketIds } = useDataProvider({
    dataProvider: positionsMarketsProvider,
@@ -81,8 +77,7 @@ export const PositionsManager = ({
      pubKeys={pubKeys}
      rowData={data}
      onMarketClick={onMarketClick}
-      // TODO: temporarily disable close position
-      // onClose={onClose}
+      onClose={disableClosePositionsButton ? undefined : onClose}
      isReadOnly={isReadOnly}
      multipleKeys={partyIds.length > 1}
      overlayNoRowsTemplate={error ? error.message : t('No positions')}
@@ -220,10 +220,7 @@ export const PositionsTable = ({
                      <p className="mb-2">{secondaryTooltip}</p>
                      <p className="mb-2">
                        {t('Status: {{status}}', {
-                          nsSeparator: '*',
-                          replace: {
-                            status: PositionStatusMapping[args.data.status],
-                          },
+                          status: PositionStatusMapping[args.data.status],
                        })}
                      </p>
                      {POSITION_RESOLUTION_LINK && (
@@ -390,18 +387,14 @@ export const PositionsTable = ({
                    <>
                      <p className="mb-2">
                        {t('Realised PNL: {{value}}', {
-                          nsSeparator: '*',
-                          replace: { value: args.value },
+                          value: args.value,
                        })}
                      </p>
                      <p className="mb-2">
                        {t(
                          'Lifetime loss socialisation deductions: {{losses}}',
                          {
-                            nsSeparator: '*',
-                            replace: {
-                              losses: lossesFormatted,
-                            },
+                            losses: lossesFormatted,
                          }
                        )}
                      </p>
@@ -30,7 +30,7 @@ export const MarketProposalNotification = ({
      </div>
    );
    return (
-      <div className="border-default min-w-min whitespace-nowrap border-l pb-1 pl-1 pr-1">
+      <div className="border-default min-w-min border-l pb-1 pl-1 pr-1">
        <Notification
          intent={Intent.Warning}
          message={message}
@@ -48,6 +48,7 @@ export const ProtocolUpgradeCountdown = ({
    case ProtocolUpgradeCountdownMode.IN_BLOCKS:
      countdown = (
        <Trans
+          i18nKey="numberOfBlocks"
          defaults="<0>{{count}}</0> blocks"
          components={[<span className={emphasis}>count</span>]}
          values={{
@@ -43,6 +43,7 @@ export const ProtocolUpgradeProposalNotification = ({
    case ProtocolUpgradeCountdownMode.IN_BLOCKS:
      countdown = (
        <Trans
+          i18nKey="numberOfBlocks"
          defaults="<0>{{count}}</0> blocks"
          components={[<span className="text-vega-orange-500">count</span>]}
          values={{
@@ -93,7 +93,7 @@ export const Notification = ({
      </div>
      <div
        className={classNames(
-          'flex flex-col items-start overflow-hidden gap-0 mt-1',
+          'flex flex-col items-start overflow-hidden gap-0',
          'text-vega-clight-50 dark:text-vega-cdark-50',
          'font-alpha',
          { 'text-sm': size === 'small', 'text-base': size === 'medium' }
@@ -1 +1,5 @@
 export const MAXGOINT64 = '9223372036854775807';
+// The fix for the close position functionality needs MaxInt64/2 for the size
+// Issue: https://github.com/vegaprotocol/vega/issues/10177
+// Core PR: https://github.com/vegaprotocol/vega/pull/10178
+export const HALFMAXGOINT64 = '4611686018427387903';
@@ -110,8 +110,7 @@ export const TransactionContent = ({
    return (
      <p className="break-all">
        {t('Error: {{errorMessage}}', {
-          nsSeparator: '*',
-          replace: { errorMessage },
+          errorMessage,
        })}
      </p>
    );
@@ -66,8 +66,11 @@ const EthTransactionDetails = ({ tx }: { tx: EthStoredTxState }) => {
          <>
            <p className="mt-[2px]">
              {t(
-                'Awaiting confirmations {{confirmations}}/{[requiredConfirmations}}',
-                tx
+                'Awaiting confirmations {{confirmations}}/{{requiredConfirmations}}',
+                {
+                  confirmations: tx.confirmations,
+                  requiredConfirmations: tx.requiredConfirmations,
+                }
              )}
            </p>
            <ProgressBar
@@ -51,10 +51,7 @@ export const useEthWithdrawApprovalsManager = () => {
      update(transaction.id, {
        status: ApprovalStatus.Error,
        message: t(`Invalid asset source: {{source}}`, {
-          nsSeparator: '*',
-          replace: {
-            source: withdrawal.asset.source.__typename,
-          },
+          source: withdrawal.asset.source.__typename,
        }),
        failureReason: WithdrawalFailure.InvalidAsset,
      });
@@ -21,6 +21,7 @@ import type {
 } from './__generated__/Orders';
 import type { VegaStoredTxState } from './use-vega-transaction-store';
 import { VegaTxStatus } from './types';
+import { type TFunction } from 'i18next';

 jest.mock('@vegaprotocol/assets', () => {
  const A1 = {
@@ -418,7 +419,7 @@ describe('getVegaTransactionContentIntent', () => {
  });
 });
 describe('getOrderToastTitle', () => {
-  const t = (v: string) => v;
+  const t = ((v: string) => v) as TFunction<'web3', undefined>;
  it('should return the correct title', () => {
    expect(getOrderToastTitle(Types.OrderStatus.STATUS_ACTIVE, t)).toBe(
      'Order submitted'
@@ -495,7 +496,7 @@ describe('getRejectionReason', () => {
          marketId: '',
          remaining: '',
        },
-        (v) => v
+        ((v) => v) as TFunction<'web3', undefined>
      )
    ).toBe('Insufficient asset balance');
  });
@@ -515,7 +516,7 @@ describe('getRejectionReason', () => {
          marketId: '',
          remaining: '',
        },
-        (v) => v
+        ((v) => v) as TFunction<'web3', undefined>
      )
    ).toBe('Your {{timeInForce}} order was not filled and it has been stopped');
  });
@@ -41,7 +41,7 @@ import {
  toBigNum,
  truncateByChars,
  useFormatTrigger,
-  MAXGOINT64,
+  HALFMAXGOINT64,
 } from '@vegaprotocol/utils';
 import { useAssetsMapProvider } from '@vegaprotocol/assets';
 import { useEthWithdrawApprovalsStore } from './use-ethereum-withdraw-approvals-store';
@@ -779,16 +779,10 @@ const VegaTxCompleteToastsContent = ({ tx }: VegaTxToastContentProps) => {
          <p>
            {tx.order.status === Schema.OrderStatus.STATUS_STOPPED
              ? t('Your order has been stopped because: {{rejectionReason}}', {
-                  nsSeparator: '*',
-                  replace: {
-                    rejectionReason,
-                  },
+                  rejectionReason,
                })
              : t('Your order has been rejected because: {{rejectionReason}}', {
-                  nsSeparator: '*',
-                  replace: {
-                    rejectionReason,
-                  },
+                  rejectionReason,
                })}
          </p>
        ) : (
@@ -1020,7 +1014,7 @@ export const getVegaTransactionContentIntent = (tx: VegaStoredTxState) => {
    tx.order &&
    tx.order.status === Schema.OrderStatus.STATUS_STOPPED &&
    tx.order.timeInForce === Schema.OrderTimeInForce.TIME_IN_FORCE_IOC &&
-    tx.order.size === MAXGOINT64 &&
+    tx.order.size >= HALFMAXGOINT64 &&
    // isClosePositionTransaction(tx) &&
    Intent.Success;

@@ -14,7 +14,7 @@ import {
 } from './__generated__/Erc20Approval';
 import {
  PendingWithdrawalFragmentDoc,
-  PendingWithdrawalFragment,
+  type PendingWithdrawalFragment,
 } from './__generated__/Withdrawal';

 export const useCompleteWithdraw = () => {
@@ -67,8 +67,8 @@
    "graphql": "^15.7.2",
    "graphql-request": "^5.0.0",
    "graphql-ws": "^5.6.3",
-    "i18next": "^20.3.5",
-    "i18next-browser-languagedetector": "^6.1.2",
+    "i18next": "23.7.6",
+    "i18next-browser-languagedetector": "7.2.0",
    "i18next-http-backend": "^2.3.1",
    "i18next-locize-backend": "^6.4.1",
    "immer": "^9.0.12",
@@ -82,7 +82,7 @@
    "react-copy-to-clipboard": "5.1.0",
    "react-dom": "18.2.0",
    "react-hook-form": "^7.27.0",
-    "react-i18next": "^11.11.4",
+    "react-i18next": "13.5.0",
    "react-intersection-observer": "^9.2.2",
    "react-markdown": "^8.0.6",
    "react-router-dom": "6.11.2",
@@ -1460,13 +1460,20 @@
  resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310"
  integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==

-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.14.5", "@babel/runtime@^7.17.2", "@babel/runtime@^7.17.8", "@babel/runtime@^7.19.0", "@babel/runtime@^7.20.7", "@babel/runtime@^7.21.0", "@babel/runtime@^7.22.6", "@babel/runtime@^7.23.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.17.2", "@babel/runtime@^7.17.8", "@babel/runtime@^7.20.7", "@babel/runtime@^7.21.0", "@babel/runtime@^7.22.6", "@babel/runtime@^7.23.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
  version "7.23.2"
  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.2.tgz#062b0ac103261d68a966c4c7baf2ae3e62ec3885"
  integrity sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==
  dependencies:
    regenerator-runtime "^0.14.0"

+"@babel/runtime@^7.22.5":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.4.tgz#36fa1d2b36db873d25ec631dcc4923fdc1cf2e2e"
+  integrity sha512-2Yv65nlWnWlSpe3fXEyX5i7fx5kIKo4Qbcj+hMO0odwaneFjfXw5fdum+4yL20O0QiaHpia0cYQ9xpNMqrBwHg==
+  dependencies:
+    regenerator-runtime "^0.14.0"
+
 "@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.22.15", "@babel/template@^7.3.3":
  version "7.22.15"
  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38"
@@ -14193,17 +14200,17 @@ husky@^7.0.4:
  resolved "https://registry.yarnpkg.com/husky/-/husky-7.0.4.tgz#242048245dc49c8fb1bf0cc7cfb98dd722531535"
  integrity sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ==

-i18next-browser-languagedetector@^6.1.2:
-  version "6.1.8"
-  resolved "https://registry.yarnpkg.com/i18next-browser-languagedetector/-/i18next-browser-languagedetector-6.1.8.tgz#8e9c61b32a4dfe9b959b38bc9d2a8b95f799b27c"
-  integrity sha512-Svm+MduCElO0Meqpj1kJAriTC6OhI41VhlT/A0UPjGoPZBhAHIaGE5EfsHlTpgdH09UVX7rcc72pSDDBeKSQQA==
+i18next-browser-languagedetector@7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/i18next-browser-languagedetector/-/i18next-browser-languagedetector-7.2.0.tgz#de0321cba6881be37d82e20e4d6f05aa75f6e37f"
+  integrity sha512-U00DbDtFIYD3wkWsr2aVGfXGAj2TgnELzOX9qv8bT0aJtvPV9CRO77h+vgmHFBMe7LAxdwvT/7VkCWGya6L3tA==
  dependencies:
-    "@babel/runtime" "^7.19.0"
+    "@babel/runtime" "^7.23.2"

 i18next-http-backend@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/i18next-http-backend/-/i18next-http-backend-2.3.1.tgz#9ea06cd96772527f5bf171f4948af5f34be5fe05"
-  integrity sha512-jnagFs5cnq4ryb+g92Hex4tB5kj3tWmiRWx8gHMCcE/PEgV1fjH5rC7xyJmPSgyb9r2xgcP8rvZxPKgsmvMqTw==
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/i18next-http-backend/-/i18next-http-backend-2.4.2.tgz#bd53cacaed671e9f38bdcfd46ac9d1763a898186"
+  integrity sha512-wKrgGcaFQ4EPjfzBTjzMU0rbFTYpa0S5gv9N/d8WBmWS64+IgJb7cHddMvV+tUkse7vUfco3eVs2lB+nJhPo3w==
  dependencies:
    cross-fetch "4.0.0"

@@ -14214,12 +14221,12 @@ i18next-locize-backend@^6.4.1:
  dependencies:
    cross-fetch "4.0.0"

-i18next@^20.3.5:
-  version "20.6.1"
-  resolved "https://registry.yarnpkg.com/i18next/-/i18next-20.6.1.tgz#535e5f6e5baeb685c7d25df70db63bf3cc0aa345"
-  integrity sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==
+i18next@23.7.6:
+  version "23.7.6"
+  resolved "https://registry.yarnpkg.com/i18next/-/i18next-23.7.6.tgz#7328e76c899052d5d33d930164612dd21e575f74"
+  integrity sha512-O66BhXBw0fH4bEJMA0/klQKPEbcwAp5wjXEL803pdAynNbg2f4qhLIYlNHJyE7icrL6XmSZKPYaaXwy11kJ6YQ==
  dependencies:
-    "@babel/runtime" "^7.12.0"
+    "@babel/runtime" "^7.23.2"

 iconv-lite@0.4.24, iconv-lite@^0.4.24:
  version "0.4.24"
@@ -19035,12 +19042,12 @@ react-hook-form@^7.27.0:
  resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.48.2.tgz#01150354d2be61412ff56a030b62a119283b9935"
  integrity sha512-H0T2InFQb1hX7qKtDIZmvpU1Xfn/bdahWBN1fH19gSe4bBEqTfmlr7H3XWTaVtiK4/tpPaI1F3355GPMZYge+A==

-react-i18next@^11.11.4:
-  version "11.18.6"
-  resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.18.6.tgz#e159c2960c718c1314f1e8fcaa282d1c8b167887"
-  integrity sha512-yHb2F9BiT0lqoQDt8loZ5gWP331GwctHz9tYQ8A2EIEUu+CcEdjBLQWli1USG3RdWQt3W+jqQLg/d4rrQR96LA==
+react-i18next@13.5.0:
+  version "13.5.0"
+  resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-13.5.0.tgz#44198f747628267a115c565f0c736a50a76b1ab0"
+  integrity sha512-CFJ5NDGJ2MUyBohEHxljOq/39NQ972rh1ajnadG9BjTk+UXbHLq4z5DKEbEQBDoIhUmmbuS/fIMJKo6VOax1HA==
  dependencies:
-    "@babel/runtime" "^7.14.5"
+    "@babel/runtime" "^7.22.5"
    html-parse-stringify "^3.0.1"

 react-inspector@^6.0.0:
Author	SHA1	Message	Date
Madalina Raicu	4571f60003	fix: live time fraction zero redundant check	2023-12-02 11:26:09 +00:00
Art	7100b0e9fc	chore(accounts): no assets avaiable in transfer form (#5358 )	2023-12-01 17:05:22 +00:00
m.ray Bartłomiej Głownia asiaznik	614a83b7d6	chore(trading): merge main back in develop (fees discounts, discount stats from prev epoch) (#5415 ) Co-authored-by: Bartłomiej Głownia <bglownia@gmail.com> Co-authored-by: asiaznik <artur@vegaprotocol.io>	2023-12-01 17:03:41 +00:00
m.ray	3dc77b0eff	chore(trading): add close position button back to console (#5407 )	2023-12-01 16:38:32 +00:00
Art	127e784ceb	chore(trading): don't redirect to inactive markets (#5359 )	2023-12-01 14:42:26 +01:00
EddandMadalina Raicu	e06f4818fc	feat(explorer): add signature viewer (#5264 ) Co-authored-by: Madalina Raicu <madalina@raygroup.uk>	2023-11-30 11:54:18 +00:00
Bartłomiej Głownia	8182da3b31	feat(deal-ticket): fix postOnly mapping in mapFormValuesToOrderSubmission (#5375 )	2023-11-30 11:25:25 +01:00
Ben	c8c56307bb	chore(trading): update vega version (#5396 )	2023-11-30 09:52:05 +00:00
Ben	a8cd7f157f	chore(trading): migrate cypress tests to python (#5367 )	2023-11-30 09:42:57 +00:00
Bartłomiej Głownia	4f18caa486	feat(trading): upgrade i18n, fix plurals (#5331 )	2023-11-30 07:31:44 +00:00
Matthew Russell	5c7c626bbc	Merge pull request #5393 from vegaprotocol/chore/sync-main chore(trading, datagrid, liquidity, proposals, ui-toolkit): sync main	2023-11-29 18:08:50 -08:00
Matthew Russell	e4c4c20631	fix: duplicate props in ag-grid-themed	2023-11-29 14:09:08 -08:00
Matthew Russell	0697302d07	Merge branch 'main' into chore/sync-main	2023-11-29 14:06:45 -08:00
ArtandMadalina Raicu	2d926c0ce0	fix(governance): sensible vote numbers (#5384 ) Co-authored-by: Madalina Raicu <madalina@raygroup.uk>	2023-11-29 10:38:41 -08:00
Art	f57d6a7c7b	fix(trading): missing volume discount program issue, inverted tiers (#5378 )	2023-11-29 17:23:14 +00:00
m.ray	15f905046f	fix(trading): fees accrued tooltip (#5387 )	2023-11-29 17:17:44 +00:00
Bartłomiej Głownia	4f7918f64e	feat(trading): remove proposal warning from market header (#5385 )	2023-11-29 17:05:53 +00:00
Bartłomiej Głownia	52ab0562b0	feat(trading): refactor ledger export form validation (#5379 )	2023-11-29 15:27:00 +00:00
m.ray	4e2b0d1b1d	fix(trading): fix ag-grid transparent filters (#5377 )	2023-11-29 15:24:37 +00:00
m.ray	eac26c1966	fix(trading): empty connect wallet dialog (#5356 )	2023-11-28 14:43:31 +00:00