chore: remove getNumberFormat func

.eslintrc.json

@@ -77,7 +77,6 @@
             "fixStyle": "inline-type-imports"
           }
         ],
-        "@typescript-eslint/no-useless-constructor": 0,
         "curly": ["error", "multi-line"]
       }
     },

.gitattributes

@@ -1,4 +1,3 @@
 * text eol=lf
 *.png binary
 *.ico binary
-*.woff2 binary

.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
@@ -19,7 +19,7 @@ jobs:
   create-docker-image:
     name: Create docker image for console-test
     runs-on: ubuntu-22.04
-    timeout-minutes: 90
+    timeout-minutes: 20
     steps:
       #----------------------------------------------
       #       check-out frontend-monorepo
@@ -138,7 +138,7 @@ jobs:
     name: run-tests
     runs-on: 8-cores
     needs: [create-docker-image, console-test-branch]
-    timeout-minutes: 90
+    timeout-minutes: 20
     steps:
       #----------------------------------------------
       #       load docker image
@@ -205,7 +205,7 @@ jobs:
       # run tests
       #----------------------------------------------
       - name: Run tests
-        run: CONSOLE_IMAGE_NAME=ci/trading:local poetry run pytest -v -s --numprocesses 2 --dist loadfile --durations=90
+        run: CONSOLE_IMAGE_NAME=ci/trading:local poetry run pytest -v -s --numprocesses 4 --dist loadfile --durations=15
         working-directory: apps/trading/e2e
       #----------------------------------------------
       # upload traces
@@ -215,7 +215,7 @@ jobs:
         if: always()
         with:
           name: playwright-trace
-          path: apps/trading/e2e/traces/
+          path: ./traces/
           retention-days: 15
       #----------------------------------------------
       #  -----  upload logs  -----
@@ -227,46 +227,3 @@ jobs:
           name: worker-logs
           path: ./logs/
           retention-days: 15
-      #----------------------------------------------
-      #  -----  upload market-sim logs  -----
-      #----------------------------------------------
-      - name: Prepare and Zip market-sim-logs
-        if: always()
-        run: |
-          parent_dir="/tmp/market-sim-logs"
-          echo "Creating parent directory at $parent_dir"
-          mkdir -p "$parent_dir"
-
-          echo "Waiting for vega-sim-* folders to be created..."
-          sleep 10  # Waits 10 seconds to ensure all folders are created
-
-          echo "Before searching for vega-sim-* folders in /tmp..."
-          folders=$(find /tmp -mindepth 1 -type d -name 'vega-sim-*' -print) || echo "Find command failed with exit code $?"
-
-          echo "After searching for vega-sim-* folders in /tmp..."
-
-          if [ -z "$folders" ]; then
-            echo "No vega-sim-* folders found."
-            exit 0
-          fi
-
-          echo "Moving vega-sim-* folders to $parent_dir"
-          echo "$folders" | xargs -I {} mv {} "$parent_dir/"
-
-          echo "Checking if $parent_dir is not empty..."
-          if [ "$(ls -A $parent_dir)" ]; then
-            echo "Zipping the parent directory..."
-            zip -r market-sim-logs.zip "$parent_dir" && echo "Zip file created successfully."
-          else
-            echo "$parent_dir is empty. No zip file created."
-            exit 0
-          fi
-        shell: /usr/bin/bash -e {0}
-
-      - name: Upload market-sim-logs
-        uses: actions/upload-artifact@v3
-        if: always()
-        with:
-          name: market-sim-logs
-          path: market-sim-logs.zip
-          retention-days: 15

.gitignore

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

.husky/pre-commit

@@ -1,8 +1,5 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-# Auto-format all files
-yarn nx format:write
-
 # Lint all staged files
 yarn lint-staged

.husky/pre-push

@@ -1,8 +1,8 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-# Lint all staged files - this brings more value as pre-commit
-# yarn nx format:check
+# Lint all staged files
+yarn nx format:check
 
 # Test all projects with changes
-# yarn nx affected -t test --exclude trading
+yarn nx affected -t test --exclude trading

apps/explorer-e2e/src/integration/proposal.cy.js

@@ -44,7 +44,7 @@ context('Proposal page', { tags: '@smoke' }, function () {
       cy.getByTestId('icon-cross').click();
     });
 
