chore: formatting

.github/workflows/console-test-run.yml

@@ -10,7 +10,7 @@ on:
     inputs:
       console-test-branch:
         type: choice
-        description: 'main: v0.73.5, develop: v0.73.5'
+        description: 'main: v0.72.14, develop: v0.73.4'
         options:
           - main
           - develop
@@ -215,7 +215,7 @@ jobs:
         if: always()
         with:
           name: playwright-trace
-          path: apps/trading/e2e/traces/
+          path: ./traces/
           retention-days: 15
       #----------------------------------------------
       #  -----  upload logs  -----

apps/explorer/src/app/app.tsx

@@ -1,4 +1,3 @@
-import '../i18n';
 import {
   NetworkLoader,
   NodeFailure,
@@ -29,24 +28,20 @@ function App() {
   );
   return (
     <TendermintWebsocketProvider>
-      <Suspense fallback={splashLoading}>
-        <NetworkLoader cache={DEFAULT_CACHE_CONFIG}>
-          <NodeGuard
-            skeleton={<div>{t('Loading')}</div>}
-            failure={
-              <NodeFailure title={t(`Node: ${VEGA_URL} is unsuitable`)} />
-            }
-          >
-            <Suspense fallback={splashLoading}>
-              <RouterProvider router={router} fallbackElement={splashLoading} />
-            </Suspense>
-          </NodeGuard>
-          <NodeSwitcherDialog
-            open={nodeSwitcherOpen}
-            setOpen={setNodeSwitcherOpen}
-          />
-        </NetworkLoader>
-      </Suspense>
+      <NetworkLoader cache={DEFAULT_CACHE_CONFIG}>
+        <NodeGuard
+          skeleton={<div>{t('Loading')}</div>}
+          failure={<NodeFailure title={t(`Node: ${VEGA_URL} is unsuitable`)} />}
+        >
+          <Suspense fallback={splashLoading}>
+            <RouterProvider router={router} fallbackElement={splashLoading} />
+          </Suspense>
+        </NodeGuard>
+        <NodeSwitcherDialog
+          open={nodeSwitcherOpen}
+          setOpen={setNodeSwitcherOpen}
+        />
+      </NetworkLoader>
     </TendermintWebsocketProvider>
   );
 }

apps/explorer/src/app/setup-tests.ts

@@ -3,9 +3,6 @@
 // expect(element).toHaveTextContent(/react/i)
 // learn more: https://github.com/testing-library/jest-dom
 import '@testing-library/jest-dom';
-import { locales } from '@vegaprotocol/i18n';
-import i18n from 'i18next';
-import { initReactI18next } from 'react-i18next';
 
 Object.defineProperty(window, 'ResizeObserver', {
   writable: false,
@@ -16,14 +13,3 @@ Object.defineProperty(window, 'ResizeObserver', {
     disconnect: jest.fn(),
   })),
 });
-
-// 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',
-  nsSeparator: false,
-  ns: ['explorer'],
-  defaultNS: 'explorer',
-});

apps/explorer/src/assets/locales

@@ -1 +0,0 @@
-../../../../libs/i18n/src/locales

apps/explorer/src/i18n/index.ts

@@ -1,45 +0,0 @@
-import type { Module } from 'i18next';
-import i18n from 'i18next';
-import HttpBackend from 'i18next-http-backend';
-import LocizeBackend from 'i18next-locize-backend';
-import LanguageDetector from 'i18next-browser-languagedetector';
-import { initReactI18next } from 'react-i18next';
-
-const isInDev = process.env.NODE_ENV === 'development';
-const useLocize = isInDev && !!process.env.NX_USE_LOCIZE;
-
-const backend = useLocize
-  ? {
-      projectId: '96ac1231-4bdd-455a-b9d7-f5322a2e7430',
-      apiKey: process.env.NX_LOCIZE_API_KEY,
-      referenceLng: 'en',
-    }
-  : {
-      loadPath: '/assets/locales/{{lng}}/{{ns}}.json',
-    };
-
-const Backend: Module = useLocize ? LocizeBackend : HttpBackend;
-
-i18n
-  .use(Backend)
-  .use(LanguageDetector)
-  .use(initReactI18next)
-  .init({
-    lng: 'en',
-    fallbackLng: 'en',
-    supportedLngs: ['en'],
-    load: 'languageOnly',
-    debug: isInDev,
-    // have a common namespace used around the full app
-    ns: ['explorer'],
-    defaultNS: 'explorer',
-    keySeparator: false, // we use content as keys
-    nsSeparator: false,
-    backend,
-    saveMissing: useLocize && !!process.env.NX_LOCIZE_API_KEY,
-    interpolation: {
-      escapeValue: false,
-    },
-  });
-
-export default i18n;

apps/governance/src/routes/proposals/components/propose/proposal-form-transaction-dialog.tsx

@@ -1,7 +1,7 @@
 import {
   getProposalDialogIcon,
   getProposalDialogIntent,
-  useGetProposalDialogTitle,
+  getProposalDialogTitle,
 } from '@vegaprotocol/proposals';
 import type { ProposalEventFieldsFragment } from '@vegaprotocol/proposals';
 import type { DialogProps } from '@vegaprotocol/proposals';