-    it('Proposal page displayed on mobile', function () {
+    it.skip('Proposal page displayed on mobile', function () {
       const proposalTitle = 'Add Lorem Ipsum market';
 
       cy.common_switch_to_mobile_and_click_toggle();
@@ -55,7 +55,7 @@ context('Proposal page', { tags: '@smoke' }, function () {
       });
     });
 
-    it.skip('Able to view new asset proposal', function () {
+    it('Able to view new asset proposal', function () {
       const proposalTitle = 'Test new asset proposal';
       const newAssetProposalBody = getNewAssetTxBody();
       cy.VegaWalletSubmitProposal(newAssetProposalBody);

apps/explorer/src/app/app.tsx

@@ -12,8 +12,7 @@ import { TendermintWebsocketProvider } from './contexts/websocket/tendermint-web
 import { Loader, Splash } from '@vegaprotocol/ui-toolkit';
 import { DEFAULT_CACHE_CONFIG } from '@vegaprotocol/apollo-client';
 import { RouterProvider } from 'react-router-dom';
-import { useRouterConfig } from './routes/router-config';
-import { createBrowserRouter } from 'react-router-dom';
+import { router } from './routes/router-config';
 import { t } from '@vegaprotocol/i18n';
 import { Suspense } from 'react';
 
@@ -39,10 +38,7 @@ function App() {
             }
           >
             <Suspense fallback={splashLoading}>
-              <RouterProvider
-                router={createBrowserRouter(useRouterConfig())}
-                fallbackElement={splashLoading}
-              />
+              <RouterProvider router={router} fallbackElement={splashLoading} />
             </Suspense>
           </NodeGuard>
           <NodeSwitcherDialog

apps/explorer/src/app/components/asset-balance/asset-balance.tsx

@@ -1,5 +1,5 @@
 import { useAssetDataProvider } from '@vegaprotocol/assets';
-import { addDecimalsFixedFormatNumber } from '@vegaprotocol/utils';
+import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
 import { AssetLink } from '../links';
 
 export type AssetBalanceProps = {
@@ -23,7 +23,7 @@ const AssetBalance = ({
 
   const label =
     !loading && asset && asset.decimals
-      ? addDecimalsFixedFormatNumber(price, asset.decimals)
+      ? addDecimalsFormatNumber(price, asset.decimals)
       : price;
 
   return (

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

@@ -12,8 +12,7 @@ import { type VegaICellRendererParams } from '@vegaprotocol/datagrid';
 import { useRef, useLayoutEffect } from 'react';
 import { BREAKPOINT_MD } from '../../config/breakpoints';
 import { useNavigate } from 'react-router-dom';
-import { type ColDef } from 'ag-grid-community';
-import type { RowClickedEvent } from 'ag-grid-community';
+import { type RowClickedEvent, ColDef } from 'ag-grid-community';
 
 type AssetsTableProps = {
   data: AssetFieldsFragment[] | null;
@@ -24,7 +23,7 @@ export const AssetsTable = ({ data }: AssetsTableProps) => {
   const navigate = useNavigate();
   const ref = useRef<AgGridReact>(null);
   const showColumnsOnDesktop = () => {
-    ref.current?.api.setColumnsVisible(
+    ref.current?.columnApi.setColumnsVisible(
       ['id', 'type', 'status'],
       window.innerWidth > BREAKPOINT_MD
     );

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

@@ -14,7 +14,7 @@ import { Routes } from '../../routes/route-names';
 import { NetworkSwitcher } from '@vegaprotocol/environment';
 import type { Navigable } from '../../routes/router-config';
 import { isNavigable } from '../../routes/router-config';
-import { useRouterConfig } from '../../routes/router-config';
+import { routerConfig } from '../../routes/router-config';
 import { useMemo } from 'react';
 import compact from 'lodash/compact';
 import { Search } from '../search';
@@ -26,7 +26,6 @@ const routeToNavigationItem = (r: Navigable) => (
 );
 
 export const Header = () => {
-  const routerConfig = useRouterConfig();
   const isHome = Boolean(useMatch(Routes.HOME));
   const pages = routerConfig[0].children || [];
   const mainItems = compact(

apps/explorer/src/app/components/links/party-link/party-link.tsx

@@ -60,7 +60,7 @@ const PartyLink = ({ id, truncate = false, ...props }: PartyLinkProps) => {
   }
 
   return (
-    <span>
+    <span className="whitespace-nowrap">
       {useName && <Icon size={4} name="cube" className="mr-2" />}
       <Link
         className="underline font-mono"

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

@@ -29,7 +29,7 @@ export const MarketsTable = ({ data }: MarketsTableProps) => {
   const gridRef = useRef<AgGridReact>(null);
   useLayoutEffect(() => {
     const showColumnsOnDesktop = () => {
-      gridRef.current?.api.setColumnsVisible(
+      gridRef.current?.columnApi.setColumnsVisible(
         ['id', 'state', 'asset'],
         window.innerWidth > BREAKPOINT_MD
       );

apps/explorer/src/app/components/order-details/deterministic-order-details.tsx

@@ -6,7 +6,6 @@ import { Time } from '../time';
 import { sideText, statusText, tifFull, tifShort } from './lib/order-labels';
 import SizeInMarket from '../size-in-market/size-in-market';
 import { TxOrderPeggedReference } from '../txs/details/order/tx-order-peg';
-import { OrderTypeMapping } from '@vegaprotocol/types';
 
 export interface DeterministicOrderDetailsProps {
   id: string;
@@ -60,7 +59,7 @@ const DeterministicOrderDetails = ({
   const o = data.orderByID;
   return (
     <div className={wrapperClasses}>
-      <div className="mb-0">
+      <div className="mb-12 lg:mb-0">
         <div className="relative block px-3 py-6 md:px-6 lg:-mr-7">
           <h2 className="text-3xl font-bold mb-4 display-5">
             <abbr title={tifFull[o.timeInForce]} className="bb-dotted mr-2">
@@ -70,7 +69,7 @@ const DeterministicOrderDetails = ({
             <span className="mx-5 text-base">@</span>
             <PriceInMarket price={o.price} marketId={o.market.id} />
           </h2>
-          <p className="text-gray-400 dark:text-gray-600">
+          <p className="text-gray-200">
             In <MarketLink id={o.market.id} /> at <Time date={o.createdAt} />.
           </p>
           {o.peggedOrder ? (
@@ -84,14 +83,15 @@ const DeterministicOrderDetails = ({
               />
             </p>
           ) : null}
+
           {o.reference ? (
             <p className="text-gray-500 mt-4">
               <span>{t('Reference')}</span>: {o.reference}
             </p>
           ) : null}
-          <div className="grid grid-cols-2 md:grid-cols-5 gap-x-6 mt-4">
-            <div className="mb-6 md:mb-0">
-              <h2 className="text-2xl font-bold text-dark mb-0 md:mb-4">
+          <div className="grid md:grid-cols-4 gap-x-6 mt-4">
+            <div className="mb-12 md:mb-0">
+              <h2 className="text-2xl font-bold text-dark mb-4">
                 {t('Status')}
               </h2>
               <h5 className="text-lg font-medium text-gray-500 mb-0 capitalize">
@@ -99,33 +99,21 @@ const DeterministicOrderDetails = ({
               </h5>
             </div>
 
-            <div className="mb-6 md:mb-0">
-              <h2 className="text-2xl font-bold text-dark mb-0 md:mb-4">
-                {t('Size')}
-              </h2>
+            <div className="mb-12 md:mb-0">
+              <h2 className="text-2xl font-bold text-dark mb-4">{t('Size')}</h2>
               <h5 className="text-lg font-medium text-gray-500 mb-0">
                 <SizeInMarket size={o.size} marketId={o.market.id} />
               </h5>
             </div>
 
-            <div className="mb-6 md:mb-0">
-              <h2 className="text-2xl font-bold text-dark mb-0 md:mb-4">
+            <div className="">
+              <h2 className="text-2xl font-bold text-dark mb-4">
                 {t('Version')}
               </h2>
               <h5 className="text-lg font-medium text-gray-500 mb-0">
                 {o.version}
               </h5>
             </div>
-            {o.type ? (
-              <div className="mb-6 md:mb-0">
-                <h2 className="text-2xl font-bold text-dark mb-0 md:mb-4">
-                  {t('Type')}
-                </h2>
-                <h5 className="text-lg font-medium text-gray-500 mb-0">
-                  {OrderTypeMapping[o.type]}
-                </h5>
-              </div>
-            ) : null}
           </div>
         </div>
       </div>

apps/explorer/src/app/components/order-summary/order-tx-summary.spec.tsx

@@ -120,6 +120,6 @@ describe('Order TX Summary component', () => {
     // After fetch renders formatted price and asset quotename
     expect(await res.findByText('3.33')).toBeInTheDocument();
     expect(await res.findByText('TEST')).toBeInTheDocument();
-    expect(await res.getByText('0.10')).toBeInTheDocument();
+    expect(await res.findByText('0.1')).toBeInTheDocument();
   });
 });

apps/explorer/src/app/components/price-in-market/price-in-market.spec.tsx

@@ -64,7 +64,7 @@ describe('Price in Market component', () => {
 
   it('Renders the formatted price when market data is fetched, using market decimals by default', async () => {
     const res = render(renderComponent('100', '123', [fullMock]));
-    expect(await res.findByText('1.00')).toBeInTheDocument();
+    expect(await res.findByText('1')).toBeInTheDocument();
     expect(await res.findByText('dai')).toBeInTheDocument();
   });
 

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

@@ -8,8 +8,7 @@ import {
   type VegaValueFormatterParams,
 } from '@vegaprotocol/datagrid';
 import { useLayoutEffect, useMemo, useRef, useState } from 'react';
-import { type ColDef } from 'ag-grid-community';
-import type { RowClickedEvent } from 'ag-grid-community';
+import { type RowClickedEvent, ColDef } from 'ag-grid-community';
 import { getDateTimeFormat } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import {
@@ -44,11 +43,11 @@ export const ProposalsTable = ({ data }: ProposalsTableProps) => {
   const gridRef = useRef<AgGridReact>(null);
   useLayoutEffect(() => {
     const showColumnsOnDesktop = () => {
-      gridRef.current?.api.setColumnsVisible(
+      gridRef.current?.columnApi.setColumnsVisible(
         ['voting', 'cDate', 'eDate', 'type'],
         window.innerWidth > BREAKPOINT_MD
       );
-      gridRef.current?.api.setColumnWidth(
+      gridRef.current?.columnApi.setColumnWidth(
         'actions',
         window.innerWidth > BREAKPOINT_MD ? 221 : 80
       );

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

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

apps/explorer/src/app/components/size-in-market/size-in-market.spec.tsx

@@ -69,6 +69,6 @@ describe('Size in Market component', () => {
 
   it('Renders the formatted size when market data is fetched', async () => {
     const res = render(renderComponent('100', '123', [fullMock]));
-    expect(await res.findByText('1.00')).toBeInTheDocument();
+    expect(await res.findByText('1')).toBeInTheDocument();
   });
 });

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

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

apps/explorer/src/app/components/txs/tx-order-type.tsx

@@ -80,12 +80,6 @@ export function getLabelForOrderType(
     if (command.orderSubmission.icebergOpts) {
       return 'Iceberg';
     }
-    if (command.orderSubmission.type === 'TYPE_MARKET') {
-      return 'Market order';
-    }
-    if (command.orderSubmission.type === 'TYPE_LIMIT') {
-      return 'Limit order';
-    }
   }
   return 'Order';
 }

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

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

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

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

apps/explorer/src/app/routes/blocks/id/block.tsx

@@ -54,7 +54,7 @@ const Block = () => {
               </Button>
             </Link>
           </div>
-          {blockData && 'result' in blockData && (
+          {blockData && (
             <>
               <TableWithTbody className="mb-8">
                 <TableRow modifier="bordered">

apps/explorer/src/app/routes/layout.tsx

@@ -73,7 +73,7 @@ export const Layout = () => {
           <ProtocolUpgradeInProgressNotification />
         </div>
         <div className={fixedWidthClasses}>
-          <main className="md:p-4">
+          <main className="p-4">
             {!isHome && <BreadcrumbsContainer className="mb-4" />}
             <Outlet />
           </main>

apps/explorer/src/app/routes/router-config.tsx

@@ -18,6 +18,7 @@ import { t } from '@vegaprotocol/i18n';
 import { Routes } from './route-names';
 import { NetworkParameters } from './network-parameters';
 import type { Params, RouteObject } from 'react-router-dom';
+import { createBrowserRouter } from 'react-router-dom';
 import { Link } from 'react-router-dom';
 import { MarketPage, MarketsPage } from './markets';
 import type { ReactNode } from 'react';
@@ -28,7 +29,7 @@ import { truncateMiddle } from '@vegaprotocol/ui-toolkit';
 import { remove0x } from '@vegaprotocol/utils';
 import { PartyAccountsByAsset } from './parties/id/accounts';
 import { Disclaimer } from './pages/disclaimer';
-import { useFeatureFlags } from '@vegaprotocol/environment';
+import { FLAGS } from '@vegaprotocol/environment';
 import RestrictedPage from './restricted';
 
 export type Navigable = {
@@ -59,315 +60,311 @@ type Route = RouteItem & {
   children?: RouteItem[];
 };
 
-export const useRouterConfig = () => {
-  const featureFlags = useFeatureFlags((state) => state.flags);
-
-  const partiesRoutes: Route[] = featureFlags.EXPLORER_PARTIES
-    ? [
-        {
-          path: Routes.PARTIES,
-          element: <Party />,
-          handle: {
-            name: t('Parties'),
-            text: t('Parties'),
-            breadcrumb: () => <Link to={Routes.PARTIES}>{t('Parties')}</Link>,
+const partiesRoutes: Route[] = FLAGS.EXPLORER_PARTIES
+  ? [
+      {
+        path: Routes.PARTIES,
+        element: <Party />,
+        handle: {
+          name: t('Parties'),
+          text: t('Parties'),
+          breadcrumb: () => <Link to={Routes.PARTIES}>{t('Parties')}</Link>,
+        },
+        children: [
+          {
+            index: true,
+            element: <Parties />,
           },
-          children: [
-            {
-              index: true,
-              element: <Parties />,
-            },
-            {
-              path: ':party',
-              element: <Party />,
+          {
+            path: ':party',
+            element: <Party />,
 
-              children: [
-                {
-                  index: true,
-                  element: <PartySingle />,
-                  handle: {
-                    breadcrumb: (params: Params<string>) => (
-                      <Link to={linkTo(Routes.PARTIES, params.party)}>
-                        {truncateMiddle(params.party as string)}
-                      </Link>
-                    ),
-                  },
+            children: [
+              {
+                index: true,
+                element: <PartySingle />,
+                handle: {
+                  breadcrumb: (params: Params<string>) => (
+                    <Link to={linkTo(Routes.PARTIES, params.party)}>
+                      {truncateMiddle(params.party as string)}
+                    </Link>
+                  ),
                 },
-                {
-                  path: 'assets',
-                  element: <Party />,
-                  handle: {
-                    breadcrumb: (params: Params<string>) => (
-                      <Link to={linkTo(Routes.PARTIES, params.party)}>
-                        {truncateMiddle(params.party as string)}
-                      </Link>
-                    ),
-                  },
-                  children: [
-                    {
-                      index: true,
-                      element: <PartyAccountsByAsset />,
-                      handle: {
-                        breadcrumb: () => {
-                          return t('Assets');
-                        },
+              },
+              {
+                path: 'assets',
+                element: <Party />,
+                handle: {
+                  breadcrumb: (params: Params<string>) => (
+                    <Link to={linkTo(Routes.PARTIES, params.party)}>
+                      {truncateMiddle(params.party as string)}
+                    </Link>
+                  ),
+                },
+                children: [
+                  {
+                    index: true,
+                    element: <PartyAccountsByAsset />,
+                    handle: {
+                      breadcrumb: () => {
+                        return t('Assets');
                       },
                     },
-                  ],
-                },
-              ],
-            },
-          ],
-        },
-      ]
-    : [];
-
-  const assetsRoutes: Route[] = featureFlags.EXPLORER_ASSETS
-    ? [
-        {
-          path: Routes.ASSETS,
-          handle: {
-            name: t('Assets'),
-            text: t('Assets'),
-            breadcrumb: () => <Link to={Routes.ASSETS}>{t('Assets')}</Link>,
-          },
-          children: [
-            {
-              index: true,
-              element: <AssetsPage />,
-            },
-            {
-              path: ':assetId',
-              element: <AssetPage />,
-              handle: {
-                breadcrumb: (params: Params<string>) => (
-                  <AssetLink assetId={params.assetId as string} />
-                ),
+                  },
+                ],
               },
-            },
-          ],
-        },
-      ]
-    : [];
-
-  const genesisRoutes: Route[] = featureFlags.EXPLORER_GENESIS
-    ? [
-        {
-          path: Routes.GENESIS,
-          handle: {
-            name: t('Genesis'),
-            text: t('Genesis Parameters'),
-            breadcrumb: () => (
-              <Link to={Routes.GENESIS}>{t('Genesis Parameters')}</Link>
-            ),
+            ],
           },
-          element: <Genesis />,
-        },
-      ]
-    : [];
+        ],
+      },
+    ]
+  : [];
 
-  const governanceRoutes: Route[] = featureFlags.EXPLORER_GOVERNANCE
-    ? [
-        {
-          path: Routes.GOVERNANCE,
-          handle: {
-            name: t('Governance proposals'),
-            text: t('Governance Proposals'),
-            breadcrumb: () => (
-              <Link to={Routes.GOVERNANCE}>{t('Governance Proposals')}</Link>
-            ),
-          },
-          element: <Proposals />,
+const assetsRoutes: Route[] = FLAGS.EXPLORER_ASSETS
+  ? [
+      {
+        path: Routes.ASSETS,
+        handle: {
+          name: t('Assets'),
+          text: t('Assets'),
+          breadcrumb: () => <Link to={Routes.ASSETS}>{t('Assets')}</Link>,
         },
-      ]
-    : [];
-
-  const marketsRoutes: Route[] = featureFlags.EXPLORER_MARKETS
-    ? [
-        {
-          path: Routes.MARKETS,
-          handle: {
-            name: t('Markets'),
-            text: t('Markets'),
-            breadcrumb: () => <Link to={Routes.MARKETS}>{t('Markets')}</Link>,
-          },
-          children: [
-            {
-              index: true,
-              element: <MarketsPage />,
-            },
-            {
-              path: ':marketId',
-              element: <MarketPage />,
-              handle: {
-                breadcrumb: (params: Params<string>) => (
-                  <MarketLink id={params.marketId as string} />
-                ),
-              },
-            },
-          ],
-        },
-      ]
-    : [];
-
-  const networkParametersRoutes: Route[] =
-    featureFlags.EXPLORER_NETWORK_PARAMETERS
-      ? [
+        children: [
           {
-            path: Routes.NETWORK_PARAMETERS,
+            index: true,
+            element: <AssetsPage />,
+          },
+          {
+            path: ':assetId',
+            element: <AssetPage />,
             handle: {
-              name: t('NetworkParameters'),
-              text: t('Network Parameters'),
-              breadcrumb: () => (
-                <Link to={Routes.NETWORK_PARAMETERS}>
-                  {t('Network Parameters')}
+              breadcrumb: (params: Params<string>) => (
+                <AssetLink assetId={params.assetId as string} />
+              ),
+            },
+          },
+        ],
+      },
+    ]
+  : [];
+
+const genesisRoutes: Route[] = FLAGS.EXPLORER_GENESIS
+  ? [
+      {
+        path: Routes.GENESIS,
+        handle: {
+          name: t('Genesis'),
+          text: t('Genesis Parameters'),
+          breadcrumb: () => (
+            <Link to={Routes.GENESIS}>{t('Genesis Parameters')}</Link>
+          ),
+        },
+        element: <Genesis />,
+      },
+    ]
+  : [];
+
+const governanceRoutes: Route[] = FLAGS.EXPLORER_GOVERNANCE
+  ? [
+      {
+        path: Routes.GOVERNANCE,
+        handle: {
+          name: t('Governance proposals'),
+          text: t('Governance Proposals'),
+          breadcrumb: () => (
+            <Link to={Routes.GOVERNANCE}>{t('Governance Proposals')}</Link>
+          ),
+        },
+        element: <Proposals />,
+      },
+    ]
+  : [];
+
+const marketsRoutes: Route[] = FLAGS.EXPLORER_MARKETS
+  ? [
+      {
+        path: Routes.MARKETS,
+        handle: {
+          name: t('Markets'),
+          text: t('Markets'),
+          breadcrumb: () => <Link to={Routes.MARKETS}>{t('Markets')}</Link>,
+        },
+        children: [
+          {
+            index: true,
+            element: <MarketsPage />,
+          },
+          {
+            path: ':marketId',
+            element: <MarketPage />,
+            handle: {
+              breadcrumb: (params: Params<string>) => (
+                <MarketLink id={params.marketId as string} />
+              ),
+            },
+          },
+        ],
+      },
+    ]
+  : [];
+
+const networkParametersRoutes: Route[] = FLAGS.EXPLORER_NETWORK_PARAMETERS
+  ? [
+      {
+        path: Routes.NETWORK_PARAMETERS,
+        handle: {
+          name: t('NetworkParameters'),
+          text: t('Network Parameters'),
+          breadcrumb: () => (
+            <Link to={Routes.NETWORK_PARAMETERS}>
+              {t('Network Parameters')}
+            </Link>
+          ),
+        },
+        element: <NetworkParameters />,
+      },
+    ]
+  : [];
+
+const validators: Route[] = FLAGS.EXPLORER_VALIDATORS
+  ? [
+      {
+        path: Routes.VALIDATORS,
+        handle: {
+          name: t('Validators'),
+          text: t('Validators'),
+          breadcrumb: () => (
+            <Link to={Routes.VALIDATORS}>{t('Validators')}</Link>
+          ),
+        },
+        element: <ValidatorsPage />,
+      },
+    ]
+  : [];
+
+const linkTo = (...segments: (string | undefined)[]) =>
+  compact(segments).join('/');
+
+export const routerConfig: Route[] = [
+  {
+    path: Routes.HOME,
+    element: <Layout />,
+    handle: {
+      name: t('Home'),
+      text: t('Home'),
+      breadcrumb: () => <Link to={Routes.HOME}>{t('Home')}</Link>,
+    },
+    errorElement: <ErrorBoundary />,
+    children: [
+      {
+        index: true,
+        element: <Home />,
+      },
+      {
+        path: Routes.TX,
+        handle: {
+          name: t('Txs'),
+          text: t('Transactions'),
+          breadcrumb: () => <Link to={Routes.TX}>{t('Transactions')}</Link>,
+        },
+        children: [
+          {
+            path: ':txHash',
+            element: <Tx />,
+            handle: {
+              breadcrumb: (params: Params<string>) => (
+                <Link to={linkTo(Routes.TX, params.txHash)}>
+                  {truncateMiddle(remove0x(params.txHash as string))}
                 </Link>
               ),
             },
-            element: <NetworkParameters />,
           },
-        ]
-      : [];
-
-  const validators: Route[] = featureFlags.EXPLORER_VALIDATORS
-    ? [
-        {
-          path: Routes.VALIDATORS,
-          handle: {
-            name: t('Validators'),
-            text: t('Validators'),
-            breadcrumb: () => (
-              <Link to={Routes.VALIDATORS}>{t('Validators')}</Link>
-            ),
+          {
+            index: true,
+            element: <TxsList />,
           },
-          element: <ValidatorsPage />,
-        },
-      ]
-    : [];
-
-  const linkTo = (...segments: (string | undefined)[]) =>
-    compact(segments).join('/');
-
-  const routerConfig: Route[] = [
-    {
-      path: Routes.HOME,
-      element: <Layout />,
-      handle: {
-        name: t('Home'),
-        text: t('Home'),
-        breadcrumb: () => <Link to={Routes.HOME}>{t('Home')}</Link>,
+        ],
       },
-      errorElement: <ErrorBoundary />,
-      children: [
-        {
-          index: true,
-          element: <Home />,
+      {
+        path: Routes.BLOCKS,
+        handle: {
+          name: t('Blocks'),
+          text: t('Blocks'),
+          breadcrumb: () => <Link to={Routes.BLOCKS}>{t('Blocks')}</Link>,
         },
-        {
-          path: Routes.TX,
-          handle: {
-            name: t('Txs'),
-            text: t('Transactions'),
-            breadcrumb: () => <Link to={Routes.TX}>{t('Transactions')}</Link>,
+        element: <BlockPage />,
+        children: [
+          {
+            index: true,
+            element: <Blocks />,
           },
-          children: [
-            {
-              path: ':txHash',
-              element: <Tx />,
-              handle: {
-                breadcrumb: (params: Params<string>) => (
-                  <Link to={linkTo(Routes.TX, params.txHash)}>
-                    {truncateMiddle(remove0x(params.txHash as string))}
-                  </Link>
-                ),
-              },
+          {
+            path: ':block',
+            element: <Block />,
+            handle: {
+              breadcrumb: (params: Params<string>) => (
+                <Link to={linkTo(Routes.BLOCKS, params.block)}>
+                  {params.block}
+                </Link>
+              ),
             },
-            {
-              index: true,
-              element: <TxsList />,
-            },
-          ],
-        },
-        {
-          path: Routes.BLOCKS,
-          handle: {
-            name: t('Blocks'),
-            text: t('Blocks'),
-            breadcrumb: () => <Link to={Routes.BLOCKS}>{t('Blocks')}</Link>,
           },
-          element: <BlockPage />,
-          children: [
-            {
-              index: true,
-              element: <Blocks />,
-            },
-            {
-              path: ':block',
-              element: <Block />,
-              handle: {
-                breadcrumb: (params: Params<string>) => (
-                  <Link to={linkTo(Routes.BLOCKS, params.block)}>
-                    {params.block}
-                  </Link>
-                ),
-              },
-            },
-          ],
-        },
-        {
-          path: Routes.ORACLES,
-          handle: {
-            name: t('Oracles'),
-            text: t('Oracles'),
-            breadcrumb: () => <Link to={Routes.ORACLES}>{t('Oracles')}</Link>,
-          },
-          element: <OraclePage />,
-          children: [
-            {
-              index: true,
-              element: <Oracles />,
-            },
-            {
-              path: ':id',
-              element: <Oracle />,
-              handle: {
-                breadcrumb: (params: Params<string>) => (
-                  <Link to={linkTo(Routes.ORACLES, params.id)}>
-                    {truncateMiddle(params.id as string)}
-                  </Link>
-                ),
-              },
-            },
-          ],
-        },
-        {
-          path: Routes.DISCLAIMER,
-          element: <Disclaimer />,
-          handle: {
-            name: t('Disclaimer'),
-            text: t('Disclaimer'),
-            breadcrumb: () => (
-              <Link to={Routes.DISCLAIMER}>{t('Disclaimer')}</Link>
-            ),
-          },
-        },
-        ...partiesRoutes,
-        ...assetsRoutes,
-        ...genesisRoutes,
-        ...governanceRoutes,
-        ...marketsRoutes,
-        ...networkParametersRoutes,
-        ...validators,
-      ],
-    },
-    {
-      path: Routes.RESTRICTED,
-      element: <RestrictedPage />,
-      handle: {
-        name: t('Restricted'),
-        text: t('Restricted'),
+        ],
       },
+      {
+        path: Routes.ORACLES,
+        handle: {
+          name: t('Oracles'),
+          text: t('Oracles'),
+          breadcrumb: () => <Link to={Routes.ORACLES}>{t('Oracles')}</Link>,
+        },
+        element: <OraclePage />,
+        children: [
+          {
+            index: true,
+            element: <Oracles />,
+          },
+          {
+            path: ':id',
+            element: <Oracle />,
+            handle: {
+              breadcrumb: (params: Params<string>) => (
+                <Link to={linkTo(Routes.ORACLES, params.id)}>
+                  {truncateMiddle(params.id as string)}
+                </Link>
+              ),
+            },
+          },
+        ],
+      },
+      {
+        path: Routes.DISCLAIMER,
+        element: <Disclaimer />,
+        handle: {
+          name: t('Disclaimer'),
+          text: t('Disclaimer'),
+          breadcrumb: () => (
+            <Link to={Routes.DISCLAIMER}>{t('Disclaimer')}</Link>
+          ),
+        },
+      },
+      ...partiesRoutes,
+      ...assetsRoutes,
+      ...genesisRoutes,
+      ...governanceRoutes,
+      ...marketsRoutes,
+      ...networkParametersRoutes,
+      ...validators,
+    ],
+  },
+  {
+    path: Routes.RESTRICTED,
+    element: <RestrictedPage />,
+    handle: {
+      name: t('Restricted'),
+      text: t('Restricted'),
     },
-  ];
-  return routerConfig;
-};
+  },
+];
+
+export const router = createBrowserRouter(routerConfig);

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

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

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

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

apps/governance-e2e/src/support/proposal.functions.ts

@@ -196,7 +196,6 @@ export function createNewMarketProposalTxBody(): ProposalSubmissionBody {
                 timeWindow: '3600',
                 scalingFactor: 10,
               },
-              // FIXME: workaround because of https://github.com/vegaprotocol/vega/issues/10343
               triggeringRatio: '0.7',
               auctionExtension: '1',
             },
@@ -335,7 +334,6 @@ export function createSuccessorMarketProposalTxBody(
                 timeWindow: '3600',
                 scalingFactor: 10,
               },
-              // FIXME: workaround because of https://github.com/vegaprotocol/vega/issues/10343
               triggeringRatio: '0.7',
               auctionExtension: '1',
             },

apps/governance/.env.capsule

@@ -32,7 +32,7 @@ CYPRESS_FAIRGROUND=false
 
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
-NX_METAMASK_SNAPS=true
+NX_METAMASK_SNAPS=false
 NX_PRODUCT_PERPETUALS=true
 NX_UPDATE_MARKET_STATE=true
 NX_REFERRALS=true

apps/governance/.env.mainnet

@@ -23,7 +23,7 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket
 
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
-NX_METAMASK_SNAPS=true
+NX_METAMASK_SNAPS=false
 NX_PRODUCT_PERPETUALS=true
 NX_UPDATE_MARKET_STATE=true
 NX_REFERRALS=true

apps/governance/.env.mainnet-mirror

@@ -22,7 +22,7 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://be.mainnet-mirror.vega.rocks/websocket
 
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
-NX_METAMASK_SNAPS=true
+NX_METAMASK_SNAPS=false
 NX_PRODUCT_PERPETUALS=true
 NX_UPDATE_MARKET_STATE=true
 NX_REFERRALS=true

apps/governance/.env.validators-testnet

@@ -21,7 +21,7 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.
 
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
-NX_METAMASK_SNAPS=true
+NX_METAMASK_SNAPS=false
 NX_PRODUCT_PERPETUALS=true
 NX_UPDATE_MARKET_STATE=true
 NX_REFERRALS=true

apps/governance/src/app-loader.tsx

@@ -2,7 +2,7 @@ import * as Sentry from '@sentry/react';
 import { toBigNum } from '@vegaprotocol/utils';
 import { Splash } from '@vegaprotocol/ui-toolkit';
 import { useVegaWallet, useEagerConnect } from '@vegaprotocol/wallet';
-import { useFeatureFlags, useEnvironment } from '@vegaprotocol/environment';
+import { FLAGS, useEnvironment } from '@vegaprotocol/environment';
 import { useWeb3React } from '@web3-react/core';
 import React, { Suspense } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -15,23 +15,21 @@ import {
 } from './contexts/app-state/app-state-context';
 import { useContracts } from './contexts/contracts/contracts-context';
 import { useRefreshAssociatedBalances } from './hooks/use-refresh-associated-balances';
-import { useConnectors } from './lib/vega-connectors';
+import { Connectors } from './lib/vega-connectors';
 import { useSearchParams } from 'react-router-dom';
 
 const useVegaWalletEagerConnect = () => {
-  const connectors = useConnectors();
-  const vegaConnecting = useEagerConnect(connectors);
+  const vegaConnecting = useEagerConnect(Connectors);
   const { pubKey, connect } = useVegaWallet();
   const [searchParams] = useSearchParams();
   const [query] = React.useState(searchParams.get('address'));
   if (query && !pubKey) {
-    connect(connectors.view);
+    connect(Connectors['view']);
   }
   return vegaConnecting;
 };
 
 export const AppLoader = ({ children }: { children: React.ReactElement }) => {
-  const featureFlags = useFeatureFlags((state) => state.flags);
   const { t } = useTranslation();
   const { account } = useWeb3React();
   const { VEGA_URL } = useEnvironment();
@@ -81,16 +79,10 @@ export const AppLoader = ({ children }: { children: React.ReactElement }) => {
       }
     };
 
-    if (!featureFlags.GOVERNANCE_NETWORK_DOWN) {
+    if (!FLAGS.GOVERNANCE_NETWORK_DOWN) {
       run();
     }
-  }, [
-    token,
-    appDispatch,
-    staking,
-    vesting,
-    featureFlags.GOVERNANCE_NETWORK_DOWN,
-  ]);
+  }, [token, appDispatch, staking, vesting]);
 
   React.useEffect(() => {
     if (account && pubKey) {
@@ -155,16 +147,16 @@ export const AppLoader = ({ children }: { children: React.ReactElement }) => {
     };
 
     // Only begin polling if network limits flag is set, as this is a new API not yet on mainnet 7/3/22
-    if (featureFlags.GOVERNANCE_NETWORK_LIMITS) {
+    if (FLAGS.GOVERNANCE_NETWORK_LIMITS) {
       getNetworkLimits();
     }
 
     return () => {
       stopPoll();
     };
-  }, [appDispatch, VEGA_URL, t, featureFlags.GOVERNANCE_NETWORK_LIMITS]);
+  }, [appDispatch, VEGA_URL, t]);
 
-  if (featureFlags.GOVERNANCE_NETWORK_DOWN) {
+  if (FLAGS.GOVERNANCE_NETWORK_DOWN) {
     return (
       <Splash>
         <SplashError />

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

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

apps/governance/src/components/vega-wallet-dialogs/vega-wallet-dialogs.tsx

@@ -7,16 +7,16 @@ import {
   AppStateActionType,
   useAppState,
 } from '../../contexts/app-state/app-state-context';
-import { useConnectors } from '../../lib/vega-connectors';
+import { Connectors } from '../../lib/vega-connectors';
 import { RiskMessage } from './risk-message';
 
 export const VegaWalletDialogs = () => {
   const { appState, appDispatch } = useAppState();
-  const connectors = useConnectors();
+
   return (
     <>
       <VegaConnectDialog
-        connectors={connectors}
+        connectors={Connectors}
         riskMessage={<RiskMessage />}
       />
 
@@ -30,7 +30,7 @@ export const VegaWalletDialogs = () => {
         }
       />
 
-      <ViewAsDialog connector={connectors.view} />
+      <ViewAsDialog connector={Connectors.view} />
     </>
   );
 };

apps/governance/src/contexts/contracts/contracts-provider.tsx

@@ -49,8 +49,12 @@ export const ContractsProvider = ({ children }: { children: JSX.Element }) => {
             ? activeProvider
             : defaultProvider;
 
-        if (account && provider && typeof provider.getSigner === 'function') {
-          signer = provider.getSigner(account);
+        if (
+          account &&
+          activeProvider &&
+          typeof activeProvider.getSigner === 'function'
+        ) {
+          signer = provider.getSigner();
         }
 
         const tokenVestingAddress =

apps/governance/src/lib/format-number.spec.ts

@@ -3,14 +3,14 @@ import { formatNumber } from './format-number';
 
 describe('formatNumber and formatNumberPercentage', () => {
   it.each([
-    { v: new BigNumber(123), d: 3, o: '123.00' },
+    { v: new BigNumber(123), d: 3, o: '123.000' },
     { v: new BigNumber(123.123), d: 3, o: '123.123' },
-    { v: new BigNumber(123.123), d: 6, o: '123.123' },
+    { v: new BigNumber(123.123), d: 6, o: '123.123000' },
     { v: new BigNumber(123.123), d: 0, o: '123' },
     { v: new BigNumber(123), d: undefined, o: '123.00' }, // it default to 2 decimal places
     { v: new BigNumber(30000), d: undefined, o: '30,000.00' },
     { v: new BigNumber(3.000001), d: undefined, o: '3.000001' },
-  ])(`formats given number with decimals correctly`, ({ v, d, o }) => {
+  ])(`formatNumber($v, $d) -> $o`, ({ v, d, o }) => {
     expect(formatNumber(v, d)).toStrictEqual(o);
   });
 });

apps/governance/src/lib/vega-connectors.ts

@@ -1,5 +1,4 @@
-import { useFeatureFlags } from '@vegaprotocol/environment';
-import { useMemo } from 'react';
+import { FLAGS } from '@vegaprotocol/environment';
 import {
   JsonRpcConnector,
   ViewConnector,
@@ -14,17 +13,13 @@ export const jsonRpc = new JsonRpcConnector();
 export const injected = new InjectedConnector();
 export const view = new ViewConnector(urlParams.get('address'));
 
-export const snap = new SnapConnector(DEFAULT_SNAP_ID);
+export const snap = FLAGS.METAMASK_SNAPS
+  ? new SnapConnector(DEFAULT_SNAP_ID)
+  : undefined;
 
-export const useConnectors = () => {
-  const featureFlags = useFeatureFlags((state) => state.flags);
-  return useMemo(
-    () => ({
-      injected,
-      jsonRpc,
-      view,
-      snap: featureFlags.METAMASK_SNAPS ? snap : undefined,
-    }),
-    [featureFlags.METAMASK_SNAPS]
-  );
+export const Connectors = {
+  injected,
+  jsonRpc,
+  view,
+  snap,
 };

apps/governance/src/routes/home/index.tsx

@@ -12,7 +12,7 @@ import { useRefreshAfterEpoch } from '../../hooks/use-refresh-after-epoch';
 import { ProposalsListItem } from '../proposals/components/proposals-list-item';
 import { ProtocolUpgradeProposalsListItem } from '../proposals/components/protocol-upgrade-proposals-list-item/protocol-upgrade-proposals-list-item';
 import Routes from '../routes';
-import { ExternalLinks, useFeatureFlags } from '@vegaprotocol/environment';
+import { ExternalLinks, FLAGS } from '@vegaprotocol/environment';
 import { removePaginationWrapper } from '@vegaprotocol/utils';
 import { useNodesQuery } from '../staking/home/__generated__/Nodes';
 import { useProposalsQuery } from '../proposals/proposals/__generated__/Proposals';
@@ -175,7 +175,6 @@ export const ValidatorDetailsLink = ({
 };
 
 const GovernanceHome = ({ name }: RouteChildProps) => {
-  const featureFlags = useFeatureFlags((state) => state.flags);
   useDocumentTitle(name);
   const { t } = useTranslation();
   const {
@@ -187,9 +186,9 @@ const GovernanceHome = ({ name }: RouteChildProps) => {
     fetchPolicy: 'network-only',
     errorPolicy: 'ignore',
     variables: {
-      includeNewMarketProductFields: !!featureFlags.PRODUCT_PERPETUALS,
-      includeUpdateMarketStates: !!featureFlags.UPDATE_MARKET_STATE,
-      includeUpdateReferralPrograms: !!featureFlags.REFERRALS,
+      includeNewMarketProductFields: !!FLAGS.PRODUCT_PERPETUALS,
+      includeUpdateMarketStates: !!FLAGS.UPDATE_MARKET_STATE,
+      includeUpdateReferralPrograms: !!FLAGS.REFERRALS,
     },
   });
 

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

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

apps/governance/src/routes/proposals/components/proposal-detail-header/proposal-header.spec.tsx

@@ -19,7 +19,7 @@ import {
   mockWalletContext,
   createUserVoteQueryMock,
 } from '../../test-helpers/mocks';
-import { useFeatureFlags } from '@vegaprotocol/environment';
+import { FLAGS } from '@vegaprotocol/environment';
 import { BrowserRouter } from 'react-router-dom';
 import { VoteState } from '../vote-details/use-user-vote';
 import { useNewTransferProposalDetails } from '@vegaprotocol/proposals';
@@ -62,7 +62,8 @@ describe('Proposal header', () => {
     jest.clearAllMocks();
   });
   it('Renders New market proposal', () => {
-    useFeatureFlags.setState({ flags: { SUCCESSOR_MARKETS: true } });
+    const mockedFlags = jest.mocked(FLAGS);
+    mockedFlags.SUCCESSOR_MARKETS = true;
     renderComponent(
       generateProposal({
         rationale: {

apps/governance/src/routes/proposals/components/proposal-detail-header/proposal-header.tsx

@@ -12,7 +12,7 @@ import {
   useNewTransferProposalDetails,
   useSuccessorMarketProposalDetails,
 } from '@vegaprotocol/proposals';
-import { useFeatureFlags } from '@vegaprotocol/environment';
+import { FLAGS } from '@vegaprotocol/environment';
 import Routes from '../../../routes';
 import { Link } from 'react-router-dom';
 import type { VoteState } from '../vote-details/use-user-vote';
@@ -28,7 +28,6 @@ export const ProposalHeader = ({
   isListItem?: boolean;
   voteState?: VoteState | null;
 }) => {
-  const featureFlags = useFeatureFlags((state) => state.flags);
   const { t } = useTranslation();
   const change = proposal?.terms.change;
 
@@ -55,14 +54,13 @@ export const ProposalHeader = ({
   switch (change?.__typename) {
     case 'NewMarket': {
       proposalType =
-        featureFlags.PRODUCT_PERPETUALS &&
-        change?.instrument?.product?.__typename
+        FLAGS.PRODUCT_PERPETUALS && change?.instrument?.product?.__typename
           ? `NewMarket${change?.instrument?.product?.__typename}`
           : 'NewMarket';
       fallbackTitle = t('NewMarketProposal');
       details = (
         <>
-          {featureFlags.SUCCESSOR_MARKETS && (
+          {FLAGS.SUCCESSOR_MARKETS && (
             <SuccessorCode proposalId={proposal?.id} />
           )}
           <span>
@@ -84,13 +82,13 @@ export const ProposalHeader = ({
     }
     case 'UpdateMarketState': {
       proposalType =
-        featureFlags.UPDATE_MARKET_STATE && change?.updateType
+        FLAGS.UPDATE_MARKET_STATE && change?.updateType
           ? t(change.updateType)
           : 'UpdateMarketState';
       fallbackTitle = t('UpdateMarketStateProposal');
       details = (
         <span>
-          {featureFlags.UPDATE_MARKET_STATE &&
+          {FLAGS.UPDATE_MARKET_STATE &&
           change?.market?.id &&
           change.updateType ? (
             <>
@@ -179,14 +177,14 @@ export const ProposalHeader = ({
     case 'NewTransfer':
       proposalType = 'NewTransfer';
       fallbackTitle = t('NewTransferProposal');
-      details = featureFlags.GOVERNANCE_TRANSFERS ? (
+      details = FLAGS.GOVERNANCE_TRANSFERS ? (
         <NewTransferSummary proposalId={proposal?.id} />
       ) : null;
       break;
     case 'CancelTransfer':
       proposalType = 'CancelTransfer';
       fallbackTitle = t('CancelTransferProposal');
-      details = featureFlags.GOVERNANCE_TRANSFERS ? (
+      details = FLAGS.GOVERNANCE_TRANSFERS ? (
         <CancelTransferSummary proposalId={proposal?.id} />
       ) : null;
       break;

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

@@ -54,8 +54,8 @@ export const ProposalReferralProgramDetails = ({
     return null;
   }
 
-  const benefitTiers = proposal?.terms?.change?.benefitTiers.slice();
-  const stakingTiers = proposal?.terms?.change?.stakingTiers.slice();
+  const benefitTiers = proposal?.terms?.change?.benefitTiers;
+  const stakingTiers = proposal?.terms?.change?.stakingTiers;
   const windowLength = proposal?.terms?.change?.windowLength;
   const endOfProgramTimestamp = proposal?.terms?.change?.endOfProgram;
 

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

@@ -26,7 +26,7 @@ import {
   ProposalCancelTransferDetails,
   ProposalTransferDetails,
 } from '../proposal-transfer';
-import { useFeatureFlags } from '@vegaprotocol/environment';
+import { FLAGS } from '@vegaprotocol/environment';
 import { ProposalUpdateBenefitTiers } from '../proposal-update-benefit-tiers';
 
 export interface ProposalProps {
@@ -53,7 +53,6 @@ export const Proposal = ({
   originalMarketProposalRestData,
   mostRecentlyEnactedAssociatedMarketProposal,
 }: ProposalProps) => {
-  const featureFlags = useFeatureFlags((state) => state.flags);
   const { t } = useTranslation();
   const { submit, Dialog, finalizedVote, transaction } = useVoteSubmit();
   const { voteState, voteDatetime } = useUserVote(proposal?.id, finalizedVote);
@@ -66,13 +65,10 @@ export const Proposal = ({
     ? removePaginationWrapper(assetData.assetsConnection?.edges)[0]
     : undefined;
 
-  const originalAsset = asset;
-
   if (proposal.terms.change.__typename === 'UpdateAsset' && asset) {
     asset = {
       ...asset,
       quantum: proposal.terms.change.quantum,
-      source: { ...asset.source },
     };
 
     if (asset.source.__typename === 'ERC20') {
@@ -133,7 +129,7 @@ export const Proposal = ({
   }
 
   // Show governance transfer details only if the GOVERNANCE_TRANSFERS flag is on.
-  const governanceTransferDetails = featureFlags.GOVERNANCE_TRANSFERS && (
+  const governanceTransferDetails = FLAGS.GOVERNANCE_TRANSFERS && (
     <>
       {proposal.terms.change.__typename === 'NewTransfer' && (
         /** Governance New Transfer Details */
@@ -232,7 +228,7 @@ export const Proposal = ({
         proposal.terms.change.__typename === 'UpdateAsset') &&
         asset && (
           <div className="mb-4">
-            <ProposalAssetDetails asset={asset} originalAsset={originalAsset} />
+            <ProposalAssetDetails asset={asset} />
           </div>
         )}
 

apps/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 {
@@ -281,8 +281,8 @@ describe('VoteBreakdown', () => {
   });
 
   it('Progress bar displays status -  LP majority', () => {
-    const yesVotesLP = 0.8;
-    const noVotesLP = 0.2;
+    const yesVotesLP = 800;
+    const noVotesLP = 200;
     const expectedProgress = (yesVotesLP / (yesVotesLP + noVotesLP)) * 100; // 80%
 
     renderComponent(
@@ -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'];
@@ -105,6 +95,8 @@ export const VoteBreakdown = ({ proposal }: VoteBreakdownProps) => {
     yesLPPercentage,
     yesTokens,
     noTokens,
+    yesEquityLikeShareWeight,
+    noEquityLikeShareWeight,
     totalEquityLikeShareWeight,
     requiredMajorityPercentage,
     requiredMajorityLPPercentage,
@@ -133,7 +125,6 @@ export const VoteBreakdown = ({ proposal }: VoteBreakdownProps) => {
         .multipliedBy(100),
       new BigNumber(100)
     );
-
   const willPass = willPassByTokenVote || willPassByLPVote;
   const updateMarketVotePassMethod = willPassByTokenVote
     ? t('byTokenVote')
@@ -201,24 +192,56 @@ export const VoteBreakdown = ({ proposal }: VoteBreakdownProps) => {
                 <div className="flex items-center gap-1">
                   <span>{t('liquidityProviderVotesFor')}:</span>
                   <Tooltip
-                    description={
-                      <span>{yesLPPercentage.toFixed(defaultDP)}%</span>
-                    }
+                    description={formatNumber(
+                      yesEquityLikeShareWeight,
+                      defaultDP
+                    )}
                   >
-                    <button>{yesLPPercentage.toFixed(1)}%</button>
+                    <button>
+                      {yesEquityLikeShareWeight
+                        .dividedBy(toBigNum(10 ** 6, 0))
+                        .toFixed(1)}
+                      M
+                    </button>
                   </Tooltip>
+                  <span>
+                    (
+                    <Tooltip
+                      description={
+                        <span>{yesLPPercentage.toFixed(defaultDP)}%</span>
+                      }
+                    >
+                      <button>{yesLPPercentage.toFixed(0)}%</button>
+                    </Tooltip>
+                    )
+                  </span>
                 </div>
 
                 <div className="flex items-center gap-1">
                   <span>{t('liquidityProviderVotesAgainst')}:</span>
+                  <Tooltip
+                    description={formatNumber(
+                      noEquityLikeShareWeight,
+                      defaultDP
+                    )}
+                  >
+                    <button>
+                      {noEquityLikeShareWeight
+                        .dividedBy(toBigNum(10 ** 6, 0))
+                        .toFixed(1)}
+                      M
+                    </button>
+                  </Tooltip>
                   <span>
+                    (
                     <Tooltip
                       description={
                         <span>{noLPPercentage.toFixed(defaultDP)}%</span>
                       }
                     >
-                      <button>{noLPPercentage.toFixed(1)}%</button>
+                      <button>{noLPPercentage.toFixed(0)}%</button>
                     </Tooltip>
+                    )
                   </span>
                 </div>
               </div>
@@ -255,8 +278,16 @@ export const VoteBreakdown = ({ proposal }: VoteBreakdownProps) => {
                       defaultDP
                     )}
                   >
-                    <span>{totalEquityLikeShareWeight.toFixed(1)}%</span>
+                    <button>
+                      {totalEquityLikeShareWeight
+                        .dividedBy(toBigNum(10 ** 6, 0))
+                        .toFixed(1)}
+                      M
+                    </button>
                   </Tooltip>
+                  <span>
+                    ({totalEquityLikeShareWeight.toFixed(defaultDP)}%)
+                  </span>
                 </div>
               </div>
             </section>
@@ -290,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>
@@ -310,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>
@@ -353,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/governance/src/routes/proposals/hooks/use-vote-information.spec.ts

@@ -54,8 +54,8 @@ describe('use-vote-information', () => {
   it('returns all required vote information', () => {
     const yesVotes = 40;
     const noVotes = 60;
-    const yesEquityLikeShareWeight = '0.30';
-    const noEquityLikeShareWeight = '0.70';
+    const yesEquityLikeShareWeight = '30';
+    const noEquityLikeShareWeight = '70';
     // Note - giving a fixedTokenValue of 1 means a ratio of 1:1 votes to tokens, making sums easier :)
     const fixedTokenValue = 1000000000000000000;
 
@@ -195,10 +195,10 @@ describe('use-vote-information', () => {
   });
 
   it('correctly shows whether an update market proposal will pass by token or LP vote - both failing', () => {
-    const yesVotes = 0.2;
-    const noVotes = 0.7;
-    const yesEquityLikeShareWeight = '0.30';
-    const noEquityLikeShareWeight = '0.60';
+    const yesVotes = 20;
+    const noVotes = 70;
+    const yesEquityLikeShareWeight = '30';
+    const noEquityLikeShareWeight = '60';
     const fixedTokenValue = 1000000000000000000;
 
     const proposal = generateProposal({

apps/governance/src/routes/proposals/hooks/use-vote-information.ts

@@ -61,7 +61,7 @@ export const useVoteInformation = ({
     const noEquityLikeShareWeight = !proposal?.votes.no
       .totalEquityLikeShareWeight
       ? new BigNumber(0)
-      : new BigNumber(proposal.votes.no.totalEquityLikeShareWeight).times(100);
+      : new BigNumber(proposal.votes.no.totalEquityLikeShareWeight);
 
     const yesTokens = new BigNumber(
       addDecimal(proposal?.votes.yes.totalTokens ?? 0, decimals)
@@ -70,7 +70,7 @@ export const useVoteInformation = ({
     const yesEquityLikeShareWeight = !proposal?.votes.yes
       .totalEquityLikeShareWeight
       ? new BigNumber(0)
-      : new BigNumber(proposal.votes.yes.totalEquityLikeShareWeight).times(100);
+      : new BigNumber(proposal.votes.yes.totalEquityLikeShareWeight);
 
     const totalTokensVoted = yesTokens.plus(noTokens);
 
@@ -81,7 +81,12 @@ export const useVoteInformation = ({
     const yesPercentage = totalTokensVoted.isZero()
       ? new BigNumber(0)
       : yesTokens.multipliedBy(100).dividedBy(totalTokensVoted);
-    const yesLPPercentage = yesEquityLikeShareWeight;
+
+    const yesLPPercentage = totalEquityLikeShareWeight.isZero()
+      ? new BigNumber(0)
+      : yesEquityLikeShareWeight
+          .multipliedBy(100)
+          .dividedBy(totalEquityLikeShareWeight);
 
     const noPercentage = totalTokensVoted.isZero()
       ? new BigNumber(0)
@@ -98,7 +103,9 @@ export const useVoteInformation = ({
     );
 
     const participationLPMet = requiredParticipationLP
-      ? totalEquityLikeShareWeight.isGreaterThan(requiredParticipationLP)
+      ? totalEquityLikeShareWeight.isGreaterThan(
+          totalSupply.multipliedBy(requiredParticipationLP)
+        )
       : false;
 
     const majorityMet = yesPercentage.isGreaterThanOrEqualTo(
@@ -113,7 +120,9 @@ export const useVoteInformation = ({
       .multipliedBy(100)
       .dividedBy(totalSupply);
 
-    const totalLPTokensPercentage = totalEquityLikeShareWeight;
+    const totalLPTokensPercentage = totalEquityLikeShareWeight
+      .multipliedBy(100)
+      .dividedBy(totalSupply);
 
     const willPassByTokenVote =
       participationMet &&

apps/governance/src/routes/proposals/proposal/Proposal.graphql

@@ -205,6 +205,7 @@ query Proposal(
             }
           }
           liquidityMonitoringParameters {
+            triggeringRatio
             targetStakeParameters {
               timeWindow
               scalingFactor
@@ -365,6 +366,7 @@ query Proposal(
               }
             }
             liquidityMonitoringParameters {
+              triggeringRatio
               targetStakeParameters {
                 timeWindow
                 scalingFactor

apps/governance/src/routes/proposals/proposal/proposal-container.tsx

@@ -15,11 +15,10 @@ import {
   useNetworkParams,
 } from '@vegaprotocol/network-parameters';
 import { useParentMarketIdQuery } from '@vegaprotocol/markets';
-import { useFeatureFlags } from '@vegaprotocol/environment';
+import { FLAGS } from '@vegaprotocol/environment';
 import { useSuccessorMarketProposalDetails } from '@vegaprotocol/proposals';
 
 export const ProposalContainer = () => {
-  const featureFlags = useFeatureFlags((state) => state.flags);
   const [
     mostRecentlyEnactedAssociatedMarketProposal,
     setMostRecentlyEnactedAssociatedMarketProposal,
@@ -60,9 +59,9 @@ export const ProposalContainer = () => {
     errorPolicy: 'ignore',
     variables: {
       proposalId: params.proposalId || '',
-      includeNewMarketProductField: !!featureFlags.PRODUCT_PERPETUALS,
-      includeUpdateMarketState: !!featureFlags.UPDATE_MARKET_STATE,
-      includeUpdateReferralProgram: !!featureFlags.REFERRALS,
+      includeNewMarketProductField: !!FLAGS.PRODUCT_PERPETUALS,
+      includeUpdateMarketState: !!FLAGS.UPDATE_MARKET_STATE,
+      includeUpdateReferralProgram: !!FLAGS.REFERRALS,
     },
     skip: !params.proposalId,
   });
@@ -121,7 +120,7 @@ export const ProposalContainer = () => {
     variables: {
       marketId: marketData?.id || '',
     },
-    skip: !featureFlags.SUCCESSOR_MARKETS || !isSuccessor || !marketData?.id,
+    skip: !FLAGS.SUCCESSOR_MARKETS || !isSuccessor || !marketData?.id,
   });
 
   const {
@@ -134,7 +133,7 @@ export const ProposalContainer = () => {
     variables: {
       marketId: parentMarketId?.market?.parentMarketID || '',
       skip:
-        !featureFlags.SUCCESSOR_MARKETS ||
+        !FLAGS.SUCCESSOR_MARKETS ||
         !isSuccessor ||
         !parentMarketId?.market?.parentMarketID,
     },

apps/governance/src/routes/proposals/proposals/proposals-container.tsx

@@ -17,7 +17,7 @@ import {
 } from './__generated__/Proposals';
 import { type ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
 import { useProtocolUpgradeProposalsQuery } from '@vegaprotocol/proposals';
-import { useFeatureFlags } from '@vegaprotocol/environment';
+import { FLAGS } from '@vegaprotocol/environment';
 
 export function getNotRejectedProposals(data?: ProposalFieldsFragment[]) {
   return flow([
@@ -43,16 +43,15 @@ export function getNotRejectedProtocolUpgradeProposals<
 }
 
 export const ProposalsContainer = () => {
-  const featureFlags = useFeatureFlags((state) => state.flags);
   const { t } = useTranslation();
   const { data, loading, error } = useProposalsQuery({
     pollInterval: 5000,
     fetchPolicy: 'network-only',
     errorPolicy: 'ignore',
     variables: {
-      includeNewMarketProductFields: !!featureFlags.PRODUCT_PERPETUALS,
-      includeUpdateMarketStates: !!featureFlags.UPDATE_MARKET_STATE,
-      includeUpdateReferralPrograms: !!featureFlags.REFERRALS,
+      includeNewMarketProductFields: !!FLAGS.PRODUCT_PERPETUALS,
+      includeUpdateMarketStates: !!FLAGS.UPDATE_MARKET_STATE,
+      includeUpdateReferralPrograms: !!FLAGS.REFERRALS,
     },
   });
 

apps/governance/src/routes/proposals/protocol-upgrade/protocol-upgrade-proposal-container.tsx

@@ -95,7 +95,7 @@ export const ProtocolUpgradeProposalContainer = () => {
           time={
             pending && time ? (
               convertToCountdownString(time, '0:00:00:00')
-            ) : blockInfo && 'result' in blockInfo && blockInfo?.result ? (
+            ) : blockInfo?.result ? (
               <span title={blockInfo.result.block.header.time}>
                 {formatDateWithLocalTimezone(
                   new Date(blockInfo.result.block.header.time)

apps/governance/src/routes/proposals/rejected/rejected-proposals-container.tsx

@@ -10,7 +10,7 @@ import { removePaginationWrapper } from '@vegaprotocol/utils';
 import flow from 'lodash/flow';
 import orderBy from 'lodash/orderBy';
 import { ProposalState } from '@vegaprotocol/types';
-import { useFeatureFlags } from '@vegaprotocol/environment';
+import { FLAGS } from '@vegaprotocol/environment';
 
 const orderByDate = (arr: ProposalFieldsFragment[]) =>
   orderBy(
@@ -33,16 +33,15 @@ export function getRejectedProposals(data?: ProposalFieldsFragment[] | null) {
 }
 
 export const RejectedProposalsContainer = () => {
-  const featureFlags = useFeatureFlags((state) => state.flags);
   const { t } = useTranslation();
   const { data, loading, error } = useProposalsQuery({
     pollInterval: 5000,
     fetchPolicy: 'network-only',
     errorPolicy: 'ignore',
     variables: {
-      includeNewMarketProductFields: !!featureFlags.PRODUCT_PERPETUALS,
-      includeUpdateMarketStates: !!featureFlags.UPDATE_MARKET_STATE,
-      includeUpdateReferralPrograms: !!featureFlags.REFERRALS,
+      includeNewMarketProductFields: !!FLAGS.PRODUCT_PERPETUALS,
+      includeUpdateMarketStates: !!FLAGS.UPDATE_MARKET_STATE,
+      includeUpdateReferralPrograms: !!FLAGS.REFERRALS,
     },
   });
 

apps/governance/src/routes/proposals/test-helpers/generate-proposals.ts

@@ -116,8 +116,7 @@ export const generateYesVotes = (
   fixedTokenValue?: number,
   totalEquityLikeShareWeight?: string
 ): Votes => {
-  const votes = [];
-  for (let i = 0; i < numberOfVotes; i++) {
+  const votes = Array.from(Array(numberOfVotes)).map(() => {
     const vote: Vote = {
       __typename: 'Vote',
       value: Schema.VoteValue.VALUE_YES,
@@ -153,9 +152,8 @@ export const generateYesVotes = (
       datetime: faker.date.past().toISOString(),
     };
 
-    votes.push(vote);
-  }
-
+    return vote;
+  });
   return {
     __typename: 'ProposalVoteSide',
     totalNumber: votes.length.toString(),
@@ -174,8 +172,7 @@ export const generateNoVotes = (
   fixedTokenValue?: number,
   totalEquityLikeShareWeight?: string
 ): Votes => {
-  const votes = [];
-  for (let i = 0; i < numberOfVotes; i++) {
+  const votes = Array.from(Array(numberOfVotes)).map(() => {
     const vote: Vote = {
       __typename: 'Vote',
       value: Schema.VoteValue.VALUE_NO,
@@ -210,9 +207,8 @@ export const generateNoVotes = (
       },
       datetime: faker.date.past().toISOString(),
     };
-    votes.push(vote);
-  }
-
+    return vote;
+  });
   return {
     __typename: 'ProposalVoteSide',
     totalNumber: votes.length.toString(),

apps/governance/src/styles.css

@@ -104,10 +104,6 @@
   list-style: circle;
 }
 
-.react-markdown-container a {
-  text-decoration: underline;
-}
-
 .jsondiffpatch-delta,
 .jsondiffpatch-delta pre {
   font-family: 'Roboto Mono', monospace !important;

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

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

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

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

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

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

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

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

apps/trading/.env

@@ -25,4 +25,3 @@ NX_ICEBERG_ORDERS=true
 # NX_PRODUCT_PERPETUALS
 NX_METAMASK_SNAPS=true
 NX_REFERRALS=true
-NX_TEAM_COMPETITION=true

apps/trading/.env.mainnet

@@ -22,12 +22,9 @@ NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 NX_SUCCESSOR_MARKETS=true
 NX_STOP_ORDERS=true
 NX_ICEBERG_ORDERS=true
+# NX_PRODUCT_PERPETUALS
 NX_METAMASK_SNAPS=true
-NX_REFERRALS=true
-# NX_DISABLE_CLOSE_POSITION=false
+NX_REFERRALS=false
 
 NX_TENDERMINT_URL=https://be.vega.community
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket
-
-NX_CHARTING_LIBRARY_PATH=https://assets.vega.community/trading-view-bundle/v0.0.1/
-NX_CHARTING_LIBRARY_HASH=PDjWaqPFndDp+LCvqbKvntWriaqNzNpZ5i9R/BULzCg=

apps/trading/.env.stagnet1

@@ -24,7 +24,4 @@ NX_STOP_ORDERS=true
 NX_ICEBERG_ORDERS=true
 # NX_PRODUCT_PERPETUALS
 NX_METAMASK_SNAPS=true
-NX_REFERRALS=true
-
-NX_CHARTING_LIBRARY_PATH=https://assets.vega.community/trading-view-bundle/v0.0.1/
-NX_CHARTING_LIBRARY_HASH=PDjWaqPFndDp+LCvqbKvntWriaqNzNpZ5i9R/BULzCg=
+NX_REFERRALS=true

apps/trading/.env.testnet

@@ -23,11 +23,9 @@ NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 NX_SUCCESSOR_MARKETS=true
 NX_STOP_ORDERS=true
 NX_ICEBERG_ORDERS=true
+# NX_PRODUCT_PERPETUALS
 NX_METAMASK_SNAPS=true
 NX_REFERRALS=true
 
 NX_TENDERMINT_URL=https://tm.be.testnet.vega.xyz
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.testnet.vega.xyz/websocket
-
-NX_CHARTING_LIBRARY_PATH=https://assets.vega.community/trading-view-bundle/v0.0.1/
-NX_CHARTING_LIBRARY_HASH=PDjWaqPFndDp+LCvqbKvntWriaqNzNpZ5i9R/BULzCg=

apps/trading/README.md

@@ -54,5 +54,3 @@ To run the UI automation tests with a mocked API, run:
 ```bash
 yarn nx run trading-e2e:e2e
 ```
-
-To run tests with market sim please read [the readme](e2e/README.md).

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

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

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

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

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

@@ -6,7 +6,6 @@ import { useEffect, useState } from 'react';
 import { useParams } from 'react-router-dom';
 import { LiquidityContainer } from '../../components/liquidity-container';
 import { useT } from '../../lib/use-t';
-import { ErrorBoundary } from '../../components/error-boundary';
 
 const enum LiquidityTabs {
   Active = 'active',
@@ -59,28 +58,19 @@ export const LiquidityViewContainer = ({
             name={t('My liquidity provision')}
             hidden={!pubKey}
           >
-            <ErrorBoundary feature="liquidity-party">
-              <LiquidityContainer
-                marketId={marketId}
-                filter={{ partyId: pubKey || undefined }}
-              />
-            </ErrorBoundary>
+            <LiquidityContainer
+              marketId={marketId}
+              filter={{ partyId: pubKey || undefined }}
+            />
           </Tab>
           <Tab id={LiquidityTabs.Active} name={t('Active')}>
-            <ErrorBoundary feature="liquidity-active">
-              <LiquidityContainer
-                marketId={marketId}
-                filter={{ active: true }}
-              />
-            </ErrorBoundary>
+            <LiquidityContainer marketId={marketId} filter={{ active: true }} />
           </Tab>
           <Tab id={LiquidityTabs.Inactive} name={t('Inactive')}>
-            <ErrorBoundary feature="liquidity-inactive">
-              <LiquidityContainer
-                marketId={marketId}
-                filter={{ active: false }}
-              />
-            </ErrorBoundary>
+            <LiquidityContainer
+              marketId={marketId}
+              filter={{ active: false }}
+            />
           </Tab>
         </Tabs>
       </div>

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

@@ -1,6 +1,7 @@
 import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
 import { DocsLinks, useEnvironment } from '@vegaprotocol/environment';
 import { ButtonLink, ExternalLink, Link } from '@vegaprotocol/ui-toolkit';
+import { MarketProposalNotification } from '@vegaprotocol/proposals';
 import type { Market } from '@vegaprotocol/markets';
 import {
   addDecimalsFormatNumber,
@@ -144,6 +145,7 @@ export const MarketHeaderStats = ({ market }: MarketHeaderStatsProps) => {
           />
         </HeaderStat>
       )}
+      <MarketProposalNotification marketId={market.id} />
     </>
   );
 };
@@ -188,11 +190,12 @@ const useNow = () => {
   return now;
 };
 
-const useEvery = (marketId: string, skip: boolean) => {
+const useEvery = (marketId: string) => {
+  const { data: marketTradingMode } = useMarketTradingMode(marketId);
   const { data: marketInfo } = useDataProvider({
     dataProvider: marketInfoProvider,
     variables: { marketId },
-    skip,
+    skip: !marketTradingMode || isMarketInAuction(marketTradingMode),
   });
   let every: number | undefined = undefined;
   const sourceType =
@@ -210,10 +213,8 @@ const useEvery = (marketId: string, skip: boolean) => {
   return every;
 };
 
-const useStartTime = (marketId: string, skip: boolean) => {
+const useStartTime = (marketId: string) => {
   const { data: fundingPeriods } = useFundingPeriodsQuery({
-    pollInterval: 5000,
-    skip,
     variables: {
       marketId: marketId,
       pagination: { first: 1 },
@@ -247,10 +248,8 @@ const useFormatCountdown = (
 
 export const FundingCountdown = ({ marketId }: { marketId: string }) => {
   const now = useNow();
-  const { data: marketTradingMode } = useMarketTradingMode(marketId);
-  const skip = !marketTradingMode || isMarketInAuction(marketTradingMode);
-  const startTime = useStartTime(marketId, skip);
-  const every = useEvery(marketId, skip);
+  const startTime = useStartTime(marketId);
+  const every = useEvery(marketId);
 
   return (
     <div data-testid="funding-countdown">

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

@@ -1,14 +1,16 @@
-import { useEffect } from 'react';
+import React, { useEffect, useMemo } from 'react';
 import { addDecimalsFormatNumber, titlefy } from '@vegaprotocol/utils';
 import { useScreenDimensions } from '@vegaprotocol/react-helpers';
 import { useThrottledDataProvider } from '@vegaprotocol/data-provider';
-import { Link, Loader, Splash } from '@vegaprotocol/ui-toolkit';
+import { ExternalLink, Loader, Splash } from '@vegaprotocol/ui-toolkit';
 import { getAsset, marketDataProvider, useMarket } from '@vegaprotocol/markets';
 import { useGlobalStore, usePageTitleStore } from '../../stores';
 import { TradeGrid } from './trade-grid';
 import { TradePanels } from './trade-panels';
 import { useNavigate, useParams } from 'react-router-dom';
 import { Links } from '../../lib/links';
+import { ViewType, useSidebar } from '../../components/sidebar';
+import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';
 import { useT, ns } from '../../lib/use-t';
 import { Trans } from 'react-i18next';
 
@@ -59,6 +61,9 @@ export const MarketPage = () => {
   const t = useT();
   const { marketId } = useParams();
   const navigate = useNavigate();
+  const currentRouteId = useGetCurrentRouteId();
+  const { setViews, getView } = useSidebar();
+  const view = getView(currentRouteId);
   const { screenSize } = useScreenDimensions();
   const largeScreen = ['lg', 'xl', 'xxl', 'xxxl'].includes(screenSize);
   const update = useGlobalStore((store) => store.update);
@@ -67,11 +72,31 @@ export const MarketPage = () => {
   const { data, loading } = useMarket(marketId);
 
   useEffect(() => {
-    if (data?.id && data.id !== lastMarketId) {
+    if (data?.id && data.id !== lastMarketId && !closed) {
       update({ marketId: data.id });
     }
   }, [update, lastMarketId, data?.id]);
 
+  useEffect(() => {
+    if (largeScreen && view === undefined) {
+      setViews(
+        { type: closed ? ViewType.Info : ViewType.Order },
+        currentRouteId
+      );
+    }
+  }, [setViews, view, currentRouteId, largeScreen]);
+
+  const pinnedAsset = data && getAsset(data);
+
+  const tradeView = useMemo(() => {
+    if (pinnedAsset) {
+      if (largeScreen) {
+        return <TradeGrid market={data} pinnedAsset={pinnedAsset} />;
+      }
+      return <TradePanels market={data} pinnedAsset={pinnedAsset} />;
+    }
+  }, [largeScreen, data, pinnedAsset]);
+
   if (loading) {
     return (
       <Splash>
@@ -89,16 +114,15 @@ 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={[
-                <Link
-                  className="underline underline-offset-4 "
+                <ExternalLink
                   onClick={() => navigate(Links.MARKETS())}
                   key="link"
                 >
                   market list
-                </Link>,
+                </ExternalLink>,
               ]}
             />
           </p>
@@ -107,8 +131,6 @@ export const MarketPage = () => {
     );
   }
 
-  const pinnedAsset = data && getAsset(data);
-
   return (
     <>
       <TitleUpdater
@@ -116,11 +138,7 @@ export const MarketPage = () => {
         marketName={data?.tradableInstrument.instrument.name}
         decimalPlaces={data?.decimalPlaces}
       />
-      {largeScreen ? (
-        <TradeGrid market={data} pinnedAsset={pinnedAsset} />
-      ) : (
-        <TradePanels market={data} pinnedAsset={pinnedAsset} />
-      )}
+      {tradeView}
     </>
   );
 };

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

@@ -1,10 +1,11 @@
-import { memo, type ReactNode } from 'react';
+import { memo } from 'react';
+import type { ReactNode } from 'react';
 import { LayoutPriority } from 'allotment';
 import classNames from 'classnames';
 import AutoSizer from 'react-virtualized-auto-sizer';
-import { useFeatureFlags } from '@vegaprotocol/environment';
-import { type PinnedAsset } from '@vegaprotocol/accounts';
-import { type Market } from '@vegaprotocol/markets';
+import type { PinnedAsset } from '@vegaprotocol/accounts';
+import { OracleBanner, useMarket } from '@vegaprotocol/markets';
+import type { Market } from '@vegaprotocol/markets';
 import { Tab, LocalStoragePersistTabs as Tabs } from '@vegaprotocol/ui-toolkit';
 import {
   ResizableGrid,
@@ -12,19 +13,29 @@ import {
   usePaneLayout,
 } from '../../components/resizable-grid';
 import { TradingViews } from './trade-views';
+import {
+  MarketSuccessorBanner,
+  MarketSuccessorProposalBanner,
+  MarketTerminationBanner,
+} from '../../components/market-banner';
+import { FLAGS } from '@vegaprotocol/environment';
 import { useT } from '../../lib/use-t';
-import { ErrorBoundary } from '../../components/error-boundary';
-import { MarketBanner } from '../../components/market-banner';
 
 interface TradeGridProps {
-  market: Market;
-  pinnedAsset?: PinnedAsset | undefined;
+  market: Market | null;
+  pinnedAsset?: PinnedAsset;
 }
 
 const MainGrid = memo(
-  ({ market, pinnedAsset }: { market: Market; pinnedAsset?: PinnedAsset }) => {
-    const featureFlags = useFeatureFlags((state) => state.flags);
+  ({
+    marketId,
+    pinnedAsset,
+  }: {
+    marketId: string;
+    pinnedAsset?: PinnedAsset;
+  }) => {
     const t = useT();
+    const { data: market } = useMarket(marketId);
     const [sizes, handleOnLayoutChange] = usePaneLayout({ id: 'top' });
     const [sizesMiddle, handleOnMiddleLayoutChange] = usePaneLayout({
       id: 'middle-1',
@@ -49,44 +60,30 @@ const MainGrid = memo(
                     id="chart"
                     overflowHidden
                     name={t('Chart')}
-                    menu={<TradingViews.chart.menu />}
+                    menu={<TradingViews.candles.menu />}
                   >
-                    <ErrorBoundary feature="chart">
-                      <TradingViews.chart.component marketId={market.id} />
-                    </ErrorBoundary>
+                    <TradingViews.candles.component marketId={marketId} />
                   </Tab>
                   <Tab id="depth" name={t('Depth')}>
-                    <ErrorBoundary feature="depth">
-                      <TradingViews.depth.component marketId={market.id} />
-                    </ErrorBoundary>
+                    <TradingViews.depth.component marketId={marketId} />
                   </Tab>
                   <Tab id="liquidity" name={t('Liquidity')}>
-                    <ErrorBoundary feature="liquidity">
-                      <TradingViews.liquidity.component marketId={market.id} />
-                    </ErrorBoundary>
+                    <TradingViews.liquidity.component marketId={marketId} />
                   </Tab>
                   {market &&
                   market.tradableInstrument.instrument.product.__typename ===
                     'Perpetual' ? (
                     <Tab id="funding-history" name={t('Funding history')}>
-                      <ErrorBoundary feature="funding-history">
-                        <TradingViews.funding.component marketId={market.id} />
-                      </ErrorBoundary>
+                      <TradingViews.funding.component marketId={marketId} />
                     </Tab>
                   ) : null}
                   {market &&
                   market.tradableInstrument.instrument.product.__typename ===
                     'Perpetual' ? (
-                    <Tab
-                      id="funding-payments"
-                      name={t('Funding payments')}
-                      settings={<TradingViews.fundingPayments.settings />}
-                    >
-                      <ErrorBoundary feature="funding-payments">
-                        <TradingViews.fundingPayments.component
-                          marketId={market.id}
-                        />
-                      </ErrorBoundary>
+                    <Tab id="funding-payments" name={t('Funding payments')}>
+                      <TradingViews.fundingPayments.component
+                        marketId={marketId}
+                      />
                     </Tab>
                   ) : null}
                 </Tabs>
@@ -99,18 +96,10 @@ const MainGrid = memo(
               <TradeGridChild>
                 <Tabs storageKey="console-trade-grid-main-right">
                   <Tab id="orderbook" name={t('Orderbook')}>
-                    <ErrorBoundary feature="orderbook">
-                      <TradingViews.orderbook.component marketId={market.id} />
-                    </ErrorBoundary>
+                    <TradingViews.orderbook.component marketId={marketId} />
                   </Tab>
-                  <Tab
-                    id="trades"
-                    name={t('Trades')}
-                    settings={<TradingViews.trades.settings />}
-                  >
-                    <ErrorBoundary feature="trades">
-                      <TradingViews.trades.component marketId={market.id} />
-                    </ErrorBoundary>
+                  <Tab id="trades" name={t('Trades')}>
+                    <TradingViews.trades.component marketId={marketId} />
                   </Tab>
                 </Tabs>
               </TradeGridChild>
@@ -128,79 +117,43 @@ const MainGrid = memo(
                 id="positions"
                 name={t('Positions')}
                 menu={<TradingViews.positions.menu />}
-                settings={<TradingViews.positions.settings />}
               >
-                <ErrorBoundary feature="positions">
-                  <TradingViews.positions.component />
-                </ErrorBoundary>
+                <TradingViews.positions.component />
               </Tab>
               <Tab
                 id="open-orders"
                 name={t('Open')}
                 menu={<TradingViews.activeOrders.menu />}
-                settings={<TradingViews.activeOrders.settings />}
               >
-                <ErrorBoundary feature="activeOrders">
-                  <TradingViews.activeOrders.component />
-                </ErrorBoundary>
+                <TradingViews.activeOrders.component />
               </Tab>
-              <Tab
-                id="closed-orders"
-                name={t('Closed')}
-                settings={<TradingViews.closedOrders.settings />}
-              >
-                <ErrorBoundary feature="closedOrders">
-                  <TradingViews.closedOrders.component />
-                </ErrorBoundary>
+              <Tab id="closed-orders" name={t('Closed')}>
+                <TradingViews.closedOrders.component />
               </Tab>
-              <Tab
-                id="rejected-orders"
-                name={t('Rejected')}
-                settings={<TradingViews.rejectedOrders.settings />}
-              >
-                <ErrorBoundary feature="rejectedOrders">
-                  <TradingViews.rejectedOrders.component />
-                </ErrorBoundary>
+              <Tab id="rejected-orders" name={t('Rejected')}>
+                <TradingViews.rejectedOrders.component />
               </Tab>
               <Tab
                 id="orders"
                 name={t('All')}
                 menu={<TradingViews.orders.menu />}
-                settings={<TradingViews.orders.settings />}
               >
-                <ErrorBoundary feature="orders">
-                  <TradingViews.orders.component />
-                </ErrorBoundary>
+                <TradingViews.orders.component />
               </Tab>
-              {featureFlags.STOP_ORDERS ? (
-                <Tab
-                  id="stop-orders"
-                  name={t('Stop orders')}
-                  settings={<TradingViews.stopOrders.settings />}
-                >
-                  <ErrorBoundary feature="stop-orders">
-                    <TradingViews.stopOrders.component />
-                  </ErrorBoundary>
+              {FLAGS.STOP_ORDERS ? (
+                <Tab id="stop-orders" name={t('Stop orders')}>
+                  <TradingViews.stopOrders.component />
                 </Tab>
               ) : null}
-              <Tab
-                id="fills"
-                name={t('Fills')}
-                settings={<TradingViews.fills.settings />}
-              >
+              <Tab id="fills" name={t('Fills')}>
                 <TradingViews.fills.component />
               </Tab>
               <Tab
                 id="accounts"
                 name={t('Collateral')}
                 menu={<TradingViews.collateral.menu />}
-                settings={<TradingViews.collateral.settings />}
               >
-                <ErrorBoundary feature="collateral">
-                  <TradingViews.collateral.component
-                    pinnedAsset={pinnedAsset}
-                  />
-                </ErrorBoundary>
+                <TradingViews.collateral.component pinnedAsset={pinnedAsset} />
               </Tab>
             </Tabs>
           </TradeGridChild>
@@ -220,10 +173,17 @@ export const TradeGrid = ({ market, pinnedAsset }: TradeGridProps) => {
   return (
     <div className={wrapperClasses}>
       <div>
-        <MarketBanner market={market} />
+        {FLAGS.SUCCESSOR_MARKETS && (
+          <>
+            <MarketSuccessorBanner market={market} />
+            <MarketSuccessorProposalBanner marketId={market?.id} />
+          </>
+        )}
+        <MarketTerminationBanner market={market} />
+        <OracleBanner marketId={market?.id || ''} />
       </div>
       <div className="min-h-0 p-0.5">
-        <MainGrid market={market} pinnedAsset={pinnedAsset} />
+        <MainGrid marketId={market?.id || ''} pinnedAsset={pinnedAsset} />
       </div>
     </div>
   );

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

@@ -1,30 +1,27 @@
-import { type PinnedAsset } from '@vegaprotocol/accounts';
-import { type Market } from '@vegaprotocol/markets';
-// TODO: handle oracle banner
-// import { OracleBanner } from '@vegaprotocol/markets';
+import type { PinnedAsset } from '@vegaprotocol/accounts';
+import type { Market } from '@vegaprotocol/markets';
+import { OracleBanner } from '@vegaprotocol/markets';
+import type { TradingView } from './trade-views';
+import { TradingViews } from './trade-views';
 import { useState } from 'react';
 import AutoSizer from 'react-virtualized-auto-sizer';
 import classNames from 'classnames';
 import {
-  Popover,
-  Splash,
-  VegaIcon,
-  VegaIconNames,
-} from '@vegaprotocol/ui-toolkit';
+  MarketSuccessorBanner,
+  MarketSuccessorProposalBanner,
+  MarketTerminationBanner,
+} from '../../components/market-banner';
+import { FLAGS } from '@vegaprotocol/environment';
 import { useT } from '../../lib/use-t';
-import { MarketBanner } from '../../components/market-banner';
-import { ErrorBoundary } from '../../components/error-boundary';
-import { type TradingView } from './trade-views';
-import { TradingViews } from './trade-views';
+import { Splash } from '@vegaprotocol/ui-toolkit';
 
 interface TradePanelsProps {
-  market: Market;
+  market: Market | null;
   pinnedAsset?: PinnedAsset;
 }
 
 export const TradePanels = ({ market, pinnedAsset }: TradePanelsProps) => {
-  const [view, setView] = useState<TradingView>('chart');
-  const viewCfg = TradingViews[view];
+  const [view, setView] = useState<TradingView>('candles');
 
   const renderView = () => {
     const Component = TradingViews[view].component;
@@ -37,44 +34,39 @@ export const TradePanels = ({ market, pinnedAsset }: TradePanelsProps) => {
 
     // Watch out here, we don't know what component is being rendered
     // so watch out for clashes in props
-    return (
-      <ErrorBoundary feature={view}>
-        <Component marketId={market?.id} pinnedAsset={pinnedAsset} />;
-      </ErrorBoundary>
-    );
+    return <Component marketId={market?.id} pinnedAsset={pinnedAsset} />;
   };
 
   const renderMenu = () => {
-    if ('menu' in viewCfg || 'settings' in viewCfg) {
+    const viewCfg = TradingViews[view];
+
+    if ('menu' in viewCfg) {
+      const Menu = viewCfg.menu;
+
       return (
-        <div className="flex items-center justify-end gap-1 p-1 bg-vega-clight-800 dark:bg-vega-cdark-800 border-b border-default">
-          {'menu' in viewCfg ? <viewCfg.menu /> : null}
-          {'settings' in viewCfg ? (
-            <Popover
-              align="end"
-              trigger={
-                <span className="ml-1 flex items-center justify-center h-6 w-6">
-                  <VegaIcon name={VegaIconNames.COG} size={16} />
-                </span>
-              }
-            >
-              <div className="p-4 flex justify-end">
-                <viewCfg.settings />
-              </div>
-            </Popover>
-          ) : null}
+        <div className="flex gap-1 p-1 bg-vega-clight-800 dark:bg-vega-cdark-800 border-b border-default">
+          <Menu />
         </div>
       );
     }
+
+    return null;
   };
 
   return (
     <div className="h-full grid grid-rows-[min-content_min-content_1fr_min-content]">
       <div>
-        <MarketBanner market={market} />
+        {FLAGS.SUCCESSOR_MARKETS && (
+          <>
+            <MarketSuccessorBanner market={market} />
+            <MarketSuccessorProposalBanner marketId={market?.id} />
+          </>
+        )}
+        <MarketTerminationBanner market={market} />
+        <OracleBanner marketId={market?.id || ''} />
       </div>
       <div>{renderMenu()}</div>
-      <div className="h-full relative">
+      <div className="h-full">
         <AutoSizer>
           {({ width, height }) => (
             <div style={{ width, height }} className="overflow-auto">
@@ -112,9 +104,7 @@ export const TradePanels = ({ market, pinnedAsset }: TradePanelsProps) => {
                 key={key}
                 view={key}
                 isActive={isActive}
-                onClick={() => {
-                  setView(key);
-                }}
+                onClick={() => setView(key)}
               />
             );
           })}
@@ -153,7 +143,7 @@ const useViewLabel = (view: TradingView) => {
   const t = useT();
 
   const labels = {
-    chart: t('Chart'),
+    candles: t('Candles'),
     depth: t('Depth'),
     liquidity: t('Liquidity'),
     funding: t('Funding'),

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

@@ -1,46 +1,28 @@
 import { DepthChartContainer } from '@vegaprotocol/market-depth';
+import {
+  CandlesChartContainer,
+  CandlesMenu,
+} from '@vegaprotocol/candles-chart';
 import { Filter, OpenOrdersMenu } from '@vegaprotocol/orders';
-import {
-  TradesContainer,
-  TradesSettings,
-} from '../../components/trades-container';
+import { TradesContainer } from '../../components/trades-container';
 import { OrderbookContainer } from '../../components/orderbook-container';
-import {
-  FillsContainer,
-  FillsSettings,
-} from '../../components/fills-container';
-import {
-  PositionsContainer,
-  PositionsSettings,
-} from '../../components/positions-container';
-import {
-  AccountsContainer,
-  AccountsSettings,
-} from '../../components/accounts-container';
+import { FillsContainer } from '../../components/fills-container';
+import { PositionsContainer } from '../../components/positions-container';
+import { AccountsContainer } from '../../components/accounts-container';
 import { LiquidityContainer } from '../../components/liquidity-container';
 import { FundingContainer } from '../../components/funding-container';
-import {
-  FundingPaymentsContainer,
-  FundingPaymentsSettings,
-} from '../../components/funding-payments-container';
-import {
-  OrdersContainer,
-  OrdersSettings,
-} from '../../components/orders-container';
-import {
-  StopOrdersContainer,
-  StopOrdersSettings,
-} from '../../components/stop-orders-container';
+import { FundingPaymentsContainer } from '../../components/funding-payments-container';
+import { OrdersContainer } from '../../components/orders-container';
+import { StopOrdersContainer } from '../../components/stop-orders-container';
 import { AccountsMenu } from '../../components/accounts-menu';
 import { PositionsMenu } from '../../components/positions-menu';
-import { ChartContainer, ChartMenu } from '../../components/chart-container';
 
 export type TradingView = keyof typeof TradingViews;
 
 export const TradingViews = {
-  chart: {
-    component: ChartContainer,
-    menu: ChartMenu,
+  candles: {
+    component: CandlesChartContainer,
+    menu: CandlesMenu,
   },
   depth: {
     component: DepthChartContainer,
@@ -53,46 +35,37 @@ export const TradingViews = {
   },
   fundingPayments: {
     component: FundingPaymentsContainer,
-    settings: FundingPaymentsSettings,
   },
   orderbook: {
     component: OrderbookContainer,
   },
   trades: {
     component: TradesContainer,
-    settings: TradesSettings,
   },
   positions: {
     component: PositionsContainer,
     menu: PositionsMenu,
-    settings: PositionsSettings,
   },
   activeOrders: {
     component: () => <OrdersContainer filter={Filter.Open} />,
     menu: OpenOrdersMenu,
-    settings: () => <OrdersSettings filter={Filter.Open} />,
   },
   closedOrders: {
     component: () => <OrdersContainer filter={Filter.Closed} />,
-    settings: () => <OrdersSettings filter={Filter.Closed} />,
   },
   rejectedOrders: {
     component: () => <OrdersContainer filter={Filter.Rejected} />,
-    settings: () => <OrdersSettings filter={Filter.Rejected} />,
   },
   orders: {
     component: OrdersContainer,
     menu: OpenOrdersMenu,
-    settings: OrdersSettings,
   },
   stopOrders: {
     component: StopOrdersContainer,
-    settings: StopOrdersSettings,
   },
   collateral: {
     component: AccountsContainer,
     menu: AccountsMenu,
-    settings: AccountsSettings,
   },
-  fills: { component: FillsContainer, settings: FillsSettings },
+  fills: { component: FillsContainer },
 } as const;

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

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

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

@@ -137,8 +137,6 @@ const ClosedMarketsDataGrid = ({
         headerName: t('Market'),
         field: 'code',
         cellRenderer: 'MarketCodeCell',
-        width: 150,
-        resizable: true,
       },
       {
         headerName: t('Status'),
@@ -282,7 +280,6 @@ const ClosedMarketsDataGrid = ({
   return (
     <AgGrid
       rowData={rowData}
-      defaultColDef={COL_DEFS.default}
       columnDefs={colDefs}
       getRowId={({ data }) => data.id}
       overlayNoRowsTemplate={error ? error.message : t('No markets')}

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;
 
@@ -17,7 +10,6 @@ const defaultColDef = {
   filter: true,
   resizable: true,
   filterParams: { buttons: ['reset'] },
-  minWidth: 120,
 };
 
 const components = {
@@ -26,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,
-      },
-    }));
-  },
-});
-
-export 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
@@ -65,7 +28,6 @@ export const MarketListTable = (props: Props) => {
       columnDefs={columnDefs}
       components={components}
       rowHeight={45}
-      {...gridStoreCallbacks}
       {...props}
     />
   );

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

@@ -15,8 +15,6 @@ import {
   useLinks,
 } from '@vegaprotocol/environment';
 import { useT } from '../../lib/use-t';
-import { ErrorBoundary } from '../../components/error-boundary';
-import { MarketsSettings } from './markets-settings';
 
 export const MarketsPage = () => {
   const t = useT();
@@ -35,42 +33,26 @@ export const MarketsPage = () => {
     <div className="h-full pt-0.5 pb-3 px-1.5">
       <div className="h-full my-1 border rounded-sm border-default">
         <Tabs storageKey="console-markets">
-          <Tab
-            id="open-markets"
-            name={t('Open markets')}
-            settings={<MarketsSettings />}
-          >
-            <ErrorBoundary feature="markets-open">
-              <OpenMarkets />
-            </ErrorBoundary>
+          <Tab id="open-markets" name={t('Open markets')}>
+            <OpenMarkets />
           </Tab>
           <Tab
             id="proposed-markets"
             name={t('Proposed markets')}
-            settings={<MarketsSettings />}
             menu={
               <TradingAnchorButton
                 size="extra-small"
                 data-testid="propose-new-market"
                 href={externalLink}
-                target="_blank"
               >
                 {t('Propose a new market')}
               </TradingAnchorButton>
             }
           >
-            <ErrorBoundary feature="markets-proposed">
-              <Proposed />
-            </ErrorBoundary>
+            <Proposed />
           </Tab>
-          <Tab
-            id="closed-markets"
-            name={t('Closed markets')}
-            settings={<MarketsSettings />}
-          >
-            <ErrorBoundary feature="markets-closed">
-              <Closed />
-            </ErrorBoundary>
+          <Tab id="closed-markets" name={t('Closed markets')}>
+            <Closed />
           </Tab>
         </Tabs>
       </div>

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

@@ -1,8 +0,0 @@
-import { GridSettings } from '../../components/grid-settings/grid-settings';
-import { useMarketsStore } from './market-list-table';
-
-export const MarketsSettings = () => (
-  <GridSettings
-    updateGridStore={useMarketsStore((store) => store.updateGridStore)}
-  />
-);

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

@@ -4,26 +4,9 @@ import {
   SidebarButton,
   SidebarDivider,
   ViewType,
-  useSidebar,
 } from '../../components/sidebar';
 import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';
 import { useT } from '../../lib/use-t';
-import { useScreenDimensions } from '@vegaprotocol/react-helpers';
-import { useEffect } from 'react';
-
-const ViewInitializer = () => {
-  const currentRouteId = useGetCurrentRouteId();
-  const { setViews, getView } = useSidebar();
-  const view = getView(currentRouteId);
-  const { screenSize } = useScreenDimensions();
-  const largeScreen = ['lg', 'xl', 'xxl', 'xxxl'].includes(screenSize);
-  useEffect(() => {
-    if (largeScreen && view === undefined) {
-      setViews({ type: ViewType.Order }, currentRouteId);
-    }
-  }, [setViews, view, currentRouteId, largeScreen]);
-  return null;
-};
 
 export const MarketsSidebar = () => {
   const t = useT();
@@ -54,7 +37,6 @@ export const MarketsSidebar = () => {
           path=":marketId"
           element={
             <>
-              <ViewInitializer />
               <SidebarDivider />
               <SidebarButton
                 view={ViewType.Order}

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

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

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

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

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

@@ -29,7 +29,6 @@ export const useColumnDefs = () => {
       {
         headerName: t('Market'),
         field: 'tradableInstrument.instrument.code',
-        pinned: true,
         cellRenderer: ({
           value,
           data,
@@ -52,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',
@@ -166,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/portfolio/portfolio.tsx

@@ -5,29 +5,14 @@ import { titlefy } from '@vegaprotocol/utils';
 import { useIncompleteWithdrawals } from '@vegaprotocol/withdraws';
 import { Tab, LocalStoragePersistTabs as Tabs } from '@vegaprotocol/ui-toolkit';
 import { usePageTitleStore } from '../../stores';
-import {
-  AccountsContainer,
-  AccountsSettings,
-} from '../../components/accounts-container';
+import { AccountsContainer } from '../../components/accounts-container';
 import { DepositsContainer } from '../../components/deposits-container';
-import {
-  FillsContainer,
-  FillsSettings,
-} from '../../components/fills-container';
-import {
-  FundingPaymentsContainer,
-  FundingPaymentsSettings,
-} from '../../components/funding-payments-container';
-import {
-  PositionsContainer,
-  PositionsSettings,
-} from '../../components/positions-container';
+import { FillsContainer } from '../../components/fills-container';
+import { FundingPaymentsContainer } from '../../components/funding-payments-container';
+import { PositionsContainer } from '../../components/positions-container';
 import { PositionsMenu } from '../../components/positions-menu';
 import { WithdrawalsContainer } from '../../components/withdrawals-container';
-import {
-  OrdersContainer,
-  OrdersSettings,
-} from '../../components/orders-container';
+import { OrdersContainer } from '../../components/orders-container';
 import { LedgerContainer } from '../../components/ledger-container';
 import {
   ResizableGrid,
@@ -40,7 +25,6 @@ import { DepositsMenu } from '../../components/deposits-menu';
 import { WithdrawalsMenu } from '../../components/withdrawals-menu';
 import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';
 import { useT } from '../../lib/use-t';
-import { ErrorBoundary } from '../../components/error-boundary';
 
 const WithdrawalsIndicator = () => {
   const { ready } = useIncompleteWithdrawals();
@@ -54,21 +38,11 @@ const WithdrawalsIndicator = () => {
   );
 };
 
-const SidebarViewInitializer = () => {
+export const Portfolio = () => {
+  const t = useT();
   const currentRouteId = useGetCurrentRouteId();
   const { getView, setViews } = useSidebar();
   const view = getView(currentRouteId);
-  // Make transfer sidebar open by default
-  useEffect(() => {
-    if (view === undefined) {
-      setViews({ type: ViewType.Transfer }, currentRouteId);
-    }
-  }, [view, setViews, currentRouteId]);
-  return null;
-};
-
-export const Portfolio = () => {
-  const t = useT();
 
   const { updateTitle } = usePageTitleStore((store) => ({
     updateTitle: store.updateTitle,
@@ -78,11 +52,17 @@ export const Portfolio = () => {
     updateTitle(titlefy([t('Portfolio')]));
   }, [updateTitle, t]);
 
+  // Make transfer sidebar open by default
+  useEffect(() => {
+    if (view === undefined) {
+      setViews({ type: ViewType.Transfer }, currentRouteId);
+    }
+  }, [view, setViews, currentRouteId]);
+
   const [sizes, handleOnLayoutChange] = usePaneLayout({ id: 'portfolio' });
   const wrapperClasses = 'p-0.5 h-full max-h-full flex flex-col';
   return (
     <div className={wrapperClasses}>
-      <SidebarViewInitializer />
       <ResizableGrid vertical onChange={handleOnLayoutChange}>
         <ResizableGridPanel minSize={75}>
           <PortfolioGridChild>
@@ -91,35 +71,20 @@ export const Portfolio = () => {
                 id="positions"
                 name={t('Positions')}
                 menu={<PositionsMenu />}
-                settings={<PositionsSettings />}
               >
-                <ErrorBoundary feature="portfolio-positions">
-                  <PositionsContainer allKeys />
-                </ErrorBoundary>
+                <PositionsContainer allKeys />
               </Tab>
-              <Tab id="orders" name={t('Orders')} settings={<OrdersSettings />}>
-                <ErrorBoundary feature="portfolio-orders">
-                  <OrdersContainer />
-                </ErrorBoundary>
+              <Tab id="orders" name={t('Orders')}>
+                <OrdersContainer />
               </Tab>
-              <Tab id="fills" name={t('Fills')} settings={<FillsSettings />}>
-                <ErrorBoundary feature="portfolio-fills">
-                  <FillsContainer />
-                </ErrorBoundary>
+              <Tab id="fills" name={t('Fills')}>
+                <FillsContainer />
               </Tab>
-              <Tab
-                id="funding-payments"
-                name={t('Funding payments')}
-                settings={<FundingPaymentsSettings />}
-              >
-                <ErrorBoundary feature="portfolio-funding-payments">
-                  <FundingPaymentsContainer />
-                </ErrorBoundary>
+              <Tab id="funding-payments" name={t('Funding payments')}>
+                <FundingPaymentsContainer />
               </Tab>
               <Tab id="ledger-entries" name={t('Ledger entries')}>
-                <ErrorBoundary feature="portfolio-ledger">
-                  <LedgerContainer />
-                </ErrorBoundary>
+                <LedgerContainer />
               </Tab>
             </Tabs>
           </PortfolioGridChild>
@@ -134,17 +99,12 @@ export const Portfolio = () => {
               <Tab
                 id="collateral"
                 name={t('Collateral')}
-                settings={<AccountsSettings />}
                 menu={<AccountsMenu />}
               >
-                <ErrorBoundary feature="portfolio-accounts">
-                  <AccountsContainer />
-                </ErrorBoundary>
+                <AccountsContainer />
               </Tab>
               <Tab id="deposits" name={t('Deposits')} menu={<DepositsMenu />}>
-                <ErrorBoundary feature="portfolio-deposit">
-                  <DepositsContainer />
-                </ErrorBoundary>
+                <DepositsContainer />
               </Tab>
               <Tab
                 id="withdrawals"
@@ -152,9 +112,7 @@ export const Portfolio = () => {
                 indicator={<WithdrawalsIndicator />}
                 menu={<WithdrawalsMenu />}
               >
-                <ErrorBoundary feature="portfolio-deposit">
-                  <WithdrawalsContainer />
-                </ErrorBoundary>
+                <WithdrawalsContainer />
               </Tab>
             </Tabs>
           </PortfolioGridChild>

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

@@ -10,43 +10,18 @@ import { useForm } from 'react-hook-form';
 import classNames from 'classnames';
 import { Navigate, useNavigate, useSearchParams } from 'react-router-dom';
 import type { ButtonHTMLAttributes, MouseEventHandler } from 'react';
-import { useCallback, useEffect, useRef, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
 import { RainbowButton } from './buttons';
 import { useVegaWallet, useVegaWalletDialogStore } from '@vegaprotocol/wallet';
-import { useIsInReferralSet, useReferral } from './hooks/use-referral';
+import { useReferral } from './hooks/use-referral';
 import { Routes } from '../../lib/links';
 import { useTransactionEventSubscription } from '@vegaprotocol/web3';
 import { Statistics, useStats } from './referral-statistics';
 import { useReferralProgram } from './hooks/use-referral-program';
-import { ns, useT } from '../../lib/use-t';
-import { useFundsAvailable } from './hooks/use-funds-available';
-import { ViewType, useSidebar } from '../../components/sidebar';
-import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';
-import { QUSDTooltip } from './qusd-tooltip';
-import { Trans } from 'react-i18next';
+import { useT } from '../../lib/use-t';
 
 const RELOAD_DELAY = 3000;
 
-const SPAM_PROTECTION_ERR = 'SPAM_PROTECTION_ERR';
-const SpamProtectionErr = ({
-  requiredFunds,
-}: {
-  requiredFunds?: string | number | bigint;
-}) => {
-  if (!requiredFunds) return null;
-  // eslint-disable-next-line react/jsx-no-undef
-  return (
-    <Trans
-      defaults="To protect the network from spam, you must have at least {{requiredFunds}} <0>qUSD</0> of any asset on the network to proceed."
-      values={{
-        requiredFunds,
-      }}
-      components={[<QUSDTooltip key="qusd" />]}
-      ns={ns}
-    />
-  );
-};
-
 const validateCode = (value: string, t: ReturnType<typeof useT>) => {
   const number = +`0x${value}`;
   if (!value || value.length !== 64) {
@@ -57,23 +32,7 @@ const validateCode = (value: string, t: ReturnType<typeof useT>) => {
   return true;
 };
 
-export const ApplyCodeFormContainer = ({
-  onSuccess,
-}: {
-  onSuccess?: () => void;
-}) => {
-  const { pubKey } = useVegaWallet();
-  const isInReferralSet = useIsInReferralSet(pubKey);
-
-  // Navigate to the index page when already in the referral set.
-  if (isInReferralSet) {
-    return <Navigate to={Routes.REFERRALS} />;
-  }
-
-  return <ApplyCodeForm onSuccess={onSuccess} />;
-};
-
-export const ApplyCodeForm = ({ onSuccess }: { onSuccess?: () => void }) => {
+export const ApplyCodeForm = () => {
   const t = useT();
   const program = useReferralProgram();
   const navigate = useNavigate();
@@ -82,15 +41,10 @@ export const ApplyCodeForm = ({ onSuccess }: { onSuccess?: () => void }) => {
   );
 
   const [status, setStatus] = useState<
-    'requested' | 'no-funds' | 'successful' | null
+    'requested' | 'failed' | 'successful' | null
   >(null);
   const txHash = useRef<string | null>(null);
   const { isReadOnly, pubKey, sendTx } = useVegaWallet();
-  const { isEligible, requiredFunds } = useFundsAvailable();
-
-  const currentRouteId = useGetCurrentRouteId();
-  const setViews = useSidebar((s) => s.setViews);
-
   const {
     register,
     handleSubmit,
@@ -101,54 +55,19 @@ export const ApplyCodeForm = ({ onSuccess }: { onSuccess?: () => void }) => {
   } = useForm();
   const [params] = useSearchParams();
 
+  const { data: referee } = useReferral({ pubKey, role: 'referee' });
+  const { data: referrer } = useReferral({ pubKey, role: 'referrer' });
+
   const codeField = watch('code');
   const { data: previewData, loading: previewLoading } = useReferral({
     code: validateCode(codeField, t) ? codeField : undefined,
   });
 
-  /**
-   * Validates if a connected party can apply a code (min funds span protection)
-   */
-  const validateFundsAvailable = useCallback(() => {
-    if (requiredFunds && !isEligible) {
-      const err = SPAM_PROTECTION_ERR;
-      return err;
-    }
-    return true;
-  }, [isEligible, requiredFunds]);
-
-  /**
-   * Validates the set a user tries to apply to.
-   */
-  const validateSet = useCallback(() => {
-    if (
-      codeField &&
-      !previewLoading &&
-      previewData &&
-      !previewData.isEligible
-    ) {
-      return t('The code is no longer valid.');
-    }
-    if (codeField && !previewLoading && !previewData) {
-      return t('The code is invalid');
-    }
-    return true;
-  }, [codeField, previewData, previewLoading, t]);
-
   useEffect(() => {
     const code = params.get('code');
     if (code) setValue('code', code);
   }, [params, setValue]);
 
-  useEffect(() => {
-    const err = validateFundsAvailable();
-    if (err !== true) {
-      setStatus('no-funds');
-    } else {
-      setStatus(null);
-    }
-  }, [isEligible, validateFundsAvailable]);
-
   const onSubmit = ({ code }: FieldValues) => {
     if (isReadOnly || !pubKey || !code || code.length === 0) {
       return;
@@ -220,17 +139,21 @@ export const ApplyCodeForm = ({ onSuccess }: { onSuccess?: () => void }) => {
   useEffect(() => {
     if (status === 'successful') {
       setTimeout(() => {
-        if (onSuccess) onSuccess();
         navigate(Routes.REFERRALS);
       }, RELOAD_DELAY);
     }
-  }, [navigate, onSuccess, status]);
+  }, [navigate, status]);
+
+  // go to main page if the current pubkey is already a referrer or referee
+  if (referee || referrer) {
+    return <Navigate to={Routes.REFERRALS} />;
+  }
 
   // show "code applied" message when successfully applied
   if (status === 'successful') {
     return (
-      <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>{' '}
@@ -261,18 +184,6 @@ export const ApplyCodeForm = ({ onSuccess }: { onSuccess?: () => void }) => {
       };
     }
 
-    if (status === 'no-funds') {
-      return {
-        disabled: false,
-        children: t('Deposit funds'),
-        type: 'button' as ButtonHTMLAttributes<HTMLButtonElement>['type'],
-        onClick: ((event) => {
-          event.preventDefault();
-          setViews({ type: ViewType.Deposit }, currentRouteId);
-        }) as MouseEventHandler,
-      };
-    }
-
     if (status === 'requested') {
       return {
         disabled: true,
@@ -294,20 +205,15 @@ export const ApplyCodeForm = ({ onSuccess }: { onSuccess?: () => void }) => {
 
   return (
     <>
-      <div
-        data-testid="referral-apply-code-form"
-        className="bg-vega-clight-800 dark:bg-vega-cdark-800 mx-auto md: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(
-            'Apply a referral code to access the discount benefits of the current program.'
-          )}
+          {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)}
@@ -318,55 +224,31 @@ export const ApplyCodeForm = ({ onSuccess }: { onSuccess?: () => void }) => {
               hasError={Boolean(errors.code)}
               {...register('code', {
                 required: t('You have to provide a code to apply it.'),
-                validate: (value) => {
-                  const codeErr = validateCode(value, t);
-                  if (codeErr !== true) return codeErr;
-                  const fundsErr = validateFundsAvailable();
-                  if (fundsErr !== true) return fundsErr;
-                  return validateSet();
-                },
+                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>
-        {status === 'no-funds' ? (
-          <InputError intent="warning" className="overflow-auto break-words">
-            <span>
-              <SpamProtectionErr requiredFunds={requiredFunds?.toString()} />
-            </span>
+        {errors.code && (
+          <InputError className="break-words overflow-auto">
+            {errors.code.message?.toString()}
           </InputError>
-        ) : (
-          errors.code && (
-            <InputError intent="warning" className="overflow-auto break-words">
-              {errors.code.message === SPAM_PROTECTION_ERR ? (
-                <span>
-                  <SpamProtectionErr
-                    requiredFunds={requiredFunds?.toString()}
-                  />
-                </span>
-              ) : (
-                errors.code.message?.toString()
-              )}
-            </InputError>
-          )
         )}
       </div>
-      {validateCode(codeField, t) === true && previewLoading && !previewData ? (
+      {previewLoading && !previewData ? (
         <div className="mt-10">
           <Loader />
         </div>
       ) : null}
-      {/* TODO: Re-check plural forms once i18n is updated */}
-      {previewData && previewData.isEligible ? (
+      {previewData ? (
         <div className="mt-10">
-          <h2 className="mb-5 text-2xl">
+          <h2 className="text-2xl mb-5">
             {t(
-              'youAreJoiningTheGroup',
-              'You are joining the group shown, but will not have access to benefits until you have completed at least {{count}} epochs.',
-              { count: nextBenefitTierEpochsValue }
+              '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/constants.ts

@@ -3,11 +3,9 @@ export const GRADIENT =
   'bg-gradient-to-b from-vega-clight-800 dark:from-vega-cdark-800 to-transparent';
 
 export const SKY_BACKGROUND =
-  'bg-[url(/sky-light.png)] dark:bg-[url(/sky-dark.png)] bg-[37%_0px] bg-[length:1440px] bg-no-repeat bg-local';
+  'bg-[url(/sky-light.png)] dark:bg-[url(/sky-dark.png)] bg-[40%_0px] bg-[length:1440px] bg-no-repeat bg-local';
 
 // TODO: Update the links to use the correct referral related pages
-export const REFERRAL_DOCS_LINK =
-  'https://docs.vega.xyz/mainnet/concepts/trading-on-vega/discounts-rewards#referral-program';
-export const ABOUT_REFERRAL_DOCS_LINK =
-  'https://docs.vega.xyz/mainnet/concepts/trading-on-vega/discounts-rewards#referral-program';
+export const REFERRAL_DOCS_LINK = 'https://docs.vega.xyz/';
+export const ABOUT_REFERRAL_DOCS_LINK = 'https://docs.vega.xyz/';
 export const DISCLAIMER_REFERRAL_DOCS_LINK = 'https://docs.vega.xyz/';

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

@@ -19,22 +19,14 @@ import {
 import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
 import { DApp, TokenStaticLinks, useLinks } from '@vegaprotocol/environment';
 import { useStakeAvailable } from './hooks/use-stake-available';
-import { ABOUT_REFERRAL_DOCS_LINK } from './constants';
-import { useIsInReferralSet, useReferral } from './hooks/use-referral';
+import {
+  ABOUT_REFERRAL_DOCS_LINK,
+  DISCLAIMER_REFERRAL_DOCS_LINK,
+} from './constants';
+import { useReferral } from './hooks/use-referral';
 import { useT } from '../../lib/use-t';
-import { Navigate } from 'react-router-dom';
-import { Routes } from '../../lib/links';
-import { useReferralProgram } from './hooks/use-referral-program';
 
 export const CreateCodeContainer = () => {
-  const { pubKey } = useVegaWallet();
-  const isInReferralSet = useIsInReferralSet(pubKey);
-
-  // Navigate to the index page when already in the referral set.
-  if (isInReferralSet) {
-    return <Navigate to={Routes.REFERRALS} />;
-  }
-
   return <CreateCodeForm />;
 };
 
@@ -47,16 +39,13 @@ export const CreateCodeForm = () => {
   const { pubKey, isReadOnly } = useVegaWallet();
 
   return (
-    <div
-      data-testid="referral-create-code-form"
-      className="md:w-2/3 max-w-md mx-auto bg-vega-clight-800 dark:bg-vega-cdark-800 p-8 rounded-lg"
-    >
+    <div className="w-2/3 max-w-md mx-auto bg-vega-clight-800 dark:bg-vega-cdark-800 p-8 rounded-lg">
       <h3 className="mb-4 text-2xl text-center calt">
         {t('Create a referral code')}
       </h3>
       <p className="mb-4 text-center text-base">
         {t(
-          'Generate a referral code to share with your friends and access the commission benefits of the current program.'
+          'Generate a referral code to share with your friends and start earning commission.'
         )}
       </p>
 
@@ -106,8 +95,6 @@ const CreateCodeDialog = ({
   const { stakeAvailable: currentStakeAvailable, requiredStake } =
     useStakeAvailable();
 
-  const { details: programDetails } = useReferralProgram();
-
   const onSubmit = () => {
     if (isReadOnly || !pubKey) {
       setErr('Not connected');
@@ -206,73 +193,12 @@ const CreateCodeDialog = ({
     );
   }
 
-  if (!programDetails) {
-    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()}
-        >
-          {t('Yes')}
-        </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>
-        </div>
-      </div>
-    );
-  }
-
   return (
     <div className="flex flex-col gap-4">
       {(status === 'idle' || status === 'loading' || status === 'error') && (
         <p>
           {t(
-            'Generate a referral code to share with your friends and access the commission benefits of the current program.'
+            'Generate a referral code to share with your friends and start earning commission.'
           )}
         </p>
       )}
@@ -303,6 +229,9 @@ const CreateCodeDialog = ({
         <ExternalLink href={ABOUT_REFERRAL_DOCS_LINK}>
           {t('About the referral program')}
         </ExternalLink>
+        <ExternalLink href={DISCLAIMER_REFERRAL_DOCS_LINK}>
+          {t('Disclaimer')}
+        </ExternalLink>
       </div>
     </div>
   );

apps/trading/client-pages/referrals/error-boundary.tsx

@@ -53,7 +53,7 @@ export const NotFound = () => {
   const navigate = useNavigate();
 
   return (
-    <LayoutWithSky className="pt-32">
+    <div className="pt-32">
       <div
         aria-hidden
         className="absolute top-64 right-[220px] md:right-[340px] max-sm:hidden"
@@ -75,6 +75,6 @@ export const NotFound = () => {
           {t('Go back and try again')}
         </RainbowButton>
       </p>
-    </LayoutWithSky>
+    </div>
   );
 };

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

@@ -1,20 +0,0 @@
-query FundsAvailable($partyId: ID!) {
-  party(id: $partyId) {
-    accountsConnection {
-      edges {
-        node {
-          balance
-          asset {
-            decimals
-            symbol
-            id
-          }
-        }
-      }
-    }
-  }
-  networkParameter(key: "spam.protection.applyReferral.min.funds") {
-    key
-    value
-  }
-}

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

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

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

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

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

@@ -1,63 +0,0 @@
-import * as Types from '@vegaprotocol/types';
-
-import { gql } from '@apollo/client';
-import * as Apollo from '@apollo/client';
-const defaultOptions = {} as const;
-export type FundsAvailableQueryVariables = Types.Exact<{
-  partyId: Types.Scalars['ID'];
-}>;
-
-
-export type FundsAvailableQuery = { __typename?: 'Query', party?: { __typename?: 'Party', accountsConnection?: { __typename?: 'AccountsConnection', edges?: Array<{ __typename?: 'AccountEdge', node: { __typename?: 'AccountBalance', balance: string, asset: { __typename?: 'Asset', decimals: number, symbol: string, id: string } } } | null> | null } | null } | null, networkParameter?: { __typename?: 'NetworkParameter', key: string, value: string } | null };
-
-
-export const FundsAvailableDocument = gql`
-    query FundsAvailable($partyId: ID!) {
-  party(id: $partyId) {
-    accountsConnection {
-      edges {
-        node {
-          balance
-          asset {
-            decimals
-            symbol
-            id
-          }
-        }
-      }
-    }
-  }
-  networkParameter(key: "spam.protection.applyReferral.min.funds") {
-    key
-    value
-  }
-}
-    `;
-
-/**
- * __useFundsAvailableQuery__
- *
- * To run a query within a React component, call `useFundsAvailableQuery` and pass it any options that fit your needs.
- * When your component renders, `useFundsAvailableQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useFundsAvailableQuery({
- *   variables: {
- *      partyId: // value for 'partyId'
- *   },
- * });
- */
-export function useFundsAvailableQuery(baseOptions: Apollo.QueryHookOptions<FundsAvailableQuery, FundsAvailableQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<FundsAvailableQuery, FundsAvailableQueryVariables>(FundsAvailableDocument, options);
-      }
-export function useFundsAvailableLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<FundsAvailableQuery, FundsAvailableQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<FundsAvailableQuery, FundsAvailableQueryVariables>(FundsAvailableDocument, options);
-        }
-export type FundsAvailableQueryHookResult = ReturnType<typeof useFundsAvailableQuery>;
-export type FundsAvailableLazyQueryHookResult = ReturnType<typeof useFundsAvailableLazyQuery>;
-export type FundsAvailableQueryResult = Apollo.QueryResult<FundsAvailableQuery, FundsAvailableQueryVariables>;

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

@@ -9,7 +9,7 @@ export type ReferralSetStatsQueryVariables = Types.Exact<{
 }>;
 
 
-export type ReferralSetStatsQuery = { __typename?: 'Query', referralSetStats: { __typename?: 'ReferralSetStatsConnection', edges: Array<{ __typename?: 'ReferralSetStatsEdge', node: { __typename?: 'ReferralSetStats', atEpoch: number, partyId: string, discountFactor: string, rewardFactor: string, epochNotionalTakerVolume: string, referralSetRunningNotionalTakerVolume: string, rewardsMultiplier: string, rewardsFactorMultiplier: string, referrerTakerVolume: string, wasEligible: boolean } } | null> } };
+export type ReferralSetStatsQuery = { __typename?: 'Query', referralSetStats: { __typename?: 'ReferralSetStatsConnection', edges: Array<{ __typename?: 'ReferralSetStatsEdge', node: { __typename?: 'ReferralSetStats', atEpoch: number, partyId: string, discountFactor: string, rewardFactor: string, epochNotionalTakerVolume: string, referralSetRunningNotionalTakerVolume: string, rewardsMultiplier: string, rewardsFactorMultiplier: string, referrerTakerVolume: string } } | null> } };
 
 
 export const ReferralSetStatsDocument = gql`
@@ -26,7 +26,6 @@ export const ReferralSetStatsDocument = gql`
         rewardsMultiplier
         rewardsFactorMultiplier
         referrerTakerVolume
-        wasEligible
       }
     }
   }

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

@@ -1,53 +0,0 @@
-import * as Types from '@vegaprotocol/types';
-
-import { gql } from '@apollo/client';
-import * as Apollo from '@apollo/client';
-const defaultOptions = {} as const;
-export type StakeAvailableQueryVariables = Types.Exact<{
-  partyId: Types.Scalars['ID'];
-}>;
-
-
-export type StakeAvailableQuery = { __typename?: 'Query', party?: { __typename?: 'Party', stakingSummary: { __typename?: 'StakingSummary', currentStakeAvailable: string } } | null, networkParameter?: { __typename?: 'NetworkParameter', value: string } | null };
-
-
-export const StakeAvailableDocument = gql`
-    query StakeAvailable($partyId: ID!) {
-  party(id: $partyId) {
-    stakingSummary {
-      currentStakeAvailable
-    }
-  }
-  networkParameter(key: "referralProgram.minStakedVegaTokens") {
-    value
-  }
-}
-    `;
-
-/**
- * __useStakeAvailableQuery__
- *
- * To run a query within a React component, call `useStakeAvailableQuery` and pass it any options that fit your needs.
- * When your component renders, `useStakeAvailableQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useStakeAvailableQuery({
- *   variables: {
- *      partyId: // value for 'partyId'
- *   },
- * });
- */
-export function useStakeAvailableQuery(baseOptions: Apollo.QueryHookOptions<StakeAvailableQuery, StakeAvailableQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<StakeAvailableQuery, StakeAvailableQueryVariables>(StakeAvailableDocument, options);
-      }
-export function useStakeAvailableLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<StakeAvailableQuery, StakeAvailableQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<StakeAvailableQuery, StakeAvailableQueryVariables>(StakeAvailableDocument, options);
-        }
-export type StakeAvailableQueryHookResult = ReturnType<typeof useStakeAvailableQuery>;
-export type StakeAvailableLazyQueryHookResult = ReturnType<typeof useStakeAvailableLazyQuery>;
-export type StakeAvailableQueryResult = Apollo.QueryResult<StakeAvailableQuery, StakeAvailableQueryVariables>;

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

@@ -1,48 +0,0 @@
-import { useVegaWallet } from '@vegaprotocol/wallet';
-import { useFundsAvailableQuery } from './__generated__/FundsAvailable';
-import compact from 'lodash/compact';
-import BigNumber from 'bignumber.js';
-
-/**
- * Gets the funds for given public key and required min for
- * the referral program.
- *
- * (Uses currently connected public key if left empty)
- */
-export const useFundsAvailable = (pubKey?: string) => {
-  const { pubKey: currentPubKey } = useVegaWallet();
-  const partyId = pubKey || currentPubKey;
-  const { data, stopPolling } = useFundsAvailableQuery({
-    variables: { partyId: partyId || '' },
-    skip: !partyId,
-    fetchPolicy: 'network-only',
-    errorPolicy: 'ignore',
-    pollInterval: 5000,
-  });
-
-  const fundsAvailable = data
-    ? compact(data.party?.accountsConnection?.edges?.map((e) => e?.node))
-    : undefined;
-  const requiredFunds = data
-    ? BigNumber(data.networkParameter?.value || '0')
-    : undefined;
-
-  const sumOfFunds =
-    fundsAvailable
-      ?.filter((fa) => fa.balance)
-      .reduce((sum, fa) => sum.plus(BigNumber(fa.balance)), BigNumber(0)) ||
-    BigNumber(0);
-
-  if (requiredFunds && sumOfFunds.isGreaterThanOrEqualTo(requiredFunds)) {
-    stopPolling();
-  }
-
-  return {
-    fundsAvailable,
-    requiredFunds,
-    isEligible:
-      fundsAvailable != null &&
-      requiredFunds != null &&
-      sumOfFunds.isGreaterThanOrEqualTo(requiredFunds),
-  };
-};

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

@@ -1,8 +1,14 @@
-import { getNumberFormat } from '@vegaprotocol/utils';
+import { addDays } from 'date-fns';
 import sortBy from 'lodash/sortBy';
 import omit from 'lodash/omit';
 import { useReferralProgramQuery } from './__generated__/CurrentReferralProgram';
-import BigNumber from 'bignumber.js';
+import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
+
+const STAKING_TIERS_MAPPING: Record<number, string> = {
+  1: 'Tradestarter',
+  2: 'Mid level degen',
+  3: 'Reward hoarder',
+};
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const MOCK = {
@@ -10,76 +16,46 @@ const MOCK = {
     currentReferralProgram: {
       id: 'abc',
       version: 1,
+      endOfProgramTimestamp: addDays(new Date(), 10).toISOString(),
+      windowLength: 10,
       benefitTiers: [
         {
-          minimumEpochs: 1,
-          minimumRunningNotionalTakerVolume: '100000',
-          referralDiscountFactor: '0.1',
+          minimumEpochs: 5,
+          minimumRunningNotionalTakerVolume: '30000',
+          referralDiscountFactor: '0.01',
+          referralRewardFactor: '0.01',
+        },
+        {
+          minimumEpochs: 5,
+          minimumRunningNotionalTakerVolume: '20000',
+          referralDiscountFactor: '0.05',
           referralRewardFactor: '0.05',
         },
         {
-          minimumEpochs: 1,
-          minimumRunningNotionalTakerVolume: '1000000',
-          referralDiscountFactor: '0.1',
-          referralRewardFactor: '0.075',
-        },
-        {
-          minimumEpochs: 1,
-          minimumRunningNotionalTakerVolume: '5000000',
-          referralDiscountFactor: '0.1',
-          referralRewardFactor: '0.1',
-        },
-        {
-          minimumEpochs: 1,
-          minimumRunningNotionalTakerVolume: '25000000',
-          referralDiscountFactor: '0.1',
-          referralRewardFactor: '0.125',
-        },
-        {
-          minimumEpochs: 1,
-          minimumRunningNotionalTakerVolume: '75000000',
-          referralDiscountFactor: '0.1',
-          referralRewardFactor: '0.15',
-        },
-        {
-          minimumEpochs: 1,
-          minimumRunningNotionalTakerVolume: '150000000',
-          referralDiscountFactor: '0.07',
-          referralRewardFactor: '0.175',
+          minimumEpochs: 5,
+          minimumRunningNotionalTakerVolume: '10000',
+          referralDiscountFactor: '0.001',
+          referralRewardFactor: '0.001',
         },
       ],
       stakingTiers: [
         {
-          minimumStakedTokens: '100000000000000000000',
-          referralRewardMultiplier: '1.025',
+          minimumStakedTokens: '10000',
+          referralRewardMultiplier: '1',
         },
         {
-          minimumStakedTokens: '1000000000000000000000',
-          referralRewardMultiplier: '1.05',
+          minimumStakedTokens: '20000',
+          referralRewardMultiplier: '2',
         },
         {
-          minimumStakedTokens: '5000000000000000000000',
-          referralRewardMultiplier: '1.1',
-        },
-        {
-          minimumStakedTokens: '50000000000000000000000',
-          referralRewardMultiplier: '1.2',
-        },
-        {
-          minimumStakedTokens: '250000000000000000000000',
-          referralRewardMultiplier: '1.25',
-        },
-        {
-          minimumStakedTokens: '500000000000000000000000',
-          referralRewardMultiplier: '1.3',
+          minimumStakedTokens: '30000',
+          referralRewardMultiplier: '3',
         },
       ],
-      endOfProgramTimestamp: '2024-12-31T01:00:00Z',
-      windowLength: 30,
     },
-    loading: false,
-    error: undefined,
   },
+  loading: false,
+  error: undefined,
 };
 
 export const useReferralProgram = () => {
@@ -99,26 +75,28 @@ export const useReferralProgram = () => {
 
   const benefitTiers = sortBy(data.currentReferralProgram.benefitTiers, (t) =>
     Number(t.referralRewardFactor)
-  ).map((t, i) => {
-    return {
-      tier: i + 1, // sorted in asc order, hence first is the lowest tier
-      rewardFactor: Number(t.referralRewardFactor),
-      commission: BigNumber(t.referralRewardFactor).times(100).toFixed(2) + '%',
-      discountFactor: Number(t.referralDiscountFactor),
-      discount: BigNumber(t.referralDiscountFactor).times(100).toFixed(2) + '%',
-      minimumVolume: Number(t.minimumRunningNotionalTakerVolume),
-      volume: getNumberFormat(0).format(
-        Number(t.minimumRunningNotionalTakerVolume)
-      ),
-      epochs: Number(t.minimumEpochs),
-    };
-  });
+  )
+    .reverse()
+    .map((t, i) => {
+      return {
+        tier: i + 1,
+        rewardFactor: Number(t.referralRewardFactor),
+        commission: Number(t.referralRewardFactor) * 100 + '%',
+        discountFactor: Number(t.referralDiscountFactor),
+        discount: Number(t.referralDiscountFactor) * 100 + '%',
+        minimumVolume: Number(t.minimumRunningNotionalTakerVolume),
+        volume: addDecimalsFormatNumber(t.minimumRunningNotionalTakerVolume, 0),
+        epochs: Number(t.minimumEpochs),
+      };
+    });
 
-  const stakingTiers = sortBy(data.currentReferralProgram.stakingTiers, (t) =>
-    parseFloat(t.referralRewardMultiplier)
+  const stakingTiers = sortBy(
+    data.currentReferralProgram.stakingTiers,
+    (t) => t.referralRewardMultiplier
   ).map((t, i) => {
     return {
       tier: i + 1,
+      label: STAKING_TIERS_MAPPING[i + 1],
       ...t,
     };
   });

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

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