@@ -15,7 +15,6 @@ export const ProposalFormTransactionDialog = ({
   finalizedProposal,
   TransactionDialog,
 }: ProposalFormTransactionDialogProps) => {
-  const title = useGetProposalDialogTitle(finalizedProposal?.state);
   // Render a custom complete UI if the proposal was rejected otherwise
   // pass undefined so that the default vega transaction dialog UI gets used
   const completeContent = finalizedProposal?.rejectionReason ? (
@@ -25,7 +24,7 @@ export const ProposalFormTransactionDialog = ({
   return (
     <div data-testid="proposal-transaction-dialog">
       <TransactionDialog
-        title={title}
+        title={getProposalDialogTitle(finalizedProposal?.state)}
         intent={getProposalDialogIntent(finalizedProposal?.state)}
         icon={getProposalDialogIcon(finalizedProposal?.state)}
         content={{

apps/governance/src/routes/proposals/components/vote-breakdown/vote-breakdown.spec.tsx

@@ -8,7 +8,7 @@ import {
   networkParamsQueryMock,
   nextWeek,
 } from '../../test-helpers/mocks';
-import { CompactVotes, VoteBreakdown } from './vote-breakdown';
+import { VoteBreakdown } from './vote-breakdown';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 import type { MockedResponse } from '@apollo/client/testing';
 import {
@@ -346,22 +346,3 @@ describe('VoteBreakdown', () => {
     expect(style.width).toBe(`${expectedProgress}%`);
   });
 });
-
-describe('CompactVotes', () => {
-  it.each([
-    [0, '0'],
-    [1, '1'],
-    [12, '12'],
-    [123, '123'],
-    [1234, '1.2K'],
-    [12345, '12.3K'],
-    [123456, '123.5K'],
-    [1234567, '1.2M'],
-    [12345678, '12.3M'],
-    [123456789, '123.5M'],
-    [1234567890, '1.2B'],
-  ])('compacts %s to %s', (input, output) => {
-    const { getByTestId } = render(<CompactVotes number={BigNumber(input)} />);
-    expect(getByTestId('compact-number').textContent).toBe(output);
-  });
-});

apps/governance/src/routes/proposals/components/vote-breakdown/vote-breakdown.tsx

@@ -3,21 +3,11 @@ import BigNumber from 'bignumber.js';
 import { useTranslation } from 'react-i18next';
 import { useVoteInformation } from '../../hooks';
 import { Icon, Tooltip } from '@vegaprotocol/ui-toolkit';
-import { formatNumber } from '@vegaprotocol/utils';
+import { formatNumber, toBigNum } from '@vegaprotocol/utils';
 import { ProposalState } from '@vegaprotocol/types';
 import type { ReactNode } from 'react';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
-import { CompactNumber } from '@vegaprotocol/react-helpers';
-
-export const CompactVotes = ({ number }: { number: BigNumber }) => (
-  <CompactNumber
-    number={number}
-    decimals={number.isGreaterThan(1000) ? 1 : 0}
-    compactAbove={1000}
-    compactDisplay="short"
-  />
-);
 
 interface VoteBreakdownProps {
   proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
@@ -208,7 +198,10 @@ export const VoteBreakdown = ({ proposal }: VoteBreakdownProps) => {
                     )}
                   >
                     <button>
-                      <CompactVotes number={yesEquityLikeShareWeight} />
+                      {yesEquityLikeShareWeight
+                        .dividedBy(toBigNum(10 ** 6, 0))
+                        .toFixed(1)}
+                      M
                     </button>
                   </Tooltip>
                   <span>
@@ -233,7 +226,10 @@ export const VoteBreakdown = ({ proposal }: VoteBreakdownProps) => {
                     )}
                   >
                     <button>
-                      <CompactVotes number={noEquityLikeShareWeight} />
+                      {noEquityLikeShareWeight
+                        .dividedBy(toBigNum(10 ** 6, 0))
+                        .toFixed(1)}
+                      M
                     </button>
                   </Tooltip>
                   <span>
@@ -283,7 +279,10 @@ export const VoteBreakdown = ({ proposal }: VoteBreakdownProps) => {
                     )}
                   >
                     <button>
-                      <CompactVotes number={totalEquityLikeShareWeight} />
+                      {totalEquityLikeShareWeight
+                        .dividedBy(toBigNum(10 ** 6, 0))
+                        .toFixed(1)}
+                      M
                     </button>
                   </Tooltip>
                   <span>
@@ -322,7 +321,7 @@ export const VoteBreakdown = ({ proposal }: VoteBreakdownProps) => {
               <span>{t('tokenVotesFor')}:</span>
               <Tooltip description={formatNumber(yesTokens, defaultDP)}>
                 <button data-testid="num-votes-for">
-                  <CompactVotes number={yesTokens} />
+                  {yesTokens.dividedBy(toBigNum(10 ** 6, 0)).toFixed(1)}M
                 </button>
               </Tooltip>
               <span>
@@ -342,7 +341,7 @@ export const VoteBreakdown = ({ proposal }: VoteBreakdownProps) => {
               <span>{t('tokenVotesAgainst')}:</span>
               <Tooltip description={formatNumber(noTokens, defaultDP)}>
                 <button data-testid="num-votes-against">
-                  <CompactVotes number={noTokens} />
+                  {noTokens.dividedBy(toBigNum(10 ** 6, 0)).toFixed(1)}M
                 </button>
               </Tooltip>
               <span>
@@ -385,7 +384,7 @@ export const VoteBreakdown = ({ proposal }: VoteBreakdownProps) => {
               <span>{t('totalTokensVoted')}:</span>
               <Tooltip description={formatNumber(totalTokensVoted, defaultDP)}>
                 <button data-testid="total-voted">
-                  <CompactVotes number={totalTokensVoted} />
+                  {totalTokensVoted.dividedBy(toBigNum(10 ** 6, 0)).toFixed(1)}M
                 </button>
               </Tooltip>
               <span data-testid="total-voted-percentage">

apps/trading-e2e/src/integration/live-env.cy.ts

@@ -0,0 +1,204 @@
+const marketInfoBtn = 'Info';
+const marketInfoSubtitle = 'accordion-title';
+const marketSummaryBlock = 'header-summary';
+const marketExpiry = 'market-expiry';
+const marketPrice = 'market-price';
+const marketChange = 'market-change';
+const marketVolume = 'market-volume';
+const marketMode = 'market-trading-mode';
+const marketSettlement = 'market-settlement-asset';
+const percentageValue = 'price-change-percentage';
+const priceChangeValue = 'price-change';
+const itemHeader = 'item-header';
+const itemValue = 'item-value';
+const marketListContent = 'popover-content';
+
+describe(
+  'Console - market info - live env',
+  { tags: '@live', testIsolation: true },
+  () => {
+    before(() => {
+      cy.visit('/');
+      cy.contains('Loading market data...').should('not.exist');
+      cy.getByTestId('link').should('be.visible');
+      cy.getByTestId('dialog-close').click();
+      cy.getByTestId(marketInfoBtn).click();
+    });
+    const titles = ['Market data', 'Market specification', 'Market governance'];
+    const subtitles = [
+      'Current fees',
+      'Market price',
+      'Market volume',
+      'Insurance pool',
+      'Key details',
+      'Instrument',
+      'Settlement asset',
+      'Metadata',
+      'Risk model',
+      'Risk parameters',
+      'Risk factors',
+      'Price monitoring bounds 1',
+      'Liquidity monitoring parameters',
+      'Liquidity',
+      'Liquidity price range',
+      'Oracle',
+      'Proposal',
+    ];
+
+    it('market info titles are displayed', () => {
+      cy.getByTestId('split-view-view')
+        .find('.text-lg')
+        .each((element, index) => {
+          cy.wrap(element).should('have.text', titles[index]);
+        });
+    });
+
+    it('market info subtitles are displayed', () => {
+      cy.getByTestId('popover-trigger').click();
+      cy.contains('Loading market data...').should('not.exist');
+      cy.contains('[data-testid="link"]', 'AAVEDAI.MF21').click();
+      cy.getByTestId(marketInfoBtn).click();
+      cy.getByTestId(marketInfoSubtitle).each((element, index) => {
+        cy.wrap(element).should('have.text', subtitles[index]);
+      });
+    });
+
+    it('renders correctly liquidity in trading tab', () => {
+      cy.getByTestId('Liquidity').click();
+      cy.contains('Loading').should('not.exist');
+      cy.contains('Something went wrong').should('not.exist');
+      cy.contains('Application error').should('not.exist');
+      cy.getByTestId('tab-liquidity').within(() => {
+        cy.get('[col-id="partyId"]').eq(1).should('not.be.empty');
+      });
+    });
+  }
+);
+
+describe(
+  'Console - market summary - live env',
+  { tags: '@live', testIsolation: true },
+  () => {
+    before(() => {
+      cy.visit('/');
+      cy.getByTestId('dialog-close').click();
+      cy.getByTestId(marketSummaryBlock).should('be.visible');
+    });
+
+    it('must display market name', () => {
+      cy.getByTestId('popover-trigger').should('not.be.empty');
+    });
+
+    it('must see market expiry', () => {
+      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', () => {
+      cy.getByTestId(marketSummaryBlock).within(() => {
+        cy.getByTestId(marketPrice).within(() => {
+          cy.getByTestId(itemHeader).should('have.text', 'Price');
+          cy.getByTestId(itemValue).should('not.be.empty');
+        });
+      });
+    });
+
+    it('must see market change', () => {
+      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', () => {
+      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 mode', () => {
+      cy.getByTestId(marketSummaryBlock).within(() => {
+        cy.getByTestId(marketMode).within(() => {
+          cy.getByTestId(itemHeader).should('have.text', 'Trading mode');
+          cy.getByTestId(itemValue).should('not.be.empty');
+        });
+      });
+    });
+
+    it('must see market settlement', () => {
+      cy.getByTestId(marketSummaryBlock).within(() => {
+        cy.getByTestId(marketSettlement).within(() => {
+          cy.getByTestId(itemHeader).should('have.text', 'Settlement asset');
+          cy.getByTestId(itemValue).should('not.be.empty');
+        });
+      });
+    });
+  }
+);
+
+describe(
+  'Console - markets table - live env',
+  { tags: '@live', testIsolation: true },
+  () => {
+    beforeEach(() => {
+      cy.visit('/');
+    });
+
+    it('renders markets correctly', () => {
+      cy.get('[data-testid^="market-link-"]').should('not.be.empty');
+      cy.getByTestId('price').invoke('text').should('not.be.empty');
+      cy.getByTestId('settlement-asset').should('not.be.empty');
+      cy.getByTestId('price-change-percentage').should('not.be.empty');
+      cy.getByTestId('price-change').should('not.be.empty');
+      cy.getByTestId('sparkline-svg').should('be.visible');
+    });
+
+    it('renders market list drop down', () => {
+      openMarketDropDown();
+      cy.getByTestId(marketListContent)
+        .find('[data-testid="price"]')
+        .invoke('text')
+        .should('not.be.empty');
+      cy.getByTestId(marketListContent)
+        .find('[data-testid="trading-mode-col"]')
+        .should('not.be.empty');
+      cy.getByTestId(marketListContent)
+        .find('[data-testid="taker-fee"]')
+        .should('contain.text', '%');
+      cy.getByTestId(marketListContent)
+        .find('[data-testid="market-volume"]')
+        .should('not.be.empty');
+      cy.getByTestId(marketListContent)
+        .find('[data-testid="market-name"]')
+        .should('not.be.empty');
+    });
+
+    it('Able to select market from dropdown', () => {
+      cy.getByTestId('popover-trigger')
+        .invoke('text')
+        .then((marketName) => {
+          openMarketDropDown();
+          cy.get('[data-testid^=market-link]').eq(1).click();
+          cy.getByTestId('popover-trigger').should('not.be.equal', marketName);
+        });
+    });
+  }
+);
+
+function openMarketDropDown() {
+  cy.contains('Loading...').should('not.exist');
+  cy.getByTestId('link').should('be.visible');
+  cy.getByTestId('dialog-close').click();
+  cy.getByTestId('popover-trigger').click();
+  cy.contains('Loading market data...').should('not.exist');
+}

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

@@ -0,0 +1,311 @@
+import { checkSorting } from '@vegaprotocol/cypress';
+import * as Schema from '@vegaprotocol/types';
+
+const liquidityTab = 'Liquidity';
+const rowSelector =
+  '[data-testid="tab-liquidity"] .ag-center-cols-container .ag-row';
+const rowSelectorLiquidityActive =
+  '[data-testid="tab-active"] .ag-center-cols-container .ag-row';
+const rowSelectorLiquidityInactive =
+  '[data-testid="tab-inactive"] .ag-center-cols-container .ag-row';
+const marketSummaryBlock = 'header-summary';
+const itemValue = 'item-value';
+const itemHeader = 'item-header';
+const colCommitmentAmount = '[col-id="commitmentAmount"]';
+const colEquityLikeShare = '[col-id="feeShare.equityLikeShare"]';
+const colFee = '[col-id="fee"]';
+const colCommitmentAmount_1 = '[col-id="commitmentAmount_1"]';
+const colBalance = '[col-id="balance"]';
+const colStatus = '[col-id="status"]';
+const colCreatedAt = '[col-id="createdAt"] button';
+const colUpdatedAt = '[col-id="updatedAt"] button';
+
+const headers = [
+  'Party',
+  'Status',
+  'Commitment (tDAI)',
+  'Obligation',
+  'Fee',
+  'Adjusted stake share',
+  'Share',
+  'Live supplied liquidity',
+  'Fees accrued this epoch',
+  'Live time on book',
+  'Live liquidity quality score (%)',
+  'Last time on the book',
+  'Last fee penalty',
+  'Last bond penalty',
+  'Created',
+  'Updated',
+];
+
+describe('liquidity table - trading', { tags: '@smoke' }, () => {
+  before(() => {
+    cy.setOnBoardingViewed();
+    cy.mockSubscription();
+    cy.mockTradingPage(
+      Schema.MarketState.STATE_ACTIVE,
+      Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
+      Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
+    );
+    cy.visit('/#/markets/market-0');
+    cy.wait('@MarketData');
+    cy.getByTestId(liquidityTab).click();
+    cy.wait('@LiquidityProvisions');
+  });
+
+  it('can see table headers', () => {
+    // 5002-LIQP-001
+    cy.getByTestId('tab-liquidity').within(($headers) => {
+      cy.wrap($headers)
+        .get('.ag-header-cell-text')
+        .each(($header, i) => {
+          cy.wrap($header).should('have.text', headers[i]);
+        });
+    });
+  });
+
+  it('renders liquidity table correctly', () => {
+    // 5002-LIQP-002
+    cy.get(rowSelector)
+      .first()
+      .find('[col-id="partyId"]')
+      .should('have.text', '69464e…dc6f');
+
+    cy.get(rowSelector)
+      .first()
+      .find(colCommitmentAmount)
+      .should('have.text', '4,000.00');
+
+    cy.get(rowSelector)
+      .first()
+      .find(colEquityLikeShare)
+      .should('have.text', '100.00%');
+
+    cy.get(rowSelector).first().find(colFee).should('have.text', '0.09%');
+
+    cy.get(rowSelector)
+      .first()
+      .find(colCommitmentAmount_1)
+      .should('have.text', '4,000.00');
+
+    cy.get(rowSelector)
+      .first()
+      .find(colBalance)
+      .scrollIntoView()
+      .should('have.text', '4,000.00');
+
+    cy.get(rowSelector).first().find(colStatus).should('have.text', 'Active');
+
+    cy.get(rowSelector).first().find(colCreatedAt).should('not.be.empty');
+    cy.get(rowSelector).first().find(colUpdatedAt).should('not.be.empty');
+  });
+
+  it('liquidity status column should be sorted properly', () => {
+    // 5002-LIQP-003
+    const liquidityColDefault = ['Active', 'Pending'];
+    const liquidityColAsc = ['Active', 'Pending'];
+    const liquidityColDesc = ['Pending', 'Active'];
+    checkSorting(
+      'status',
+      liquidityColDefault,
+      liquidityColAsc,
+      liquidityColDesc
+    );
+  });
+});
+
+describe('liquidity table view', { tags: '@smoke' }, () => {
+  before(() => {
+    cy.setOnBoardingViewed();
+    cy.mockSubscription();
+    cy.mockTradingPage(
+      Schema.MarketState.STATE_ACTIVE,
+      Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
+      Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
+    );
+    cy.visit('/#/liquidity/market-0');
+    cy.wait('@LiquidityProvisions');
+  });
+
+  it('can see header title', () => {
+    // 5002-LIQP-004
+    // 5002-LIQP-005
+    cy.getByTestId('header-title').should(
+      'contain.text',
+      'BTCUSD.MF21 liquidity provision'
+    );
+  });
+
+  it('can see target stake', () => {
+    // 5002-LIQP-006
+    cy.getByTestId(marketSummaryBlock).within(() => {
+      cy.getByTestId('target-stake').within(() => {
+        cy.getByTestId(itemHeader).should('have.text', 'Target stake');
+        cy.getByTestId(itemValue).should('have.text', '10.00 tDAI').realHover();
+      });
+    });
+    cy.getByTestId('tooltip-content').should(
+      'contain.text',
+      `The market's liquidity requirement which is derived from the maximum open interest observed over a rolling time window.The market's liquidity requirement which is derived from the maximum open interest observed over a rolling time window.`
+    );
+  });
+
+  it('can see supplied stake', () => {
+    // 5002-LIQP-007
+    cy.getByTestId(marketSummaryBlock).within(() => {
+      cy.getByTestId('supplied-stake').within(() => {
+        cy.getByTestId(itemHeader).should('have.text', 'Supplied stake');
+        cy.getByTestId(itemValue).should('have.text', '0.01 tDAI').realHover();
+      });
+    });
+    cy.getByTestId('tooltip-content').should(
+      'contain.text',
+      'The current amount of liquidity supplied for this market.'
+    );
+  });
+
+  it('can see liquidity supplied', () => {
+    // 5002-LIQP-008
+    cy.getByTestId(marketSummaryBlock).within(() => {
+      cy.getByTestId('liquidity-supplied').within(() => {
+        cy.getByTestId(itemHeader).should('have.text', 'Liquidity supplied');
+        cy.getByTestId('indicator').should('be.visible');
+        cy.getByTestId(itemValue).should('have.text', ' 0.10%').realHover();
+      });
+    });
+  });
+
+  it('can see market id', () => {
+    // 5002-LIQP-009
+    cy.getByTestId(marketSummaryBlock).within(() => {
+      cy.getByTestId('liquidity-market-id').within(() => {
+        cy.getByTestId(itemHeader).should('have.text', 'Market ID');
+        cy.getByTestId(itemValue).should('have.text', 'market-0');
+      });
+    });
+  });
+
+  it('can see market id', () => {
+    // 5002-LIQP-010
+    cy.getByTestId(marketSummaryBlock).within(() => {
+      cy.getByTestId('liquidity-learn-more').within(() => {
+        cy.getByTestId(itemHeader).should('have.text', 'Learn more');
+        cy.getByTestId(itemValue).should('have.text', 'Providing liquidity');
+        cy.getByTestId('external-link')
+          .should('have.attr', 'href')
+          .and(
+            'include',
+            'https://docs.vega.xyz/testnet/concepts/liquidity/provision'
+          );
+      });
+    });
+  });
+
+  describe('liquidity table view', { tags: '@smoke' }, () => {
+    it('can see table headers', () => {
+      cy.getByTestId('tab-active').within(($headers) => {
+        cy.wrap($headers)
+          .get('.ag-header-cell-text')
+          .each(($header, i) => {
+            cy.wrap($header).should('have.text', headers[i]);
+          });
+      });
+    });
+
+    it('renders liquidity active table correctly', () => {
+      // 5002-LIQP-011
+      cy.get(rowSelectorLiquidityActive)
+        .first()
+        .find('[col-id="partyId"]')
+        .should('have.text', '69464e…dc6f');
+
+      cy.get(rowSelectorLiquidityActive)
+        .first()
+        .find(colCommitmentAmount)
+        .should('have.text', '4,000.00');
+
+      cy.get(rowSelectorLiquidityActive)
+        .first()
+        .find(colEquityLikeShare)
+        .should('have.text', '100.00%');
+
+      cy.get(rowSelectorLiquidityActive)
+        .first()
+        .find(colFee)
+        .should('have.text', '0.09%');
+
+      cy.get(rowSelectorLiquidityActive)
+        .first()
+        .find(colCommitmentAmount_1)
+        .should('have.text', '4,000.00');
+
+      cy.get(rowSelectorLiquidityActive)
+        .first()
+        .find(colBalance)
+        .should('have.text', '4,000.00');
+
+      cy.get(rowSelectorLiquidityActive)
+        .first()
+        .find(colStatus)
+        .should('have.text', 'Active');
+
+      cy.get(rowSelectorLiquidityActive)
+        .first()
+        .find(colCreatedAt)
+        .should('not.be.empty');
+      cy.get(rowSelectorLiquidityActive)
+        .first()
+        .find(colUpdatedAt)
+        .should('not.be.empty');
+    });
+
+    it('renders liquidity inactive table correctly', () => {
+      // 5002-LIQP-012
+      cy.getByTestId('Inactive').click();
+      cy.get(rowSelectorLiquidityInactive)
+        .first()
+        .find('[col-id="partyId"]')
+        .should('have.text', 'cc464e…dc6f');
+
+      cy.get(rowSelectorLiquidityInactive)
+        .first()
+        .find(colCommitmentAmount)
+        .should('have.text', '4,000.00');
+
+      cy.get(rowSelectorLiquidityInactive)
+        .first()
+        .find(colEquityLikeShare)
+        .should('have.text', '100.00%');
+
+      cy.get(rowSelectorLiquidityInactive)
+        .first()
+        .find(colFee)
+        .should('have.text', '0.40%');
+
+      cy.get(rowSelectorLiquidityInactive)
+        .first()
+        .find(colCommitmentAmount_1)
+        .should('have.text', '4,000.00');
+
+      cy.get(rowSelectorLiquidityInactive)
+        .first()
+        .find(colBalance)
+        .should('have.text', '2,000.00');
+
+      cy.get(rowSelectorLiquidityInactive)
+        .first()
+        .find(colStatus)
+        .should('have.text', 'Pending');
+
+      cy.get(rowSelectorLiquidityInactive)
+        .first()
+        .find(colCreatedAt)
+        .should('not.be.empty');
+      cy.get(rowSelectorLiquidityInactive)
+        .first()
+        .find(colUpdatedAt)
+        .should('not.be.empty');
+    });
+  });
+});

apps/trading-e2e/src/integration/market-proposal-notification.cy.ts

@@ -0,0 +1,47 @@
+import { aliasGQLQuery } from '@vegaprotocol/cypress';
+import { proposalListQuery, marketUpdateProposal } from '@vegaprotocol/mock';
+import * as Schema from '@vegaprotocol/types';
+
+const marketSummaryBlock = 'header-summary';
+
+describe('Market proposal notification', { tags: '@smoke' }, () => {
+  before(() => {
+    cy.setVegaWallet();
+    cy.mockTradingPage(
+      Schema.MarketState.STATE_ACTIVE,
+      Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
+      Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
+    );
+    cy.mockGQL((req) => {
+      aliasGQLQuery(
+        req,
+        'ProposalsList',
+        proposalListQuery({
+          proposalsConnection: {
+            edges: [{ node: marketUpdateProposal }],
+          },
+        })
+      );
+    });
+    cy.mockSubscription();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@MarketData');
+    cy.getByTestId(marketSummaryBlock).should('be.visible');
+  });
+
+  it('should display market proposal notification if proposal found', () => {
+    cy.getByTestId(marketSummaryBlock).within(() => {
+      cy.getByTestId('market-proposal-notification').should(
+        'contain.text',
+        'Changes have been proposed for this market'
+      );
+      cy.getByTestId('market-proposal-notification').within(() => {
+        cy.getByTestId('external-link').should(
+          'have.attr',
+          'href',
+          `${Cypress.env('VEGA_TOKEN_URL')}/proposals/123`
+        );
+      });
+    });
+  });
+});

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

@@ -14,6 +14,7 @@ const marketMode = 'market-trading-mode';
 const marketName = 'header-title';
 const marketPrice = 'market-price';
 const marketSettlement = 'market-settlement-asset';
+const marketState = 'market-state';
 const marketSummaryBlock = 'header-summary';
 const marketVolume = 'market-volume';
 const percentageValue = 'price-change-percentage';
@@ -84,6 +85,30 @@ describe('Market trading page', () => {
       });
     });
 
+    it('must see market mode', () => {
+      // 6002-MDET-006
+      cy.getByTestId(marketSummaryBlock).within(() => {
+        cy.getByTestId(marketMode).within(() => {
+          cy.getByTestId(itemHeader).should('have.text', 'Trading mode');
+          cy.getByTestId(itemValue).should(
+            'have.text',
+            'Monitoring auction - liquidity (target not met)'
+          );
+        });
+      });
+    });
+
+    it('must see market status', () => {
+      // 6002-MDET-007
+      // 7002-SORD-061
+      cy.getByTestId(marketSummaryBlock).within(() => {
+        cy.getByTestId(marketState).within(() => {
+          cy.getByTestId(itemHeader).should('have.text', 'Status');
+          cy.getByTestId(itemValue).should('not.be.empty');
+        });
+      });
+    });
+
     it('must see market settlement', () => {
       // 6002-MDET-008
       cy.getByTestId(marketSummaryBlock).within(() => {
@@ -93,6 +118,15 @@ describe('Market trading page', () => {
         });
       });
     });
+    it('must see market liquidity supplied', () => {
+      // 6002-MDET-009
+      cy.getByTestId(marketSummaryBlock).within(() => {
+        cy.getByTestId(liquiditySupplied).within(() => {
+          cy.getByTestId(itemHeader).should('have.text', 'Liquidity supplied');
+          cy.getByTestId(itemValue).should('not.be.empty');
+        });
+      });
+    });
   });
 
   describe('Market tooltips', { tags: '@smoke' }, () => {

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

@@ -1,21 +1,11 @@
 import { FeesContainer } from '../../components/fees-container';
 import { useT } from '../../lib/use-t';
-import { usePageTitleStore } from '../../stores';
-import { titlefy } from '@vegaprotocol/utils';
-import { useEffect } from 'react';
 
 export const Fees = () => {
   const t = useT();
-  const title = t('Fees');
-  const { updateTitle } = usePageTitleStore((store) => ({
-    updateTitle: store.updateTitle,
-  }));
-  useEffect(() => {
-    updateTitle(titlefy([title]));
-  }, [updateTitle, title]);
   return (
     <div className="container p-4 mx-auto">
-      <h1 className="px-4 pb-4 text-2xl">{title}</h1>
+      <h1 className="px-4 pb-4 text-2xl">{t('Fees')}</h1>
       <FeesContainer />
     </div>
   );

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

@@ -114,7 +114,7 @@ export const MarketPage = () => {
           </p>
           <p className="justify-center text-sm">
             <Trans
-              defaults="Please choose another market from the <0>market list</0>"
+              defaults="Please choose another market from the <0>market list<0>"
               ns={ns}
               components={[
                 <ExternalLink

apps/trading/client-pages/markets/market-list-table.tsx

@@ -1,14 +1,7 @@
 import type { TypedDataAgGrid } from '@vegaprotocol/datagrid';
-import {
-  AgGrid,
-  PriceFlashCell,
-  useDataGridEvents,
-} from '@vegaprotocol/datagrid';
+import { AgGrid, PriceFlashCell } from '@vegaprotocol/datagrid';
 import type { MarketMaybeWithData } from '@vegaprotocol/markets';
 import { useColumnDefs } from './use-column-defs';
-import type { DataGridStore } from '../../stores/datagrid-store-slice';
-import { type StateCreator, create } from 'zustand';
-import { persist } from 'zustand/middleware';
 
 export const getRowId = ({ data }: { data: { id: string } }) => data.id;
 
@@ -25,37 +18,8 @@ const components = {
 
 type Props = TypedDataAgGrid<MarketMaybeWithData>;
 
-export type DataGridSlice = {
-  gridStore: DataGridStore;
-  updateGridStore: (gridStore: DataGridStore) => void;
-};
-
-export const createDataGridSlice: StateCreator<DataGridSlice> = (set) => ({
-  gridStore: {},
-  updateGridStore: (newStore) => {
-    set((curr) => ({
-      gridStore: {
-        ...curr.gridStore,
-        ...newStore,
-      },
-    }));
-  },
-});
-
-const useMarketsStore = create<DataGridSlice>()(
-  persist(createDataGridSlice, {
-    name: 'vega_market_list_store',
-  })
-);
-
 export const MarketListTable = (props: Props) => {
   const columnDefs = useColumnDefs();
-  const gridStore = useMarketsStore((store) => store.gridStore);
-  const updateGridStore = useMarketsStore((store) => store.updateGridStore);
-
-  const gridStoreCallbacks = useDataGridEvents(gridStore, (colState) => {
-    updateGridStore(colState);
-  });
 
   return (
     <AgGrid
@@ -64,7 +28,6 @@ export const MarketListTable = (props: Props) => {
       columnDefs={columnDefs}
       components={components}
       rowHeight={45}
-      {...gridStoreCallbacks}
       {...props}
     />
   );

apps/trading/client-pages/markets/use-column-defs.tsx

@@ -51,29 +51,6 @@ export const useColumnDefs = () => {
         headerName: t('Description'),
         field: 'tradableInstrument.instrument.name',
       },
-      {
-        headerName: t('Settlement asset'),
-        field: 'tradableInstrument.instrument.product.settlementAsset.symbol',
-        cellRenderer: ({
-          data,
-        }: VegaICellRendererParams<
-          MarketMaybeWithData,
-          'tradableInstrument.instrument.product.settlementAsset.symbol'
-        >) => {
-          const value = data && getAsset(data);
-          return value ? (
-            <ButtonLink
-              onClick={(e) => {
-                openAssetDetailsDialog(value.id, e.target as HTMLElement);
-              }}
-            >
-              {value.symbol}
-            </ButtonLink>
-          ) : (
-            ''
-          );
-        },
-      },
       {
         headerName: t('Trading mode'),
         field: 'tradingMode',
@@ -165,21 +142,27 @@ export const useColumnDefs = () => {
         },
       },
       {
-        headerName: t('Open Interest'),
-        field: 'data.openInterest',
-        type: 'rightAligned',
-        valueFormatter: ({
+        headerName: t('Settlement asset'),
+        field: 'tradableInstrument.instrument.product.settlementAsset.symbol',
+        cellRenderer: ({
           data,
-        }: VegaValueFormatterParams<
+        }: VegaICellRendererParams<
           MarketMaybeWithData,
-          'data.openInterest'
-        >) =>
-          data?.data?.openInterest === undefined
-            ? '-'
-            : addDecimalsFormatNumber(
-                data?.data?.openInterest,
-                data?.positionDecimalPlaces
-              ),
+          'tradableInstrument.instrument.product.settlementAsset.symbol'
+        >) => {
+          const value = data && getAsset(data);
+          return value ? (
+            <ButtonLink
+              onClick={(e) => {
+                openAssetDetailsDialog(value.id, e.target as HTMLElement);
+              }}
+            >
+              {value.symbol}
+            </ButtonLink>
+          ) : (
+            ''
+          );
+        },
       },
       {
         headerName: t('Spread'),

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

@@ -152,8 +152,8 @@ export const ApplyCodeForm = () => {
   // show "code applied" message when successfully applied
   if (status === 'successful') {
     return (
-      <div className="mx-auto w-1/2">
-        <h3 className="calt mb-5 flex flex-row items-center justify-center gap-2 text-center text-xl uppercase">
+      <div className="w-1/2 mx-auto">
+        <h3 className="mb-5 text-xl text-center uppercase calt flex flex-row gap-2 justify-center items-center">
           <span className="text-vega-green-500">
             <VegaIcon name={VegaIconNames.TICK} size={20} />
           </span>{' '}
@@ -205,15 +205,15 @@ export const ApplyCodeForm = () => {
 
   return (
     <>
-      <div className="bg-vega-clight-800 dark:bg-vega-cdark-800 mx-auto w-2/3 max-w-md rounded-lg p-8">
-        <h3 className="calt mb-4 text-center text-2xl">
+      <div className="w-2/3 max-w-md mx-auto bg-vega-clight-800 dark:bg-vega-cdark-800 p-8 rounded-lg">
+        <h3 className="mb-4 text-2xl text-center calt">
           {t('Apply a referral code')}
         </h3>
         <p className="mb-4 text-center text-base">
           {t('Enter a referral code to get trading discounts.')}
         </p>
         <form
-          className={classNames('flex w-full flex-col gap-4', {
+          className={classNames('w-full flex flex-col gap-4', {
             'animate-shake': Boolean(errors.code),
           })}
           onSubmit={handleSubmit(onSubmit)}
@@ -227,13 +227,13 @@ export const ApplyCodeForm = () => {
                 validate: (value) => validateCode(value, t),
               })}
               placeholder="Enter a code"
-              className="bg-vega-clight-900 dark:bg-vega-cdark-700 mb-2"
+              className="mb-2 bg-vega-clight-900 dark:bg-vega-cdark-700"
             />
           </label>
           <RainbowButton variant="border" {...getButtonProps()} />
         </form>
         {errors.code && (
-          <InputError className="overflow-auto break-words">
+          <InputError className="break-words overflow-auto">
             {errors.code.message?.toString()}
           </InputError>
         )}
@@ -245,10 +245,10 @@ export const ApplyCodeForm = () => {
       ) : null}
       {previewData ? (
         <div className="mt-10">
-          <h2 className="mb-5 text-2xl">
+          <h2 className="text-2xl mb-5">
             {t(
-              'You are joining the group shown, but will not have access to benefits until you have completed at least {{count}} epochs.',
-              { count: nextBenefitTierEpochsValue }
+              'You are joining the group shown, but will not have access to benefits until you have completed at least %s epochs.',
+              [nextBenefitTierEpochsValue.toString()]
             )}
           </h2>
           <Statistics data={previewData} program={program} as="referee" />

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

@@ -95,11 +95,6 @@ const CreateCodeDialog = ({
   const { stakeAvailable: currentStakeAvailable, requiredStake } =
     useStakeAvailable();
 
-  const { data: referralSets } = useReferral({
-    pubKey,
-    role: 'referrer',
-  });
-
   const onSubmit = () => {
     if (isReadOnly || !pubKey) {
       setErr('Not connected');
@@ -198,68 +193,6 @@ const CreateCodeDialog = ({
     );
   }
 
-  if (!referralSets) {
-    return (
-      <div className="flex flex-col gap-4">
-        {(status === 'idle' || status === 'loading' || status === 'error') && (
-          <>
-            {
-              <p>
-                {t(
-                  'There is currently no referral program active, are you sure you want to create a code?'
-                )}
-              </p>
-            }
-          </>
-        )}
-        {status === 'success' && code && (
-          <div className="flex items-center gap-2">
-            <div className="flex-1 min-w-0 p-2 text-sm rounded bg-vega-clight-700 dark:bg-vega-cdark-700">
-              <p className="overflow-hidden whitespace-nowrap text-ellipsis">
-                {code}
-              </p>
-            </div>
-            <CopyWithTooltip text={code}>
-              <TradingButton
-                className="text-sm no-underline"
-                icon={<VegaIcon name={VegaIconNames.COPY} />}
-              >
-                <span>{t('Copy')}</span>
-              </TradingButton>
-            </CopyWithTooltip>
-          </div>
-        )}
-        <TradingButton
-          fill={true}
-          intent={Intent.Primary}
-          onClick={() => onSubmit()}
-          {...getButtonProps()}
-        ></TradingButton>
-        {status === 'idle' && (
-          <TradingButton
-            fill={true}
-            intent={Intent.Primary}
-            onClick={() => {
-              refetch();
-              setDialogOpen(false);
-            }}
-          >
-            {t('No')}
-          </TradingButton>
-        )}
-        {err && <InputError>{err}</InputError>}
-        <div className="flex justify-center pt-5 mt-2 text-sm border-t gap-4 text-default border-default">
-          <ExternalLink href={ABOUT_REFERRAL_DOCS_LINK}>
-            {t('About the referral program')}
-          </ExternalLink>
-          <ExternalLink href={DISCLAIMER_REFERRAL_DOCS_LINK}>
-            {t('Disclaimer')}
-          </ExternalLink>
-        </div>
-      </div>
-    );
-  }
-
   return (
     <div className="flex flex-col gap-4">
       {(status === 'idle' || status === 'loading' || status === 'error') && (

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

@@ -6,12 +6,7 @@ import { BORDER_COLOR, GRADIENT } from './constants';
 import { Tag } from './tag';
 import type { ComponentProps, ReactNode } from 'react';
 import { ExternalLink } from '@vegaprotocol/ui-toolkit';
-import {
-  DApp,
-  DocsLinks,
-  TOKEN_PROPOSALS,
-  useLinks,
-} from '@vegaprotocol/environment';
+import { DApp, TOKEN_PROPOSALS, useLinks } from '@vegaprotocol/environment';
 import { useT, ns } from '../../lib/use-t';
 import { Trans } from 'react-i18next';
 
@@ -93,19 +88,10 @@ export const TiersContainer = () => {
     return (
       <div className="text-base px-5 py-10 text-center">
         <Trans
-          defaults="There are currently no active referral programs. Check the <0>Governance App</0> to see if there are any proposals in progress and vote."
+          defaults="We're sorry but we don't have an active referral programme currently running. You can propose a new programme <0>here</0>."
           components={[
             <ExternalLink href={governanceLink(TOKEN_PROPOSALS)} key="link">
-              {t('Governance App')}
-            </ExternalLink>,
-          ]}
-          ns={ns}
-        />
-        <Trans
-          defaults="You can propose a new program via the <0>Docs</0>."
-          components={[
-            <ExternalLink href={DocsLinks?.REFERRALS} key="link">
-              {t('Docs')}
+              {t('here')}
             </ExternalLink>,
           ]}
           ns={ns}

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

@@ -8,9 +8,6 @@ import classNames from 'classnames';
 import type { HTMLAttributes, ReactNode } from 'react';
 import { Button } from './buttons';
 import { useT } from '../../lib/use-t';
-import { Routes } from '../../lib/links';
-import { DApp, useLinks } from '@vegaprotocol/environment';
-import truncate from 'lodash/truncate';
 
 export const Tile = ({
   className,
@@ -66,10 +63,6 @@ export const CodeTile = ({
   className?: string;
 }) => {
   const t = useT();
-  const consoleLink = useLinks(DApp.Console);
-  const applyCodeLink = consoleLink(
-    `#${Routes.REFERRALS_APPLY_CODE}?code=${code}`
-  );
   return (
     <StatTile
       title={t('Your referral code')}
@@ -96,27 +89,10 @@ export const CodeTile = ({
             {code}
           </div>
         </Tooltip>
-        <CopyWithTooltip text={code} description={t('Copy referral code')}>
+        <CopyWithTooltip text={code}>
           <Button className="text-sm no-underline !py-0 !px-0 h-fit !bg-transparent">
             <span className="sr-only">{t('Copy')}</span>
-            <VegaIcon size={20} name={VegaIconNames.COPY} />
-          </Button>
-        </CopyWithTooltip>
-        <CopyWithTooltip
-          text={applyCodeLink}
-          description={
-            <>
-              {t('Copy shareable apply code link')}
-              {': '}
-              <a className="text-vega-blue-500 underline" href={applyCodeLink}>
-                {truncate(applyCodeLink, { length: 32 })}
-              </a>
-            </>
-          }
-        >
-          <Button className="text-sm no-underline !py-0 !px-0 h-fit !bg-transparent">
-            <span className="sr-only">{t('Copy')}</span>
-            <VegaIcon size={20} name={VegaIconNames.OPEN_EXTERNAL} />
+            <VegaIcon size={24} name={VegaIconNames.COPY} />
           </Button>
         </CopyWithTooltip>
       </div>

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

@@ -1,21 +1,10 @@
-import { useT } from '../../lib/use-t';
+import { t } from '@vegaprotocol/i18n';
 import { RewardsContainer } from '../../components/rewards-container';
-import { usePageTitleStore } from '../../stores';
-import { titlefy } from '@vegaprotocol/utils';
-import { useEffect } from 'react';
 
 export const Rewards = () => {
-  const t = useT();
-  const title = t('Rewards');
-  const { updateTitle } = usePageTitleStore((store) => ({
-    updateTitle: store.updateTitle,
-  }));
-  useEffect(() => {
-    updateTitle(titlefy([title]));
-  }, [updateTitle, title]);
   return (
     <div className="container mx-auto p-4">
-      <h1 className="px-4 pb-4 text-2xl">{title}</h1>
+      <h1 className="px-4 pb-4 text-2xl">{t('Rewards')}</h1>
       <RewardsContainer />
     </div>
   );

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

@@ -1,6 +1,7 @@
 import groupBy from 'lodash/groupBy';
 import type { Account } from '@vegaprotocol/accounts';
 import { useAccounts } from '@vegaprotocol/accounts';
+import { t } from '@vegaprotocol/i18n';
 import {
   NetworkParams,
   useNetworkParams,
@@ -30,10 +31,8 @@ import { addDecimalsFormatNumberQuantum } from '@vegaprotocol/utils';
 import { ViewType, useSidebar } from '../sidebar';
 import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';
 import { RewardsHistoryContainer } from './rewards-history';
-import { useT } from '../../lib/use-t';
 
 export const RewardsContainer = () => {
-  const t = useT();
   const { pubKey } = useVegaWallet();
   const { params, loading: paramsLoading } = useNetworkParams([
     NetworkParams.reward_asset,
@@ -122,9 +121,7 @@ export const RewardsContainer = () => {
         return (
           <Card
             key={assetId}
-            title={t('{{assetSymbol}} Reward pot', {
-              assetSymbol: asset.symbol,
-            })}
+            title={t('%s Reward pot', asset.symbol)}
             className="lg:col-span-3 xl:col-span-2"
             loading={loading}
           >
@@ -170,7 +167,6 @@ export const RewardPot = ({
   assetId,
   vestingBalancesSummary,
 }: RewardPotProps) => {
-  const t = useT();
   // TODO: Opening the sidebar for the first time works, but then clicking on redeem
   // for a different asset does not update the form
   const currentRouteId = useGetCurrentRouteId();
@@ -246,9 +242,7 @@ export const RewardPot = ({
             <CardTable>
               <tr>
                 <CardTableTH className="flex items-center gap-1">
-                  {t('Locked {{assetSymbol}}', {
-                    assetSymbol: rewardAsset.symbol,
-                  })}
+                  {t(`Locked ${rewardAsset.symbol}`)}
                   <VegaIcon name={VegaIconNames.LOCK} size={12} />
                 </CardTableTH>
                 <CardTableTD>
@@ -260,11 +254,7 @@ export const RewardPot = ({
                 </CardTableTD>
               </tr>
               <tr>
-                <CardTableTH>
-                  {t('Vesting {{assetSymbol}}', {
-                    assetSymbol: rewardAsset.symbol,
-                  })}
-                </CardTableTH>
+                <CardTableTH>{t(`Vesting ${rewardAsset.symbol}`)}</CardTableTH>
                 <CardTableTD>
                   {addDecimalsFormatNumberQuantum(
                     totalVesting.toString(),
@@ -319,7 +309,6 @@ export const Vesting = ({
   baseRate: string;
   multiplier?: string;
 }) => {
-  const t = useT();
   const rate = new BigNumber(baseRate).times(multiplier);
   const rateFormatted = formatPercentage(Number(rate));
   const baseRateFormatted = formatPercentage(Number(baseRate));
@@ -352,7 +341,6 @@ export const Multipliers = ({
   streakMultiplier?: string;
   hoarderMultiplier?: string;
 }) => {
-  const t = useT();
   const combinedMultiplier = new BigNumber(streakMultiplier).times(
     hoarderMultiplier
   );

apps/trading/components/rewards-container/rewards-history.tsx

@@ -16,12 +16,12 @@ import {
   VegaIcon,
   VegaIconNames,
 } from '@vegaprotocol/ui-toolkit';
+import { t } from '@vegaprotocol/i18n';
 import {
   useRewardsHistoryQuery,
   type RewardsHistoryQuery,
 } from './__generated__/Rewards';
 import { useRewardsRowData } from './use-reward-row-data';
-import { useT } from '../../lib/use-t';
 
 export const RewardsHistoryContainer = ({
   epoch,
@@ -140,7 +140,6 @@ export const RewardHistoryTable = ({
   onEpochChange: (epochVariables: { from: number; to: number }) => void;
   loading: boolean;
 }) => {
-  const t = useT();
   const [isParty, setIsParty] = useState(false);
 
   const rowData = useRewardsRowData({

apps/trading/e2e/.env

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

apps/trading/e2e/.env.develop

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

apps/trading/e2e/.env.main

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

apps/trading/e2e/actions/utils.py

@@ -34,15 +34,4 @@ def next_epoch(vega: VegaServiceNull):
                 "Epoch not started after forwarding the duration of two epochs."
             )
     vega.wait_fn(1)
-    vega.wait_for_total_catchup()
-
-def truncate_middle(market_id, start=6, end=4):
-    if len(market_id) < 11:
-        return market_id
-    return market_id[:start] + '\u2026' + market_id[-end:]
-
-def change_keys(page: Page, vega:VegaServiceNull, key_name):
-    page.get_by_test_id("manage-vega-wallet").click()
-    page.get_by_test_id("key-" + vega.wallet.public_key(key_name)).click()
-    page.click(f'data-testid=key-{vega.wallet.public_key(key_name)} >> .inline-flex')
-    page.reload()
+    vega.wait_for_total_catchup()

apps/trading/e2e/conftest.py

@@ -136,11 +136,8 @@ def init_page(vega: VegaServiceNull, browser: Browser, request: pytest.FixtureRe
             page.add_init_script(script=window_env)
             yield page
         finally:
-            try:
-                if not os.path.exists("apps/trading/e2e/traces"):
-                    os.makedirs("apps/trading/e2e/traces")
-            except OSError as e:
-                print(f"Failed to create directory '{'apps/trading/e2e/traces'}': {e}")
+            if not os.path.exists("traces"):
+                os.makedirs("traces")
 
             # Check whether this test failed or passed
             outcome = request.config.cache.get(request.node.nodeid, None)

apps/trading/e2e/fixtures/market.py

@@ -1,13 +1,26 @@
+from collections import namedtuple
 from vega_sim.service import VegaService
 from actions.vega import submit_multiple_orders, submit_order, submit_liquidity
-from wallet_config import MM_WALLET, MM_WALLET2, TERMINATE_WALLET, wallets
+
+
 import logging
 
 logger = logging.getLogger()
 
+# Defined namedtuples
+WalletConfig = namedtuple("WalletConfig", ["name", "passphrase"])
+
+# Wallet Configurations
+MM_WALLET = WalletConfig("mm", "pin")
+MM_WALLET2 = WalletConfig("mm2", "pin2")
+TERMINATE_WALLET = WalletConfig("FJMKnwfZdd48C8NqvYrG", "bY3DxwtsCstMIIZdNpKs")
+
+wallets = [MM_WALLET, MM_WALLET2, TERMINATE_WALLET]
+
 mint_amount: float = 10e5
 market_name = "BTC:DAI_2023"
 
+
 def setup_simple_market(
     vega: VegaService,
     approve_proposal=True,

apps/trading/e2e/tests/chart_depth/test_chart_depth.py

@@ -0,0 +1,12 @@
+import pytest
+from playwright.sync_api import expect, Page
+
+@pytest.mark.usefixtures("page", "continuous_market", "risk_accepted")
+def test_see_market_depth_chart(continuous_market, page: Page):
+    page.goto(f"/#/markets/{continuous_market}")
+    # Click on the 'Depth' tab
+    page.get_by_test_id("Depth").click()
+    # Check if the 'Depth' tab and the depth chart are visible
+    # 6006-DEPC-001
+    expect(page.get_by_test_id("tab-depth")).to_be_visible()
+    expect(page.locator('[class^="depth-chart-module_canvas__"]').first).to_be_visible()

apps/trading/e2e/tests/deal_ticket/test_basic_submit.py

@@ -29,12 +29,11 @@ def continuous_market(vega):
 @pytest.mark.usefixtures("page", "auth", "risk_accepted")
 def test_limit_buy_order_GTT(continuous_market, vega: VegaService, page: Page):
     page.goto(f"/#/markets/{continuous_market}")
-    page.get_by_test_id(tif).select_option("Good 'til Time (GTT)")
     page.get_by_test_id(order_size).fill("10")
     page.get_by_test_id(order_price).fill("120")
+    page.get_by_test_id(tif).select_option("Good 'til Time (GTT)")
     expires_at = datetime.now() + timedelta(days=1)
     expires_at_input_value = expires_at.strftime("%Y-%m-%dT%H:%M:%S")
-    page.get_by_test_id("date-picker-field").clear()
     page.get_by_test_id("date-picker-field").fill(expires_at_input_value)
     # 7002-SORD-011
     expect(page.get_by_test_id("place-order").locator("span").first).to_have_text(

apps/trading/e2e/tests/deal_ticket/test_fees_margin_estimations.py

@@ -1,9 +1,16 @@
 import pytest
+from collections import namedtuple
 from playwright.sync_api import Page, expect
 from vega_sim.service import VegaService
 from actions.vega import submit_order
 from actions.utils import wait_for_toast_confirmation
 
+# Defined namedtuples
+WalletConfig = namedtuple("WalletConfig", ["name", "passphrase"])
+
+# Wallet Configurations
+MM_WALLET = WalletConfig("mm", "pin")
+
 notional = "deal-ticket-fee-notional"
 fees = "deal-ticket-fee-fees"
 margin_required = "deal-ticket-fee-margin-required"

apps/trading/e2e/tests/deal_ticket/test_stop_order.py

@@ -1,4 +1,5 @@
 import pytest
+from collections import namedtuple
 from playwright.sync_api import Page, expect
 from vega_sim.service import VegaService
 from actions.vega import submit_order
@@ -6,6 +7,14 @@ from datetime import datetime, timedelta
 from conftest import init_vega
 from fixtures.market import setup_continuous_market
 
+# Defined namedtuples
+WalletConfig = namedtuple("WalletConfig", ["name", "passphrase"])
+
+# Wallet Configurations
+MM_WALLET = WalletConfig("mm", "pin")
+MM_WALLET2 = WalletConfig("mm2", "pin2")
+TERMINATE_WALLET = WalletConfig("FJMKnwfZdd48C8NqvYrG", "bY3DxwtsCstMIIZdNpKs")
+
 stop_order_btn = "order-type-Stop"
 stop_limit_order_btn = "order-type-StopLimit"
 stop_market_order_btn = "order-type-StopMarket"

apps/trading/e2e/tests/deal_ticket/test_stop_order_oco.py

@@ -1,9 +1,19 @@
 import pytest
+from collections import namedtuple
 from playwright.sync_api import Page, expect
 from vega_sim.service import VegaService
 from actions.vega import submit_order
+from conftest import init_vega
+from fixtures.market import setup_continuous_market
 from actions.utils import wait_for_toast_confirmation
 
+# Defined namedtuples
+WalletConfig = namedtuple("WalletConfig", ["name", "passphrase"])
+
+# Wallet Configurations
+MM_WALLET = WalletConfig("mm", "pin")
+MM_WALLET2 = WalletConfig("mm2", "pin2")
+TERMINATE_WALLET = WalletConfig("FJMKnwfZdd48C8NqvYrG", "bY3DxwtsCstMIIZdNpKs")
 
 stop_order_btn = "order-type-Stop"
 stop_limit_order_btn = "order-type-StopLimit"
@@ -326,4 +336,98 @@ def test_submit_stop_oco_limit_order_cancel(
         page.locator(".ag-center-cols-container").locator('[col-id="status"]').last
     ).to_have_text("CancelledOCO")
 
+class TestStopOcoValidation:
+    @pytest.fixture(scope="class")
+    def vega(self, request):
+        with init_vega(request) as vega:
+            yield vega
 
+    @pytest.fixture(scope="class")
+    def continuous_market(self, vega):
+        return setup_continuous_market(vega)
+
+    @pytest.mark.usefixtures("page", "auth", "risk_accepted")
+    def test_stop_market_order_oco_form_validation(self, continuous_market, page: Page):
+        page.goto(f"/#/markets/{continuous_market}")
+        page.get_by_test_id(stop_order_btn).click()
+        page.get_by_test_id(stop_market_order_btn).is_visible()
+        page.get_by_test_id(stop_market_order_btn).click()
+        page.get_by_test_id(oco).click()
+        expect(
+            page.get_by_test_id("sidebar-content").get_by_text("Trigger").last
+        ).to_be_visible()
+        # 7002-SORD-084
+        expect(page.locator('[for="triggerDirection-risesAbove-oco"]')).to_have_text(
+            "Rises above"
+        )
+        # 7002-SORD-085
+        expect(page.locator('[for="triggerDirection-fallsBelow-oco"]')).to_have_text(
+            "Falls below"
+        )
+        # 7002-SORD-087
+        expect(page.locator('[for="triggerType-price-oco"]')).to_have_text("Price")
+        expect(page.locator('[for="triggerType-price"]')).to_be_checked
+        # 7002-SORD-088
+        expect(
+            page.locator('[for="triggerType-trailingPercentOffset-oco"]')
+        ).to_have_text("Trailing Percent Offset")
+        expect(page.locator('[for="order-size-oco"]')).to_have_text("Size")
+
+    @pytest.mark.usefixtures("page", "auth", "risk_accepted")
+    def test_stop_limit_order_oco_form_validation(self, continuous_market, page: Page):
+        page.goto(f"/#/markets/{continuous_market}")
+        page.get_by_test_id(stop_order_btn).click()
+        page.get_by_test_id(stop_market_order_btn).is_visible()
+        page.get_by_test_id(stop_limit_order_btn).click()
+        page.get_by_test_id(oco).click()
+        expect(
+            page.get_by_test_id("sidebar-content").get_by_text("Trigger").last
+        ).to_be_visible()
+        # 7002-SORD-099
+        expect(page.locator('[for="triggerDirection-risesAbove-oco"]')).to_have_text(
+            "Rises above"
+        )
+        # 7002-SORD-091
+        expect(page.locator('[for="triggerDirection-fallsBelow-oco"]')).to_have_text(
+            "Falls below"
+        )
+        # 7002-SORD-095
+        expect(page.locator('[for="triggerType-price-oco"]')).to_have_text("Price")
+        expect(page.locator('[for="triggerType-price"]')).to_be_checked
+        # 7002-SORD-095
+        expect(
+            page.locator('[for="triggerType-trailingPercentOffset-oco"]')
+        ).to_have_text("Trailing Percent Offset")
+
+        expect(page.locator('[for="order-size-oco"]')).to_have_text("Size")
+        expect(page.locator('[for="order-price-oco"]')).to_have_text("Price")
+    
+    @pytest.mark.usefixtures("page", "auth", "risk_accepted")
+    def test_maximum_number_of_active_stop_orders_oco(
+        self, continuous_market, vega: VegaService, page: Page
+    ):  
+        page.goto(f"/#/markets/{continuous_market}")   
+        page.get_by_test_id(stop_order_btn).click()
+        page.get_by_test_id(stop_limit_order_btn).is_visible()
+        page.get_by_test_id(stop_limit_order_btn).click()
+        page.get_by_test_id(order_side_sell).click()
+        page.locator("label").filter(has_text="Falls below").click()
+        page.get_by_test_id(trigger_price).fill("102")
+        page.get_by_test_id(order_size).fill("3")
+        page.get_by_test_id(order_price).fill("103")
+        page.get_by_test_id(oco).click()
+        page.get_by_test_id(trigger_price_oco).fill("120")
+        page.get_by_test_id(order_size_oco).fill("2")
+        page.get_by_test_id(order_limit_price_oco).fill("99")
+        for i in range(2):
+            page.get_by_test_id(submit_stop_order).click()
+            wait_for_toast_confirmation(page)
+            vega.wait_fn(1)
+            vega.forward("20s")
+            vega.wait_for_total_catchup()
+            if page.get_by_test_id(close_toast).is_visible():
+               page.get_by_test_id(close_toast).click()
+        # 7002-SORD-011
+        expect(page.get_by_test_id("stop-order-warning-limit")).to_have_text(
+            "There is a limit of 4 active stop orders per market. Orders submitted above the limit will be immediately rejected."
+        )

apps/trading/e2e/tests/deal_ticket/test_trading_deal_ticket_submit_account.py

@@ -1,7 +1,7 @@
 import pytest
 from playwright.sync_api import Page, expect
 from vega_sim.service import VegaService
-from actions.utils import change_keys
+from actions.utils import wait_for_toast_confirmation
 from conftest import init_vega
 from fixtures.market import setup_continuous_market
 
@@ -39,7 +39,9 @@ def test_should_display_info_and_button_for_deposit(continuous_market, vega: Veg
 def test_should_show_an_error_if_your_balance_is_zero(continuous_market, vega: VegaService, page: Page):
     page.goto(f"/#/markets/{continuous_market}")
     vega.create_key("key_empty")
-    change_keys(page, vega, "key_empty")
+    page.get_by_test_id("manage-vega-wallet").click()
+    page.locator('[role="menuitemradio"]').nth(4).click()
+    page.reload()
     page.get_by_test_id(order_size).fill("200")
     page.get_by_test_id(order_price).fill("20")
     # 7002-SORD-060

apps/trading/e2e/tests/get_started/test_get_started.py

@@ -4,8 +4,8 @@ import json
 from vega_sim.service import VegaService
 from fixtures.market import setup_simple_market
 from conftest import init_vega
+from collections import namedtuple
 from actions.vega import submit_order
-from wallet_config import MM_WALLET, TERMINATE_WALLET, wallets
 import logging
 
 logger = logging.getLogger()
@@ -74,6 +74,16 @@ class TestGetStarted:
 
         page.reload()
 
+        # Defined namedtuples
+        WalletConfig = namedtuple("WalletConfig", ["name", "passphrase"])
+
+        # Wallet Configurations
+        MM_WALLET = WalletConfig("mm", "pin")
+        MM_WALLET2 = WalletConfig("mm2", "pin2")
+        TERMINATE_WALLET = WalletConfig("FJMKnwfZdd48C8NqvYrG", "bY3DxwtsCstMIIZdNpKs")
+
+        wallets = [MM_WALLET, MM_WALLET2, TERMINATE_WALLET]
+
         mint_amount: float = 10e5
 
         for wallet in wallets:

apps/trading/e2e/tests/iceberg_orders/test_iceberg_orders.py

@@ -1,10 +1,22 @@
 import pytest
+from collections import namedtuple
 from playwright.sync_api import expect, Page
 from vega_sim.service import VegaService
 from actions.vega import submit_order
 from conftest import init_vega
 from fixtures.market import setup_continuous_market
-from wallet_config import MM_WALLET2
+
+# Defined namedtuples
+WalletConfig = namedtuple("WalletConfig", ["name", "passphrase"])
+
+# Wallet Configurations
+MM_WALLET = WalletConfig("mm", "pin")
+MM_WALLET2 = WalletConfig("mm2", "pin2")
+TERMINATE_WALLET = WalletConfig("FJMKnwfZdd48C8NqvYrG", "bY3DxwtsCstMIIZdNpKs")
+
+
+wallets = [MM_WALLET, MM_WALLET2, TERMINATE_WALLET]
+
 
 def hover_and_assert_tooltip(page: Page, element_text):
     element = page.get_by_text(element_text)
@@ -40,13 +52,55 @@ class TestIcebergOrdersValidations:
         vega.wait_fn(1)
         vega.wait_for_total_catchup()
         expect(page.get_by_test_id("toast-content")).to_have_text(
-            "Order filledYour transaction has been confirmedView in block explorerSubmit order - filledBTC:DAI_2023+3 @ 107.00 tDAI"
+            "Order filledYour transaction has been confirmed View in block explorerSubmit order - filledBTC:DAI_2023+3 @ 107.00 tDAI"
         )
         page.get_by_test_id("All").click()
         expect(
             (page.get_by_role("row").locator('[col-id="type"]')).nth(1)
         ).to_have_text("Limit (Iceberg)")
 
+    @pytest.mark.usefixtures("page", "auth", "risk_accepted")
+    def test_iceberg_tooltips(self, continuous_market, page: Page):
+        page.goto(f"/#/markets/{continuous_market}")
+        page.get_by_test_id("iceberg").hover()
+        expect(page.get_by_role("tooltip")).to_be_visible()
+        page.get_by_test_id("iceberg").click()
+        hover_and_assert_tooltip(page, "Peak size")
+        hover_and_assert_tooltip(page, "Minimum size")
+
+    @pytest.mark.usefixtures("page", "auth", "risk_accepted")
+    def test_iceberg_validations(self, continuous_market, page: Page):
+        page.goto(f"/#/markets/{continuous_market}")
+        page.get_by_test_id("iceberg").click()
+        page.get_by_test_id("place-order").click()
+        expect(page.get_by_test_id("deal-ticket-peak-error-message")).to_be_visible()
+        expect(page.get_by_test_id("deal-ticket-peak-error-message")).to_have_text(
+            "You need to provide a peak size"
+        )
+        expect(page.get_by_test_id("deal-ticket-minimum-error-message")).to_be_visible()
+        expect(page.get_by_test_id("deal-ticket-minimum-error-message")).to_have_text(
+            "You need to provide a minimum visible size"
+        )
+        page.get_by_test_id("order-peak-size").clear()
+        page.get_by_test_id("order-peak-size").type("1")
+        page.get_by_test_id("order-minimum-size").clear()
+        page.get_by_test_id("order-minimum-size").type("2")
+        expect(page.get_by_test_id("deal-ticket-peak-error-message")).to_be_visible()
+        expect(page.get_by_test_id("deal-ticket-peak-error-message")).to_have_text(
+            "Peak size cannot be greater than the size (0)"
+        )
+        expect(page.get_by_test_id("deal-ticket-minimum-error-message")).to_be_visible()
+        expect(page.get_by_test_id("deal-ticket-minimum-error-message")).to_have_text(
+            "Minimum visible size cannot be greater than the peak size (1)"
+        )
+        page.get_by_test_id("order-minimum-size").clear()
+        page.get_by_test_id("order-minimum-size").type("0.1")
+        expect(page.get_by_test_id("deal-ticket-minimum-error-message")).to_be_visible()
+        expect(page.get_by_test_id("deal-ticket-minimum-error-message")).to_have_text(
+            "Minimum visible size cannot be lower than 1"
+        )
+
+
 @pytest.mark.usefixtures("vega", "page", "continuous_market", "auth", "risk_accepted")
 def test_iceberg_open_order(continuous_market, vega: VegaService, page: Page):
     page.goto(f"/#/markets/{continuous_market}")

apps/trading/e2e/tests/liquidity_provision/test_liquidity_provision.py

@@ -3,8 +3,7 @@ from playwright.sync_api import Page, expect
 from vega_sim.service import VegaService
 from conftest import init_vega
 from fixtures.market import setup_continuous_market
-from actions.utils import next_epoch, truncate_middle, change_keys
-
+from actions.utils import next_epoch
 
 @pytest.fixture(scope="module")
 def vega(request):
@@ -21,28 +20,19 @@ def continuous_market(vega):
 def test_liquidity_provision_amendment(continuous_market, vega: VegaService, page: Page):
     # TODO Refactor asserting the grid
     page.goto(f"/#/liquidity/{continuous_market}")
-    change_keys(page, vega, "market_maker")
+    page.get_by_test_id("manage-vega-wallet").click()
+    #TODO Rename "mm" to "marketMaker" so that we don't have to specify where to click when switching wallets
+    # Currently the default click will click the middle of the element which will click the copy wallet key button
+    page.locator('[role="menuitemradio"] >> .mr-2.uppercase').nth(1).click(position={ "x": 0, "y": 0}, force=True)
+    page.reload()
     row = page.get_by_test_id("tab-myLP").locator(".ag-center-cols-container .ag-row").first
     expect(row).to_contain_text(
         "Active"
     )
-    # 5002-LIQP-006
-    expect(page.get_by_test_id("target-stake")).to_have_text("Target stake5.82757 tDAI")
-    # 5002-LIQP-007
-    expect(page.get_by_test_id("supplied-stake")).to_have_text("Supplied stake10,000.00 tDAI")
-    # 5002-LIQP-008
-    expect(page.get_by_test_id("liquidity-supplied")).to_have_text("Liquidity supplied 171,598.11%")
-    expect(page.get_by_test_id("fees-paid")).to_have_text("Fees paid-")
-    # 5002-LIQP-009
-    expect(page.get_by_test_id("liquidity-market-id")).to_have_text("Market ID" + truncate_middle(continuous_market))
-    expect(page.get_by_test_id("liquidity-learn-more")).to_have_text("Learn moreProviding liquidity")
-    # 002-LIQP-010
-    expect(page.get_by_test_id("liquidity-learn-more").get_by_test_id("external-link")).to_have_attribute("href", "https://docs.vega.xyz/testnet/concepts/liquidity/provision")
-
     vega.submit_simple_liquidity(
-        key_name="market_maker",
+        key_name="mm",
         market_id=continuous_market,
-        commitment_amount=1,
+        commitment_amount=100,
         fee=0.001,
         is_amendment=True,
     )
@@ -56,30 +46,7 @@ def test_liquidity_provision_amendment(continuous_market, vega: VegaService, pag
     )
     next_epoch(vega=vega)
     page.reload()
-    expect(page.get_by_test_id("supplied-stake")).to_have_text("Supplied stake1.00001 tDAI")
-    expect(page.get_by_test_id("liquidity-supplied")).to_have_text("Liquidity supplied 17.16%")
     row = page.get_by_test_id("tab-myLP").locator(".ag-center-cols-container .ag-row").first
     expect(row).to_contain_text(
         "Active"
-    )
-
-@pytest.mark.skip("Waiting for the ability to cancel LP")
-@pytest.mark.usefixtures("page", "auth", "risk_accepted")
-def test_liquidity_provision_inactive(continuous_market, vega: VegaService, page: Page):
-    # TODO Refactor asserting the grid
-    page.goto(f"/#/liquidity/{continuous_market}")
-    change_keys(page,vega, "market_maker")
-    row = page.get_by_test_id("tab-myLP").locator(".ag-center-cols-container .ag-row").first
-    expect(row).to_contain_text(
-        "Active"
-    )
-    vega.submit_simple_liquidity(
-        key_name="market_maker",
-        market_id=continuous_market,
-        commitment_amount=0,
-        fee=0,
-        is_amendment=False,
-    )
-    vega.wait_fn(1)
-    vega.wait_for_total_catchup()
-    
+    )

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

@@ -1,12 +1,23 @@
 import pytest
+
+from collections import namedtuple
 from playwright.sync_api import Page, expect
-from vega_sim.service import VegaService
+from vega_sim.service import VegaService, PeggedOrder
 from actions.vega import submit_order
-from wallet_config import MM_WALLET, MM_WALLET2
+
 import logging
 
 logger = logging.getLogger()
 
+
+# Wallet Configurations
+WalletConfig = namedtuple("WalletConfig", ["name", "passphrase"])
+MM_WALLET = WalletConfig("mm", "pin")
+MM_WALLET2 = WalletConfig("mm2", "pin2")
+TERMINATE_WALLET = WalletConfig("FJMKnwfZdd48C8NqvYrG", "bY3DxwtsCstMIIZdNpKs")
+
+wallets = [MM_WALLET, MM_WALLET2, TERMINATE_WALLET]
+
 table_row_selector = (
     '[data-testid="tab-open-markets"] .ag-center-cols-container .ag-row'
 )
@@ -74,7 +85,7 @@ def test_price_monitoring(simple_market, vega: VegaService, page: Page):
         time_in_force="TIME_IN_FORCE_GTC",
         volume=99,
     )
-    #6002-MDET-009
+
     expect(
         page.get_by_test_id(liquidity_supplied).get_by_test_id(item_value)
     ).to_have_text("0.00 (0.00%)")
@@ -192,7 +203,6 @@ def test_price_monitoring(simple_market, vega: VegaService, page: Page):
     # commented out because we have an issue #4233
     # expect(page.get_by_text("Opening auction")).to_be_hidden()
     
-    #6002-MDET-009
     expect(
         page.get_by_test_id(liquidity_supplied).get_by_test_id(item_value)
     ).to_have_text("50.00 (>100%)")

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

@@ -25,15 +25,15 @@ def test_table_headers(page: Page, create_markets):
     headers = [
         "Market",
         "Description",
-        "Settlement asset",
         "Trading mode",
         "Status",
         "Mark price",
         "24h volume",
-        "Open Interest",
+        "Settlement asset",
         "Spread",
         "",
     ]
+
     page.wait_for_selector('[data-testid="tab-open-markets"]', state="visible")
     page_headers = (
         page.get_by_test_id("tab-open-markets").locator(".ag-header-cell-text").all()
@@ -157,4 +157,4 @@ def test_drag_and_drop_column(page: Page, create_markets):
     page.locator(col_instrument_code).drag_to(
         page.locator('.ag-header-row [col-id="data.bestBidPrice"]')
     )
-    expect(page.locator(col_instrument_code)).to_have_attribute("aria-colindex", "9")
+    expect(page.locator(col_instrument_code)).to_have_attribute("aria-colindex", "8")

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

@@ -1,11 +1,24 @@
+from math import exp
 import pytest
 import vega_sim.api.governance as governance
 import re
+
+from collections import namedtuple
 from playwright.sync_api import Page, expect
 from vega_sim.service import VegaService
+
 from conftest import init_vega
 from fixtures.market import setup_simple_market
-from wallet_config import MM_WALLET, MM_WALLET2, TERMINATE_WALLET, wallets
+
+# Defined namedtuples
+WalletConfig = namedtuple("WalletConfig", ["name", "passphrase"])
+
+# Wallet Configurations
+MM_WALLET = WalletConfig("mm", "pin")
+MM_WALLET2 = WalletConfig("mm2", "pin2")
+TERMINATE_WALLET = WalletConfig("FJMKnwfZdd48C8NqvYrG", "bY3DxwtsCstMIIZdNpKs")
+
+wallets = [MM_WALLET, MM_WALLET2, TERMINATE_WALLET]
 
 row_selector = '[data-testid="tab-proposed-markets"] .ag-center-cols-container .ag-row'
 col_market_id = '[col-id="market"] [data-testid="stack-cell-primary"]'
@@ -16,6 +29,7 @@ def vega(request):
     with init_vega(request) as vega:
         yield vega
 
+
 @pytest.fixture(scope="module")
 def proposed_market(vega: VegaService):
     # setup market without liquidity provided
@@ -40,6 +54,7 @@ def test_can_see_table_headers(proposed_market, page: Page):
         "Settlement asset",
         "State",
         "Parent market",
+        "Voting",
         "Closing date",
         "Enactment date",
         "",
@@ -68,6 +83,10 @@ def test_renders_markets_correctly(proposed_market, page: Page):
         row.locator('[col-id="terms.change.successorConfiguration.parentMarketId"]')
     ).to_have_text("-")
 
+    # 6001-MARK-054
+    # 6001-MARK-055
+    expect(row.get_by_test_id("vote-progress-bar-against")).to_be_visible()
+
     # 6001-MARK-056
     expect(row.locator('[col-id="closing-date"]')).not_to_be_empty()
 
@@ -105,8 +124,8 @@ def test_can_drag_and_drop_columns(proposed_market, page: Page):
     page.goto("/#/markets/all")
     page.click('[data-testid="Proposed markets"]')
     col_market = page.locator('[col-id="market"]').first
-    col_state = page.locator('[col-id="state"]').first
-    col_market.drag_to(col_state)
+    col_vote = page.locator('[col-id="voting"]').first
+    col_market.drag_to(col_vote)
 
     # Check the attribute of the dragged element
     attribute_value = col_market.get_attribute("aria-colindex")

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

@@ -1,11 +1,23 @@
 import pytest
+from collections import namedtuple
 from playwright.sync_api import Page, expect
 from vega_sim.service import VegaService
 from actions.vega import submit_order
 from fixtures.market import setup_simple_market
 from conftest import init_vega
+
 from actions.utils import wait_for_toast_confirmation
-from wallet_config import MM_WALLET, MM_WALLET2
+
+
+# Defined namedtuples
+WalletConfig = namedtuple("WalletConfig", ["name", "passphrase"])
+
+# Wallet Configurations
+MM_WALLET = WalletConfig("mm", "pin")
+MM_WALLET2 = WalletConfig("mm2", "pin2")
+TERMINATE_WALLET = WalletConfig("FJMKnwfZdd48C8NqvYrG", "bY3DxwtsCstMIIZdNpKs")
+
+wallets = [MM_WALLET, MM_WALLET2, TERMINATE_WALLET]
 
 @pytest.fixture(scope="module")
 def vega(request):

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

@@ -1,11 +1,27 @@
 import pytest
 import vega_sim.api.governance as governance
+import re
+
+from collections import namedtuple
 from playwright.sync_api import Page, expect
 from vega_sim.service import VegaService, PeggedOrder
+import vega_sim.proto.vega as vega_protos
 import vega_sim.api.governance as governance
 from actions.vega import submit_order
-from wallet_config import MM_WALLET, MM_WALLET2, GOVERNANCE_WALLET
+from fixtures.market import setup_continuous_market
+from datetime import datetime
+from datetime import timedelta
+from vega_sim.service import MarketStateUpdateType
 
+# Defined namedtuples
+WalletConfig = namedtuple("WalletConfig", ["name", "passphrase"])
+
+# Wallet Configurations
+MM_WALLET = WalletConfig("mm", "pin")
+MM_WALLET2 = WalletConfig("mm2", "pin2")
+GOVERNANCE_WALLET = WalletConfig("FJMKnwfZdd48C8NqvYrG", "bY3DxwtsCstMIIZdNpKs")
+
+wallets = [MM_WALLET, MM_WALLET2, GOVERNANCE_WALLET]
 
 
 @pytest.mark.usefixtures("vega", "page", "proposed_market", "risk_accepted")
@@ -20,9 +36,6 @@ def test_market_lifecycle(proposed_market, vega: VegaService, page: Page):
     page.goto(f"/#/markets/{market_id}")
 
     # check that market is in proposed state
-    # 6002-MDET-006
-    # 6002-MDET-007
-    # 7002-SORD-061
     expect(trading_mode).to_have_text("No trading")
     expect(market_state).to_have_text("Proposed")
 
@@ -122,7 +135,7 @@ def test_market_closing_banners(page: Page, continuous_market, vega: VegaService
     page.goto(f"/#/markets/{market_id}")
     proposalID = vega.update_market_state(
         continuous_market,
-        "market_maker",
+        "mm",
         MarketStateUpdateType.Terminate,
         approve_proposal=False,
         vote_enactment_time = datetime.now() + timedelta(weeks=1),
@@ -135,7 +148,7 @@ def test_market_closing_banners(page: Page, continuous_market, vega: VegaService
 
     vega.update_market_state(
         continuous_market,
-        "market_maker",
+        "mm",
         MarketStateUpdateType.Terminate,
         approve_proposal=False,
         vote_enactment_time = datetime.now() + timedelta(weeks=1),
@@ -148,7 +161,7 @@ def test_market_closing_banners(page: Page, continuous_market, vega: VegaService
     governance.approve_proposal( 
         proposal_id=proposalID,
         wallet=vega.wallet,
-        key_name="market_maker"
+        key_name="mm"
         
     )
     vega.forward("60s")

apps/trading/e2e/tests/orderbook/test_orderbook.py

@@ -1,10 +1,19 @@
 import pytest
+from collections import namedtuple
 from playwright.sync_api import Page, expect
+from vega_sim.service import VegaService
 from typing import List
 from actions.vega import submit_order, submit_liquidity, submit_multiple_orders
 from conftest import init_vega
 from fixtures.market import setup_simple_market
-from wallet_config import MM_WALLET, MM_WALLET2
+
+# Defined namedtuples
+WalletConfig = namedtuple("WalletConfig", ["name", "passphrase"])
+
+# Wallet Configurations
+MM_WALLET = WalletConfig("mm", "pin")
+MM_WALLET2 = WalletConfig("mm2", "pin2")
+
 
 @pytest.fixture(scope="module")
 def vega():

apps/trading/e2e/tests/pnl/test_pnl.py

@@ -2,7 +2,6 @@ import pytest
 from playwright.sync_api import Page
 from vega_sim.service import VegaService
 from actions.vega import submit_order
-from actions.utils import change_keys
 
 def check_pnl_color_value(element, expected_color, expected_value):
     color = element.evaluate("element => getComputedStyle(element).color")
@@ -30,16 +29,18 @@ def test_pnl(continuous_market, vega: VegaService, page: Page):
     check_pnl_color_value(unrealised_pnl, "rgb(236, 0, 60)", "-4.00")
 
     # profit Trading unrealised
-    change_keys(page, vega, "market_maker")
+    page.get_by_test_id("manage-vega-wallet").click()
+    page.locator('[role="menuitemradio"] >> .mr-2.uppercase').nth(1).click(position={ "x": 0, "y": 0}, force=True)
     check_pnl_color_value(realised_pnl, "rgb(0, 0, 0)", "0.00")
     check_pnl_color_value(unrealised_pnl, "rgb(1, 145, 75)", "4.00")
 
     # neutral Trading unrealised
-    change_keys(page, vega, "market_maker_2")
+    page.locator('[role="menuitemradio"] >> .mr-2.uppercase').nth(2).click(position={ "x": 0, "y": 0}, force=True)
     check_pnl_color_value(realised_pnl, "rgb(0, 0, 0)", "0.00")
     check_pnl_color_value(unrealised_pnl, "rgb(0, 0, 0)", "0.00")
 
     # Portfolio Unrealised
+    page.get_by_test_id("manage-vega-wallet").click(force=True)
     page.get_by_role("link", name="Portfolio").click()
     page.get_by_test_id("Positions").click()
     page.wait_for_selector(
@@ -51,10 +52,10 @@ def test_pnl(continuous_market, vega: VegaService, page: Page):
         '//div[@role="row" and .//div[@col-id="partyId"]/div/span[text()="Key 1"]]'
     )
     key_mm = page.query_selector(
-        '//div[@role="row" and .//div[@col-id="partyId"]/div/span[text()="market_maker"]]'
+        '//div[@role="row" and .//div[@col-id="partyId"]/div/span[text()="mm"]]'
     )
     key_mm2 = page.query_selector(
-        '//div[@role="row" and .//div[@col-id="partyId"]/div/span[text()="market_maker_2"]]'
+        '//div[@role="row" and .//div[@col-id="partyId"]/div/span[text()="mm2"]]'
     )
 
     key_1_unrealised_pnl = key_1.query_selector('xpath=./div[@col-id="unrealisedPNL"]')
@@ -100,11 +101,12 @@ def test_pnl(continuous_market, vega: VegaService, page: Page):
     check_pnl_color_value(unrealised_pnl, "rgb(0, 0, 0)", "0.00")
 
     # profit trading realised
-    change_keys(page, vega, "market_maker")
+    page.get_by_test_id("manage-vega-wallet").click()
+    page.locator('[role="menuitemradio"] >> .mr-2.uppercase').nth(1).click(position={ "x": 0, "y": 0}, force=True)
     check_pnl_color_value(realised_pnl, "rgb(1, 145, 75)", "8.00")
     check_pnl_color_value(unrealised_pnl, "rgb(0, 0, 0)", "0.00")
 
     # loss trading realised
-    change_keys(page, vega, "Key 1")
+    page.locator('[role="menuitemradio"] >> .mr-2.uppercase').nth(0).click(position={ "x": 0, "y": 0}, force=True)
     check_pnl_color_value(realised_pnl, "rgb(236, 0, 60)", "-8.00")
     check_pnl_color_value(unrealised_pnl, "rgb(0, 0, 0)", "0.00")

apps/trading/e2e/tests/settings/test_settings.py

@@ -32,12 +32,12 @@ def test_share_usage_data(page: Page):
 
 # Define a mapping of icon selectors to toast selectors
 ICON_TO_TOAST = {
-    'aria-label="arrow-top-left icon"': 'class="relative flex-1 overflow-auto p-4 pr-[40px] [&>p]:mb-[2.5px]"',
-    'aria-label="arrow-up icon"': 'class="relative flex-1 overflow-auto p-4 pr-[40px] [&>p]:mb-[2.5px]"',
-    'aria-label="arrow-top-right icon"': 'class="relative flex-1 overflow-auto p-4 pr-[40px] [&>p]:mb-[2.5px]"',
-    'aria-label="arrow-bottom-left icon"': 'class="relative flex-1 overflow-auto p-4 pr-[40px] [&>p]:mb-[2.5px]"',
-    'aria-label="arrow-down icon"': 'class="relative flex-1 overflow-auto p-4 pr-[40px] [&>p]:mb-[2.5px]"',
-    'aria-label="arrow-bottom-right icon"': 'class="relative flex-1 overflow-auto p-4 pr-[40px] [&>p]:mb-[2.5px]"',
+    'aria-label="arrow-top-left icon"': 'class="group absolute z-20 top-0 left-0 max-w-full max-h-full overflow-x-hidden overflow-y-auto p-4"',
+    'aria-label="arrow-up icon"': 'class="group absolute z-20 top-0 left-[50%] translate-x-[-50%] max-w-full max-h-full overflow-x-hidden overflow-y-auto p-4"',
+    'aria-label="arrow-top-right icon"': 'class="group absolute z-20 top-0 right-0 max-w-full max-h-full overflow-x-hidden overflow-y-auto p-4"',
+    'aria-label="arrow-bottom-left icon"': 'class="group absolute z-20 bottom-0 left-0 max-w-full max-h-full overflow-x-hidden overflow-y-auto p-4"',
+    'aria-label="arrow-down icon"': 'class="group absolute z-20 bottom-0 left-[50%] translate-x-[-50%] max-w-full max-h-full overflow-x-hidden overflow-y-auto p-4"',
+    'aria-label="arrow-bottom-right icon"': 'class="group absolute z-20 bottom-0 right-0 max-w-full max-h-full overflow-x-hidden overflow-y-auto p-4"',
 }
 
 

apps/trading/e2e/tests/trading_chart/test_trading_chart.py

@@ -18,8 +18,8 @@
 #     page.goto(f"/#/markets/{continuous_market}")
 #     vega.forward("24h")
 #     vega.wait_for_total_catchup()
-#     submit_order(vega, "market_maker", continuous_market, "SIDE_SELL", 1, 101.50000)
-#     submit_order(vega, "market_maker_2", continuous_market, "SIDE_SELL", 1, 101.50000)
+#     submit_order(vega, "mm", continuous_market, "SIDE_SELL", 1, 101.50000)
+#     submit_order(vega, "mm2", continuous_market, "SIDE_SELL", 1, 101.50000)
 #     vega.forward("10s")
 #     vega.wait_for_total_catchup()
 

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

@@ -2,7 +2,7 @@ import pytest
 import re
 from playwright.sync_api import Page, expect
 from vega_sim.service import VegaService
-from actions.utils import wait_for_toast_confirmation, create_and_faucet_wallet, WalletConfig, next_epoch, change_keys
+from actions.utils import wait_for_toast_confirmation, create_and_faucet_wallet, WalletConfig, next_epoch
 import vega_sim.proto.vega as vega_protos
 
 LIQ = WalletConfig("liq", "liq")
@@ -42,7 +42,7 @@ def test_transfer_submit(continuous_market, vega: VegaService, page: Page):
     vega.forward("10s")
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
-    expected_confirmation_text = re.compile(r"Transfer completeYour transaction has been confirmedView in block explorerTransferTo .{6}….{6}1\.00 tDAI")
+    expected_confirmation_text = re.compile(r"Transfer completeYour transaction has been confirmed View in block explorerTransferTo .{6}….{6}1\.00 tDAI")
     actual_confirmation_text = page.get_by_test_id('toast-content').text_content()
     assert expected_confirmation_text.search(actual_confirmation_text), f"Expected pattern not found in {actual_confirmation_text}"
     
@@ -50,7 +50,7 @@ def test_transfer_submit(continuous_market, vega: VegaService, page: Page):
 @pytest.mark.usefixtures("page", "auth", "risk_accepted")
 def test_transfer_vesting_below_minimum(continuous_market, vega: VegaService, page: Page):
     vega.update_network_parameter(
-    "market_maker", parameter="transfer.minTransferQuantumMultiple", new_value="100000" 
+    "mm", parameter="transfer.minTransferQuantumMultiple", new_value="100000" 
     )
     vega.wait_for_total_catchup()
     
@@ -97,7 +97,9 @@ def test_transfer_vesting_below_minimum(continuous_market, vega: VegaService, pa
     page.goto('/#/portfolio')
     expect(page.get_by_test_id('transfer-form')).to_be_visible
     
-    change_keys(page, vega, "party_b")
+    page.get_by_test_id("manage-vega-wallet").click()
+    page.locator('[role="menuitemradio"]').nth(5).click()
+    page.reload()
     page.get_by_test_id('select-asset').click()
     page.get_by_test_id('rich-select-option').click()
     
@@ -127,6 +129,6 @@ def test_transfer_vesting_below_minimum(continuous_market, vega: VegaService, pa
     vega.forward("10s")
     vega.wait_fn(1)
     vega.wait_for_total_catchup()
-    expected_confirmation_text = re.compile(r"Transfer completeYour transaction has been confirmedView in block explorerTransferTo .{6}….{6}0\.00001 tDAI")
+    expected_confirmation_text = re.compile(r"Transfer completeYour transaction has been confirmed View in block explorerTransferTo .{6}….{6}0\.00001 tDAI")
     actual_confirmation_text = page.get_by_test_id('toast-content').text_content()
     assert expected_confirmation_text.search(actual_confirmation_text), f"Expected pattern not found in {actual_confirmation_text}"

apps/trading/e2e/wallet_config.py

@@ -1,12 +0,0 @@
-from collections import namedtuple
-
-# Defined namedtuples
-WalletConfig = namedtuple("WalletConfig", ["name", "passphrase"])
-
-# Wallet Configurations
-MM_WALLET = WalletConfig("market_maker", "pin")
-MM_WALLET2 = WalletConfig("market_maker_2", "pin2")
-TERMINATE_WALLET = WalletConfig("FJMKnwfZdd48C8NqvYrG", "bY3DxwtsCstMIIZdNpKs")
-GOVERNANCE_WALLET = WalletConfig("FJMKnwfZdd48C8NqvYrG", "bY3DxwtsCstMIIZdNpKs")
-
-wallets = [MM_WALLET, MM_WALLET2, TERMINATE_WALLET, GOVERNANCE_WALLET]

apps/trading/lib/i18n/index.ts

@@ -66,18 +66,7 @@ i18n
       'environment',
       'fills',
       'funding-payments',
-      'ledger',
-      'liquidity',
-      'market-depth',
-      'markets',
-      'orders',
-      'positions',
-      'trades',
       'trading',
-      'ui-toolkit',
-      'utils',
-      'wallet',
-      'web3',
     ],
     defaultNS: 'trading',
     nsSeparator: false,

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

@@ -39,7 +39,6 @@ export const AgGridThemed = ({
         ref={gridRef}
         overlayLoadingTemplate={t('Loading...')}
         overlayNoRowsTemplate={t('No data')}
-        suppressDragLeaveHidesColumns
         {...defaultProps}
         {...props}
       />

libs/deal-ticket/src/components/deal-ticket/deal-ticket-stop-order.spec.tsx

@@ -101,7 +101,7 @@ describe('StopOrder', () => {
     jest.clearAllMocks();
   });
 
-  it('should display ticket defaults limit order', async () => {
+  it('should display ticket defaults', async () => {
     render(generateJsx());
     // place order button should always be enabled
     expect(screen.getByTestId(submitButton)).toBeEnabled();
@@ -131,47 +131,6 @@ describe('StopOrder', () => {
     });
   });
 
-  it('should display ticket defaults market order', async () => {
-    render(generateJsx());
-    // place order button should always be enabled
-    expect(screen.getByTestId(submitButton)).toBeEnabled();
-    // Assert defaults are used
-    await userEvent.click(screen.getByTestId(orderTypeTrigger));
-    await userEvent.click(screen.getByTestId(orderTypeMarket));
-    await userEvent.click(screen.getByTestId(orderTypeTrigger));
-    expect(screen.getByTestId(orderTypeLimit).dataset.state).toEqual(
-      'unchecked'
-    );
-    expect(screen.getByTestId(orderTypeMarket).dataset.state).toEqual(
-      'checked'
-    );
-    await userEvent.click(screen.getByTestId(orderTypeMarket));
-    expect(screen.getByTestId(orderSideBuy).dataset.state).toEqual('checked');
-    expect(screen.getByTestId(sizeInput)).toHaveDisplayValue('0');
-    expect(screen.getByTestId(timeInForce)).toHaveValue(
-      Schema.OrderTimeInForce.TIME_IN_FORCE_FOK
-    );
-    // 7002-SORD-084
-    expect(
-      screen.getByTestId(triggerDirectionRisesAbove).dataset.state
-    ).toEqual('checked');
-    // 7002-SORD-085
-    expect(
-      screen.getByTestId(triggerDirectionFallsBelow).dataset.state
-    ).toEqual('unchecked');
-    expect(screen.getByTestId(triggerTypePrice).dataset.state).toEqual(
-      'checked'
-    );
-    expect(screen.getByTestId(expire).dataset.state).toEqual('unchecked');
-    expect(screen.getByTestId(oco).dataset.state).toEqual('unchecked');
-    await userEvent.click(screen.getByTestId(expire));
-    await waitFor(() => {
-      expect(screen.getByTestId(expiryStrategySubmit).dataset.state).toEqual(
-        'checked'
-      );
-    });
-  });
-
   it('calculate notional for market limit', async () => {
     render(generateJsx());
     await userEvent.type(screen.getByTestId(sizeInput), '10');
@@ -280,43 +239,33 @@ describe('StopOrder', () => {
   it.each([
     { fieldName: 'size', ocoValue: false },
     { fieldName: 'ocoSize', ocoValue: true },
-    { fieldName: 'size', ocoValue: false, orderTypeMarketValue: true },
-    { fieldName: 'ocoSize', ocoValue: true, orderTypeMarketValue: true },
-  ])(
-    'validates $fieldName field',
-    async ({ ocoValue, orderTypeMarketValue }) => {
-      render(generateJsx());
-      if (orderTypeMarketValue) {
-        await userEvent.click(screen.getByTestId(orderTypeTrigger));
-        await userEvent.click(screen.getByTestId(orderTypeMarket));
-      }
-      if (ocoValue) {
-        await userEvent.click(screen.getByTestId(oco));
-      }
-      await userEvent.click(screen.getByTestId(submitButton));
-      const getByTestId = (id: string) =>
-        screen.getByTestId(ocoPostfix(id, ocoValue));
-      const queryByTestId = (id: string) =>
-        screen.queryByTestId(ocoPostfix(id, ocoValue));
-      // default value should be invalid
-      expect(getByTestId(sizeErrorMessage)).toBeInTheDocument();
-      // to small value should be invalid
-      await userEvent.type(getByTestId(sizeInput), '0.01');
-      expect(getByTestId(sizeErrorMessage)).toBeInTheDocument();
-
-      // clear and fill using valid value
-      await userEvent.clear(getByTestId(sizeInput));
-      await userEvent.type(getByTestId(sizeInput), '0.1');
-      expect(queryByTestId(sizeErrorMessage)).toBeNull();
+  ])('validates $fieldName field', async ({ ocoValue }) => {
+    render(generateJsx());
+    if (ocoValue) {
+      await userEvent.click(screen.getByTestId(oco));
     }
-  );
+    await userEvent.click(screen.getByTestId(submitButton));
+    const getByTestId = (id: string) =>
+      screen.getByTestId(ocoPostfix(id, ocoValue));
+    const queryByTestId = (id: string) =>
+      screen.queryByTestId(ocoPostfix(id, ocoValue));
+    // default value should be invalid
+    expect(getByTestId(sizeErrorMessage)).toBeInTheDocument();
+    // to small value should be invalid
+    await userEvent.type(getByTestId(sizeInput), '0.01');
+    expect(getByTestId(sizeErrorMessage)).toBeInTheDocument();
+
+    // clear and fill using valid value
+    await userEvent.clear(getByTestId(sizeInput));
+    await userEvent.type(getByTestId(sizeInput), '0.1');
+    expect(queryByTestId(sizeErrorMessage)).toBeNull();
+  });
 
   it.each([
     { fieldName: 'price', ocoValue: false },
     { fieldName: 'ocoPrice', ocoValue: true },
   ])('validates $fieldName field', async ({ ocoValue }) => {
     render(generateJsx());
-
     if (ocoValue) {
       await userEvent.click(screen.getByTestId(oco));
     }
@@ -326,7 +275,7 @@ describe('StopOrder', () => {
       screen.getByTestId(ocoPostfix(id, ocoValue));
     const queryByTestId = (id: string) =>
       screen.queryByTestId(ocoPostfix(id, ocoValue));
-    // 7002-SORD-095
+
     expect(getByTestId(priceErrorMessage)).toBeInTheDocument();
     await userEvent.type(getByTestId(priceInput), '0.001');
     expect(getByTestId(priceErrorMessage)).toBeInTheDocument();
@@ -356,77 +305,48 @@ describe('StopOrder', () => {
   it.each([
     { fieldName: 'triggerPrice', ocoValue: false },
     { fieldName: 'ocoTriggerPrice', ocoValue: true },
-    { fieldName: 'triggerPrice', ocoValue: false, orderTypeMarketValue: true },
-    {
-      fieldName: 'ocoTriggerPrice',
-      ocoValue: true,
-      orderTypeMarketValue: true,
-    },
-  ])(
-    'validates $fieldName field',
-    async ({ ocoValue, orderTypeMarketValue }) => {
-      render(generateJsx());
-      if (orderTypeMarketValue) {
-        await userEvent.click(screen.getByTestId(orderTypeTrigger));
-        await userEvent.click(screen.getByTestId(orderTypeMarket));
-      }
-      if (ocoValue) {
-        await userEvent.click(screen.getByTestId(oco));
-        await userEvent.click(screen.getByTestId(triggerDirectionFallsBelow));
-      }
-      await userEvent.click(screen.getByTestId(submitButton));
-      const getByTestId = (id: string) =>
-        screen.getByTestId(ocoPostfix(id, ocoValue));
-      const queryByTestId = (id: string) =>
-        screen.queryByTestId(ocoPostfix(id, ocoValue));
-      // 7002-SORD-095
-      // 7002-SORD-087
+  ])('validates $fieldName field', async ({ ocoValue }) => {
+    render(generateJsx());
 
-      expect(getByTestId(triggerPriceErrorMessage)).toBeInTheDocument();
-
-      // switch to trailing percentage offset trigger type
-      await userEvent.click(getByTestId(triggerTypeTrailingPercentOffset));
-      expect(queryByTestId(triggerPriceErrorMessage)).toBeNull();
-
-      // switch back to price trigger type
-      await userEvent.click(getByTestId(triggerTypePrice));
-      expect(getByTestId(triggerPriceErrorMessage)).toBeInTheDocument();
-
-      // to small value should be invalid
-      await userEvent.type(getByTestId(triggerPriceInput), '0.001');
-      expect(getByTestId(triggerPriceErrorMessage)).toBeInTheDocument();
-
-      // clear and fill using value causing immediate trigger
-      await userEvent.clear(getByTestId(triggerPriceInput));
-      await userEvent.type(getByTestId(triggerPriceInput), '0.01');
-      expect(queryByTestId(triggerPriceErrorMessage)).toBeNull();
-      expect(queryByTestId(triggerPriceWarningMessage)).toBeInTheDocument();
-
-      // change to correct value
-      await userEvent.type(getByTestId(triggerPriceInput), '2');
-      expect(queryByTestId(triggerPriceWarningMessage)).toBeNull();
+    if (ocoValue) {
+      await userEvent.click(screen.getByTestId(oco));
+      await userEvent.click(screen.getByTestId(triggerDirectionFallsBelow));
     }
-  );
+    await userEvent.click(screen.getByTestId(submitButton));
+    const getByTestId = (id: string) =>
+      screen.getByTestId(ocoPostfix(id, ocoValue));
+    const queryByTestId = (id: string) =>
+      screen.queryByTestId(ocoPostfix(id, ocoValue));
+    expect(getByTestId(triggerPriceErrorMessage)).toBeInTheDocument();
+
+    // switch to trailing percentage offset trigger type
+    await userEvent.click(getByTestId(triggerTypeTrailingPercentOffset));
+    expect(queryByTestId(triggerPriceErrorMessage)).toBeNull();
+
+    // switch back to price trigger type
+    await userEvent.click(getByTestId(triggerTypePrice));
+    expect(getByTestId(triggerPriceErrorMessage)).toBeInTheDocument();
+
+    // to small value should be invalid
+    await userEvent.type(getByTestId(triggerPriceInput), '0.001');
+    expect(getByTestId(triggerPriceErrorMessage)).toBeInTheDocument();
+
+    // clear and fill using value causing immediate trigger
+    await userEvent.clear(getByTestId(triggerPriceInput));
+    await userEvent.type(getByTestId(triggerPriceInput), '0.01');
+    expect(queryByTestId(triggerPriceErrorMessage)).toBeNull();
+    expect(queryByTestId(triggerPriceWarningMessage)).toBeInTheDocument();
+
+    // change to correct value
+    await userEvent.type(getByTestId(triggerPriceInput), '2');
+    expect(queryByTestId(triggerPriceWarningMessage)).toBeNull();
+  });
 
   it.each([
     { fieldName: 'trailingPercentageOffset', ocoValue: false },
     { fieldName: 'ocoTrailingPercentageOffset', ocoValue: true },
-    {
-      fieldName: 'trailingPercentageOffset',
-      ocoValue: false,
-      orderTypeMarket: true,
-    },
-    {
-      fieldName: 'ocoTrailingPercentageOffset',
-      ocoValue: true,
-      orderTypeMarket: true,
-    },
   ])('validates $fieldName field', async ({ ocoValue }) => {
     render(generateJsx());
-    if (orderTypeMarket) {
-      await userEvent.click(screen.getByTestId(orderTypeTrigger));
-      await userEvent.click(screen.getByTestId(orderTypeMarket));
-    }
     if (ocoValue) {
       await userEvent.click(screen.getByTestId(oco));
     }
@@ -481,11 +401,9 @@ describe('StopOrder', () => {
   it('sync oco trigger', async () => {
     render(generateJsx());
     await userEvent.click(screen.getByTestId(oco));
-    // 7002-SORD-099
     expect(
       screen.getByTestId(triggerDirectionRisesAbove).dataset.state
     ).toEqual('checked');
-    // 7002-SORD-091
     expect(
       screen.getByTestId(ocoPostfix(triggerDirectionFallsBelow)).dataset.state
     ).toEqual('checked');
@@ -563,7 +481,6 @@ describe('StopOrder', () => {
     expect(mockDataProvider.mock.lastCall?.[0].skip).toBe(true);
     await userEvent.type(screen.getByTestId(sizeInput), '0.01');
     expect(mockDataProvider.mock.lastCall?.[0].skip).toBe(false);
-    // 7002-SORD-011
     expect(screen.getByTestId(numberOfActiveOrdersLimit)).toBeInTheDocument();
   });
 

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

@@ -367,29 +367,6 @@ describe('DealTicket', () => {
     });
   });
 
-  it('should see an explanation of peak size', async () => {
-    render(generateJsx());
-    await userEvent.click(screen.getByTestId('iceberg'));
-    await userEvent.hover(screen.getByText('Peak size'));
-    await waitFor(() => {
-      const tooltips = screen.getAllByTestId('tooltip-content');
-      expect(tooltips[0]).toHaveTextContent(
-        `The maximum volume that can be traded at once. Must be less than the total size of the order.`
-      );
-    });
-  });
-  it('should see an explanation of minimum size', async () => {
-    render(generateJsx());
-    await userEvent.click(screen.getByTestId('iceberg'));
-    await userEvent.hover(screen.getByText('Minimum size'));
-    await waitFor(() => {
-      const tooltips = screen.getAllByTestId('tooltip-content');
-      expect(tooltips[0]).toHaveTextContent(
-        `When the order trades and its size falls below this threshold, it will be reset to the peak size and moved to the back of the priority order. Must be less than or equal to peak size, and greater than 0.`
-      );
-    });
-  });
-
   it('should see an explanation of reduce only', async () => {
     render(generateJsx());
     userEvent.hover(screen.getByText('Reduce only'));

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

@@ -85,7 +85,6 @@ export const DocsLinks = VEGA_DOCS_URL
       ICEBERG_ORDERS: `${VEGA_DOCS_URL}/concepts/trading-on-vega/orders#iceberg-order`,
       POST_REDUCE_ONLY: `${VEGA_DOCS_URL}/concepts/trading-on-vega/orders#conditional-order-parameters`,
       QUANTUM: `${VEGA_DOCS_URL}/concepts/assets/asset-framework#quantum`,
-      REFERRALS: `${VEGA_DOCS_URL}/tutorials/proposals/referral-program-proposal`,
     }
   : undefined;
 

libs/i18n/src/index.ts

@@ -1,5 +1,4 @@
 export * from './lib/i18n';
-
 import en_accounts from './locales/en/accounts.json';
 import en_assets from './locales/en/assets.json';
 import en_candles_chart from './locales/en/candles-chart.json';
@@ -13,12 +12,8 @@ import en_governance from './locales/en/governance.json';
 import en_trading from './locales/en/trading.json';
 import en_markets from './locales/en/markets.json';
 import en_web3 from './locales/en/web3.json';
-import en_proposals from './locales/en/proposals.json';
-import en_positions from './locales/en/positions.json';
-import en_trades from './locales/en/trading.json';
-import en_ui_toolkit from './locales/en/ui-toolkit.json';
-import en_wallet from './locales/en/wallet.json';
 
+import en_positions from './locales/en/positions.json';
 export const locales = {
   en: {
     accounts: en_accounts,
@@ -35,9 +30,5 @@ export const locales = {
     markets: en_markets,
     web3: en_web3,
     positions: en_positions,
-    proposals: en_proposals,
-    trades: en_trades,
-    'ui-toolkit': en_ui_toolkit,
-    wallet: en_wallet,
   },
 };

libs/i18n/src/locales/en/explorer.json

@@ -1 +0,0 @@
-{}

libs/i18n/src/locales/en/markets.json

@@ -139,5 +139,5 @@
   "View settlement data specification": "View settlement data specification",
   "View settlement schedule specification": "View settlement schedule specification",
   "View termination specification": "View termination specification",
-  "Within {{horizonSecs}} seconds": "Within {{horizonSecs}} seconds"
+  "Within %s seconds": "Within %s seconds"
 }

libs/i18n/src/locales/en/proposals.json

@@ -1,46 +0,0 @@
-{
-  "[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.",
-  "Changes have been proposed for this market.": "Changes have been proposed for this market.",
-  "Closing date": "Closing date",
-  "Confirm transaction in wallet": "Confirm transaction in wallet",
-  "Enactment date: {{date}}": "Enactment date: {{date}}",
-  "Enactment date": "Enactment date",
-  "estimated time to protocol upgrade": "estimated time to protocol upgrade",
-  "estimating...": "estimating...",
-  "Market": "Market",
-  "Network upgrade in {{countdown}}": "Network upgrade in {{countdown}}",
-  "No proposed markets": "No proposed markets",
-  "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",
-  "Proposal declined": "Proposal declined",
-  "Proposal enacted": "Proposal enacted",
-  "Proposal failed": "Proposal failed",
-  "Proposal passed": "Proposal passed",
-  "Proposal rejected": "Proposal rejected",
-  "Proposal submitted": "Proposal submitted",
-  "Proposal waiting for node vote": "Proposal waiting for node vote",
-  "Rejection reason: {{reason}}": "Rejection reason: {{reason}}",
-  "Settlement asset": "Settlement asset",
-  "State": "State",
-  "Submission failed": "Submission failed",
-  "The network is being upgraded to {{vegaReleaseTag}}": "The network is being upgraded to {{vegaReleaseTag}}",
-  "The network will upgrade to {{vegaReleaseTag}} in {{countdown}}": "The network will upgrade to {{vegaReleaseTag}} in {{countdown}}",
-  "Trading activity will be interrupted, manage your risk appropriately.": "Trading activity will be interrupted, manage your risk appropriately.",
-  "Trading and other network activity has stopped until the upgrade is complete.": "Trading and other network activity has stopped until the upgrade is complete.",
-  "Transaction complete": "Transaction complete",
-  "Transaction failed": "Transaction failed",
-  "Unknown proposal {{proposalState}}": "Unknown proposal {{proposalState}}",
-  "Update <0>{{key}}</0> to {{value}}": "Update <0>{{key}}</0> to {{value}}",
-  "View details": "View details",
-  "View in block explorer": "View in block explorer",
-  "View proposal details": "View proposal details",
-  "View proposal": "View proposal",
-  "Voting": "Voting",
-  "Your transaction has been confirmed": "Your transaction has been confirmed"
-}

libs/i18n/src/locales/en/trades.json

@@ -1,6 +0,0 @@
-{
-  "Created at": "Created at",
-  "No trades": "No trades",
-  "Price": "Price",
-  "Size": "Size"
-}

libs/i18n/src/locales/en/trading.json

@@ -2,7 +2,6 @@
   "(Combined set volume {{runningVolume}} over last {{epochs}} epochs)": "(Combined set volume {{runningVolume}} over last {{epochs}} epochs)",
   "(Created at: {{createdAt}})": "(Created at: {{createdAt}})",
   "{{amount}} $VEGA staked": "{{amount}} $VEGA staked",
-  "{{assetSymbol}} Reward pot": "{{assetSymbol}} Reward pot",
   "{{checkedAssets}} Assets": "{{checkedAssets}} Assets",
   "{{distance}} ago": "{{distance}} ago",
   "{{instrumentCode}} liquidity provision": "{{instrumentCode}} liquidity provision",
@@ -18,9 +17,7 @@
   "Anyone with the referral link can apply it to their key(s) of choice via an on chain transaction": "Anyone with the referral link can apply it to their key(s) of choice via an on chain transaction",
   "Asset (1)": "Asset (1)",
   "Assets": "Assets",
-  "Available to withdraw this epoch": "Available to withdraw this epoch",
   "Base commission rate": "Base commission rate",
-  "Base rate": "Base rate",
   "Best bid": "Best bid",
   "Best offer": "Best offer",
   "Browse": "Browse",
@@ -74,7 +71,6 @@
   "Discounts are applied automatically during trading based on the key(s) used": "Discounts are applied automatically during trading based on the key(s) used",
   "Docs": "Docs",
   "Earn commission & stake rewards": "Earn commission & stake rewards",
-  "Earned by me": "Earned by me",
   "Enactment date reached and usual auction exit checks pass": "Enactment date reached and usual auction exit checks pass",
   "Environment not configured": "Environment not configured",
   "epochs in referral set": "epochs in referral set",
@@ -100,7 +96,6 @@
   "Funding Rate": "Funding Rate",
   "Funding rate": "Funding rate",
   "Futures": "Futures",
-  "From epoch": "From epoch",
   "Generate a referral code to share with your friends and start earning commission.": "Generate a referral code to share with your friends and start earning commission.",
   "Generate code": "Generate code",
   "Get started": "Get started",
@@ -114,7 +109,6 @@
   "Help identify bugs and improve the service by sharing anonymous usage data.": "Help identify bugs and improve the service by sharing anonymous usage data.",
   "Help us identify bugs and improve Vega Governance by sharing anonymous usage data.": "Help us identify bugs and improve Vega Governance by sharing anonymous usage data.",
   "Hide closed markets": "Hide closed markets",
-  "Hoarder reward multiplier": "Hoarder reward multiplier",
   "How it works": "How it works",
   "I want a code": "I want a code",
   "Improve vega console": "Improve vega console",
@@ -128,7 +122,6 @@
   "Liquidity": "Liquidity",
   "Liquidity fees": "Liquidity fees",
   "Liquidity supplied": "Liquidity supplied",
-  "Locked {{assetSymbol}}": "Locked {{assetSymbol}}",
   "Low fees and no cost to place orders": "Low fees and no cost to place orders",
   "Mainnet status & incidents": "Mainnet status & incidents",
   "Make withdrawal": "Make withdrawal",
@@ -164,7 +157,6 @@
   "No perpetual markets.": "No perpetual markets.",
   "No referral program active": "No referral program active",
   "No rejected orders": "No rejected orders",
-  "No rewards": "No rewards",
   "No thanks": "No thanks",
   "No third party has access to your funds.": "No third party has access to your funds.",
   "No volume discount program active": "No volume discount program active",
@@ -173,7 +165,6 @@
   "Non-custodial and pseudonymous": "Non-custodial and pseudonymous",
   "None": "None",
   "Number of traders": "Number of traders",
-  "Not connected": "Not connected",
   "Open": "Open",
   "Open a position": "Open a position",
   "Open markets": "Open markets",
@@ -185,7 +176,7 @@
   "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 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",
   "Portfolio": "Portfolio",
   "Positions": "Positions",
@@ -202,7 +193,6 @@
   "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",
   "Referral benefits": "Referral benefits",
   "Referral discount": "Referral discount",
   "referral-statistics-commission": "Commission earned in <0>qUSD</0> (last {{count}} epochs)",
@@ -215,9 +205,6 @@
   "Required epochs": "Required epochs",
   "Required for next tier": "Required for next tier",
   "Resources": "Resources",
-  "Rewards": "Rewards",
-  "Rewards history": "Rewards history",
-  "Rewards multipliers": "Rewards multipliers",
   "SCCR": "SCCR",
   "Search": "Search",
   "See all markets": "See all markets",
@@ -242,12 +229,10 @@
   "Status": "Status",
   "Stop": "Stop",
   "Stop orders": "Stop orders",
-  "Streak reward multiplier": "Streak reward multiplier",
   "Successor of a market": "Successor of a market",
   "Successors to this market have been proposed": "Successors to this market have been proposed",
   "Supplied stake": "Supplied stake",
   "Suspended due to price or liquidity monitoring trigger": "Suspended due to price or liquidity monitoring trigger",
-  "to": "to",
   "Target stake": "Target stake",
   "The amount of fees paid to liquidity providers across the whole market during the last epoch {{epoch}}.": "The amount of fees paid to liquidity providers across the whole market during the last epoch {{epoch}}.",
   "The commission is taken from the infrastructure fee, maker fee, and liquidity provider fee, not from the referee": "The commission is taken from the infrastructure fee, maker fee, and liquidity provider fee, not from the referee",
@@ -269,7 +254,6 @@
   "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",
   "Total fee before discount": "Total fee before discount",
   "Trader": "Trader",
@@ -283,10 +267,6 @@
   "Transfer": "Transfer",
   "Unknown": "Unknown",
   "Unknown settlement date": "Unknown settlement date",
-  "Vega Reward pot": "Vega Reward pot",
-  "Vesting": "Vesting",
-  "Vesting {{assetSymbol}}": "Vesting {{assetSymbol}}",
-  "Vesting multiplier": "Vesting multiplier",
   "View as party": "View as party",
   "View liquidity provision table": "View liquidity provision table",
   "View on Explorer": "View on Explorer",
@@ -304,7 +284,6 @@
   "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.",

libs/i18n/src/locales/en/ui-toolkit.json

@@ -1,21 +0,0 @@
-{
-  "{{fee}} Fee": "{{fee}} Fee",
-  "Auction Trigger stake {{trigger}}": "Auction Trigger stake {{trigger}}",
-  "Collapse": "Collapse",
-  "Copied": "Copied",
-  "Dark mode": "Dark mode",
-  "Dismiss all toasts": "Dismiss all toasts",
-  "Dismiss all": "Dismiss all",
-  "Exit view as": "Exit view as",
-  "Expand": "Expand",
-  "Light mode": "Light mode",
-  "Loading...": "Loading...",
-  "No data": "No data",
-  "Providers greater than 2x target stake not shown": "Providers greater than 2x target stake not shown",
-  "Show more": "Show more",
-  "Something went wrong: {{errorMessage}}": "Something went wrong: {{errorMessage}}",
-  "Target stake {{target}}": "Target stake {{target}}",
-  "This is an example of a toast notification": "This is an example of a toast notification",
-  "Try again": "Try again",
-  "Viewing as Vega user: {{pubKey}}": "Viewing as Vega user: {{pubKey}}"
-}

libs/i18n/src/locales/en/wallet.json

@@ -1,63 +0,0 @@
-{
-  "About the Vega wallet": "About the Vega wallet",
-  "Supported browsers": "Supported browsers",
-  "Connect Vega wallet": "Connect Vega wallet",
-  "Get a Vega wallet": "Get a Vega wallet",
-  "Connect securely, deposit funds and approve or reject transactions with the Vega wallet": "Connect securely, deposit funds and approve or reject transactions with the Vega wallet",
-  "Connect": "Connect",
-  "Vega Wallet <0>full featured<0>": "Vega Wallet <0>full featured<0>",
-  "your browser": "your browser",
-  "Connect with Vega Wallet extension for {{browserName}} to access all features including key management and detailed transaction views from your browser.": "Connect with Vega Wallet extension for {{browserName}} to access all features including key management and detailed transaction views from your browser.",
-  "Install Vega Wallet extension for {{browserName}} to access all features including key management and detailed transaction views from your browser.": "Install Vega Wallet extension for {{browserName}} to access all features including key management and detailed transaction views from your browser.",
-  "Metamask Snap <0>quick start</0>": "Metamask Snap <0>quick start</0>",
-  "Connect directly via Metamask with the Vega Snap for single key support without advanced features.": "Connect directly via Metamask with the Vega Snap for single key support without advanced features.",
-  "Connect via Vega MetaMask Snap": "Connect via Vega MetaMask Snap",
-  "Install Metamask with the Vega Snap for single key support without advanced features.": "Install Metamask with the Vega Snap for single key support without advanced features.",
-  "Install Vega MetaMask Snap": "Install Vega MetaMask Snap",
-  "No MetaMask version that supports snaps detected. Learn more about <0>MetaMask Snaps</0>": "No MetaMask version that supports snaps detected. Learn more about <0>MetaMask Snaps</0>",
-  "Advanced / Other options...": "Advanced / Other options...",
-  "View as party": "View as party",
-  "Get the Vega Wallet": "Get the Vega Wallet",
-  "Custom wallet location": "Custom wallet location",
-  "Go back": "Go back",
-  "Connect the App/CLI": "Connect the App/CLI",
-  "Use the Desktop App/CLI": "Use the Desktop App/CLI",
-  "Enter a custom wallet location": "Enter a custom wallet location",
-  "<0>No running Desktop App/CLI detected. Open your app now to connect or enter a</0> <1>custom wallet location</1>": "<0>No running Desktop App/CLI detected. Open your app now to connect or enter a</0> <1>custom wallet location</1>",
-  "Verifying chain": "Verifying chain",
-  "Successfully connected": "Successfully connected",
-  "Connecting...": "Connecting...",
-  "Approve the connection from your Vega wallet app. If you have multiple wallets you'll need to choose which to connect with.": "Approve the connection from your Vega wallet app. If you have multiple wallets you'll need to choose which to connect with.",
-  "Understand the risk": "Understand the risk",
-  "Cancel": "Cancel",
-  "I agree": "I agree",
-  "Something went wrong": "Something went wrong",
-  "An unknown error occurred": "An unknown error occurred",
-  "Try again": "Try again",
-  "User rejected": "User rejected",
-  "The user rejected the wallet connection": "The user rejected the wallet connection",
-  "Wrong network": "Wrong network",
-  "No wallet detected": "No wallet detected",
-  "Vega browser extension not installed": "Vega browser extension not installed",
-  "Snap failed": "Snap failed",
-  "Could not connect to Vega MetaMask Snap": "Could not connect to Vega MetaMask Snap",
-  "No wallet application running at {{connectorUrl}}": "No wallet application running at {{connectorUrl}}",
-  "No Vega Wallet application running": "No Vega Wallet application running",
-  "Read the docs to troubleshoot": "Read the docs to troubleshoot",
-  "Connection in progress": "Connection in progress",
-  "Approve the connection from your Vega wallet app.": "Approve the connection from your Vega wallet app.",
-  "To complete your wallet connection, set your wallet network in your app to \"{{appChainId}}\".": "To complete your wallet connection, set your wallet network in your app to \"{{appChainId}}\".",
-  "SELECT A VEGA KEY": "SELECT A VEGA KEY",
-  "Select": "Select",
-  "Copy": "Copy",
-  "Disconnect all keys": "Disconnect all keys",
-  "Pubkey must be 64 characters in length": "Pubkey must be 64 characters in length",
-  "Pubkey must be be valid hex": "Pubkey must be be valid hex",
-  "VIEW AS VEGA USER": "VIEW AS VEGA USER",
-  "Browse from the perspective of another Vega user in read-only mode.": "Browse from the perspective of another Vega user in read-only mode.",
-  "Required": "Required",
-  "Browse network": "Browse network",
-  "Checking wallet version": "Checking wallet version",
-  "Checking your wallet is compatible with this app": "Checking your wallet is compatible with this app",
-  "Wrong Network": "Wrong Network"
-}

libs/i18n/src/locales/en/withdraws.json

@@ -1,49 +0,0 @@
-{
-  "All {{symbol}} withdrawals are subject to a {{delay}} delay.": "All {{symbol}} withdrawals are subject to a {{delay}} delay.",
-  "Amount": "Amount",
-  "Asset": "Asset",
-  "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",
-  "Complete withdrawal": "Complete withdrawal",
-  "Completed": "Completed",
-  "Connect Ethereum wallet to complete": "Connect Ethereum wallet to complete",
-  "Connect": "Connect",
-  "Created": "Created",
-  "Delay time": "Delay time",
-  "Delayed (ready in {{readyIn}})": "Delayed (ready in {{readyIn}})",
-  "Delayed withdrawal threshold": "Delayed withdrawal threshold",
-  "Disconnect": "Disconnect",
-  "Failed": "Failed",
-  "Insufficient amount in account": "Insufficient amount in account",
-  "Invalid asset source: {{source}}": "Invalid asset source: {{source}}",
-  "No withdrawals": "No withdrawals",
-  "None": "None",
-  "Pending": "Pending",
-  "Please select an asset": "Please select an asset",
-  "Read more": "Read more",
-  "Ready to complete": "Ready to complete",
-  "Recipient": "Recipient",
-  "Rejected": "Rejected",
-  "Release funds": "Release funds",
-  "Status": "Status",
-  "Step 1 - Release funds from Vega": "Step 1 - Release funds from Vega",
-  "Step 2 - Transfer funds to your Ethereum wallet": "Step 2 - Transfer funds to your Ethereum wallet",
-  "There are two steps required to make a withdrawal": "There are two steps required to make a withdrawal",
-  "This app only works on {{chainName}}. Please change chain.": "This app only works on {{chainName}}. Please change chain.",
-  "To (Ethereum address)": "To (Ethereum address)",
-  "Transaction": "Transaction",
-  "Use maximum": "Use maximum",
-  "Verifying withdrawal approval": "Verifying withdrawal approval",
-  "View withdrawal details": "View withdrawal details",
-  "View withdrawals": "View withdrawals",
-  "Withdraw {{amount}} {{symbol}}": "Withdraw {{amount}} {{symbol}}",
-  "Withdraw funds": "Withdraw funds",
-  "Withdraw": "Withdraw",
-  "Withdrawal ready": "Withdrawal ready",
-  "Withdrawals of {{threshold}} {{symbol}} or more will be delayed for {{delay}}.": "Withdrawals of {{threshold}} {{symbol}} or more will be delayed for {{delay}}.",
-  "Withdrawals ready": "Withdrawals ready",
-  "You have no assets to withdraw": "You have no assets to withdraw",
-  "Your funds have been unlocked for withdrawal - <0>View in block explorer<0>": "Your funds have been unlocked for withdrawal - <0>View in block explorer<0>"
-}

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

@@ -1,60 +1,24 @@
 import LiquidityTable from './liquidity-table';
-import { act, render, screen, within } from '@testing-library/react';
+import { act, render, screen } from '@testing-library/react';
 import * as Schema from '@vegaprotocol/types';
 import type { LiquidityProvisionData } from './liquidity-data-provider';
-import userEvent from '@testing-library/user-event';
 
-const partyId1 = 'party1';
-const partyId2 = 'party2';
-
-const singleRow: LiquidityProvisionData = {
-  id: 'lp-single',
-  commitmentMinTimeFraction: '100',
-  performanceHysteresisEpochs: 4,
-  priceRange: '1',
-  slaCompetitionFactor: '1',
-  partyId: partyId1,
-  party: {
-    id: partyId1,
-  },
+const singleRow = {
+  party: 'a3f762f0a6e998e1d0c6e73017a13ec8a22386c30f7f64a1bdca47330bc592dd',
   createdAt: '2022-08-19T17:18:36.257028Z',
   updatedAt: '2022-08-19T17:18:36.257028Z',
-  commitmentAmount: '100',
+  commitmentAmount: '56298653179',
   fee: '0.001',
   status: Schema.LiquidityProvisionStatus.STATUS_ACTIVE,
   feeShare: {
     equityLikeShare: '0.5',
     averageEntryValuation: '0.5',
-    virtualStake: '0.5',
-    averageScore: '0.5',
   },
-};
-
-const multiRow: LiquidityProvisionData = {
-  id: 'lp-multi',
-  commitmentMinTimeFraction: '100',
-  performanceHysteresisEpochs: 4,
-  priceRange: '1',
-  slaCompetitionFactor: '1',
-  partyId: partyId2,
-  party: {
-    id: partyId2,
-  },
-  createdAt: '2022-08-19T17:18:37.257028Z',
-  updatedAt: '2022-08-19T17:18:37.257028Z',
-  commitmentAmount: '200',
-  fee: '0.002',
-  status: Schema.LiquidityProvisionStatus.STATUS_ACTIVE,
-  feeShare: {
-    equityLikeShare: '0.5',
-    averageEntryValuation: '0.5',
-    virtualStake: '0.5',
-    averageScore: '0.5',
-  },
-};
+  supplied: '67895',
+  obligation: '56785',
+} as unknown as LiquidityProvisionData;
 
 const singleRowData = [singleRow];
-const multiRowData = [singleRow, multiRow];
 
 describe('LiquidityTable', () => {
   it('should render successfully', async () => {
@@ -62,10 +26,6 @@ describe('LiquidityTable', () => {
       const { baseElement } = render(
         <LiquidityTable rowData={[]} stakeToCcyVolume={'1'} />
       );
-      // 5002-LIQP-002
-      // 5002-LIQP-004
-      // 5002-LIQP-005
-      // 5002-LIQP-011
       expect(baseElement).toBeTruthy();
     });
   });
@@ -105,30 +65,7 @@ describe('LiquidityTable', () => {
       'Created',
       'Updated',
     ];
-    // 5002-LIQP-001
     expect(headers).toHaveLength(expectedHeaders.length);
     expect(headerTexts).toEqual(expectedHeaders);
   });
-
-  it('should be able to sort', async () => {
-    await act(async () => {
-      render(
-        <LiquidityTable rowData={multiRowData} stakeToCcyVolume={'0.3'} />
-      );
-    });
-    const headers = await screen.findAllByRole('columnheader');
-
-    const commitmentHeader = headers.find(
-      (h) => h.getAttribute('col-id') === 'commitmentAmount'
-    );
-
-    if (!commitmentHeader) {
-      throw new Error('No commitment header found');
-    }
-
-    // 5002-LIQP-003
-    expect(commitmentHeader).toHaveAttribute('aria-sort', 'none');
-    await userEvent.click(within(commitmentHeader).getByText(/commitment/i));
-    expect(commitmentHeader).toHaveAttribute('aria-sort', 'ascending');
-  });
 });

libs/market-depth/src/lib/depth-chart.spec.tsx

@@ -9,7 +9,6 @@ describe('DepthChart', () => {
         <DepthChartContainer marketId={'market-id'} />
       </MockedProvider>
     );
-    // 6006-DEPC-001
     expect(baseElement).toBeTruthy();
   });
 });

libs/markets/src/lib/__generated__/markets-data.ts

@@ -3,12 +3,12 @@ import * as Types from '@vegaprotocol/types';
 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
-export type MarketsDataFieldsFragment = { __typename?: 'MarketData', bestBidPrice: string, bestOfferPrice: string, markPrice: string, trigger: Types.AuctionTrigger, staticMidPrice: string, marketState: Types.MarketState, marketTradingMode: Types.MarketTradingMode, indicativeVolume: string, indicativePrice: string, bestStaticBidPrice: string, bestStaticOfferPrice: string, targetStake?: string | null, suppliedStake?: string | null, auctionStart?: string | null, auctionEnd?: string | null, openInterest: string, market: { __typename?: 'Market', id: string } };
+export type MarketsDataFieldsFragment = { __typename?: 'MarketData', bestBidPrice: string, bestOfferPrice: string, markPrice: string, trigger: Types.AuctionTrigger, staticMidPrice: string, marketState: Types.MarketState, marketTradingMode: Types.MarketTradingMode, indicativeVolume: string, indicativePrice: string, bestStaticBidPrice: string, bestStaticOfferPrice: string, targetStake?: string | null, suppliedStake?: string | null, auctionStart?: string | null, auctionEnd?: string | null, market: { __typename?: 'Market', id: string } };
 
 export type MarketsDataQueryVariables = Types.Exact<{ [key: string]: never; }>;
 
 
-export type MarketsDataQuery = { __typename?: 'Query', marketsConnection?: { __typename?: 'MarketConnection', edges: Array<{ __typename?: 'MarketEdge', node: { __typename?: 'Market', data?: { __typename?: 'MarketData', bestBidPrice: string, bestOfferPrice: string, markPrice: string, trigger: Types.AuctionTrigger, staticMidPrice: string, marketState: Types.MarketState, marketTradingMode: Types.MarketTradingMode, indicativeVolume: string, indicativePrice: string, bestStaticBidPrice: string, bestStaticOfferPrice: string, targetStake?: string | null, suppliedStake?: string | null, auctionStart?: string | null, auctionEnd?: string | null, openInterest: string, market: { __typename?: 'Market', id: string } } | null } }> } | null };
+export type MarketsDataQuery = { __typename?: 'Query', marketsConnection?: { __typename?: 'MarketConnection', edges: Array<{ __typename?: 'MarketEdge', node: { __typename?: 'Market', data?: { __typename?: 'MarketData', bestBidPrice: string, bestOfferPrice: string, markPrice: string, trigger: Types.AuctionTrigger, staticMidPrice: string, marketState: Types.MarketState, marketTradingMode: Types.MarketTradingMode, indicativeVolume: string, indicativePrice: string, bestStaticBidPrice: string, bestStaticOfferPrice: string, targetStake?: string | null, suppliedStake?: string | null, auctionStart?: string | null, auctionEnd?: string | null, market: { __typename?: 'Market', id: string } } | null } }> } | null };
 
 export const MarketsDataFieldsFragmentDoc = gql`
     fragment MarketsDataFields on MarketData {
@@ -30,7 +30,6 @@ export const MarketsDataFieldsFragmentDoc = gql`
   suppliedStake
   auctionStart
   auctionEnd
-  openInterest
 }
     `;
 export const MarketsDataDocument = gql`

libs/markets/src/lib/components/market-info/market-info-panels.tsx

@@ -723,7 +723,7 @@ export const PriceMonitoringBoundsInfoPanel = ({
           })}
         </p>
         <p className="col-span-1 text-right">
-          {t('Within {{horizonSecs}} seconds', {
+          {t('Within %s seconds', {
             horizonSecs: formatNumber(trigger.horizonSecs),
           })}
         </p>

libs/markets/src/lib/components/oracle-full-profile/oracle-full-profile.tsx

@@ -189,7 +189,7 @@ export const OracleFullProfile = ({
                         'verifyProofs',
                         'Verify {{count}} proofs of ownership',
                         {
-                          count: signedMessageProofs.length,
+                          proofs: signedMessageProofs,
                         }
                       )}{' '}
                       <VegaIcon name={VegaIconNames.OPEN_EXTERNAL} size={13} />

libs/markets/src/lib/markets-data.graphql

@@ -17,7 +17,6 @@ fragment MarketsDataFields on MarketData {
   suppliedStake
   auctionStart
   auctionEnd
-  openInterest
 }
 
 query MarketsData {

libs/markets/src/lib/markets-data.mock.ts

@@ -40,7 +40,6 @@ export const createMarketsDataFragment = (
     bestStaticBidPrice: '0',
     bestStaticOfferPrice: '0',
     indicativeVolume: '0',
-    openInterest: '0',
     bestBidPrice: '0',
     bestOfferPrice: '0',
     markPrice: '4612690058',

libs/markets/src/lib/use-t.jsx

@@ -1,3 +1,3 @@
 import { useTranslation } from 'react-i18next';
 
-export const useT = () => useTranslation('markets').t;
+export const useT = () => useTranslation('funding-payments').t;

libs/positions/src/lib/positions-data-providers.ts

@@ -267,7 +267,6 @@ export const preparePositions = (metrics: Position[], showClosed: boolean) => {
         MarketState.STATE_ACTIVE,
         MarketState.STATE_PENDING,
         MarketState.STATE_SUSPENDED,
-        MarketState.STATE_SUSPENDED_VIA_GOVERNANCE,
       ].includes(p.marketState)
     ) {
       return true;

libs/proposals/src/components/asset-proposal-notification.tsx

@@ -1,8 +1,8 @@
 import { DApp, TOKEN_PROPOSAL, useLinks } from '@vegaprotocol/environment';
+import { t } from '@vegaprotocol/i18n';
 import * as Schema from '@vegaprotocol/types';
 import { ExternalLink, Intent, Notification } from '@vegaprotocol/ui-toolkit';
 import { useUpdateProposal } from '../lib';
-import { useT } from '../use-t';
 
 type AssetProposalNotificationProps = {
   assetId?: string;
@@ -10,7 +10,6 @@ type AssetProposalNotificationProps = {
 export const AssetProposalNotification = ({
   assetId,
 }: AssetProposalNotificationProps) => {
-  const t = useT();
   const tokenLink = useLinks(DApp.Governance);
   const { data: proposal } = useUpdateProposal({
     id: assetId,

libs/proposals/src/components/market-proposal-notification.tsx

@@ -1,8 +1,8 @@
+import { t } from '@vegaprotocol/i18n';
 import * as Schema from '@vegaprotocol/types';
 import { ExternalLink, Intent, Notification } from '@vegaprotocol/ui-toolkit';
 import { DApp, TOKEN_PROPOSAL, useLinks } from '@vegaprotocol/environment';
 import { useUpdateProposal } from '../lib';
-import { useT } from '../use-t';
 
 type MarketProposalNotificationProps = {
   marketId?: string;
@@ -10,7 +10,6 @@ type MarketProposalNotificationProps = {
 export const MarketProposalNotification = ({
   marketId,
 }: MarketProposalNotificationProps) => {
-  const t = useT();
   const tokenLink = useLinks(DApp.Governance);
   const { data: proposal } = useUpdateProposal({
     id: marketId,
@@ -30,7 +29,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-l border-default pl-1 pr-1 pb-1 min-w-min whitespace-nowrap">
         <Notification
           intent={Intent.Warning}
           message={message}

libs/proposals/src/components/proposal-actions-dropdown.tsx

@@ -5,11 +5,10 @@ import {
   Link,
   ActionsDropdown,
 } from '@vegaprotocol/ui-toolkit';
+import { t } from '@vegaprotocol/i18n';
 import { DApp, TOKEN_PROPOSAL, useLinks } from '@vegaprotocol/environment';
-import { useT } from '../use-t';
 
 export const ProposalActionsDropdown = ({ id }: { id: string }) => {
-  const t = useT();
   const linkCreator = useLinks(DApp.Governance);
 
   return (

libs/proposals/src/components/proposals-list/proposals-list.tsx

@@ -1,11 +1,11 @@
 import type { FC } from 'react';
 import { AgGrid } from '@vegaprotocol/datagrid';
+import { t } from '@vegaprotocol/i18n';
 import * as Types from '@vegaprotocol/types';
 import { removePaginationWrapper } from '@vegaprotocol/utils';
 import type { ProposalListFieldsFragment } from '../../lib/proposals-data-provider/__generated__/Proposals';
 import { useProposalsListQuery } from '../../lib/proposals-data-provider/__generated__/Proposals';
 import { useColumnDefs } from './use-column-defs';
-import { useT } from '../../use-t';
 
 export const getNewMarketProposals = (data: ProposalListFieldsFragment[]) =>
   data.filter((proposal) =>
@@ -30,7 +30,6 @@ interface ProposalListProps {
 }
 
 export const ProposalsList = ({ cellRenderers }: ProposalListProps) => {
-  const t = useT();
   const { data } = useProposalsListQuery({
     variables: {
       proposalType: Types.ProposalType.TYPE_NEW_MARKET,

libs/proposals/src/components/proposals-list/use-column-defs.tsx

@@ -8,6 +8,7 @@ import {
 } from '@vegaprotocol/datagrid';
 import compact from 'lodash/compact';
 import { getDateTimeFormat } from '@vegaprotocol/utils';
+import { t } from '@vegaprotocol/i18n';
 import type {
   VegaICellRendererParams,
   VegaValueFormatterParams,
@@ -18,11 +19,8 @@ import {
 } from '@vegaprotocol/types';
 import type { ProposalListFieldsFragment } from '../../lib/proposals-data-provider/__generated__/Proposals';
 import { ProposalActionsDropdown } from '../proposal-actions-dropdown';
-import { useT } from '../../use-t';
 
 export const useColumnDefs = () => {
-  const t = useT();
-
   const columnDefs: ColDef[] = useMemo(() => {
     return compact([
       {
@@ -126,7 +124,7 @@ export const useColumnDefs = () => {
         },
       },
     ]);
-  }, [t]);
+  }, []);
 
   return columnDefs;
 };

libs/proposals/src/components/protocol-upgrade-countdown.tsx

@@ -1,3 +1,4 @@
+import { t } from '@vegaprotocol/i18n';
 import { useNextProtocolUpgradeProposal, useTimeToUpgrade } from '../lib';
 import { convertToCountdownString } from '@vegaprotocol/utils';
 import classNames from 'classnames';
@@ -8,8 +9,6 @@ import {
 } from '@vegaprotocol/ui-toolkit';
 import { useProtocolUpgradeProposalLink } from '@vegaprotocol/environment';
 import { useContext } from 'react';
-import { useT } from '../use-t';
-import { Trans } from 'react-i18next';
 
 export enum ProtocolUpgradeCountdownMode {
   IN_BLOCKS,
@@ -22,7 +21,6 @@ type ProtocolUpgradeCountdownProps = {
 export const ProtocolUpgradeCountdown = ({
   mode = ProtocolUpgradeCountdownMode.IN_ESTIMATED_TIME_REMAINING,
 }: ProtocolUpgradeCountdownProps) => {
-  const t = useT();
   const { theme } = useContext(NavigationContext);
   const { data, lastBlockHeight } = useNextProtocolUpgradeProposal();
 
@@ -47,13 +45,12 @@ export const ProtocolUpgradeCountdown = ({
   switch (mode) {
     case ProtocolUpgradeCountdownMode.IN_BLOCKS:
       countdown = (
-        <Trans
-          defaults="<0>{{count}}</0> blocks"
-          components={[<span className={emphasis}>count</span>]}
-          values={{
-            count: Number(data.upgradeBlockHeight) - Number(lastBlockHeight),
-          }}
-        />
+        <>
+          <span className={emphasis}>
+            {Number(data.upgradeBlockHeight) - Number(lastBlockHeight)}
+          </span>{' '}
+          {t('blocks')}
+        </>
       );
       break;
     case ProtocolUpgradeCountdownMode.IN_ESTIMATED_TIME_REMAINING:
@@ -64,7 +61,7 @@ export const ProtocolUpgradeCountdown = ({
           </span>
         ) : (
           <span
-            className={classNames('text-vega-orange-600 lowercase italic', {
+            className={classNames('italic lowercase text-vega-orange-600', {
               '!text-black': theme === 'yellow',
             })}
           >
@@ -83,19 +80,20 @@ export const ProtocolUpgradeCountdown = ({
       <div
         data-testid="protocol-upgrade-counter"
         className={classNames(
-          'flex h-8 flex-nowrap items-center gap-1 px-2 py-1 text-xs lg:px-4',
-          'rounded border',
+          'flex flex-nowrap gap-1 items-center text-xs py-1 px-2 lg:px-4 h-8',
+          'border rounded',
           'border-vega-orange-500 dark:border-vega-orange-500',
           'bg-vega-orange-300 dark:bg-vega-orange-700',
           'text-default',
           {
-            '!border-black !bg-transparent': theme === 'yellow',
+            '!bg-transparent !border-black': theme === 'yellow',
           }
         )}
       >
         <VegaIcon name={VegaIconNames.EXCLAIMATION_MARK} size={12} />{' '}
-        <span className="flex flex-nowrap gap-1 whitespace-nowrap">
-          <span>{t('Network upgrade in {{countdown}}', { countdown })} </span>
+        <span className="flex gap-1 flex-nowrap whitespace-nowrap">
+          <span>{t('Network upgrade in')} </span>
+          {countdown}
         </span>
       </div>
     </a>

libs/proposals/src/components/protocol-upgrade-in-progress-notification.tsx

@@ -1,5 +1,6 @@
 import { useProtocolUpgradeProposalLink } from '@vegaprotocol/environment';
 
+import { t } from '@vegaprotocol/i18n';
 import {
   ExternalLink,
   Intent,
@@ -13,7 +14,6 @@ import {
 } from '../lib';
 import { useLocalStorageSnapshot } from '@vegaprotocol/react-helpers';
 import { useBlockRising } from '../lib/protocol-upgrade-proposals/use-block-rising';
-import { useT } from '../use-t';
 
 /**
  * A flag determining whether to get the upgrade proposal data from local
@@ -22,7 +22,6 @@ import { useT } from '../use-t';
 const ALLOW_STORED_PROPOSAL_DATA = true;
 
 export const ProtocolUpgradeInProgressNotification = () => {
-  const t = useT();
   const { data, error } = useNextProtocolUpgradeProposal(undefined, true);
   const [nextUpgrade] = useLocalStorageSnapshot(
     NEXT_PROTOCOL_UPGRADE_PROPOSAL_SNAPSHOT
@@ -72,9 +71,7 @@ export const ProtocolUpgradeInProgressNotification = () => {
   return (
     <NotificationBanner intent={Intent.Danger} className={SHORT}>
       <div className="uppercase">
-        {t('The network is being upgraded to {{vegaReleaseTag}}', {
-          vegaReleaseTag,
-        })}
+        {t('The network is being upgraded to %s', vegaReleaseTag)}
       </div>
       <div>
         {t(

libs/proposals/src/components/protocol-upgrade-proposal-notification.tsx

@@ -4,12 +4,11 @@ import {
   NotificationBanner,
 } from '@vegaprotocol/ui-toolkit';
 import { useNextProtocolUpgradeProposal, useTimeToUpgrade } from '../lib';
+import { t } from '@vegaprotocol/i18n';
 import { useProtocolUpgradeProposalLink } from '@vegaprotocol/environment';
 import { ProtocolUpgradeCountdownMode } from './protocol-upgrade-countdown';
 import { convertToCountdownString } from '@vegaprotocol/utils';
 import { useState } from 'react';
-import { useT } from '../use-t';
-import { Trans } from 'react-i18next';
 
 type ProtocolUpgradeProposalNotificationProps = {
   mode?: ProtocolUpgradeCountdownMode;
@@ -17,7 +16,6 @@ type ProtocolUpgradeProposalNotificationProps = {
 export const ProtocolUpgradeProposalNotification = ({
   mode = ProtocolUpgradeCountdownMode.IN_BLOCKS,
 }: ProtocolUpgradeProposalNotificationProps) => {
-  const t = useT();
   const [visible, setVisible] = useState(true);
   const { data, lastBlockHeight } = useNextProtocolUpgradeProposal();
   const detailsLink = useProtocolUpgradeProposalLink();
@@ -42,13 +40,10 @@ export const ProtocolUpgradeProposalNotification = ({
   switch (mode) {
     case ProtocolUpgradeCountdownMode.IN_BLOCKS:
       countdown = (
-        <Trans
-          defaults="<0>{{count}}</0> blocks"
-          components={[<span className="text-vega-orange-500">count</span>]}
-          values={{
-            count: blocksLeft,
-          }}
-        />
+        <>
+          <span className="text-vega-orange-500">{blocksLeft}</span>{' '}
+          {t('blocks')}
+        </>
       );
       break;
     case ProtocolUpgradeCountdownMode.IN_ESTIMATED_TIME_REMAINING:
@@ -77,13 +72,10 @@ export const ProtocolUpgradeProposalNotification = ({
       }}
     >
       <div className="uppercase ">
-        {t('The network will upgrade to {{vegaReleaseTag}} in {{countdown}}', {
-          vegaReleaseTag: data.vegaReleaseTag,
-          countdown,
-        })}
+        {t('The network will upgrade to %s in ', [data.vegaReleaseTag])}
+        {countdown}
       </div>
       <div>
-        <Trans />
         {t(
           'Trading activity will be interrupted, manage your risk appropriately.'
         )}{' '}

libs/proposals/src/components/vega-transaction-dialog/vega-transaction-dialog.tsx

@@ -1,10 +1,10 @@
 import type { ReactNode } from 'react';
+import { t } from '@vegaprotocol/i18n';
 import { Dialog, Icon, Intent, Loader } from '@vegaprotocol/ui-toolkit';
 import { WalletClientError } from '@vegaprotocol/wallet-client';
 import type { VegaTxState } from '../../lib/proposals-hooks/use-vega-transaction';
 import { VegaTxStatus } from '../../lib/proposals-hooks/use-vega-transaction';
 import { useVegaWallet } from '@vegaprotocol/wallet';
-import { useT } from '../../use-t';
 
 export type VegaTransactionContentMap = {
   [C in VegaTxStatus]?: JSX.Element;
@@ -28,9 +28,8 @@ export const VegaTransactionDialog = ({
   icon,
   content,
 }: VegaTransactionDialogProps) => {
-  const t = useT();
   const computedIntent = intent ? intent : getIntent(transaction);
-  const computedTitle = title ? title : getTitle(transaction, t);
+  const computedTitle = title ? title : getTitle(transaction);
   const computedIcon = icon ? icon : getIcon(transaction);
 
   return (
@@ -87,7 +86,6 @@ interface VegaDialogProps {
  * Default dialog content
  */
 export const VegaDialog = ({ transaction }: VegaDialogProps) => {
-  const t = useT();
   const { links, network } = useVegaWallet();
 
   let content = null;
@@ -101,7 +99,7 @@ export const VegaDialog = ({ transaction }: VegaDialogProps) => {
         </p>
         {network !== 'MAINNET' && (
           <p data-testid="testnet-transaction-info">
-            {t('[This is {{network}} transaction only]', { network })}
+            {t('[This is %s transaction only]').replace('%s', network)}
           </p>
         )}
       </>
@@ -178,7 +176,7 @@ const getIntent = (transaction: VegaTxState) => {
   }
 };
 
-const getTitle = (transaction: VegaTxState, t: ReturnType<typeof useT>) => {
+const getTitle = (transaction: VegaTxState) => {
   switch (transaction.status) {
     case VegaTxStatus.Requested:
       return t('Confirm transaction in wallet');

libs/proposals/src/lib/proposals-hooks/use-proposal-toasts.tsx

@@ -1,5 +1,6 @@
 import { DApp, TOKEN_PROPOSAL, useLinks } from '@vegaprotocol/environment';
 import { getDateTimeFormat } from '@vegaprotocol/utils';
+import { t } from '@vegaprotocol/i18n';
 import {
   ProposalChangeMapping,
   ProposalRejectionReasonMapping,
@@ -15,8 +16,6 @@ import {
   useOnProposalSubscription,
   type OnProposalFragmentFragment,
 } from './__generated__/Proposal';
-import { Trans } from 'react-i18next';
-import { useT } from '../../use-t';
 
 export const PROPOSAL_STATES_TO_TOAST = [
   ProposalState.STATE_DECLINED,
@@ -28,7 +27,6 @@ const CLOSE_AFTER = 0;
 type Proposal = OnProposalFragmentFragment;
 
 const ProposalDetails = ({ proposal }: { proposal: Proposal }) => {
-  const t = useT();
   const change = proposal.terms.change;
   switch (change.__typename) {
     case 'UpdateNetworkParameter':
@@ -45,10 +43,8 @@ const ProposalDetails = ({ proposal }: { proposal: Proposal }) => {
           {proposal.state === ProposalState.STATE_REJECTED &&
           proposal.rejectionReason ? (
             <p data-testid="proposal-toast-rejection-reason">
-              {t('Rejection reason: {{reason}}', {
-                reason:
-                  ProposalRejectionReasonMapping[proposal.rejectionReason],
-              })}
+              {t('Rejection reason:')}{' '}
+              {ProposalRejectionReasonMapping[proposal.rejectionReason]}
             </p>
           ) : null}
         </>
@@ -65,30 +61,24 @@ const UpdateNetworkParameterDetails = ({
   if (change.__typename !== 'UpdateNetworkParameter') return null;
   return (
     <p data-testid="proposal-toast-network-param" className="italic">
-      <Trans
-        defaults="Update <0>{{key}}</0> to {{value}}"
-        values={change.networkParameter}
-        components={[<span className="break-all">key</span>]}
-      />
+      '{t('Update ')}
+      <span className="break-all">{change.networkParameter.key}</span>
+      {t(' to ')}
+      <span>{change.networkParameter.value}</span>'
     </p>
   );
 };
 
 export const ProposalToastContent = ({ proposal }: { proposal: Proposal }) => {
-  const t = useT();
   const tokenLink = useLinks(DApp.Governance);
   const change = proposal.terms.change;
 
   // Generates toast's title,
   // e.g. Update market proposal enacted, New transfer proposal open, ...
-  const title = change.__typename
-    ? t('{{proposalChange}} proposal {{proposalState}}', {
-        proposalChange: ProposalChangeMapping[change.__typename],
-        proposalState: ProposalStateMapping[proposal.state].toLowerCase(),
-      })
-    : t('Unknown proposal {{proposalState}}', {
-        proposalState: ProposalStateMapping[proposal.state].toLowerCase(),
-      });
+  const title = t('%s proposal %s', [
+    change.__typename ? ProposalChangeMapping[change.__typename] : 'Unknown',
+    ProposalStateMapping[proposal.state].toLowerCase(),
+  ]);
 
   const enactment = Date.parse(proposal.terms.enactmentDatetime);
 
@@ -98,9 +88,7 @@ export const ProposalToastContent = ({ proposal }: { proposal: Proposal }) => {
       <ProposalDetails proposal={proposal} />
       {!isNaN(enactment) && (
         <p>
-          {t('Enactment date: {{date}}', {
-            date: getDateTimeFormat().format(enactment),
-          })}
+          {t('Enactment date:')} {getDateTimeFormat().format(enactment)}
         </p>
       )}
       <p>

libs/proposals/src/setup-tests.ts

@@ -1,17 +1,4 @@
 import '@testing-library/jest-dom';
 import ResizeObserver from 'resize-observer-polyfill';
-import '@testing-library/jest-dom';
-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: ['proposals'],
-  defaultNS: 'proposals',
-});
 global.ResizeObserver = ResizeObserver;

libs/proposals/src/use-t.ts

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

libs/proposals/src/utils/proposal-dialog-helpers.tsx

@@ -1,12 +1,11 @@
 import { ProposalState } from '@vegaprotocol/types';
+import { t } from '@vegaprotocol/i18n';
 import { Icon, Intent } from '@vegaprotocol/ui-toolkit';
 import type { ReactNode } from 'react';
-import { useT } from '../use-t';
 
-export const useGetProposalDialogTitle = (
+export const getProposalDialogTitle = (
   status?: ProposalState
 ): string | undefined => {
-  const t = useT();
   if (!status) {
     return;
   }

libs/react-helpers/src/lib/format/number.tsx

@@ -22,13 +22,11 @@ export const CompactNumber = ({
   decimals = 'infer',
   compactDisplay = 'short',
   testId = 'compact-number',
-  compactAbove = DEFAULT_COMPACT_ABOVE,
 }: {
   number: BigNumber;
   decimals?: number | 'infer';
   compactDisplay?: 'short' | 'long';
   testId?: string;
-  compactAbove?: number;
 }) => {
   if (!number.isFinite()) {
     return (
@@ -46,7 +44,7 @@ export const CompactNumber = ({
     return <span data-testid={testId}>{INFINITY}</span>;
   }
 
-  if (number.isLessThan(compactAbove)) {
+  if (number.isLessThan(DEFAULT_COMPACT_ABOVE)) {
     return (
       <span data-testid={testId}>{formatNumber(number, decimalPlaces)}</span>
     );

libs/trades/__mocks__/react-i18next.ts

@@ -1,3 +0,0 @@
-export const useTranslation = () => ({
-  t: (label: string) => label,
-});

libs/trades/src/lib/trades-manager.tsx

@@ -2,8 +2,8 @@ import { useDataProvider } from '@vegaprotocol/data-provider';
 import { tradesWithMarketProvider } from './trades-data-provider';
 import { TradesTable } from './trades-table';
 import { useDealTicketFormValues } from '@vegaprotocol/deal-ticket';
+import { t } from '@vegaprotocol/i18n';
 import type { useDataGridEvents } from '@vegaprotocol/datagrid';
-import { useT } from './use-t';
 
 interface TradesContainerProps {
   marketId: string;
@@ -14,7 +14,6 @@ export const TradesManager = ({
   marketId,
   gridProps,
 }: TradesContainerProps) => {
-  const t = useT();
   const update = useDealTicketFormValues((state) => state.updateAll);
 
   const { data, error } = useDataProvider({

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

@@ -10,6 +10,7 @@ import {
   addDecimalsFormatNumber,
   getTimeFormat,
 } from '@vegaprotocol/utils';
+import { t } from '@vegaprotocol/i18n';
 import {
   type ColDef,
   type CellClassParams,
@@ -19,7 +20,6 @@ import {
 import { type AgGridReactProps } from 'ag-grid-react';
 import { type Trade } from './trades-data-provider';
 import { Side } from '@vegaprotocol/types';
-import { useT } from './use-t';
 
 export const BUY_CLASS = 'text-market-green-600 dark:text-market-green';
 export const SELL_CLASS = 'text-market-red dark:text-market-red';
@@ -51,7 +51,6 @@ interface Props extends AgGridReactProps {
 }
 
 export const TradesTable = ({ onClick, ...props }: Props) => {
-  const t = useT();
   const columnDefs = useMemo<ColDef[]>(
     () => [
       {
@@ -119,7 +118,7 @@ export const TradesTable = ({ onClick, ...props }: Props) => {
         },
       },
     ],
-    [onClick, t]
+    [onClick]
   );
   return (
     <AgGrid

libs/trades/src/lib/use-t.ts

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

libs/types/src/__generated__/types.ts

@@ -4376,19 +4376,7 @@ export type Query = {
   /** The last block process by the blockchain */
   lastBlockHeight: Scalars['String'];
   /**
-   * Get a list of ledger entries within the given date range. The date range is restricted to a maximum of 5 days.
-   * This query requests and sums the number of ledger entries from a given subset of accounts, specified via the 'filter' argument.
-   * It returns a time series - implemented as a list of AggregateLedgerEntry structs - with a row for every time
-   * the summed ledger entries of the set of specified accounts changes.
-   * Each account filter must contain no more than one party ID.
-   * At least one party ID must be specified in the from or to account filter.
-   *
-   * Entries can be filtered by:
-   *   - the sending account (market ID, asset ID, account type)
-   *   - receiving account (market ID, asset ID, account type)
-   *   - sending AND receiving account
-   *   - transfer type either in addition to the above filters or as a standalone option
-   *
+   * Get ledger entries by asset, market, party, account type, transfer type within the given date range.
    * Note: The date range is restricted to any 5 days.
    * If no start or end date is provided, only ledger entries from the last 5 days will be returned.
    * If a start and end date are provided, but the end date is more than 5 days after the start date, only data up to 5 days after the start date will be returned.

libs/ui-toolkit/__mocks__/react-i18next.ts

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

libs/ui-toolkit/src/components/async-renderer/async-renderer.tsx

@@ -1,7 +1,7 @@
 import { Splash } from '../splash';
 import type { ReactNode } from 'react';
+import { t } from '@vegaprotocol/i18n';
 import { Button } from '../button';
-import { useT } from '../../use-t';
 
 interface AsyncRendererProps<T> {
   loading: boolean;
@@ -28,18 +28,15 @@ export function AsyncRenderer<T = object>({
   render,
   reload,
 }: AsyncRendererProps<T>) {
-  const t = useT();
   if (error) {
     if (!data || (Array.isArray(data) && !data.length)) {
       return (
-        <div className="flex h-full items-center justify-center">
-          <div className="flex h-12 flex-col  items-center">
+        <div className="h-full flex items-center justify-center">
+          <div className="h-12 flex flex-col  items-center">
             <Splash>
               {errorMessage
                 ? errorMessage
-                : t('Something went wrong: {{errorMessage}}', {
-                    errorMessage: error.message,
-                  })}
+                : t(`Something went wrong: ${error.message}`)}
             </Splash>
             {reload && error.message === 'Timeout exceeded' && (
               <Button
@@ -80,7 +77,6 @@ export function AsyncRendererInline<T>({
   render,
   reload,
 }: AsyncRendererProps<T>) {
-  const t = useT();
   const wrapperClasses = 'text-sm';
   if (error) {
     if (!data) {
@@ -89,9 +85,7 @@ export function AsyncRendererInline<T>({
           <p>
             {errorMessage
               ? errorMessage
-              : t('Something went wrong: {{errorMessage}}', {
-                  errorMessage: error.message,
-                })}
+              : t(`Something went wrong: ${error.message}`)}
           </p>
           {reload && error.message === 'Timeout exceeded' && (
             <Button

libs/ui-toolkit/src/components/copy-with-tooltip/copy-with-tooltip.tsx

@@ -1,41 +1,24 @@
-import type { ReactElement, ReactNode } from 'react';
+import type { ReactElement } from 'react';
 import { Tooltip } from '../tooltip';
 import CopyToClipboard from 'react-copy-to-clipboard';
 import { useCopyTimeout } from '@vegaprotocol/react-helpers';
-import { useT } from '../../use-t';
 
 export const TOOLTIP_TIMEOUT = 800;
 
 export interface CopyWithTooltipProps {
   children: ReactElement;
   text: string;
-  /**
-   * The tooltip's description to be shown on mouse over
-   * (replaced by "Copied" when clicked on)
-   */
-  description?: ReactNode;
 }
 
-export function CopyWithTooltip({
-  children,
-  text,
-  description,
-}: CopyWithTooltipProps) {
-  const t = useT();
+export function CopyWithTooltip({ children, text }: CopyWithTooltipProps) {
   const [copied, setCopied] = useCopyTimeout();
 
-  const copiedDescription = t('Copied');
-
   return (
     <CopyToClipboard text={text} onCopy={() => setCopied(true)}>
       {/*
       // @ts-ignore not sure about this typescript error. Needs this wrapping span as tooltip component interferes with element used to capture click for copy */}
       <span>
-        <Tooltip
-          description={copied ? copiedDescription : description}
-          open={description ? copied || undefined : copied}
-          align="center"
-        >
+        <Tooltip description="Copied" open={copied} align="center">
           {children}
         </Tooltip>
       </span>

libs/ui-toolkit/src/components/dropdown-menu/dropdown-menu.tsx

@@ -5,7 +5,7 @@ import { forwardRef } from 'react';
 import { VegaIcon, VegaIconNames } from '../icon';
 import { useCopyTimeout } from '@vegaprotocol/react-helpers';
 import CopyToClipboard from 'react-copy-to-clipboard';
-import { useT } from '../../use-t';
+import { t } from '@vegaprotocol/i18n';
 
 const itemClass = classNames(
   'relative flex gap-2 items-center rounded-sm p-2 text-sm',
@@ -214,7 +214,6 @@ export const DropdownMenuCopyItem = ({
   value: string;
   text: string;
 }) => {
-  const t = useT();
   const [copied, setCopied] = useCopyTimeout();
 
   return (

libs/ui-toolkit/src/components/healthbar/healthbar.tsx

@@ -3,14 +3,14 @@ import {
   addDecimalsFormatNumber,
   formatNumberPercentage,
 } from '@vegaprotocol/utils';
+import { t } from '@vegaprotocol/i18n';
 import { BigNumber } from 'bignumber.js';
 import { getIntentBackground, Intent } from '../../utils/intent';
 import { Indicator } from '../indicator';
 import { Tooltip } from '../tooltip';
-import { useT } from '../../use-t';
 
 const Remainder = () => (
-  <div className="bg-greys-light-200 relative h-[inherit] flex-1" />
+  <div className="bg-greys-light-200 h-[inherit] relative flex-1" />
 );
 
 const Target = ({
@@ -22,7 +22,6 @@ const Target = ({
   target: string;
   decimals: number;
 }) => {
-  const t = useT();
   return (
     <Tooltip
       description={
@@ -31,22 +30,20 @@ const Target = ({
             <Indicator variant={Intent.None} />
           </div>
           <span>
-            {t('Target stake {{target}}', {
-              target: addDecimalsFormatNumber(target, decimals),
-            })}{' '}
+            {t('Target stake')} {addDecimalsFormatNumber(target, decimals)}
           </span>
         </div>
       }
     >
       <div
         className={classNames(
-          'group absolute left-1/2 top-1/2 -translate-x-2/4 -translate-y-1/2 px-1.5'
+          'absolute top-1/2 left-1/2 -translate-x-2/4 -translate-y-1/2 px-1.5 group'
         )}
         style={{ left: '50%' }}
       >
         <div
           className={classNames(
-            'health-target bg-vega-dark-100 dark:bg-vega-light-100 group-hover:scale-y-108 w-0.5 group-hover:scale-x-150',
+            'health-target w-0.5 bg-vega-dark-100 dark:bg-vega-light-100 group-hover:scale-x-150 group-hover:scale-y-108',
             {
               'h-6': !isLarge,
               'h-12': isLarge,
@@ -69,7 +66,6 @@ const AuctionTarget = ({
   rangeLimit: number;
   decimals: number;
 }) => {
-  const t = useT();
   const leftPosition = new BigNumber(trigger).div(rangeLimit).multipliedBy(100);
   return (
     <Tooltip
@@ -79,16 +75,15 @@ const AuctionTarget = ({
             <Indicator variant={Intent.None} />
           </div>
           <span>
-            {t('Auction Trigger stake {{trigger}}', {
-              trigger: addDecimalsFormatNumber(trigger, decimals),
-            })}
+            {t('Auction Trigger stake')}{' '}
+            {addDecimalsFormatNumber(trigger, decimals)}
           </span>
         </div>
       }
     >
       <div
         className={classNames(
-          'group absolute left-1/2 top-1/2 -translate-x-2/4 -translate-y-1/2 px-1.5'
+          'absolute top-1/2 left-1/2 -translate-x-2/4 -translate-y-1/2 px-1.5 group'
         )}
         style={{
           left: `${leftPosition}%`,
@@ -96,7 +91,7 @@ const AuctionTarget = ({
       >
         <div
           className={classNames(
-            'health-target group-hover:scale-y-108 dashed-background w-0.5 group-hover:scale-x-150',
+            'health-target w-0.5 group-hover:scale-x-150 group-hover:scale-y-108 dashed-background',
             {
               'h-6': !isLarge,
               'h-12': isLarge,
@@ -125,7 +120,6 @@ const Level = ({
   decimals: number;
   intent: Intent;
 }) => {
-  const t = useT();
   const width = new BigNumber(commitmentAmount)
     .div(rangeLimit)
     .multipliedBy(100)
@@ -140,7 +134,9 @@ const Level = ({
       <div className="mt-1.5 inline-flex">
         <Indicator variant={intent} />
       </div>
-      <span>{t('{{fee}} Fee', { fee: formattedFee })}</span>
+      <span>
+        {formattedFee} {t('Fee')}
+      </span>
       <div className="flex  flex-col">
         <span>
           {prevLevel ? addDecimalsFormatNumber(prevLevel, decimals) : '0'} -{' '}
@@ -153,14 +149,14 @@ const Level = ({
   return (
     <Tooltip description={tooltipContent}>
       <div
-        className="group relative h-[inherit] w-full min-w-[1px]"
+        className={classNames(`relative h-[inherit] w-full group min-w-[1px]`)}
         style={{
           width: `${width}%`,
         }}
       >
         <div
           className={classNames(
-            'relative h-[inherit] w-full group-hover:scale-y-150',
+            'relative w-full h-[inherit] group-hover:scale-y-150',
             getIntentBackground(intent)
           )}
           style={{ opacity }}
@@ -171,7 +167,7 @@ const Level = ({
 };
 
 const Full = () => (
-  <div className="absolute bottom-0 left-0 h-[inherit] w-full bg-transparent" />
+  <div className="bg-transparent w-full h-[inherit] absolute bottom-0 left-0" />
 );
 
 interface Levels {
@@ -194,7 +190,6 @@ export const HealthBar = ({
   intent: Intent;
   triggerRatio?: string;
 }) => {
-  const t = useT();
   const targetNumber = parseInt(target, 10);
   const rangeLimit = targetNumber * 2;
 
@@ -225,7 +220,7 @@ export const HealthBar = ({
         })}
       >
         <div
-          className={classNames('health-inner relative flex w-full', {
+          className={classNames('health-inner relative w-full flex', {
             'h-4': !isLarge,
             'h-8': isLarge,
           })}
@@ -233,8 +228,8 @@ export const HealthBar = ({
           <Full />
 
           <div
-            className="health-bars outline-vega-light-200 dark:outline-vega-dark-200 flex
-              h-[inherit] w-full gap-0.5 outline"
+            className="health-bars h-[inherit] flex w-full
+              gap-0.5 outline outline-vega-light-200 dark:outline-vega-dark-200"
           >
             {levels.map((p, index) => {
               const { commitmentAmount, fee } = p;
@@ -258,11 +253,11 @@ export const HealthBar = ({
               <Tooltip
                 description={
                   <div className="text-vega-dark-100 dark:text-vega-light-200">
-                    {t('Providers greater than 2x target stake not shown')}
+                    t( 'Providers greater than 2x target stake not shown' )
                   </div>
                 }
               >
-                <div className="relative h-[inherit] flex-1 leading-4">...</div>
+                <div className="h-[inherit] relative flex-1 leading-4">...</div>
               </Tooltip>
             )}
           </div>

libs/ui-toolkit/src/components/show-more/show-more.tsx

@@ -1,8 +1,8 @@
 import classNames from 'classnames';
 import { useRef, useState, useEffect } from 'react';
+import { t } from '@vegaprotocol/i18n';
 import { Button } from '../button';
 import type { ReactNode } from 'react';
-import { useT } from '../../use-t';
 
 type ShowMoreProps = {
   children: ReactNode;
@@ -15,7 +15,6 @@ export const ShowMore = ({
   closedMaxHeightPx = 125,
   overlayColourOverrides,
 }: ShowMoreProps) => {
-  const t = useT();
   const containerRef = useRef<HTMLDivElement | null>(null);
   const [expanded, setExpanded] = useState(false);
 

libs/ui-toolkit/src/components/theme-switcher/theme-switcher.tsx

@@ -1,7 +1,7 @@
+import { t } from '@vegaprotocol/i18n';
 import { useThemeSwitcher } from '@vegaprotocol/react-helpers';
 import { SunIcon, MoonIcon } from './icons';
 import { Toggle } from '../toggle';
-import { useT } from '../../use-t';
 
 export const ThemeSwitcher = ({
   className,
@@ -10,7 +10,6 @@ export const ThemeSwitcher = ({
   className?: string;
   withMobile?: boolean;
 }) => {
-  const t = useT();
   const { theme, setTheme } = useThemeSwitcher();
   const button = (
     <button
@@ -36,7 +35,7 @@ export const ThemeSwitcher = ({
   ];
   return withMobile ? (
     <>
-      <div className="flex grow justify-between gap-6 whitespace-nowrap md:hidden">
+      <div className="flex grow gap-6 md:hidden whitespace-nowrap justify-between">
         {button}{' '}
         <Toggle
           name="theme-switch"

libs/ui-toolkit/src/components/toast/toast-position-setter.tsx

@@ -1,27 +1,28 @@
 import classNames from 'classnames';
+import { t } from '@vegaprotocol/i18n';
 import { IconNames } from '@blueprintjs/icons';
 import { Icon } from '../icon';
 import { ToastPosition, useToastsConfiguration, useToasts } from './use-toasts';
 import { useCallback } from 'react';
 import { Intent } from '../../utils/intent';
-import { useT } from '../../use-t';
+
+const TEST_TOAST = {
+  id: 'test-toast',
+  intent: Intent.Primary,
+  content: <>{t('This is an example of a toast notification')}</>,
+  onClose: () => useToasts.getState().remove('test-toast'),
+};
 
 export const ToastPositionSetter = () => {
-  const t = useT();
   const setPostion = useToastsConfiguration((store) => store.setPosition);
   const position = useToastsConfiguration((store) => store.position);
   const setToast = useToasts((store) => store.setToast);
   const handleChange = useCallback(
     (position: ToastPosition) => {
       setPostion(position);
-      setToast({
-        id: 'test-toast',
-        intent: Intent.Primary,
-        content: <>{t('This is an example of a toast notification')}</>,
-        onClose: () => useToasts.getState().remove('test-toast'),
-      });
+      setToast(TEST_TOAST);
     },
-    [setToast, setPostion, t]
+    [setToast, setPostion]
   );
   const buttonCssClasses =
     'flex items-center px-1 py-1 relative rounded bg-vega-clight-400 dark:bg-vega-cdark-400';

libs/ui-toolkit/src/components/toast/toast.tsx

@@ -17,7 +17,7 @@ import {
 import { Intent } from '../../utils/intent';
 import { Icon, VegaIcon, VegaIconNames } from '../icon';
 import { Loader } from '../loader';
-import { useT } from '../../use-t';
+import { t } from '@vegaprotocol/i18n';
 
 export type ToastContent = JSX.Element | undefined;
 
@@ -83,7 +83,6 @@ export const CollapsiblePanel = forwardRef<
   HTMLDivElement,
   CollapsiblePanelProps & HTMLAttributes<HTMLDivElement>
 >(({ children, className, actions, ...props }, ref) => {
-  const t = useT();
   const [collapsed, setCollapsed] = useState(true);
   return (
     // eslint-disable-next-line jsx-a11y/no-static-element-interactions