fix: live time fraction zero redundant check

2023-12-02 11:26:09 +00:00
90 changed files with 811 additions and 2138 deletions
@@ -77,7 +77,6 @@
            "fixStyle": "inline-type-imports"
          }
        ],
-        "@typescript-eslint/no-useless-constructor": 0,
        "curly": ["error", "multi-line"]
      }
    },
@@ -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;
@@ -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,12 +83,13 @@ const DeterministicOrderDetails = ({
              />
            </p>
          ) : null}
+
          {o.reference ? (
            <p className="text-gray-500 mt-4">
              <span>{t('Reference')}</span>: {o.reference}
            </p>
          ) : null}
-          <div className="grid md:grid-cols-5 gap-x-6 mt-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')}
@@ -114,16 +114,6 @@ const DeterministicOrderDetails = ({
                {o.version}
              </h5>
            </div>
-            {o.type ? (
-              <div className="">
-                <h2 className="text-2xl font-bold text-dark 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>
@@ -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';
 }
@@ -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>
@@ -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 =
@@ -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,
@@ -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;

@@ -65,13 +65,10 @@ export const Proposal = ({
    ? removePaginationWrapper(assetData.assetsConnection?.edges)[0]
    : undefined;

-  const originalAsset = asset;
-
  if (proposal.terms.change.__typename === 'UpdateAsset' && asset) {
    asset = {
      ...asset,
      quantum: proposal.terms.change.quantum,
-      source: { ...asset.source },
    };

    if (asset.source.__typename === 'ERC20') {
@@ -231,7 +228,7 @@ export const Proposal = ({
        proposal.terms.change.__typename === 'UpdateAsset') &&
        asset && (
          <div className="mb-4">
-            <ProposalAssetDetails asset={asset} originalAsset={originalAsset} />
+            <ProposalAssetDetails asset={asset} />
          </div>
        )}

@@ -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;
@@ -1,9 +1,8 @@
-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';
+import { titlefy } from '@vegaprotocol/utils';
+import { useEffect } from 'react';

 export const Fees = () => {
  const t = useT();
@@ -11,17 +10,13 @@ export const 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">{title}</h1>
+      <FeesContainer />
+    </div>
  );
 };
@@ -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>
@@ -20,7 +20,6 @@ import {
 } from '../../components/market-banner';
 import { FLAGS } from '@vegaprotocol/environment';
 import { useT } from '../../lib/use-t';
-import { ErrorBoundary } from '../../components/error-boundary';

 interface TradeGridProps {
  market: Market | null;
@@ -63,38 +62,28 @@ const MainGrid = memo(
                    name={t('Chart')}
                    menu={<TradingViews.candles.menu />}
                  >
-                    <ErrorBoundary feature="chart">
-                      <TradingViews.candles.component marketId={marketId} />
-                    </ErrorBoundary>
+                    <TradingViews.candles.component marketId={marketId} />
                  </Tab>
                  <Tab id="depth" name={t('Depth')}>
-                    <ErrorBoundary feature="depth">
-                      <TradingViews.depth.component marketId={marketId} />
-                    </ErrorBoundary>
+                    <TradingViews.depth.component marketId={marketId} />
                  </Tab>
                  <Tab id="liquidity" name={t('Liquidity')}>
-                    <ErrorBoundary feature="liquidity">
-                      <TradingViews.liquidity.component marketId={marketId} />
-                    </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={marketId} />
-                      </ErrorBoundary>
+                      <TradingViews.funding.component marketId={marketId} />
                    </Tab>
                  ) : null}
                  {market &&
                  market.tradableInstrument.instrument.product.__typename ===
                    'Perpetual' ? (
                    <Tab id="funding-payments" name={t('Funding payments')}>
-                      <ErrorBoundary feature="funding-payments">
-                        <TradingViews.fundingPayments.component
-                          marketId={marketId}
-                        />
-                      </ErrorBoundary>
+                      <TradingViews.fundingPayments.component
+                        marketId={marketId}
+                      />
                    </Tab>
                  ) : null}
                </Tabs>
@@ -107,14 +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={marketId} />
-                    </ErrorBoundary>
+                    <TradingViews.orderbook.component marketId={marketId} />
                  </Tab>
                  <Tab id="trades" name={t('Trades')}>
-                    <ErrorBoundary feature="trades">
-                      <TradingViews.trades.component marketId={marketId} />
-                    </ErrorBoundary>
+                    <TradingViews.trades.component marketId={marketId} />
                  </Tab>
                </Tabs>
              </TradeGridChild>
@@ -133,43 +118,31 @@ const MainGrid = memo(
                name={t('Positions')}
                menu={<TradingViews.positions.menu />}
              >
-                <ErrorBoundary feature="positions">
-                  <TradingViews.positions.component />
-                </ErrorBoundary>
+                <TradingViews.positions.component />
              </Tab>
              <Tab
                id="open-orders"
                name={t('Open')}
                menu={<TradingViews.activeOrders.menu />}
              >
-                <ErrorBoundary feature="activeOrders">
-                  <TradingViews.activeOrders.component />
-                </ErrorBoundary>
+                <TradingViews.activeOrders.component />
              </Tab>
              <Tab id="closed-orders" name={t('Closed')}>
-                <ErrorBoundary feature="closedOrders">
-                  <TradingViews.closedOrders.component />
-                </ErrorBoundary>
+                <TradingViews.closedOrders.component />
              </Tab>
              <Tab id="rejected-orders" name={t('Rejected')}>
-                <ErrorBoundary feature="rejectedOrders">
-                  <TradingViews.rejectedOrders.component />
-                </ErrorBoundary>
+                <TradingViews.rejectedOrders.component />
              </Tab>
              <Tab
                id="orders"
                name={t('All')}
                menu={<TradingViews.orders.menu />}
              >
-                <ErrorBoundary feature="orders">
-                  <TradingViews.orders.component />
-                </ErrorBoundary>
+                <TradingViews.orders.component />
              </Tab>
              {FLAGS.STOP_ORDERS ? (
                <Tab id="stop-orders" name={t('Stop orders')}>
-                  <ErrorBoundary feature="stop-orders">
-                    <TradingViews.stopOrders.component />
-                  </ErrorBoundary>
+                  <TradingViews.stopOrders.component />
                </Tab>
              ) : null}
              <Tab id="fills" name={t('Fills')}>
@@ -180,11 +153,7 @@ const MainGrid = memo(
                name={t('Collateral')}
                menu={<TradingViews.collateral.menu />}
              >
-                <ErrorBoundary feature="collateral">
-                  <TradingViews.collateral.component
-                    pinnedAsset={pinnedAsset}
-                  />
-                </ErrorBoundary>
+                <TradingViews.collateral.component pinnedAsset={pinnedAsset} />
              </Tab>
            </Tabs>
          </TradeGridChild>
@@ -1,20 +1,19 @@
-import { type PinnedAsset } from '@vegaprotocol/accounts';
-import { type Market } 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 { FLAGS } from '@vegaprotocol/environment';
-import { Splash } from '@vegaprotocol/ui-toolkit';
-import { useT } from '../../lib/use-t';
 import {
  MarketSuccessorBanner,
  MarketSuccessorProposalBanner,
  MarketTerminationBanner,
 } from '../../components/market-banner';
-import { ErrorBoundary } from '../../components/error-boundary';
-import { type TradingView } from './trade-views';
-import { TradingViews } from './trade-views';
+import { FLAGS } from '@vegaprotocol/environment';
+import { useT } from '../../lib/use-t';
+import { Splash } from '@vegaprotocol/ui-toolkit';

 interface TradePanelsProps {
  market: Market | null;
@@ -35,11 +34,7 @@ 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 = () => {
@@ -1,5 +1,4 @@
 import { act, render, screen, waitFor, within } from '@testing-library/react';
-// import userEvent from '@testing-library/user-event';
 import { MemoryRouter } from 'react-router-dom';
 import { Closed } from './closed';
 import { MarketStateMapping, PropertyKeyType } from '@vegaprotocol/types';
@@ -27,7 +26,6 @@ import {
  marketsDataQuery,
  createMarketsDataFragment,
 } from '@vegaprotocol/mock';
-import userEvent from '@testing-library/user-event';

 describe('Closed', () => {
  let originalNow: typeof Date.now;
@@ -170,11 +168,14 @@ describe('Closed', () => {
    Date.now = originalNow;
  });

-  const renderComponent = async (mocks: MockedResponse[]) => {
+  // eslint-disable-next-line jest/no-disabled-tests
+  it.skip('renders correctly formatted and filtered rows', async () => {
    await act(async () => {
      render(
        <MemoryRouter>
-          <MockedProvider mocks={mocks}>
+          <MockedProvider
+            mocks={[marketsMock, marketsDataMock, oracleDataMock]}
+          >
            <VegaWalletContext.Provider
              value={{ pubKey } as VegaWalletContextShape}
            >
@@ -184,10 +185,6 @@ describe('Closed', () => {
        </MemoryRouter>
      );
    });
-  };
-
-  it('renders correct headers', async () => {
-    await renderComponent([marketsMock, marketsDataMock, oracleDataMock]);

    const headers = screen.getAllByRole('columnheader');
    const expectedHeaders = [
@@ -203,10 +200,6 @@ describe('Closed', () => {
    ];
    expect(headers).toHaveLength(expectedHeaders.length);
    expect(headers.map((h) => h.textContent?.trim())).toEqual(expectedHeaders);
-  });
-
-  it('renders correctly formatted and filtered rows', async () => {
-    await renderComponent([marketsMock, marketsDataMock, oracleDataMock]);

    const assetSymbol = getAsset(market).symbol;

@@ -280,8 +273,21 @@ describe('Closed', () => {
        },
      },
    };
-
-    await renderComponent([mixedMarketsMock, marketsDataMock, oracleDataMock]);
+    await act(async () => {
+      render(
+        <MemoryRouter>
+          <MockedProvider
+            mocks={[mixedMarketsMock, marketsDataMock, oracleDataMock]}
+          >
+            <VegaWalletContext.Provider
+              value={{ pubKey } as VegaWalletContextShape}
+            >
+              <Closed />
+            </VegaWalletContext.Provider>
+          </MockedProvider>
+        </MemoryRouter>
+      );
+    });

    // check that the number of rows in datagrid is 2
    const container = within(
@@ -313,67 +319,8 @@ describe('Closed', () => {
    );
  });

-  it('display market actions', async () => {
-    // Use market with a succcessor Id as the actions dropdown will optionally
-    // show a link to the successor market
-    const marketsWithSuccessorAndParent = [
-      {
-        __typename: 'MarketEdge' as const,
-        node: createMarketFragment({
-          id: 'include-0',
-          state: MarketState.STATE_SETTLED,
-          successorMarketID: 'successor',
-          parentMarketID: 'parent',
-        }),
-      },
-    ];
-    const mockWithSuccessorAndParent: MockedResponse<MarketsQuery> = {
-      request: {
-        query: MarketsDocument,
-      },
-      result: {
-        data: {
-          marketsConnection: {
-            __typename: 'MarketConnection',
-            edges: marketsWithSuccessorAndParent,
-          },
-        },
-      },
-    };
-    await renderComponent([
-      mockWithSuccessorAndParent,
-      marketsDataMock,
-      oracleDataMock,
-    ]);
-
-    const actionCell = screen
-      .getAllByRole('gridcell')
-      .find((el) => el.getAttribute('col-id') === 'market-actions');
-
-    await userEvent.click(
-      within(actionCell as HTMLElement).getByTestId('dropdown-menu')
-    );
-
-    expect(screen.getByRole('menu')).toBeInTheDocument();
-
-    expect(
-      screen.getByRole('menuitem', { name: 'Copy Market ID' })
-    ).toBeInTheDocument();
-    expect(
-      screen.getByRole('menuitem', { name: 'View on Explorer' })
-    ).toBeInTheDocument();
-    expect(
-      screen.getByRole('menuitem', { name: 'View settlement asset details' })
-    ).toBeInTheDocument();
-    expect(
-      screen.getByRole('menuitem', { name: 'View parent market' })
-    ).toBeInTheDocument();
-    expect(
-      screen.getByRole('menuitem', { name: 'View successor market' })
-    ).toBeInTheDocument();
-  });
-
-  it('successor market should be visible', async () => {
+  // eslint-disable-next-line jest/no-disabled-tests
+  it.skip('successor marked should be visible', async () => {
    const marketsWithSuccessorID = [
      {
        __typename: 'MarketEdge' as const,
@@ -398,11 +345,21 @@ describe('Closed', () => {
      },
    };

-    await renderComponent([
-      mockWithSuccessors,
-      marketsDataMock,
-      oracleDataMock,
-    ]);
+    await act(async () => {
+      render(
+        <MemoryRouter>
+          <MockedProvider
+            mocks={[mockWithSuccessors, marketsDataMock, oracleDataMock]}
+          >
+            <VegaWalletContext.Provider
+              value={{ pubKey } as VegaWalletContextShape}
+            >
+              <Closed />
+            </VegaWalletContext.Provider>
+          </MockedProvider>
+        </MemoryRouter>
+      );
+    });

    const container = within(
      document.querySelector('.ag-center-cols-container') as HTMLElement
@@ -15,7 +15,6 @@ import {
  useLinks,
 } from '@vegaprotocol/environment';
 import { useT } from '../../lib/use-t';
-import { ErrorBoundary } from '../../components/error-boundary';

 export const MarketsPage = () => {
  const t = useT();
@@ -35,9 +34,7 @@ export const MarketsPage = () => {
      <div className="h-full my-1 border rounded-sm border-default">
        <Tabs storageKey="console-markets">
          <Tab id="open-markets" name={t('Open markets')}>
-            <ErrorBoundary feature="markets-open">
-              <OpenMarkets />
-            </ErrorBoundary>
+            <OpenMarkets />
          </Tab>
          <Tab
            id="proposed-markets"
@@ -52,14 +49,10 @@ export const MarketsPage = () => {
              </TradingAnchorButton>
            }
          >
-            <ErrorBoundary feature="markets-proposed">
-              <Proposed />
-            </ErrorBoundary>
+            <Proposed />
          </Tab>
          <Tab id="closed-markets" name={t('Closed markets')}>
-            <ErrorBoundary feature="markets-closed">
-              <Closed />
-            </ErrorBoundary>
+            <Closed />
          </Tab>
        </Tabs>
      </div>
@@ -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);
-  });
-});
@@ -25,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();
@@ -73,29 +72,19 @@ export const Portfolio = () => {
                name={t('Positions')}
                menu={<PositionsMenu />}
              >
-                <ErrorBoundary feature="portfolio-positions">
-                  <PositionsContainer allKeys />
-                </ErrorBoundary>
+                <PositionsContainer allKeys />
              </Tab>
              <Tab id="orders" name={t('Orders')}>
-                <ErrorBoundary feature="portfolio-orders">
-                  <OrdersContainer />
-                </ErrorBoundary>
+                <OrdersContainer />
              </Tab>
              <Tab id="fills" name={t('Fills')}>
-                <ErrorBoundary feature="portfolio-fills">
-                  <FillsContainer />
-                </ErrorBoundary>
+                <FillsContainer />
              </Tab>
              <Tab id="funding-payments" name={t('Funding payments')}>
-                <ErrorBoundary feature="portfolio-funding-payments">
-                  <FundingPaymentsContainer />
-                </ErrorBoundary>
+                <FundingPaymentsContainer />
              </Tab>
              <Tab id="ledger-entries" name={t('Ledger entries')}>
-                <ErrorBoundary feature="portfolio-ledger">
-                  <LedgerContainer />
-                </ErrorBoundary>
+                <LedgerContainer />
              </Tab>
            </Tabs>
          </PortfolioGridChild>
@@ -112,14 +101,10 @@ export const Portfolio = () => {
                name={t('Collateral')}
                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"
@@ -127,9 +112,7 @@ export const Portfolio = () => {
                indicator={<WithdrawalsIndicator />}
                menu={<WithdrawalsMenu />}
              >
-                <ErrorBoundary feature="portfolio-deposit">
-                  <WithdrawalsContainer />
-                </ErrorBoundary>
+                <WithdrawalsContainer />
              </Tab>
            </Tabs>
          </PortfolioGridChild>
@@ -13,40 +13,15 @@ import type { ButtonHTMLAttributes, MouseEventHandler } from 'react';
 import { useCallback, 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,20 @@ const validateCode = (value: string, t: ReturnType<typeof useT>) => {
  return true;
 };

-export const ApplyCodeFormContainer = ({
-  onSuccess,
-}: {
-  onSuccess?: () => void;
-}) => {
+export const ApplyCodeFormContainer = () => {
  const { pubKey } = useVegaWallet();
-  const isInReferralSet = useIsInReferralSet(pubKey);
+  const { data: referee } = useReferral({ pubKey, role: 'referee' });
+  const { data: referrer } = useReferral({ pubKey, role: 'referrer' });

-  // Navigate to the index page when already in the referral set.
-  if (isInReferralSet) {
+  // go to main page if the current pubkey is already a referrer or referee
+  if (referee || referrer) {
    return <Navigate to={Routes.REFERRALS} />;
  }

-  return <ApplyCodeForm onSuccess={onSuccess} />;
+  return <ApplyCodeForm />;
 };

-export const ApplyCodeForm = ({ onSuccess }: { onSuccess?: () => void }) => {
+export const ApplyCodeForm = () => {
  const t = useT();
  const program = useReferralProgram();
  const navigate = useNavigate();
@@ -82,15 +54,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,
@@ -106,17 +73,6 @@ export const ApplyCodeForm = ({ onSuccess }: { onSuccess?: () => void }) => {
    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.
   */
@@ -140,15 +96,6 @@ export const ApplyCodeForm = ({ onSuccess }: { onSuccess?: () => void }) => {
    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,11 +167,10 @@ export const ApplyCodeForm = ({ onSuccess }: { onSuccess?: () => void }) => {
  useEffect(() => {
    if (status === 'successful') {
      setTimeout(() => {
-        if (onSuccess) onSuccess();
        navigate(Routes.REFERRALS);
      }, RELOAD_DELAY);
    }
-  }, [navigate, onSuccess, status]);
+  }, [navigate, status]);

  // show "code applied" message when successfully applied
  if (status === 'successful') {
@@ -261,18 +207,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,
@@ -302,9 +236,7 @@ export const ApplyCodeForm = ({ onSuccess }: { onSuccess?: () => void }) => {
          {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', {
@@ -319,10 +251,8 @@ export const ApplyCodeForm = ({ onSuccess }: { onSuccess?: () => void }) => {
              {...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;
+                  const err = validateCode(value, t);
+                  if (err !== true) return err;
                  return validateSet();
                },
              })}
@@ -332,26 +262,10 @@ export const ApplyCodeForm = ({ onSuccess }: { onSuccess?: () => void }) => {
          </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="overflow-auto break-words">
+            {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 ? (
@@ -6,8 +6,6 @@ export const SKY_BACKGROUND =
  '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/';
@@ -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 />;
 };

@@ -56,7 +48,7 @@ export const CreateCodeForm = () => {
      </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,7 +98,10 @@ const CreateCodeDialog = ({
  const { stakeAvailable: currentStakeAvailable, requiredStake } =
    useStakeAvailable();

-  const { details: programDetails } = useReferralProgram();
+  const { data: referralSets } = useReferral({
+    pubKey,
+    role: 'referrer',
+  });

  const onSubmit = () => {
    if (isReadOnly || !pubKey) {
@@ -206,7 +201,7 @@ const CreateCodeDialog = ({
    );
  }

-  if (!programDetails) {
+  if (!referralSets) {
    return (
      <div className="flex flex-col gap-4">
        {(status === 'idle' || status === 'loading' || status === 'error') && (
@@ -242,9 +237,7 @@ const CreateCodeDialog = ({
          intent={Intent.Primary}
          onClick={() => onSubmit()}
          {...getButtonProps()}
-        >
-          {t('Yes')}
-        </TradingButton>
+        ></TradingButton>
        {status === 'idle' && (
          <TradingButton
            fill={true}
@@ -262,6 +255,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>
    );
@@ -272,7 +268,7 @@ const CreateCodeDialog = ({
      {(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 +299,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>
  );
@@ -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>
  );
 };
@@ -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
-  }
-}
@@ -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>;
@@ -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),
-  };
-};
@@ -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';
+
+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 = () => {
@@ -103,9 +79,9 @@ export const useReferralProgram = () => {
    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) + '%',
+      commission: Number(t.referralRewardFactor) * 100 + '%',
      discountFactor: Number(t.referralDiscountFactor),
-      discount: BigNumber(t.referralDiscountFactor).times(100).toFixed(2) + '%',
+      discount: Number(t.referralDiscountFactor) * 100 + '%',
      minimumVolume: Number(t.minimumRunningNotionalTakerVolume),
      volume: getNumberFormat(0).format(
        Number(t.minimumRunningNotionalTakerVolume)
@@ -114,11 +90,13 @@ export const useReferralProgram = () => {
    };
  });

-  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,
    };
  });
@@ -75,7 +75,10 @@ export const useReferralToasts = () => {
                data-testid="toast-apply-code"
                size="xs"
                onClick={() => {
-                  const matched = matchPath(Routes.REFERRALS, pathname);
+                  const matched = matchPath(
+                    Routes.REFERRALS_APPLY_CODE,
+                    pathname
+                  );
                  if (!matched) navigate(Routes.REFERRALS_APPLY_CODE);
                  updateToast(NON_ELIGIBLE_REFERRAL_SET_TOAST_ID + epoch, {
                    hidden: true,
@@ -2,10 +2,7 @@ import { removePaginationWrapper } from '@vegaprotocol/utils';
 import { useCallback } from 'react';
 import { useRefereesQuery } from './__generated__/Referees';
 import compact from 'lodash/compact';
-import type {
-  ReferralSetsQuery,
-  ReferralSetsQueryVariables,
-} from './__generated__/ReferralSets';
+import type { ReferralSetsQueryVariables } from './__generated__/ReferralSets';
 import { useReferralSetsQuery } from './__generated__/ReferralSets';
 import { useStakeAvailable } from './use-stake-available';

@@ -121,36 +118,3 @@ export const useReferral = (args: UseReferralArgs) => {
    refetch,
  };
 };
-
-const retrieveReferralSetData = (data: ReferralSetsQuery | undefined) =>
-  data?.referralSets.edges && data.referralSets.edges.length > 0
-    ? data.referralSets.edges[0]?.node
-    : undefined;
-
-export const useIsInReferralSet = (pubKey: string | null) => {
-  const [asRefereeVariables, asRefereeSkip] = prepareVariables({
-    pubKey,
-    role: 'referee',
-  });
-  const [asReferrerVariables, asReferrerSkip] = prepareVariables({
-    pubKey,
-    role: 'referrer',
-  });
-
-  const { data: asRefereeData } = useReferralSetsQuery({
-    variables: asRefereeVariables,
-    skip: asRefereeSkip,
-    fetchPolicy: 'cache-and-network',
-  });
-
-  const { data: asReferrerData } = useReferralSetsQuery({
-    variables: asReferrerVariables,
-    skip: asReferrerSkip,
-    fetchPolicy: 'cache-and-network',
-  });
-
-  return Boolean(
-    retrieveReferralSetData(asRefereeData) ||
-      retrieveReferralSetData(asReferrerData)
-  );
-};
@@ -13,6 +13,7 @@ export const useStakeAvailable = (pubKey?: string) => {
  const { data } = useStakeAvailableQuery({
    variables: { partyId: partyId || '' },
    skip: !partyId,
+    // TODO: remove when network params available
    errorPolicy: 'ignore',
  });

@@ -15,16 +15,11 @@ export const LandingBanner = () => {
        </div>
        <div className="pt-20 sm:w-[50%]">
          <h1 className="text-6xl font-alpha calt mb-10">
-            {t('Vega community referrals')}
+            {t('Earn commission & stake rewards')}
          </h1>
-          <p className="text-lg mb-1">
-            {t(
-              'Referral programs can be proposed and created via community governance.'
-            )}
-          </p>
          <p className="text-lg mb-10">
            {t(
-              'Once live, users can generate referral codes to share with their friends and earn commission on their trades, while referred traders can access fee discounts based on the running volume of the group.'
+              'Invite friends and earn rewards from the trading fees they pay. Stake those rewards to earn multipliers on future rewards.'
            )}
          </p>
        </div>
@@ -1,28 +0,0 @@
-import { DocsLinks } from '@vegaprotocol/environment';
-import { ExternalLink, Tooltip } from '@vegaprotocol/ui-toolkit';
-import { useT } from '../../lib/use-t';
-
-export const QUSDTooltip = () => {
-  const t = useT();
-  return (
-    <Tooltip
-      description={
-        <>
-          <p className="mb-1">
-            {t(
-              'qUSD provides a rough USD equivalent of balances across all assets using the value of "Quantum" for that asset'
-            )}
-          </p>
-          {DocsLinks && (
-            <ExternalLink href={DocsLinks.QUANTUM}>
-              {t('Find out more')}
-            </ExternalLink>
-          )}
-        </>
-      }
-      underline={true}
-    >
-      <span>{t('qUSD')}</span>
-    </Tooltip>
-  );
-};
@@ -275,34 +275,30 @@ jest.mock('@vegaprotocol/wallet', () => {
 });

 describe('ReferralStatistics', () => {
-  it('displays apply code when no data has been found for given pubkey', () => {
+  it('displays create code when no data has been found for given pubkey', () => {
    const { queryByTestId } = render(
-      <MemoryRouter>
-        <MockedProvider mocks={[]} showWarnings={false}>
-          <ReferralStatistics />
-        </MockedProvider>
-      </MemoryRouter>
+      <MockedProvider mocks={[]} showWarnings={false}>
+        <ReferralStatistics />
+      </MockedProvider>
    );

-    expect(queryByTestId('referral-apply-code-form')).toBeInTheDocument();
+    expect(queryByTestId('referral-create-code-form')).toBeInTheDocument();
  });

  it('displays referrer stats when given pubkey is a referrer', async () => {
    const { queryByTestId } = render(
-      <MemoryRouter>
-        <MockedProvider
-          mocks={[
-            programMock,
-            referralSetAsReferrerMock,
-            noReferralSetAsRefereeMock,
-            stakeAvailableMock,
-            refereesMock,
-          ]}
-          showWarnings={false}
-        >
-          <ReferralStatistics />
-        </MockedProvider>
-      </MemoryRouter>
+      <MockedProvider
+        mocks={[
+          programMock,
+          referralSetAsReferrerMock,
+          noReferralSetAsRefereeMock,
+          stakeAvailableMock,
+          refereesMock,
+        ]}
+        showWarnings={false}
+      >
+        <ReferralStatistics />
+      </MockedProvider>
    );

    await waitFor(() => {
@@ -4,10 +4,13 @@ import {
  VegaIcon,
  VegaIconNames,
  truncateMiddle,
+  ExternalLink,
+  Tooltip,
 } from '@vegaprotocol/ui-toolkit';

 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { DEFAULT_AGGREGATION_DAYS, useReferral } from './hooks/use-referral';
+import { CreateCodeContainer } from './create-code-form';
 import classNames from 'classnames';
 import { Table } from './table';
 import {
@@ -23,39 +26,34 @@ import compact from 'lodash/compact';
 import { useReferralProgram } from './hooks/use-referral-program';
 import { useStakeAvailable } from './hooks/use-stake-available';
 import sortBy from 'lodash/sortBy';
-import { useCallback, useLayoutEffect, useMemo, useRef, useState } from 'react';
+import { useLayoutEffect, useMemo, useRef, useState } from 'react';
 import { useCurrentEpochInfoQuery } from './hooks/__generated__/Epoch';
 import BigNumber from 'bignumber.js';
+import { DocsLinks } from '@vegaprotocol/environment';
 import { useT, ns } from '../../lib/use-t';
 import { Trans } from 'react-i18next';
-import { ApplyCodeForm, ApplyCodeFormContainer } from './apply-code-form';
-import { QUSDTooltip } from './qusd-tooltip';
+import { ApplyCodeForm } from './apply-code-form';

 export const ReferralStatistics = () => {
  const { pubKey } = useVegaWallet();

  const program = useReferralProgram();

-  const { data: referee, refetch: refereeRefetch } = useReferral({
+  const { data: referee } = useReferral({
    pubKey,
    role: 'referee',
    aggregationEpochs: program.details?.windowLength,
  });
-  const { data: referrer, refetch: referrerRefetch } = useReferral({
+  const { data: referrer } = useReferral({
    pubKey,
    role: 'referrer',
    aggregationEpochs: program.details?.windowLength,
  });

-  const refetch = useCallback(() => {
-    refereeRefetch();
-    referrerRefetch();
-  }, [refereeRefetch, referrerRefetch]);
-
  if (referee?.code) {
    return (
      <>
-        <Statistics data={referee} program={program} as="referee" />
+        <Statistics data={referee} program={program} as="referee" />;
        {!referee.isEligible && <ApplyCodeForm />}
      </>
    );
@@ -64,13 +62,13 @@ export const ReferralStatistics = () => {
  if (referrer?.code) {
    return (
      <>
-        <Statistics data={referrer} program={program} as="referrer" />
+        <Statistics data={referrer} program={program} as="referrer" />;
        <RefereesTable data={referrer} program={program} />
      </>
    );
  }

-  return <ApplyCodeFormContainer onSuccess={refetch} />;
+  return <CreateCodeContainer />;
 };

 export const useStats = ({
@@ -83,9 +81,7 @@ export const useStats = ({
  as?: 'referrer' | 'referee';
 }) => {
  const { benefitTiers } = program;
-  const { data: epochData } = useCurrentEpochInfoQuery({
-    fetchPolicy: 'network-only',
-  });
+  const { data: epochData } = useCurrentEpochInfoQuery();
  const { data: statsData } = useReferralSetStatsQuery({
    variables: {
      code: data?.code || '',
@@ -119,7 +115,7 @@ export const useStats = ({
    : 1;
  const finalCommissionValue = isNaN(multiplier)
    ? baseCommissionValue
-    : new BigNumber(multiplier).times(baseCommissionValue).toNumber();
+    : multiplier * baseCommissionValue;

  const discountFactorValue = refereeStats?.discountFactor
    ? Number(refereeStats.discountFactor)
@@ -178,7 +174,6 @@ export const Statistics = ({
    discountFactorValue,
    currentBenefitTierValue,
    epochsValue,
-    nextBenefitTierValue,
    nextBenefitTierVolumeValue,
    nextBenefitTierEpochsValue,
  } = useStats({ data, program, as });
@@ -212,7 +207,6 @@ export const Statistics = ({
          ).toString(),
        }
      )}
-      overrideWithNoProgram={!details}
    >
      {baseCommissionValue * 100}%
    </StatTile>
@@ -235,28 +229,22 @@ export const Statistics = ({
          })}
        </span>
      }
-      overrideWithNoProgram={!details}
    >
      {multiplier || t('None')}
    </StatTile>
  );
-  const baseCommissionFormatted = BigNumber(baseCommissionValue)
-    .times(100)
-    .toString();
-  const finalCommissionFormatted = new BigNumber(finalCommissionValue)
-    .times(100)
-    .toString();
  const finalCommissionTile = (
    <StatTile
      title={t('Final commission rate')}
      description={
        !isNaN(multiplier)
-          ? `(${baseCommissionFormatted}% ⨉ ${multiplier} = ${finalCommissionFormatted}%)`
+          ? `(${baseCommissionValue * 100}% ⨉ ${multiplier} = ${
+              finalCommissionValue * 100
+            }%)`
          : undefined
      }
-      overrideWithNoProgram={!details}
    >
-      {finalCommissionFormatted}%
+      {finalCommissionValue * 100}%
    </StatTile>
  );
  const numberOfTradersValue = data.referees.length;
@@ -276,7 +264,6 @@ export const Statistics = ({
      title={t('myVolume', 'My volume (last {{count}} epochs)', {
        count: details?.windowLength || DEFAULT_AGGREGATION_DAYS,
      })}
-      overrideWithNoProgram={!details}
    >
      {compactNumFormat.format(referrerVolumeValue)}
    </StatTile>
@@ -287,7 +274,7 @@ export const Statistics = ({
    .reduce((all, r) => all.plus(r), new BigNumber(0));
  const totalCommissionTile = (
    <StatTile
-      title={t('totalCommission', 'Total commission (last {{count}} epochs)', {
+      title={t('totalCommission', 'Total commission (last {{count}}} epochs)', {
        count: details?.windowLength || DEFAULT_AGGREGATION_DAYS,
      })}
      description={<QUSDTooltip />}
@@ -314,25 +301,15 @@ export const Statistics = ({
  );

  const currentBenefitTierTile = (
-    <StatTile
-      title={t('Current tier')}
-      description={
-        nextBenefitTierValue?.tier
-          ? t('(Next tier: {{nextTier}})', {
-              nextTier: nextBenefitTierValue?.tier,
-            })
-          : undefined
-      }
-      overrideWithNoProgram={!details}
-    >
+    <StatTile title={t('Current tier')}>
      {isApplyCodePreview
        ? currentBenefitTierValue?.tier || benefitTiers[0]?.tier || 'None'
        : currentBenefitTierValue?.tier || 'None'}
    </StatTile>
  );
  const discountFactorTile = (
-    <StatTile title={t('Discount')} overrideWithNoProgram={!details}>
-      {isApplyCodePreview && benefitTiers.length >= 1
+    <StatTile title={t('Discount')}>
+      {isApplyCodePreview
        ? benefitTiers[0].discountFactor * 100
        : discountFactorValue * 100}
      %
@@ -347,7 +324,6 @@ export const Statistics = ({
          count: details?.windowLength,
        }
      )}
-      overrideWithNoProgram={!details}
    >
      {compactNumFormat.format(runningVolumeValue)}
    </StatTile>
@@ -356,14 +332,14 @@ export const Statistics = ({
    <StatTile title={t('Epochs in set')}>{epochsValue}</StatTile>
  );
  const nextTierVolumeTile = (
-    <StatTile title={t('Volume to next tier')} overrideWithNoProgram={!details}>
+    <StatTile title={t('Volume to next tier')}>
      {nextBenefitTierVolumeValue <= 0
        ? '0'
        : compactNumFormat.format(nextBenefitTierVolumeValue)}
    </StatTile>
  );
  const nextTierEpochsTile = (
-    <StatTile title={t('Epochs to next tier')} overrideWithNoProgram={!details}>
+    <StatTile title={t('Epochs to next tier')}>
      {nextBenefitTierEpochsValue <= 0 ? '0' : nextBenefitTierEpochsValue}
    </StatTile>
  );
@@ -485,7 +461,6 @@ export const RefereesTable = ({
                        count:
                          details?.windowLength || DEFAULT_AGGREGATION_DAYS,
                      }}
-                      components={[<QUSDTooltip key="qusd" />]}
                      ns={ns}
                    />
                  ),
@@ -517,3 +492,28 @@ export const RefereesTable = ({
    </>
  );
 };
+
+export const QUSDTooltip = () => {
+  const t = useT();
+  return (
+    <Tooltip
+      description={
+        <>
+          <p className="mb-1">
+            {t(
+              'qUSD provides a rough USD equivalent of balances across all assets using the value of "Quantum" for that asset'
+            )}
+          </p>
+          {DocsLinks && (
+            <ExternalLink href={DocsLinks.QUANTUM}>
+              {t('Find out more')}
+            </ExternalLink>
+          )}
+        </>
+      }
+      underline={true}
+    >
+      <span>{t('qUSD')}</span>
+    </Tooltip>
+  );
+};
@@ -4,10 +4,11 @@ import {
  VegaIcon,
  VegaIconNames,
 } from '@vegaprotocol/ui-toolkit';
+import { HowItWorksTable } from './how-it-works-table';
 import { LandingBanner } from './landing-banner';
 import { TiersContainer } from './tiers';
 import { TabLink } from './buttons';
-import { Outlet, useMatch } from 'react-router-dom';
+import { Outlet } from 'react-router-dom';
 import { Routes } from '../../lib/links';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { useReferral } from './hooks/use-referral';
@@ -17,17 +18,15 @@ import { usePageTitleStore } from '../../stores';
 import { useEffect } from 'react';
 import { titlefy } from '@vegaprotocol/utils';
 import { useT } from '../../lib/use-t';
-import { ErrorBoundary } from '../../components/error-boundary';

 const Nav = () => {
  const t = useT();
-  const match = useMatch(Routes.REFERRALS_APPLY_CODE);
  return (
    <div className="flex justify-center border-b border-vega-cdark-500">
-      <TabLink end to={match ? Routes.REFERRALS_APPLY_CODE : Routes.REFERRALS}>
-        {t('Apply code')}
+      <TabLink end to={Routes.REFERRALS}>
+        {t('I want a code')}
      </TabLink>
-      <TabLink to={Routes.REFERRALS_CREATE_CODE}>{t('Create code')}</TabLink>
+      <TabLink to={Routes.REFERRALS_APPLY_CODE}>{t('I have a code')}</TabLink>
    </div>
  );
 };
@@ -66,7 +65,7 @@ export const Referrals = () => {
  }, [updateTitle, t]);

  return (
-    <ErrorBoundary feature="referrals">
+    <>
      <LandingBanner />

      {showNav && <Nav />}
@@ -96,16 +95,18 @@ export const Referrals = () => {
        <h2 className="text-2xl">{t('How it works')}</h2>
      </div>
      <div className="md:w-[60%] mx-auto">
+        <HowItWorksTable />
        <div className="mt-5">
          <TradingAnchorButton
            className="mx-auto w-max"
            href={REFERRAL_DOCS_LINK}
            target="_blank"
          >
-            {t('Read the docs')} <VegaIcon name={VegaIconNames.OPEN_EXTERNAL} />
+            {t('Read the terms')}{' '}
+            <VegaIcon name={VegaIconNames.OPEN_EXTERNAL} />
          </TradingAnchorButton>
        </div>
      </div>
-    </ErrorBoundary>
+    </>
  );
 };
@@ -14,10 +14,8 @@ export const Tag = ({
    className={classNames(
      'w-max border rounded-[1rem] py-[0.125rem] px-2 text-xs',
      {
-        'border-vega-yellow-550  text-vega-yellow-550 dark:border-vega-yellow-500  dark:text-vega-yellow-500':
-          color === 'yellow',
-        'border-vega-green-550  text-vega-green-550 dark:border-vega-green-500  dark:text-vega-green-500':
-          color === 'green',
+        'border-vega-yellow-500  text-vega-yellow-500': color === 'yellow',
+        'border-vega-green-500  text-vega-green-500': color === 'green',
        'border-vega-blue-500  text-vega-blue-500': color === 'blue',
        'border-vega-purple-500  text-vega-purple-500': color === 'purple',
        'border-vega-pink-500  text-vega-pink-500': color === 'pink',
@@ -1,43 +1,20 @@
-import {
-  addDecimalsFormatNumber,
-  getDateTimeFormat,
-} from '@vegaprotocol/utils';
+import { getDateTimeFormat } from '@vegaprotocol/utils';
 import { useReferralProgram } from './hooks/use-referral-program';
 import { Table } from './table';
 import classNames from 'classnames';
 import { BORDER_COLOR, GRADIENT } from './constants';
 import { Tag } from './tag';
 import type { ComponentProps, ReactNode } from 'react';
-import { ExternalLink, truncateMiddle } from '@vegaprotocol/ui-toolkit';
+import { ExternalLink } from '@vegaprotocol/ui-toolkit';
 import {
  DApp,
  DocsLinks,
-  TOKEN_PROPOSAL,
  TOKEN_PROPOSALS,
  useLinks,
 } from '@vegaprotocol/environment';
 import { useT, ns } from '../../lib/use-t';
 import { Trans } from 'react-i18next';

-// rainbow-ish order
-const TIER_COLORS: Array<ComponentProps<typeof Tag>['color']> = [
-  'pink',
-  'orange',
-  'yellow',
-  'green',
-  'blue',
-  'purple',
-];
-
-const getTierColor = (tier: number) => {
-  const tiers = Object.keys(TIER_COLORS).length;
-  let index = Math.abs(tier - 1);
-  if (tier >= tiers) {
-    index = index % tiers;
-  }
-  return TIER_COLORS[index];
-};
-
 const Loading = ({ variant }: { variant: 'large' | 'inline' }) => (
  <div
    className={classNames(
@@ -51,63 +28,51 @@ const Loading = ({ variant }: { variant: 'large' | 'inline' }) => (

 const StakingTier = ({
  tier,
+  label,
  referralRewardMultiplier,
  minimumStakedTokens,
 }: {
  tier: number;
+  label: string;
  referralRewardMultiplier: string;
  minimumStakedTokens: string;
 }) => {
  const t = useT();
-  const minimum = addDecimalsFormatNumber(minimumStakedTokens, 18);
-
-  // TODO: Decide what to do with the multiplier images
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  const multiplierImage = (
-    <div
-      aria-hidden
-      className={classNames(
-        'w-full max-w-[80px] h-full min-h-[80px]',
-        'bg-cover bg-right-bottom',
-        {
-          "bg-[url('/1x.png')]": tier === 1,
-          "bg-[url('/2x.png')]": tier === 2,
-          "bg-[url('/3x.png')]": tier === 3,
-        }
-      )}
-    >
-      <span className="sr-only">{`${referralRewardMultiplier}x multiplier`}</span>
-    </div>
-  );
-
+  const color: Record<number, ComponentProps<typeof Tag>['color']> = {
+    1: 'green',
+    2: 'blue',
+    3: 'pink',
+  };
  return (
    <div
      className={classNames(
        'overflow-hidden',
        'border rounded-md w-full',
        'flex flex-row',
-        'bg-white dark:bg-vega-cdark-900',
        GRADIENT,
        BORDER_COLOR
      )}
    >
-      <div
-        className={classNames(
-          'p-3 flex flex-row min-h-[80px] h-full items-center'
+      <div aria-hidden className="max-w-[120px]">
+        {tier < 4 && (
+          // eslint-disable-next-line @next/next/no-img-element
+          <img
+            src={`/${tier}x.png`}
+            alt={`${referralRewardMultiplier}x multiplier`}
+            width={240}
+            height={240}
+            className="w-full h-full"
+          />
        )}
-      >
-        <div>
-          <Tag color={getTierColor(tier)}>
-            {t('Multiplier')} {referralRewardMultiplier}x
-          </Tag>
-          <p className="mt-1 text-sm text-vega-clight-100 dark:text-vega-cdark-100">
-            <Trans
-              defaults="Stake a minimum of <0>{{minimum}}</0> $VEGA tokens"
-              values={{ minimum }}
-              components={[<b key={minimum}></b>]}
-            />
-          </p>
-        </div>
+      </div>
+      <div className={classNames('p-3')}>
+        <Tag color={color[tier]}>Multiplier {referralRewardMultiplier}x</Tag>
+        <h3 className="mt-1 mb-1 text-base">{label}</h3>
+        <p className="text-sm text-vega-clight-100 dark:text-vega-cdark-100">
+          {t('Stake a minimum of {{minimumStakedTokens}} $VEGA tokens', {
+            minimumStakedTokens,
+          })}
+        </p>
      </div>
    </div>
  );
@@ -126,29 +91,21 @@ export const TiersContainer = () => {

  if ((!loading && !details) || error) {
    return (
-      <div className="bg-vega-clight-800 dark:bg-vega-cdark-800 text-black dark:text-white rounded-lg p-6 mt-1 mb-20 text-sm text-center">
+      <div className="text-base px-5 py-10 text-center">
        <Trans
          defaults="There are currently no active referral programs. Check the <0>Governance App</0> to see if there are any proposals in progress and vote."
          components={[
-            <ExternalLink
-              href={governanceLink(TOKEN_PROPOSALS)}
-              key="link"
-              className="underline"
-            >
+            <ExternalLink href={governanceLink(TOKEN_PROPOSALS)} key="link">
              {t('Governance App')}
            </ExternalLink>,
          ]}
          ns={ns}
-        />{' '}
+        />
        <Trans
-          defaults="Use the <0>docs</0> tutorial to propose a new program."
+          defaults="You can propose a new program via the <0>Docs</0>."
          components={[
-            <ExternalLink
-              href={DocsLinks?.REFERRALS}
-              key="link"
-              className="underline"
-            >
-              {t('docs')}
+            <ExternalLink href={DocsLinks?.REFERRALS} key="link">
+              {t('Docs')}
            </ExternalLink>,
          ]}
          ns={ns}
@@ -159,93 +116,47 @@ export const TiersContainer = () => {

  return (
    <>
-      <h2 className="text-3xl mt-10">{t('Current program details')}</h2>
-      {details?.id && (
-        <p>
-          <Trans
-            defaults="As a result of governance proposal <0>{{proposal}}</0> the program below is currently active on the Vega network."
-            values={{ proposal: truncateMiddle(details.id) }}
-            components={[
-              <ExternalLink
-                key="referral-program-proposal-link"
-                href={governanceLink(TOKEN_PROPOSAL.replace(':id', details.id))}
-                className="underline"
-              >
-                proposal
-              </ExternalLink>,
-            ]}
-          />
-        </p>
-      )}
-
-      {/* Meta */}
-      <div className="mt-10 flex flex-row items-baseline justify-between text-xs text-vega-clight-100 dark:text-vega-cdark-100 font-alpha calt">
-        {details?.id && (
-          <span>
-            {t('Proposal ID:')}{' '}
-            <ExternalLink
-              href={governanceLink(TOKEN_PROPOSAL.replace(':id', details.id))}
-            >
-              <span>{truncateMiddle(details.id)}</span>
-            </ExternalLink>
-          </span>
-        )}
+      {/* Benefit tiers */}
+      <div className="flex flex-col items-baseline justify-between mt-10 mb-5">
+        <h2 className="text-2xl">{t('Referral tiers')}</h2>
        {ends && (
-          <span>
+          <span className="text-sm text-vega-clight-200 dark:text-vega-cdark-200">
            {t('Program ends:')} {ends}
          </span>
        )}
      </div>
+      <div className="mb-20">
+        {loading || !benefitTiers || benefitTiers.length === 0 ? (
+          <Loading variant="large" />
+        ) : (
+          <TiersTable
+            windowLength={details?.windowLength}
+            data={benefitTiers.map((bt) => ({
+              ...bt,
+              tierElement: (
+                <div className="rounded-full bg-vega-clight-900 dark:bg-vega-cdark-900 p-1 w-8 h-8 text-center">
+                  {bt.tier}
+                </div>
+              ),
+            }))}
+          />
+        )}
+      </div>

-      {/* Container */}
-      <div className="bg-vega-clight-800 dark:bg-vega-cdark-800 text-black dark:text-white rounded-lg p-6 mt-1 mb-20">
-        {/* Benefit tiers */}
-        <div className="flex flex-col mb-5">
-          <h3 className="text-2xl calt">{t('Benefit tiers')}</h3>
-          <p className="text-sm text-vega-clight-200 dark:text-vega-cdark-200">
-            {t(
-              'Members of a referral group can access the increasing commission and discount benefits defined in the program based on their combined running volume.'
-            )}
-          </p>
-        </div>
-        <div className="mb-10">
-          {loading || !benefitTiers || benefitTiers.length === 0 ? (
+      {/* Staking tiers */}
+      <div className="flex flex-row items-baseline justify-between mb-5">
+        <h2 className="text-2xl">{t('Staking multipliers')}</h2>
+      </div>
+      <div className="mb-20 flex flex-col justify-items-stretch lg:flex-row gap-5">
+        {loading || !stakingTiers || stakingTiers.length === 0 ? (
+          <>
            <Loading variant="large" />
-          ) : (
-            <TiersTable
-              windowLength={details?.windowLength}
-              data={benefitTiers.map((bt) => ({
-                ...bt,
-                tierElement: (
-                  <div className="rounded-full bg-vega-clight-900 dark:bg-vega-cdark-900 p-1 w-8 h-8 text-center">
-                    {bt.tier}
-                  </div>
-                ),
-              }))}
-            />
-          )}
-        </div>
-
-        {/* Staking tiers */}
-        <div className="flex flex-col mb-5">
-          <h3 className="text-2xl calt">{t('Staking multipliers')}</h3>
-          <p className="text-sm text-vega-clight-200 dark:text-vega-cdark-200">
-            {t(
-              'Referrers can access the commission multipliers defined in the program by staking VEGA tokens in the amounts shown.'
-            )}
-          </p>
-        </div>
-        <div className="gap-5 grid lg:grid-cols-3">
-          {loading || !stakingTiers || stakingTiers.length === 0 ? (
-            <>
-              <Loading variant="large" />
-              <Loading variant="large" />
-              <Loading variant="large" />
-            </>
-          ) : (
-            <StakingTiers data={stakingTiers} />
-          )}
-        </div>
+            <Loading variant="large" />
+            <Loading variant="large" />
+          </>
+        ) : (
+          <StakingTiers data={stakingTiers} />
+        )}
      </div>
    </>
  );
@@ -257,14 +168,17 @@ const StakingTiers = ({
  data: ReturnType<typeof useReferralProgram>['stakingTiers'];
 }) => (
  <>
-    {data.map(({ tier, referralRewardMultiplier, minimumStakedTokens }, i) => (
-      <StakingTier
-        key={i}
-        tier={tier}
-        referralRewardMultiplier={referralRewardMultiplier}
-        minimumStakedTokens={minimumStakedTokens}
-      />
-    ))}
+    {data.map(
+      ({ tier, label, referralRewardMultiplier, minimumStakedTokens }, i) => (
+        <StakingTier
+          key={i}
+          tier={tier}
+          label={label}
+          referralRewardMultiplier={referralRewardMultiplier}
+          minimumStakedTokens={minimumStakedTokens}
+        />
+      )
+    )}
  </>
 );

@@ -289,17 +203,9 @@ const TiersTable = ({
        {
          name: 'commission',
          displayName: t('Referrer commission'),
-          tooltip: t(
-            "The proportion of the referee's taker fees to be rewarded to the referrer"
-          ),
-        },
-        {
-          name: 'discount',
-          displayName: t('Referee trading discount'),
-          tooltip: t(
-            "The proportion of the referee's taker fees to be discounted"
-          ),
+          tooltip: t('A percentage of commission earned by the referrer'),
        },
+        { name: 'discount', displayName: t('Referrer trading discount') },
        {
          name: 'volume',
          displayName: t(
@@ -309,34 +215,20 @@ const TiersTable = ({
              count: windowLength,
            }
          ),
-          tooltip: t('The minimum running notional for the given benefit tier'),
-        },
-        {
-          name: 'epochs',
-          displayName: t('Min. epochs'),
-          tooltip: t(
-            'The minimum number of epochs the party needs to be in the referral set to be eligible for the benefit'
-          ),
        },
+        { name: 'epochs', displayName: t('Min. epochs') },
      ]}
-      className="bg-white dark:bg-vega-cdark-900"
      data={data.map((d) => ({
        ...d,
        className: classNames({
-          'from-vega-yellow-400 dark:from-vega-yellow-600 to-20%  bg-highlight':
-            'yellow' === getTierColor(d.tier),
-          'from-vega-green-400 dark:from-vega-green-600 to-20%  bg-highlight':
-            'green' === getTierColor(d.tier),
-          'from-vega-blue-400 dark:from-vega-blue-600 to-20%  bg-highlight':
-            'blue' === getTierColor(d.tier),
-          'from-vega-purple-400 dark:from-vega-purple-600 to-20%  bg-highlight':
-            'purple' === getTierColor(d.tier),
          'from-vega-pink-400 dark:from-vega-pink-600 to-20%  bg-highlight':
-            'pink' === getTierColor(d.tier),
+            d.tier >= 3,
+          'from-vega-purple-400 dark:from-vega-purple-600 to-20%  bg-highlight':
+            d.tier === 2,
+          'from-vega-blue-400 dark:from-vega-blue-600 to-20%  bg-highlight':
+            d.tier === 1,
          'from-vega-orange-400 dark:from-vega-orange-600 to-20%  bg-highlight':
-            'orange' === getTierColor(d.tier),
-          'from-vega-clight-200 dark:from-vega-cdark-200 to-20%  bg-highlight':
-            'none' === getTierColor(d.tier),
+            d.tier == 0,
        }),
      }))}
    />
@@ -34,17 +34,8 @@ type StatTileProps = {
  title: string;
  description?: ReactNode;
  children?: ReactNode;
-  overrideWithNoProgram?: boolean;
 };
-export const StatTile = ({
-  title,
-  description,
-  children,
-  overrideWithNoProgram = false,
-}: StatTileProps) => {
-  if (overrideWithNoProgram) {
-    return <NoProgramTile title={title} />;
-  }
+export const StatTile = ({ title, description, children }: StatTileProps) => {
  return (
    <Tile>
      <h3 className="mb-1 text-sm text-vega-clight-100 dark:text-vega-cdark-100 calt">
@@ -60,20 +51,6 @@ export const StatTile = ({
  );
 };

-export const NoProgramTile = ({ title }: Pick<StatTileProps, 'title'>) => {
-  const t = useT();
-  return (
-    <Tile title={title}>
-      <h3 className="mb-1 text-sm text-vega-clight-100 dark:text-vega-cdark-100 calt">
-        {title}
-      </h3>
-      <div className="text-xs text-vega-clight-300 dark:text-vega-cdark-300 leading-[3rem]">
-        {t('No active program')}
-      </div>
-    </Tile>
-  );
-};
-
 const FADE_OUT_STYLE = classNames(
  'after:w-5 after:h-full after:absolute after:top-0 after:right-0',
  'after:bg-gradient-to-l after:from-vega-clight-800 after:dark:from-vega-cdark-800 after:to-transparent'
@@ -1,9 +1,8 @@
-import { useEffect } from 'react';
-import { titlefy } from '@vegaprotocol/utils';
 import { useT } from '../../lib/use-t';
 import { RewardsContainer } from '../../components/rewards-container';
 import { usePageTitleStore } from '../../stores';
-import { ErrorBoundary } from '../../components/error-boundary';
+import { titlefy } from '@vegaprotocol/utils';
+import { useEffect } from 'react';

 export const Rewards = () => {
  const t = useT();
@@ -15,11 +14,9 @@ export const Rewards = () => {
    updateTitle(titlefy([title]));
  }, [updateTitle, title]);
  return (
-    <ErrorBoundary feature="rewards">
-      <div className="container mx-auto p-4">
-        <h1 className="px-4 pb-4 text-2xl">{title}</h1>
-        <RewardsContainer />
-      </div>
-    </ErrorBoundary>
+    <div className="container mx-auto p-4">
+      <h1 className="px-4 pb-4 text-2xl">{title}</h1>
+      <RewardsContainer />
+    </div>
  );
 };
@@ -1,79 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import { ErrorBoundary } from './error-boundary';
-import { localLoggerFactory } from '@vegaprotocol/logger';
-
-jest.mock('@vegaprotocol/logger', () => ({
-  localLoggerFactory: jest.fn(),
-}));
-
-describe('ErrorBoundary', () => {
-  const mockLogError = jest.fn();
-  const originalConsoleError = console.error;
-  const mockLoggerFactory = localLoggerFactory as jest.Mock;
-
-  beforeAll(() => {
-    console.error = () => {};
-  });
-
-  afterAll(() => {
-    console.error = originalConsoleError;
-  });
-
-  beforeEach(() => {
-    mockLoggerFactory.mockImplementation(() => ({
-      error: mockLogError,
-    }));
-  });
-
-  afterEach(() => {
-    mockLogError.mockClear();
-  });
-
-  it('renders children', () => {
-    render(
-      <ErrorBoundary feature="feature">
-        <div data-testid="child" />
-      </ErrorBoundary>
-    );
-
-    expect(screen.getByTestId('child')).toBeInTheDocument();
-  });
-
-  it('renders fallback ui and logs an error', () => {
-    const error = new Error('bork!');
-    const BorkedComponent = () => {
-      throw error;
-    };
-
-    render(
-      <ErrorBoundary feature="test-feature">
-        <BorkedComponent />
-      </ErrorBoundary>
-    );
-
-    expect(screen.getByText('Something went wrong')).toBeInTheDocument();
-    expect(mockLogError).toHaveBeenCalledTimes(1);
-    expect(mockLogError).toHaveBeenCalledWith(
-      error.message,
-      expect.stringContaining('componentStack')
-    );
-  });
-
-  it('renders fallback render prop if error', () => {
-    const error = new Error('bork!');
-    const BorkedComponent = () => {
-      throw error;
-    };
-
-    render(
-      <ErrorBoundary
-        feature="test-feature"
-        fallback={<div data-testid="custom-ui" />}
-      >
-        <BorkedComponent />
-      </ErrorBoundary>
-    );
-
-    expect(screen.getByTestId('custom-ui')).toBeInTheDocument();
-  });
-});
@@ -1,53 +0,0 @@
-import { localLoggerFactory, type LocalLogger } from '@vegaprotocol/logger';
-import { Component, type ErrorInfo, type ReactNode } from 'react';
-import { useT } from '../../lib/use-t';
-
-interface ErrorBoundaryProps {
-  children: ReactNode;
-  feature: string;
-  fallback?: ReactNode;
-}
-
-interface ErrorBoundaryState {
-  hasError: boolean;
-}
-
-export class ErrorBoundary extends Component<
-  ErrorBoundaryProps,
-  ErrorBoundaryState
-> {
-  logger: LocalLogger | null = null;
-
-  constructor(props: ErrorBoundaryProps) {
-    super(props);
-
-    this.logger = localLoggerFactory({ application: props.feature });
-
-    this.state = {
-      hasError: false,
-    };
-  }
-
-  static getDerivedStateFromError() {
-    return { hasError: true };
-  }
-
-  componentDidCatch(error: Error, info: ErrorInfo) {
-    if (this.logger) {
-      this.logger.error(error.message, JSON.stringify(info));
-    }
-  }
-
-  render() {
-    if (this.state.hasError) {
-      return this.props.fallback || <DefaultFallback />;
-    }
-
-    return this.props.children;
-  }
-}
-
-const DefaultFallback = () => {
-  const t = useT();
-  return <p className="text-xs">{t('Something went wrong')}</p>;
-};
@@ -1 +0,0 @@
-export { ErrorBoundary } from './error-boundary';
@@ -310,25 +310,16 @@ export const CurrentVolume = ({
  const t = useT();
  const nextTier = tiers[tierIndex + 1];
  const requiredForNextTier = nextTier
-    ? new BigNumber(nextTier.minimumRunningNotionalTakerVolume).minus(
-        windowLengthVolume
-      )
-    : new BigNumber(0);
-  const currentVolume = new BigNumber(windowLengthVolume);
+    ? Number(nextTier.minimumRunningNotionalTakerVolume) - windowLengthVolume
+    : 0;

  return (
    <div className="flex flex-col gap-3 pt-4">
      <CardStat
-        value={
-          currentVolume.isZero()
-            ? `<${formatNumberRounded(requiredForNextTier)}`
-            : formatNumberRounded(currentVolume)
-        }
-        text={t('pastEpochs', 'Past {{count}} epochs', {
-          count: windowLength,
-        })}
+        value={formatNumberRounded(new BigNumber(windowLengthVolume))}
+        text={t('pastEpochs', 'Past {{count}} epochs', { count: windowLength })}
      />
-      {requiredForNextTier.isGreaterThan(0) && (
+      {requiredForNextTier > 0 && (
        <CardStat
          value={formatNumber(requiredForNextTier)}
          text={t('Required for next tier')}
@@ -40,9 +40,6 @@ const DateRange = {
  RANGE_ALL: 'All',
 };

-const priceFormat = (fundingRate: number) =>
-  `${(fundingRate * 100).toFixed(4)}%`;
-
 export const FundingContainer = ({ marketId }: { marketId: string }) => {
  const t = useT();
  const { theme } = useThemeSwitcher();
@@ -85,7 +82,7 @@ export const FundingContainer = ({ marketId }: { marketId: string }) => {
    <LineChart
      data={values}
      theme={theme}
-      priceFormat={priceFormat}
+      priceFormat={(fundingRate) => `${(fundingRate * 100).toFixed(4)}%`}
      yAxisTickFormat="%"
    />
  );
@@ -1,5 +1,4 @@
 import groupBy from 'lodash/groupBy';
-import uniq from 'lodash/uniq';
 import type { Account } from '@vegaprotocol/accounts';
 import { useAccounts } from '@vegaprotocol/accounts';
 import {
@@ -32,12 +31,6 @@ import { ViewType, useSidebar } from '../sidebar';
 import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';
 import { RewardsHistoryContainer } from './rewards-history';
 import { useT } from '../../lib/use-t';
-import { useAssetsMapProvider } from '@vegaprotocol/assets';
-
-const ASSETS_WITH_INCORRECT_VESTING_REWARD_DATA = [
-  'bf1e88d19db4b3ca0d1d5bdb73718a01686b18cf731ca26adedf3c8b83802bba', // USDT mainnet
-  '8ba0b10971f0c4747746cd01ff05a53ae75ca91eba1d4d050b527910c983e27e', // USDT testnet
-];

 export const RewardsContainer = () => {
  const t = useT();
@@ -47,67 +40,34 @@ export const RewardsContainer = () => {
    NetworkParams.rewards_activityStreak_benefitTiers,
    NetworkParams.rewards_vesting_baseRate,
  ]);
-
  const { data: accounts, loading: accountsLoading } = useAccounts(pubKey);

-  const { data: assetMap } = useAssetsMapProvider();
-
  const { data: epochData } = useRewardsEpochQuery();

  // No need to specify the fromEpoch as it will by default give you the last
-  // Note activityStreak in query will fail
  const { data: rewardsData, loading: rewardsLoading } = useRewardsPageQuery({
    variables: {
      partyId: pubKey || '',
    },
-    // Inclusion of activity streak in query currently fails
-    errorPolicy: 'ignore',
  });

-  if (!epochData?.epoch || !assetMap) return null;
+  if (!epochData?.epoch) return null;

  const loading = paramsLoading || accountsLoading || rewardsLoading;

  const rewardAccounts = accounts
-    ? accounts
-        .filter((a) =>
-          [
-            AccountType.ACCOUNT_TYPE_VESTED_REWARDS,
-            AccountType.ACCOUNT_TYPE_VESTING_REWARDS,
-          ].includes(a.type)
-        )
-        .filter((a) => new BigNumber(a.balance).isGreaterThan(0))
-    : [];
-
-  const rewardAccountsAssetMap = groupBy(rewardAccounts, 'asset.id');
-
-  const lockedBalances = rewardsData?.party?.vestingBalancesSummary
-    .lockedBalances
-    ? rewardsData.party.vestingBalancesSummary.lockedBalances.filter((b) =>
-        new BigNumber(b.balance).isGreaterThan(0)
+    ? accounts.filter((a) =>
+        [
+          AccountType.ACCOUNT_TYPE_VESTED_REWARDS,
+          AccountType.ACCOUNT_TYPE_VESTING_REWARDS,
+        ].includes(a.type)
      )
    : [];
-  const lockedAssetMap = groupBy(lockedBalances, 'asset.id');

-  const vestingBalances = rewardsData?.party?.vestingBalancesSummary
-    .vestingBalances
-    ? rewardsData.party.vestingBalancesSummary.vestingBalances.filter((b) =>
-        new BigNumber(b.balance).isGreaterThan(0)
-      )
-    : [];
-  const vestingAssetMap = groupBy(vestingBalances, 'asset.id');
-
-  // each asset reward pot is made up of:
-  // available to withdraw - ACCOUNT_TYPE_VESTED_REWARDS
-  // vesting               - vestingBalancesSummary.vestingBalances
-  // locked                - vestingBalancesSummary.lockedBalances
-  //
-  // there can be entires for the same asset in each list so we need a uniq list of assets
-  const assets = uniq([
-    ...Object.keys(rewardAccountsAssetMap),
-    ...Object.keys(lockedAssetMap),
-    ...Object.keys(vestingAssetMap),
-  ]);
+  const rewardAssetsMap = groupBy(
+    rewardAccounts.filter((a) => a.asset.id !== params.reward_asset),
+    'asset.id'
+  );

  return (
    <div className="grid auto-rows-min grid-cols-6 gap-3">
@@ -157,72 +117,28 @@ export const RewardsContainer = () => {
      </Card>

      {/* Show all other reward pots, most of the time users will not have other rewards */}
-      {assets
-        .filter((assetId) => assetId !== params.reward_asset)
-        .map((assetId) => {
-          const asset = assetMap ? assetMap[assetId] : null;
-
-          if (!asset) return null;
-
-          // Following code is for mitigating an issue due to a core bug where locked and vesting
-          // balances were incorrectly increased for infrastructure rewards for USDT on mainnet
-          //
-          // We don't want to incorrectly show the wring locked/vesting values, but we DO want to
-          // show the user that they have rewards available to withdraw
-          if (ASSETS_WITH_INCORRECT_VESTING_REWARD_DATA.includes(asset.id)) {
-            const accountsForAsset = rewardAccountsAssetMap[asset.id];
-            const vestedAccount = accountsForAsset?.find(
-              (a) => a.type === AccountType.ACCOUNT_TYPE_VESTED_REWARDS
-            );
-
-            // No vested rewards available to withdraw, so skip over USDT
-            if (!vestedAccount || Number(vestedAccount.balance) <= 0) {
-              return null;
-            }
-
-            return (
-              <Card
-                key={assetId}
-                title={t('{{assetSymbol}} Reward pot', {
-                  assetSymbol: asset.symbol,
-                })}
-                className="lg:col-span-3 xl:col-span-2"
-                loading={loading}
-              >
-                <RewardPot
-                  pubKey={pubKey}
-                  accounts={accounts}
-                  assetId={assetId}
-                  // Ensure that these values are shown as 0
-                  vestingBalancesSummary={{
-                    lockedBalances: [],
-                    vestingBalances: [],
-                  }}
-                />
-              </Card>
-            );
-          }
-
-          return (
-            <Card
-              key={assetId}
-              title={t('{{assetSymbol}} Reward pot', {
-                assetSymbol: asset.symbol,
-              })}
-              className="lg:col-span-3 xl:col-span-2"
-              loading={loading}
-            >
-              <RewardPot
-                pubKey={pubKey}
-                accounts={accounts}
-                assetId={assetId}
-                vestingBalancesSummary={
-                  rewardsData?.party?.vestingBalancesSummary
-                }
-              />
-            </Card>
-          );
-        })}
+      {Object.keys(rewardAssetsMap).map((assetId) => {
+        const asset = rewardAssetsMap[assetId][0].asset;
+        return (
+          <Card
+            key={assetId}
+            title={t('{{assetSymbol}} Reward pot', {
+              assetSymbol: asset.symbol,
+            })}
+            className="lg:col-span-3 xl:col-span-2"
+            loading={loading}
+          >
+            <RewardPot
+              pubKey={pubKey}
+              accounts={accounts}
+              assetId={assetId}
+              vestingBalancesSummary={
+                rewardsData?.party?.vestingBalancesSummary
+              }
+            />
+          </Card>
+        );
+      })}
      <Card
        title={t('Rewards history')}
        className="lg:col-span-full"
@@ -231,7 +147,6 @@ export const RewardsContainer = () => {
        <RewardsHistoryContainer
          epoch={Number(epochData?.epoch.id)}
          pubKey={pubKey}
-          assets={assetMap}
        />
      </Card>
    </div>
@@ -398,14 +313,14 @@ export const RewardPot = ({
 export const Vesting = ({
  pubKey,
  baseRate,
-  multiplier,
+  multiplier = '1',
 }: {
  pubKey: string | null;
  baseRate: string;
  multiplier?: string;
 }) => {
  const t = useT();
-  const rate = new BigNumber(baseRate).times(multiplier || 1);
+  const rate = new BigNumber(baseRate).times(multiplier);
  const rateFormatted = formatPercentage(Number(rate));
  const baseRateFormatted = formatPercentage(Number(baseRate));

@@ -420,7 +335,7 @@ export const Vesting = ({
        {pubKey && (
          <tr>
            <CardTableTH>{t('Vesting multiplier')}</CardTableTH>
-            <CardTableTD>{multiplier ? `${multiplier}x` : '-'}</CardTableTD>
+            <CardTableTD>{multiplier}x</CardTableTD>
          </tr>
        )}
      </CardTable>
@@ -430,16 +345,16 @@ export const Vesting = ({

 export const Multipliers = ({
  pubKey,
-  streakMultiplier,
-  hoarderMultiplier,
+  streakMultiplier = '1',
+  hoarderMultiplier = '1',
 }: {
  pubKey: string | null;
  streakMultiplier?: string;
  hoarderMultiplier?: string;
 }) => {
  const t = useT();
-  const combinedMultiplier = new BigNumber(streakMultiplier || 1).times(
-    hoarderMultiplier || 1
+  const combinedMultiplier = new BigNumber(streakMultiplier).times(
+    hoarderMultiplier
  );

  if (!pubKey) {
@@ -460,15 +375,11 @@ export const Multipliers = ({
      <CardTable>
        <tr>
          <CardTableTH>{t('Streak reward multiplier')}</CardTableTH>
-          <CardTableTD>
-            {streakMultiplier ? `${streakMultiplier}x` : '-'}
-          </CardTableTD>
+          <CardTableTD>{streakMultiplier}x</CardTableTD>
        </tr>
        <tr>
          <CardTableTH>{t('Hoarder reward multiplier')}</CardTableTH>
-          <CardTableTD>
-            {hoarderMultiplier ? `${hoarderMultiplier}x` : '-'}
-          </CardTableTD>
+          <CardTableTD>{hoarderMultiplier}x</CardTableTD>
        </tr>
      </CardTable>
    </div>
@@ -61,14 +61,6 @@ const rewardSummaries = [
      rewardType: AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS,
    },
  },
-  {
-    node: {
-      epoch: 7,
-      assetId: assets.asset2.id,
-      amount: '300',
-      rewardType: AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
-    },
-  },
 ];

 const getCell = (cells: HTMLElement[], colId: string) => {
@@ -77,7 +69,7 @@ const getCell = (cells: HTMLElement[], colId: string) => {
  );
 };

-describe('RewardsHistoryTable', () => {
+describe('RewarsHistoryTable', () => {
  const props = {
    epochRewardSummaries: {
      edges: rewardSummaries,
@@ -96,7 +88,7 @@ describe('RewardsHistoryTable', () => {
    loading: false,
  };

-  it('renders table with accounts summed up by asset', () => {
+  it('Renders table with accounts summed up by asset', () => {
    render(<RewardHistoryTable {...props} />);

    const container = within(
@@ -118,27 +110,17 @@ describe('RewardsHistoryTable', () => {
      assets.asset2.name
    );

-    // First row
    const marketCreationCell = getCell(cells, 'marketCreation');
    expect(
      marketCreationCell.getByTestId('stack-cell-primary')
    ).toHaveTextContent('300');
    expect(
      marketCreationCell.getByTestId('stack-cell-secondary')
-    ).toHaveTextContent('50.00%');
-
-    const infrastructureFeesCell = getCell(cells, 'infrastructureFees');
-    expect(
-      infrastructureFeesCell.getByTestId('stack-cell-primary')
-    ).toHaveTextContent('300');
-    expect(
-      infrastructureFeesCell.getByTestId('stack-cell-secondary')
-    ).toHaveTextContent('50.00%');
+    ).toHaveTextContent('100.00%');

    let totalCell = getCell(cells, 'total');
-    expect(totalCell.getByText('600.00')).toBeInTheDocument();
+    expect(totalCell.getByText('300.00')).toBeInTheDocument();

-    // Second row
    row = within(rows[1]);
    cells = row.getAllByRole('gridcell');

@@ -2,7 +2,10 @@ import debounce from 'lodash/debounce';
 import { useMemo, useState } from 'react';
 import BigNumber from 'bignumber.js';
 import type { ColDef, ValueFormatterFunc } from 'ag-grid-community';
-import { type AssetFieldsFragment } from '@vegaprotocol/assets';
+import {
+  useAssetsMapProvider,
+  type AssetFieldsFragment,
+} from '@vegaprotocol/assets';
 import {
  addDecimalsFormatNumberQuantum,
  formatNumberPercentage,
@@ -23,17 +26,17 @@ import { useT } from '../../lib/use-t';
 export const RewardsHistoryContainer = ({
  epoch,
  pubKey,
-  assets,
 }: {
  pubKey: string | null;
  epoch: number;
-  assets: Record<string, AssetFieldsFragment>;
 }) => {
  const [epochVariables, setEpochVariables] = useState(() => ({
    from: epoch - 1,
    to: epoch,
  }));

+  const { data: assets } = useAssetsMapProvider();
+
  // No need to specify the fromEpoch as it will by default give you the last
  const { refetch, data, loading } = useRewardsHistoryQuery({
    variables: {
@@ -151,12 +154,10 @@ export const RewardHistoryTable = ({
    const rewardValueFormatter: ValueFormatterFunc<RewardRow> = ({
      data,
      value,
-      ...rest
    }) => {
      if (!value || !data) {
        return '-';
      }
-
      return addDecimalsFormatNumberQuantum(
        value,
        data.asset.decimals,
@@ -196,11 +197,6 @@ export const RewardHistoryTable = ({
        },
        sort: 'desc',
      },
-      {
-        field: 'infrastructureFees',
-        valueFormatter: rewardValueFormatter,
-        cellRenderer: rewardCellRenderer,
-      },
      {
        field: 'staking',
        valueFormatter: rewardValueFormatter,
@@ -1,159 +0,0 @@
-import { type AssetFieldsFragment } from '@vegaprotocol/assets';
-import { getRewards } from './use-reward-row-data';
-import * as Schema from '@vegaprotocol/types';
-
-const asset1 = {
-  id: 'asset1',
-  name: 'USD (KRW)',
-  symbol: 'USD-KRW',
-  decimals: 6,
-  quantum: '1000000',
-  status: Schema.AssetStatus.STATUS_ENABLED,
-  // @ts-ignore not needed
-  source: {},
-} as AssetFieldsFragment;
-
-const asset2 = {
-  id: 'asset2',
-  name: 'tDAI TEST',
-  symbol: 'tDAI',
-  decimals: 5,
-  quantum: '1',
-  status: Schema.AssetStatus.STATUS_ENABLED,
-  // @ts-ignore not needed
-  source: {},
-} as AssetFieldsFragment;
-
-const asset3 = {
-  id: 'asset3',
-  name: 'Tether USD',
-  symbol: 'USDT',
-  decimals: 6,
-  quantum: '1000000',
-  status: Schema.AssetStatus.STATUS_ENABLED,
-  // @ts-ignore not needed
-  source: {},
-} as AssetFieldsFragment;
-
-const asset4 = {
-  id: 'asset4',
-  name: 'USDT-T',
-  symbol: 'USDT-T',
-  decimals: 18,
-  quantum: '1',
-  status: Schema.AssetStatus.STATUS_ENABLED,
-  // @ts-ignore not needed
-  source: {},
-} as AssetFieldsFragment;
-
-const assets: Record<string, AssetFieldsFragment> = {
-  asset1,
-  asset2,
-  asset3,
-  asset4,
-};
-
-const testData = {
-  rewards: [
-    {
-      rewardType: Schema.AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
-      assetId: 'asset1',
-      amount: '31897424',
-    },
-    {
-      rewardType: Schema.AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
-      assetId: 'asset2',
-      amount: '57',
-    },
-    {
-      rewardType: Schema.AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
-      assetId: 'asset3',
-      amount: '5501',
-    },
-    {
-      rewardType: Schema.AccountType.ACCOUNT_TYPE_REWARD_AVERAGE_POSITION,
-      assetId: 'asset3',
-      amount: '5501',
-    },
-    {
-      rewardType: Schema.AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES,
-      assetId: 'asset4',
-      amount: '5501',
-    },
-    {
-      rewardType: Schema.AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
-      assetId: 'asset4',
-      amount: '456',
-    },
-    {
-      rewardType: Schema.AccountType.ACCOUNT_TYPE_REWARD_VALIDATOR_RANKING,
-      assetId: 'asset4',
-      amount: '4565',
-    },
-  ],
-  assets,
-};
-
-describe('getRewards', () => {
-  it('should return the correct rewards when infra fees are included', () => {
-    const rewards = getRewards(testData.rewards, testData.assets);
-    expect(rewards).toEqual([
-      {
-        asset: asset1,
-        infrastructureFees: 31897424,
-        staking: 0,
-        priceTaking: 0,
-        priceMaking: 0,
-        liquidityProvision: 0,
-        marketCreation: 0,
-        averagePosition: 0,
-        relativeReturns: 0,
-        returnsVolatility: 0,
-        validatorRanking: 0,
-        total: 31897424,
-      },
-      {
-        asset: asset2,
-        infrastructureFees: 57,
-        staking: 0,
-        priceTaking: 0,
-        priceMaking: 0,
-        liquidityProvision: 0,
-        marketCreation: 0,
-        averagePosition: 0,
-        relativeReturns: 0,
-        returnsVolatility: 0,
-        validatorRanking: 0,
-        total: 57,
-      },
-      {
-        asset: asset3,
-        infrastructureFees: 5501,
-        staking: 0,
-        priceTaking: 0,
-        priceMaking: 0,
-        liquidityProvision: 0,
-        marketCreation: 0,
-        averagePosition: 5501,
-        relativeReturns: 0,
-        returnsVolatility: 0,
-        validatorRanking: 0,
-        total: 11002,
-      },
-      {
-        asset: asset4,
-        infrastructureFees: 0,
-        staking: 0,
-        priceTaking: 0,
-        priceMaking: 5501,
-        liquidityProvision: 456,
-        marketCreation: 0,
-        averagePosition: 0,
-        relativeReturns: 0,
-        returnsVolatility: 0,
-        validatorRanking: 4565,
-        total: 10522,
-      },
-    ]);
-  });
-});
@@ -16,10 +16,9 @@ const REWARD_ACCOUNT_TYPES = [
  AccountType.ACCOUNT_TYPE_REWARD_RELATIVE_RETURN,
  AccountType.ACCOUNT_TYPE_REWARD_RETURN_VOLATILITY,
  AccountType.ACCOUNT_TYPE_REWARD_VALIDATOR_RANKING,
-  AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
 ];

-export const getRewards = (
+const getRewards = (
  rewards: Array<{
    rewardType: AccountType;
    assetId: string;
@@ -57,9 +56,6 @@ export const getRewards = (

    return {
      asset,
-      infrastructureFees: totals.get(
-        AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE
-      ),
      staking: totals.get(AccountType.ACCOUNT_TYPE_GLOBAL_REWARD),
      priceTaking: totals.get(AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES),
      priceMaking: totals.get(
@@ -105,8 +101,7 @@ export const useRewardsRowData = ({
      assetId: r.asset.id,
      amount: r.amount,
    }));
-    const result = getRewards(rewards, assets);
-    return result;
+    return getRewards(rewards, assets);
  }

  const rewards = removePaginationWrapper(epochRewardSummaries?.edges);
@@ -16,7 +16,6 @@ import { GetStarted } from '../welcome-dialog';
 import { useVegaWallet, useViewAsDialog } from '@vegaprotocol/wallet';
 import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';
 import { useT } from '../../lib/use-t';
-import { ErrorBoundary } from '../error-boundary';

 export enum ViewType {
  Order = 'Order',
@@ -164,14 +163,12 @@ export const SidebarContent = () => {
    if (params.marketId) {
      return (
        <ContentWrapper>
-          <ErrorBoundary feature="deal-ticket">
-            <DealTicketContainer
-              marketId={params.marketId}
-              onDeposit={(assetId) =>
-                setViews({ type: ViewType.Deposit, assetId }, currentRouteId)
-              }
-            />
-          </ErrorBoundary>
+          <DealTicketContainer
+            marketId={params.marketId}
+            onDeposit={(assetId) =>
+              setViews({ type: ViewType.Deposit, assetId }, currentRouteId)
+            }
+          />
          <GetStarted />
        </ContentWrapper>
      );
@@ -184,9 +181,7 @@ export const SidebarContent = () => {
    if (params.marketId) {
      return (
        <ContentWrapper>
-          <ErrorBoundary feature="market-info">
-            <MarketInfoAccordionContainer marketId={params.marketId} />
-          </ErrorBoundary>
+          <MarketInfoAccordionContainer marketId={params.marketId} />
        </ContentWrapper>
      );
    } else {
@@ -197,9 +192,7 @@ export const SidebarContent = () => {
  if (view.type === ViewType.Deposit) {
    return (
      <ContentWrapper title={t('Deposit')}>
-        <ErrorBoundary feature="deposit">
-          <DepositContainer assetId={view.assetId} />
-        </ErrorBoundary>
+        <DepositContainer assetId={view.assetId} />
      </ContentWrapper>
    );
  }
@@ -207,9 +200,7 @@ export const SidebarContent = () => {
  if (view.type === ViewType.Withdraw) {
    return (
      <ContentWrapper title={t('Withdraw')}>
-        <ErrorBoundary feature="withdraw">
-          <WithdrawContainer assetId={view.assetId} />
-        </ErrorBoundary>
+        <WithdrawContainer assetId={view.assetId} />
      </ContentWrapper>
    );
  }
@@ -217,9 +208,7 @@ export const SidebarContent = () => {
  if (view.type === ViewType.Transfer) {
    return (
      <ContentWrapper title={t('Transfer')}>
-        <ErrorBoundary feature="transfer">
-          <TransferContainer assetId={view.assetId} />
-        </ErrorBoundary>
+        <TransferContainer assetId={view.assetId} />
      </ContentWrapper>
    );
  }
@@ -227,9 +216,7 @@ export const SidebarContent = () => {
  if (view.type === ViewType.Settings) {
    return (
      <ContentWrapper title={t('Settings')}>
-        <ErrorBoundary feature="settings">
-          <Settings />
-        </ErrorBoundary>
+        <Settings />
      </ContentWrapper>
    );
  }
@@ -10,7 +10,6 @@ import { positionsDataProvider } from '@vegaprotocol/positions';
 import { useGlobalStore } from '../../stores';

 const ONBOARDING_STORAGE_KEY = 'vega_onboarding';
-
 export const useOnboardingStore = create<{
  dialogOpen: boolean;
  walletDialogOpen: boolean;
@@ -21,7 +20,7 @@ export const useOnboardingStore = create<{
 }>()(
  persist(
    (set) => ({
-      dialogOpen: false,
+      dialogOpen: true,
      walletDialogOpen: false,
      dismissed: false,
      dismiss: () => set({ dismissed: true }),
@@ -1,29 +1,18 @@
-import { useEffect } from 'react';
-import { matchPath, useLocation } from 'react-router-dom';
 import { Dialog, Intent } from '@vegaprotocol/ui-toolkit';
 import { useEnvironment } from '@vegaprotocol/environment';
-import { VegaConnectDialog } from '@vegaprotocol/wallet';
-import { Connectors } from '../../lib/vega-connectors';
-import { useT } from '../../lib/use-t';
-import { Routes } from '../../lib/links';
-import { RiskMessage } from './risk-message';
 import { WelcomeDialogContent } from './welcome-dialog-content';
 import { useOnboardingStore } from './use-get-onboarding-step';
-import { ensureSuffix } from '@vegaprotocol/utils';
-
-/**
- * A list of paths on which the welcome dialog should be omitted.
- */
-const OMIT_ON_LIST = [ensureSuffix(Routes.REFERRALS, '/*')];
+import { VegaConnectDialog } from '@vegaprotocol/wallet';
+import { Connectors } from '../../lib/vega-connectors';
+import { RiskMessage } from './risk-message';
+import { useT } from '../../lib/use-t';

 export const WelcomeDialog = () => {
-  const { pathname } = useLocation();
  const t = useT();
  const { VEGA_ENV } = useEnvironment();
  const dismissed = useOnboardingStore((store) => store.dismissed);
  const dialogOpen = useOnboardingStore((store) => store.dialogOpen);
  const dismiss = useOnboardingStore((store) => store.dismiss);
-  const setDialogOpen = useOnboardingStore((store) => store.setDialogOpen);
  const walletDialogOpen = useOnboardingStore(
    (store) => store.walletDialogOpen
  );
@@ -31,16 +20,6 @@ export const WelcomeDialog = () => {
    (store) => store.setWalletDialogOpen
  );

-  useEffect(() => {
-    const shouldOmit = OMIT_ON_LIST.map((path) =>
-      matchPath(path, pathname)
-    ).some((m) => !!m);
-
-    if (dismissed || shouldOmit) return;
-
-    setDialogOpen(true);
-  }, [dismissed, pathname, setDialogOpen]);
-
  const content = walletDialogOpen ? (
    <VegaConnectDialog
      connectors={Connectors}
@@ -52,12 +31,7 @@ export const WelcomeDialog = () => {
    <WelcomeDialogContent />
  );

-  const onClose = walletDialogOpen
-    ? () => setWalletDialogOpen(false)
-    : () => {
-        setDialogOpen(false);
-        dismiss();
-      };
+  const onClose = walletDialogOpen ? () => setWalletDialogOpen(false) : dismiss;

  const title = walletDialogOpen ? null : (
    <span className="font-alpha calt" data-testid="welcome-title">
@@ -1,2 +1,2 @@
 CONSOLE_IMAGE_NAME=vegaprotocol/trading:latest
-VEGA_VERSION=v0.73.8
+VEGA_VERSION=v0.73.6
@@ -1,2 +1,2 @@
 CONSOLE_IMAGE_NAME=vegaprotocol/trading:develop
-VEGA_VERSION=v0.73.8
+VEGA_VERSION=v0.73.6
@@ -1,2 +1,2 @@
 CONSOLE_IMAGE_NAME=vegaprotocol/trading:main
-VEGA_VERSION=v0.73.8
+VEGA_VERSION=v0.73.6
@@ -12,7 +12,6 @@ from contextlib import contextmanager
 from vega_sim.null_service import VegaServiceNull
 from playwright.sync_api import Browser, Page
 from config import console_image_name, vega_version
-from datetime import datetime, timedelta
 from fixtures.market import (
    setup_simple_market,
    setup_opening_auction_market,
@@ -79,7 +78,6 @@ def init_vega(request=None):
        store_transactions=True,
        transactions_per_block=1000,
        seconds_per_block=seconds_per_block,
-        genesis_time= datetime.now() - timedelta(days=1),
    ) as vega:
        try:
            container = docker_client.containers.run(
@@ -1159,9 +1159,9 @@ profile = ["pytest-profiling", "snakeviz"]

 [package.source]
 type = "git"
-url = "https://github.com/vegaprotocol/vega-market-sim.git/"
-reference = "fix/genesis_panic"
-resolved_reference = "7ab04931924380db8000544b7f3d65fcb39b5467"
+url = "https://github.com/vegaprotocol/vega-market-sim.git"
+reference = "HEAD"
+resolved_reference = "e93f7dfa8463c59cfd0e299362b845511cebeef6"

 [[package]]
 name = "websocket-client"
@@ -1342,4 +1342,4 @@ files = [
 [metadata]
 lock-version = "2.0"
 python-versions = ">=3.9,<3.11"
-content-hash = "68ed0de55290a3b929d47eb7f7b031fb7e172261c7bbeb4f554b7c27a4462754"
+content-hash = "d1231fe591b774e34b8f94a54cd02e4d7dae924c57785263841c3b0b0feed505"
@@ -9,7 +9,7 @@ packages = [{include = "trading market-sim e2e"}]
 [tool.poetry.dependencies]
 python = ">=3.9,<3.11"
 psutil = "^5.9.5"
-vega-sim = {git = "https://github.com/vegaprotocol/vega-market-sim.git/", branch = "fix/genesis_panic"}
+vega-sim = {git = "https://github.com/vegaprotocol/vega-market-sim.git"}
 pytest-playwright = "^0.4.2"
 docker = "^6.1.3"
 pytest-xdist = "^3.3.1"
@@ -58,6 +58,7 @@ class TestSettledMarket:
    def test_settled_rows(self, page: Page, create_settled_market):
        page.goto(f"/#/markets/all")
        page.get_by_test_id("Closed markets").click()
+
        row_selector = page.locator(
            '[data-testid="tab-closed-markets"] .ag-center-cols-container .ag-row'
        ).first
@@ -71,7 +72,7 @@ class TestSettledMarket:
        # 6001-MARK-009
        # 6001-MARK-008
        # 6001-MARK-010
-        pattern = r"(\d+)\s+(months|hours|days)\s+ago"
+        pattern = r"(\d+)\s+months\s+ago"
        date_text = row_selector.locator('[col-id="settlementDate"]').inner_text()
        assert re.match(pattern, date_text), f"Expected text to match pattern but got {date_text}"
       
@@ -2,7 +2,6 @@ import pytest
 from playwright.sync_api import Page, expect
 from vega_sim.service import VegaService
 from actions.vega import submit_order
-from actions.utils import change_keys
 from wallet_config import MM_WALLET, MM_WALLET2
 import logging

@@ -31,7 +30,7 @@ initial_spread: float = 0.1
 market_name = "BTC:DAI_2023"


-@pytest.mark.usefixtures("vega", "page", "simple_market", "risk_accepted", "auth")
+@pytest.mark.usefixtures("vega", "page", "simple_market", "risk_accepted")
 def test_price_monitoring(simple_market, vega: VegaService, page: Page):
    page.goto(f"/#/markets/all")
    expect(page.locator(table_row_selector).locator(trading_mode_col)).to_have_text(
@@ -109,8 +108,9 @@ def test_price_monitoring(simple_market, vega: VegaService, page: Page):
    expect(
        page.get_by_test_id(liquidity_supplied).get_by_test_id(item_value)
    ).to_have_text("100.00 (>100%)")
+
    vega.forward("10s")
-    vega.wait_fn(10)
+    vega.wait_fn(1)
    vega.wait_for_total_catchup()
    expect(
        page.get_by_test_id(liquidity_supplied).get_by_test_id(item_value)
@@ -196,17 +196,3 @@ def test_price_monitoring(simple_market, vega: VegaService, page: Page):
    expect(
        page.get_by_test_id(liquidity_supplied).get_by_test_id(item_value)
    ).to_have_text("50.00 (>100%)")
-
-COL_ID_FEE = ".ag-center-cols-container [col-id='fee'] .ag-cell-value"
-
-@pytest.mark.usefixtures("vega", "page", "continuous_market", "risk_accepted", "auth")
-def test_auction_uncross_fees(continuous_market, vega: VegaService, page: Page):
-    page.goto(f"/#/markets/{continuous_market}")
-    page.get_by_test_id("Fills").click()
-    expect(page.locator(COL_ID_FEE)).to_have_text("0.00 tDAI")
-    page.locator(COL_ID_FEE).hover()
-    expect(page.get_by_test_id("fee-breakdown-tooltip")).to_have_text("If the market was suspendedIf the market is in monitoring auction, half of the infrastructure and liquidity fees will be paid.Infrastructure fee0.00 tDAILiquidity fee0.00 tDAIMaker fee0.00 tDAITotal fees0.00 tDAI")
-    change_keys(page,vega, "market_maker")
-    expect(page.locator(COL_ID_FEE)).to_have_text("0.00 tDAI")
-    page.locator(COL_ID_FEE).hover()
-    expect(page.get_by_test_id("fee-breakdown-tooltip")).to_have_text("If the market was suspendedIf the market is in monitoring auction, half of the infrastructure and liquidity fees will be paid.Infrastructure fee0.00 tDAILiquidity fee0.00 tDAIMaker fee0.00 tDAITotal fees0.00 tDAI")
@@ -197,10 +197,10 @@ def test_market_info_risk_factors(page: Page):
    fields = [
        ["Long", "0.05153"],
        ["Short", "0.05422"],
-        ["Max Leverage Long", "19.406"],
-        ["Max Leverage Short", "18.445"],
-        ["Max Initial Leverage Long", "12.937"],
-        ["Max Initial Leverage Short", "12.297"],
+        ["Max Leverage Long", "19.036"],
+        ["Max Leverage Short", "18.111"],
+        ["Max Initial Leverage Long", "12.691"],
+        ["Max Initial Leverage Short", "12.074"],
    ]
    validate_info_section(page, fields)

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


@@ -59,9 +58,9 @@ def test_market_lifecycle(proposed_market, vega: VegaService, page: Page):

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

@@ -52,21 +52,6 @@ const num = (asset: Asset, n: string | undefined | null) => {
  return addDecimalsFormatNumber(n, asset.decimals);
 };

-const Diff = ({
-  oldValue,
-  newValue,
-}: {
-  oldValue: ReactNode;
-  newValue: ReactNode;
-}) => (
-  <span className="flex gap-1">
-    <span className="line-through bg-vega-red-300 dark:bg-vega-red-600">
-      {oldValue}
-    </span>
-    <span className="bg-vega-green-300 dark:bg-vega-green-600">{newValue}</span>
-  </span>
-);
-
 export const useRows = () => {
  const t = useT();
  const AssetTypeMapping = useAssetTypeMapping();
@@ -118,14 +103,7 @@ export const useRows = () => {
        key: AssetDetail.QUANTUM,
        label: t('Quantum'),
        tooltip: t('The minimum economically meaningful amount of the asset'),
-        value: (asset, originalAsset) => {
-          const value = num(asset, asset.quantum);
-          if (originalAsset && originalAsset.quantum !== asset.quantum) {
-            const original = num(originalAsset, originalAsset.quantum);
-            return <Diff oldValue={original} newValue={value} />;
-          }
-          return value;
-        },
+        value: (asset) => num(asset, asset.quantum),
      },
      {
        key: AssetDetail.STATUS,
@@ -165,24 +143,8 @@ export const useRows = () => {
        tooltip: t('WITHDRAW_THRESHOLD_TOOLTIP_TEXT', {
          defaultValue: WITHDRAW_THRESHOLD_TOOLTIP_TEXT,
        }),
-        value: (asset, originalAsset) => {
-          const value = num(
-            asset,
-            (asset.source as Schema.ERC20).withdrawThreshold
-          );
-          if (
-            originalAsset &&
-            (originalAsset.source as Schema.ERC20).withdrawThreshold !==
-              (asset.source as Schema.ERC20).withdrawThreshold
-          ) {
-            const original = num(
-              asset,
-              (originalAsset.source as Schema.ERC20).withdrawThreshold
-            );
-            return <Diff oldValue={original} newValue={value} />;
-          }
-          return value;
-        },
+        value: (asset) =>
+          num(asset, (asset.source as Schema.ERC20).withdrawThreshold),
      },
      {
        key: AssetDetail.LIFETIME_LIMIT,
@@ -190,26 +152,8 @@ export const useRows = () => {
        tooltip: t(
          'The lifetime deposit limit per address. Note: this is a temporary measure that can be changed or removed through governance'
        ),
-        value: (asset, originalAsset) => {
-          const value = num(
-            asset,
-            (asset.source as Schema.ERC20).lifetimeLimit
-          );
-
-          if (
-            originalAsset &&
-            (originalAsset.source as Schema.ERC20).lifetimeLimit !==
-              (asset.source as Schema.ERC20).lifetimeLimit
-          ) {
-            const original = num(
-              asset,
-              (originalAsset.source as Schema.ERC20).lifetimeLimit
-            );
-            return <Diff oldValue={original} newValue={value} />;
-          }
-
-          return value;
-        },
+        value: (asset) =>
+          num(asset, (asset.source as Schema.ERC20).lifetimeLimit),
      },
      {
        key: AssetDetail.MAX_FAUCET_AMOUNT_MINT,
@@ -317,13 +261,10 @@ export const testId = (detail: AssetDetail, field: 'label' | 'value') =>

 export type AssetDetailsTableProps = {
  asset: Asset;
-  originalAsset?: Asset;
-
  omitRows?: AssetDetail[];
 } & Omit<KeyValueTableRowProps, 'children'>;
 export const AssetDetailsTable = ({
  asset,
-  originalAsset,
  omitRows = [],
  ...props
 }: AssetDetailsTableProps) => {
@@ -334,7 +275,7 @@ export const AssetDetailsTable = ({

  const details = useRows().map((r) => ({
    ...r,
-    value: r.value(asset, originalAsset),
+    value: r.value(asset),
    valueTooltip: r.valueTooltip?.(asset),
  }));

@@ -153,8 +153,7 @@ interface DataProviderParams<
  pagination?: {
    getPageInfo: GetPageInfo<QueryData>;
    append: Append<Data>;
-    first?: number;
-    last?: number;
+    first: number;
  };
  fetchPolicy?: FetchPolicy;
  resetDelay?: number;
@@ -19,27 +19,16 @@ export const LayoutCell = ({
 }: LayoutCellProps) => {
  const t = useT();
  const classes = [
-    'lg:text-right flex lg:block justify-stretch gap-2',
+    'lg:text-right flex justify-between lg:block',
    'my-2 lg:my-0',
  ];

  return (
    <div className={classnames(classes)}>
-      {label && (
-        <>
-          <span className="lg:hidden text-xs text-vega-clight-200 dark:text-vega-cdark-200 whitespace-nowrap">
-            {label}
-          </span>
-          <span
-            /* separator */
-            aria-hidden
-            className="border-b border-dashed border-b-vega-clight-400 dark:border-b-vega-cdark-400 w-full h-[9px]"
-          ></span>
-        </>
-      )}
+      {label && <span className="lg:hidden">{label}</span>}
      <span
        data-testid={dataTestId}
-        className={classnames('font-mono text-xs lg:text-sm', {
+        className={classnames('font-mono', {
          'text-danger': !isLoading && hasError,
          'text-muted': isLoading,
        })}
@@ -89,30 +89,30 @@ export const NodeSwitcher = ({ closeDialog }: { closeDialog: () => void }) => {
                <span className="text-right">{t('Block')}</span>
                <span className="text-right">{t('Subscription')}</span>
              </LayoutRow>
-            </div>
-            <div>
-              {nodes.map((node, index) => {
-                return (
-                  <LayoutRow key={node} dataTestId="node-row">
-                    <ApolloWrapper url={node}>
-                      <RowData
-                        id={index.toString()}
-                        url={node}
-                        highestBlock={highestBlock}
-                        onBlockHeight={handleHighestBlock}
-                      />
-                    </ApolloWrapper>
-                  </LayoutRow>
-                );
-              })}
-              <CustomRowWrapper
-                inputText={customUrlText}
-                setInputText={setCustomUrlText}
-                nodes={nodes}
-                highestBlock={highestBlock}
-                onBlockHeight={handleHighestBlock}
-                nodeRadio={nodeRadio}
-              />
+              <div>
+                {nodes.map((node, index) => {
+                  return (
+                    <LayoutRow key={node} dataTestId="node-row">
+                      <ApolloWrapper url={node}>
+                        <RowData
+                          id={index.toString()}
+                          url={node}
+                          highestBlock={highestBlock}
+                          onBlockHeight={handleHighestBlock}
+                        />
+                      </ApolloWrapper>
+                    </LayoutRow>
+                  );
+                })}
+                <CustomRowWrapper
+                  inputText={customUrlText}
+                  setInputText={setCustomUrlText}
+                  nodes={nodes}
+                  highestBlock={highestBlock}
+                  onBlockHeight={handleHighestBlock}
+                  nodeRadio={nodeRadio}
+                />
+              </div>
            </div>
          </TradingRadioGroup>
          <div className="mt-4">
@@ -79,6 +79,7 @@
  "Size": "Size",
  "Size cannot be lower than {{sizeStep}}": "Size cannot be lower than {{sizeStep}}",
  "sizeAtPrice-market": "market",
+  "Subtotal": "Subtotal",
  "Stagnet": "Stagnet",
  "Stop": "Stop",
  "Stop Limit": "Stop Limit",
@@ -86,7 +87,6 @@
  "Stop order will be triggered immediately": "Stop order will be triggered immediately",
  "Strategy": "Strategy",
  "Submit": "Submit",
-  "Subtotal": "Subtotal",
  "terminated": "terminated",
  "The expiry date that you have entered appears to be in the past": "The expiry date that you have entered appears to be in the past",
  "The latest Vega code auto-deployed": "The latest Vega code auto-deployed",
@@ -104,16 +104,9 @@
  "This market is in opening auction until it has reached enough liquidity to move into continuous trading.": "This market is in opening auction until it has reached enough liquidity to move into continuous trading.",
  "This market may have sufficient liquidity but there are not enough priced limit orders in the order book, which are required to deploy liquidity commitment pegged orders.": "This market may have sufficient liquidity but there are not enough priced limit orders in the order book, which are required to deploy liquidity commitment pegged orders.",
  "Time in force": "Time in force",
-  "TIME_IN_FORCE_FOK": "Fill or Kill (FOK)",
-  "TIME_IN_FORCE_GFA": "Good for Auction (GFA)",
-  "TIME_IN_FORCE_GFN": "Good for Normal (GFN)",
-  "TIME_IN_FORCE_GTC": "Good 'til Cancelled (GTC)",
-  "TIME_IN_FORCE_GTT": "Good 'til Time (GTT)",
-  "TIME_IN_FORCE_IOC": "Immediate or Cancel (IOC)",
  "TIME_IN_FORCE_SELECTOR_LIQUIDITY_MONITORING_AUCTION": "This market is in auction until it reaches <0>sufficient liquidity</0>. Until the auction ends, you can only place GFA, GTT, or GTC limit orders.",
  "TIME_IN_FORCE_SELECTOR_PRICE_MONITORING_AUCTION": "This market is in auction due to <0>high price volatility</0>. Until the auction ends, you can only place GFA, GTT, or GTC limit orders.",
  "Total": "Total",
-  "Total fees": "Total fees",
  "Total margin available": "Total margin available",
  "TOTAL_MARGIN_AVAILABLE": "Total margin available = general {{assetSymbol}} balance ({{generalAccountBalance}} {{assetSymbol}}) + margin balance ({{marginAccountBalance}} {{assetSymbol}}) - maintenance level ({{marginMaintenance}} {{assetSymbol}}).",
  "Trading terminated": "Trading terminated",
@@ -137,5 +130,11 @@
  "You need to connect your own wallet to start trading on this market": "You need to connect your own wallet to start trading on this market",
  "You need to provide a minimum visible size": "You need to provide a minimum visible size",
  "You need to provide a peak size": "You need to provide a peak size",
-  "You need to provide a size": "You need to provide a size"
+  "You need to provide a size": "You need to provide a size",
+  "TIME_IN_FORCE_FOK": "Fill or Kill (FOK)",
+  "TIME_IN_FORCE_GFA": "Good for Auction (GFA)",
+  "TIME_IN_FORCE_GFN": "Good for Normal (GFN)",
+  "TIME_IN_FORCE_GTC": "Good 'til Cancelled (GTC)",
+  "TIME_IN_FORCE_GTT": "Good 'til Time (GTT)",
+  "TIME_IN_FORCE_IOC": "Immediate or Cancel (IOC)"
 }
@@ -2,9 +2,9 @@
  "A release candidate for the staging environment": "A release candidate for the staging environment",
  "Advanced": "Advanced",
  "Block": "Block",
+  "blocksBehind": "{{count}} Blocks behind",
  "blocksBehind_one": "{{count}} Block behind",
  "blocksBehind_other": "{{count}} Blocks behind",
-  "blocksBehind": "{{count}} Blocks behind",
  "Change node": "Change node",
  "Check": "Check",
  "Checking": "Checking",
@@ -1,5 +1,5 @@
 {
-  "Adjusted stake": "Adjusted stake",
+  "Adjusted stake share": "Adjusted stake share",
  "Commitment ({{symbol}})": "Commitment ({{symbol}})",
  "Commitment details": "Commitment details",
  "Created": "Created",
@@ -7,14 +7,14 @@
  "Fee": "Fee",
  "Fees accrued this epoch": "Fees accrued this epoch",
  "Last bond penalty": "Last bond penalty",
-  "Penalty applied on a provider's bond penalty at the end of the last epoch. This percentage increased if an LP: had a shortfall and their bond needed to be used to cover it, did not meet the SLA, and/or reduced their commitment to the point that the market was below its target stake.": "Penalty applied on a provider's bond penalty at the end of the last epoch. This percentage increased if an LP: had a shortfall and their bond needed to be used to cover it, did not meet the SLA, and/or reduced their commitment to the point that the market was below its target stake.",
-  "Penalty applied on the fees a liquidity provider collected in the last epoch. This number increases if an LP did not meet the SLA, or if they met it but other LPs outscored them in the previous epoch.": "Penalty applied on the fees a liquidity provider collected in the last epoch. This percentage increased if an LP did not meet the SLA, or if they met it but other LPs outscored them in the previous epoch.",
-  "Fraction of time on the book at the end of the last epoch.": "Fraction of time on the book at the end of the last epoch.",
+  "Last epoch bond penalty.": "Last epoch bond penalty.",
+  "Last epoch fee penalty.": "Last epoch fee penalty.",
+  "Last epoch fraction of time on the book.": "Last epoch fraction of time on the book.",
  "Last epoch SLA details": "Last epoch SLA details",
  "Last fee penalty": "Last fee penalty",
-  "Last time on book": "Last time on book",
+  "Last time on the book": "Last time on the book",
  "Live liquidity data": "Live liquidity data",
-  "Live liquidity score (%)": "Live liquidity score (%)",
+  "Live liquidity quality score (%)": "Live liquidity quality score (%)",
  "Live supplied liquidity": "Live supplied liquidity",
  "Live time on book": "Live time on book",
  "No liquidity provisions": "No liquidity provisions",
@@ -24,7 +24,7 @@
  "Status": "Status",
  "The amount committed to the market by this liquidity provider.": "The amount committed to the market by this liquidity provider.",
  "The amount of liquidity volume supplied by the LP order in order to meet the obligation. If the obligation is already met in full by other limit orders from the same Vega key the LP order is not required and this value will be zero. Also note if the target stake for the market is less than the obligation the full value of the obligation may not be required.": "The amount of liquidity volume supplied by the LP order in order to meet the obligation. If the obligation is already met in full by other limit orders from the same Vega key the LP order is not required and this value will be zero. Also note if the target stake for the market is less than the obligation the full value of the obligation may not be required.",
-  "The liquidity score of the provider, used to determine allocation of fees to the best performing LPs. Posting volume closer to the mid on both sides of the book will improve this score.": "The liquidity score of the provider, used to determine allocation of fees to the best performing LPs. Posting volume closer to the mid on both sides of the book will improve this score.",
+  "The average score of the liquidity provider.": "The average score of the liquidity provider.",
  "The current status of this liquidity provision.": "The current status of this liquidity provision.",
  "The date and time this liquidity provision was created.": "The date and time this liquidity provision was created.",
  "The date and time this liquidity provision was last updated.": "The date and time this liquidity provision was last updated.",
@@ -33,7 +33,7 @@
  "The liquidity fees accrued by each provider, which will be distributed at the end of the epoch after applying any penalties.": "The liquidity fees accrued by each provider, which will be distributed at the end of the epoch after applying any penalties.",
  "The liquidity provider's obligation to the market, calculated as the liquidity commitment amount multiplied by the value of the stake_to_ccy_volume network parameter to convert into units of liquidity volume.": "The liquidity provider's obligation to the market, calculated as the liquidity commitment amount multiplied by the value of the stake_to_ccy_volume network parameter to convert into units of liquidity volume.",
  "The public key of the party making this commitment.": "The public key of the party making this commitment.",
-  "The effective stake of the liquidity provider, adjusted for length of commitment and impact on equity like share.": "The effective stake of the liquidity provider, adjusted for length of commitment and impact on equity like share.",
+  "The virtual stake of the liquidity provider.": "The virtual stake of the liquidity provider.",
  "This LP's time on the book in the current epoch ({{currentEpoch}}) is less than 100%, so they could lose some fees to a better performing LP.": "This LP's time on the book in the current epoch ({{currentEpoch}}) is less than 100%, so they could lose some fees to a better performing LP.",
  "This LP's time on the book in the current epoch ({{currentEpoch}}) is less than the minimum required ({{minimumRequired}}), so they could lose all fee revenue for this epoch.": "This LP's time on the book in the current epoch ({{currentEpoch}}) is less than the minimum required ({{minimumRequired}}), so they could lose all fee revenue for this epoch.",
  "Updated": "Updated",
@@ -32,9 +32,9 @@
  "Insurance pool": "Insurance pool",
  "Internal conditions": "Internal conditions",
  "Invalid data source": "Invalid data source",
-  "involvedInMarkets_one": "Involved in {{count}} market",
-  "involvedInMarkets_other": "Involved in {{count}} markets",
  "involvedInMarkets": "Involved in {{count}} markets",
+  "involvedInMarkets_other": "Involved in {{count}} markets",
+  "involvedInMarkets_one": "Involved in {{count}} market",
  "Key": "Key",
  "Key details": "Key details",
  "Liquidity": "Liquidity",
@@ -54,9 +54,9 @@
  "Maximum fraction of an LP's accrued fees that an LP would lose to liquidity providers that achieved a higher SLA performance than them. This is a market parameter.": "Maximum fraction of an LP's accrued fees that an LP would lose to liquidity providers that achieved a higher SLA performance than them. This is a market parameter.",
  "Maximum value that a proposed fee amount can be, which is submitted as part of the LP commitment transaction. Note that a value of 0.05 = 5%. This is a network parameter.": "Maximum value that a proposed fee amount can be, which is submitted as part of the LP commitment transaction. Note that a value of 0.05 = 5%. This is a network parameter.",
  "Metadata": "Metadata",
+  "moreProofs": "And {{count}} more proofs",
  "moreProofs_one": "And {{count}} more proof",
  "moreProofs_other": "And {{count}} more proofs",
-  "moreProofs": "And {{count}} more proofs",
  "Multiplier used to translate an LP's commitment amount to their liquidity obligation. This is a network parameter.": "Multiplier used to translate an LP's commitment amount to their liquidity obligation. This is a network parameter.",
  "No data": "No data",
  "No oracle proof for settlement data": "No oracle proof for settlement data",
@@ -69,16 +69,16 @@
  "Oracle repository": "Oracle repository",
  "Oracle status for this market is <0>{{status}}</0>. {{description}} <1>Show more</1>": "Oracle status for this market is <0>{{status}}</0>. {{description}} <1>Show more</1>",
  "Oracle status: {{status}}. {{description}}": "Oracle status: {{status}}. {{description}}",
+  "oracleInMarkets": "Oracle in {{count}} markets",
  "oracleInMarkets_one": "Oracle in {{count}} market",
  "oracleInMarkets_other": "Oracle in {{count}} markets",
-  "oracleInMarkets": "Oracle in {{count}} markets",
  "Price monitoring bounds {{index}}": "Price monitoring bounds {{index}}",
  "Probability level for price projection, e.g. value of 0.95 will result in a price range such that over the specified projection horizon, the prices observed in the market should be in that range 95% of the time.": "Probability level for price projection, e.g. value of 0.95 will result in a price range such that over the specified projection horizon, the prices observed in the market should be in that range 95% of the time.",
  "Probability level used in <0>Expected Shortfall</0> calculation when obtaining Risk Factor Long and Risk Factor Short": "Probability level used in <0>Expected Shortfall</0> calculation when obtaining Risk Factor Long and Risk Factor Short",
  "Projection horizon measured as a year fraction used in <0>Expected Shortfall</0> calculation when obtaining Risk Factor Long and Risk Factor Short": "Projection horizon measured as a year fraction used in <0>Expected Shortfall</0> calculation when obtaining Risk Factor Long and Risk Factor Short",
+  "proofsOfOwnership": "{{count}} proofs of ownership",
  "proofsOfOwnership_one": "{{count}} proof of ownership",
  "proofsOfOwnership_other": "{{count}} proofs of ownership",
-  "proofsOfOwnership": "{{count}} proofs of ownership",
  "Proposal": "Proposal",
  "Propose a change to market": "Propose a change to market",
  "Read more": "Read more",
@@ -135,9 +135,9 @@
  "Updated": "Updated",
  "Used to calculate the penalty to liquidity providers when they cannot support their open position with the assets in their margin and general accounts. This is a network parameter.": "Used to calculate the penalty to liquidity providers when they cannot support their open position with the assets in their margin and general accounts. This is a network parameter.",
  "Verified since {{lastVerified}}": "Verified since {{lastVerified}}",
+  "verifyProofs": "Verify {{count}} proofs of ownership",
  "verifyProofs_one": "Verify {{count}} proof of ownership",
  "verifyProofs_other": "Verify {{count}} proofs of ownership",
-  "verifyProofs": "Verify {{count}} proofs of ownership",
  "View governance proposal": "View governance proposal",
  "View liquidity provision table": "View liquidity provision table",
  "View on Etherscan": "View on Etherscan",
@@ -7,8 +7,8 @@
  "Changes have been proposed for this market.": "Changes have been proposed for this market.",
  "Closing date": "Closing date",
  "Confirm transaction in wallet": "Confirm transaction in wallet",
-  "Enactment date": "Enactment date",
  "Enactment date: {{date}}": "Enactment date: {{date}}",
+  "Enactment date": "Enactment date",
  "estimated time to protocol upgrade": "estimated time to protocol upgrade",
  "estimating...": "estimating...",
  "Market": "Market",
@@ -41,8 +41,8 @@
  "Update <0>{{key}}</0> to {{value}}": "Update <0>{{key}}</0> to {{value}}",
  "View details": "View details",
  "View in block explorer": "View in block explorer",
-  "View proposal": "View proposal",
  "View proposal details": "View proposal details",
+  "View proposal": "View proposal",
  "Voting": "Voting",
  "Your transaction has been confirmed": "Your transaction has been confirmed"
 }
@@ -6,7 +6,6 @@
  "{{checkedAssets}} Assets": "{{checkedAssets}} Assets",
  "{{distance}} ago": "{{distance}} ago",
  "{{instrumentCode}} liquidity provision": "{{instrumentCode}} liquidity provision",
-  "<0>No running Desktop App/CLI detected. Open your app now to connect or enter a</0> <1>custom wallet location</1>": "<0>No running Desktop App/CLI detected. Open your app now to connect or enter a</0> <1>custom wallet location</1>",
  "24h vol": "24h vol",
  "24h volume": "24h volume",
  "A percentage of commission earned by the referrer": "A percentage of commission earned by the referrer",
@@ -54,11 +53,13 @@
  "Countdown": "Countdown",
  "Create a referral code": "Create a referral code",
  "Current tier": "Current tier",
+  "combinedVolume": "Combined volume (last {{count}} epochs)",
+  "combinedVolume_one": "Combined volume (last {{count}} epoch)",
+  "combinedVolume_other": "Combined volume (last {{count}} epochs)",
  "Dark mode": "Dark mode",
  "Date Joined": "Date Joined",
  "Deposit": "Deposit",
  "Deposit funds": "Deposit funds",
-  "Deposits": "Deposits",
  "Depth": "Depth",
  "Description": "Description",
  "Disclaimer": "Disclaimer",
@@ -92,15 +93,15 @@
  "Final commission rate": "Final commission rate",
  "Find out more": "Find out more",
  "Free from the risks of real trading, Fairground is a safe and fun place to try out Vega yourself with virtual assets.": "Free from the risks of real trading, Fairground is a safe and fun place to try out Vega yourself with virtual assets.",
-  "From epoch": "From epoch",
  "Fully decentralised high performance peer-to-network trading.": "Fully decentralised high performance peer-to-network trading.",
  "Funding": "Funding",
  "Funding history": "Funding history",
-  "Funding Payments": "Funding Payments",
  "Funding payments": "Funding payments",
+  "Funding Payments": "Funding Payments",
  "Funding Rate": "Funding Rate",
  "Funding rate": "Funding rate",
  "Futures": "Futures",
+  "From epoch": "From epoch",
  "Generate a referral code to share with your friends and start earning commission.": "Generate a referral code to share with your friends and start earning commission.",
  "Generate code": "Generate code",
  "Get started": "Get started",
@@ -141,15 +142,14 @@
  "Market triggers cancellation or governance vote has passed to cancel": "Market triggers cancellation or governance vote has passed to cancel",
  "Markets": "Markets",
  "Menu": "Menu",
-  "Metamask Snap <0>quick start</0>": "Metamask Snap <0>quick start</0>",
  "Min. epochs": "Min. epochs",
  "Min. trading volume": "Min. trading volume",
-  "minTradingVolume": "Min. trading volume (last {{count}} epochs)",
-  "minTradingVolume_one": "Min. trading volume (last {{count}} epoch)",
-  "minTradingVolume_other": "Min. trading volume (last {{count}} epochs)",
  "My current volume": "My current volume",
  "My liquidity provision": "My liquidity provision",
  "My trading fees": "My trading fees",
+  "minTradingVolume": "Min. trading volume (last {{count}} epochs)",
+  "minTradingVolume_one": "Min. trading volume (last {{count}} epoch)",
+  "minTradingVolume_other": "Min. trading volume (last {{count}} epochs)",
  "myVolume": "My volume (last {{count}} epochs)",
  "myVolume_one": "My volume (last {{count}} epoch)",
  "myVolume_other": "My volume (last {{count}} epochs)",
@@ -163,7 +163,6 @@
  "No market": "No market",
  "No markets": "No markets",
  "No markets.": "No markets.",
-  "No MetaMask version that supports snaps detected. Learn more about <0>MetaMask Snaps</0>": "No MetaMask version that supports snaps detected. Learn more about <0>MetaMask Snaps</0>",
  "No open orders": "No open orders",
  "No orders": "No orders",
  "No party accepts any liability for any losses whatsoever.": "No party accepts any liability for any losses whatsoever.",
@@ -178,8 +177,8 @@
  "Node: {{VEGA_URL}} is unsuitable": "Node: {{VEGA_URL}} is unsuitable",
  "Non-custodial and pseudonymous": "Non-custodial and pseudonymous",
  "None": "None",
-  "Not connected": "Not connected",
  "Number of traders": "Number of traders",
+  "Not connected": "Not connected",
  "Open": "Open",
  "Open a position": "Open a position",
  "Open markets": "Open markets",
@@ -189,9 +188,6 @@
  "Orders": "Orders",
  "Page not found": "Page not found",
  "Parent of a market": "Parent of a market",
-  "pastEpochs": "Past {{count}} epochs",
-  "pastEpochs_one": "Past {{count}} epoch",
-  "pastEpochs_other": "Past {{count}} epochs",
  "Perpetuals": "Perpetuals",
  "Please choose another market from the <0>market list</0>": "Please choose another market from the <0>market list</0>",
  "Please connect Vega wallet": "Please connect Vega wallet",
@@ -205,6 +201,9 @@
  "Proposed markets": "Proposed markets",
  "Providing liquidity": "Providing liquidity",
  "Purpose built proof of stake blockchain": "Purpose built proof of stake blockchain",
+  "pastEpochs": "Past {{count}} epochs",
+  "pastEpochs_one": "Past {{count}} epoch",
+  "pastEpochs_other": "Past {{count}} epochs",
  "qUSD": "qUSD",
  "qUSD provides a rough USD equivalent of balances across all assets using the value of \"Quantum\" for that asset": "qUSD provides a rough USD equivalent of balances across all assets using the value of \"Quantum\" for that asset",
  "Read the terms": "Read the terms",
@@ -214,9 +213,6 @@
  "Referral benefits": "Referral benefits",
  "Referral discount": "Referral discount",
  "Referrals": "Referrals",
-  "referralStatisticsCommission": "Commission earned in <0>qUSD</0> (last {{count}} epochs)",
-  "referralStatisticsCommission_one": "Commission earned in <0>qUSD</0> (last {{count}} epoch)",
-  "referralStatisticsCommission_other": "Commission earned in <0>qUSD</0> (last {{count}} epochs)",
  "Referrer commission": "Referrer commission",
  "Referrer trading discount": "Referrer trading discount",
  "Referrers earn commission based on a percentage of the taker fees their referees pay": "Referrers earn commission based on a percentage of the taker fees their referees pay",
@@ -228,6 +224,9 @@
  "Rewards": "Rewards",
  "Rewards history": "Rewards history",
  "Rewards multipliers": "Rewards multipliers",
+  "referralStatisticsCommission": "Commission earned in <0>qUSD</0> (last {{count}} epochs)",
+  "referralStatisticsCommission_one": "Commission earned in <0>qUSD</0> (last {{count}} epoch)",
+  "referralStatisticsCommission_other": "Commission earned in <0>qUSD</0> (last {{count}} epochs)",
  "runningNotionalOverEpochs": "Combined running notional over the {{count}} epochs",
  "runningNotionalOverEpochs_one": "Combined running notional over the {{count}} epoch",
  "runningNotionalOverEpochs_other": "Combined running notional over the {{count}} epochs",
@@ -260,6 +259,7 @@
  "Successors to this market have been proposed": "Successors to this market have been proposed",
  "Supplied stake": "Supplied stake",
  "Suspended due to price or liquidity monitoring trigger": "Suspended due to price or liquidity monitoring trigger",
+  "to": "to",
  "Target stake": "Target stake",
  "The amount of fees paid to liquidity providers across the whole market during the last epoch {{epoch}}.": "The amount of fees paid to liquidity providers across the whole market during the last epoch {{epoch}}.",
  "The commission is taken from the infrastructure fee, maker fee, and liquidity provider fee, not from the referee": "The commission is taken from the infrastructure fee, maker fee, and liquidity provider fee, not from the referee",
@@ -278,16 +278,11 @@
  "This market URL is not available any more.": "This market URL is not available any more.",
  "This timestamp is user curated metadata and does not drive any on-chain functionality.": "This timestamp is user curated metadata and does not drive any on-chain functionality.",
  "Tier": "Tier",
-  "to": "to",
-  "To protect the network from spam, you must have at least {{requiredFunds}} qUSD of any asset on the network to proceed.": "To protect the network from spam, you must have at least {{requiredFunds}} qUSD of any asset on the network to proceed.",
  "Toast location": "Toast location",
  "Total discount": "Total discount",
  "Total distributed": "Total distributed",
  "Total fee after discount": "Total fee after discount",
  "Total fee before discount": "Total fee before discount",
-  "totalCommission": "Total commission (last {{count}}} epochs)",
-  "totalCommission_one": "Total commission (last {{count}}} epoch)",
-  "totalCommission_other": "Total commission (last {{count}}} epochs)",
  "Trader": "Trader",
  "Trades": "Trades",
  "Trading": "Trading",
@@ -297,13 +292,12 @@
  "Trading on Market {{name}} may stop. There are open proposals to close this market": "Trading on Market {{name}} may stop. There are open proposals to close this market",
  "Trading on Market {{name}} will stop on {{date}}": "Trading on Market {{name}} will stop on {{date}}",
  "Transfer": "Transfer",
-  "totalCommission": "Total commission (last {{count}} epochs)",
-  "totalCommission_one": "Total commission (last {{count}} epoch)",
-  "totalCommission_other": "Total commission (last {{count}} epochs)",
+  "totalCommission": "Total commission (last {{count}}} epochs)",
+  "totalCommission_one": "Total commission (last {{count}}} epoch)",
+  "totalCommission_other": "Total commission (last {{count}}} epochs)",
  "Unknown": "Unknown",
  "Unknown settlement date": "Unknown settlement date",
  "Vega Reward pot": "Vega Reward pot",
-  "Vega Wallet <0>full featured<0>": "Vega Wallet <0>full featured<0>",
  "Vesting": "Vesting",
  "Vesting {{assetSymbol}}": "Vesting {{assetSymbol}}",
  "Vesting multiplier": "Vesting multiplier",
@@ -326,18 +320,17 @@
  "We're sorry but we don't have an active referral programme currently running. You can propose a new programme <0>here</0>.": "We're sorry but we don't have an active referral programme currently running. You can propose a new programme <0>here</0>.",
  "Welcome to Vega trading!": "Welcome to Vega trading!",
  "Withdraw": "Withdraw",
-  "Withdrawals": "Withdrawals",
  "You can opt out any time via settings": "You can opt out any time via settings",
  "You may encounter bugs, loss of functionality or loss of assets.": "You may encounter bugs, loss of functionality or loss of assets.",
  "You must be connected to the Vega wallet.": "You must be connected to the Vega wallet.",
  "You need a <0>Vega wallet</0> to start trading in this market.": "You need a <0>Vega wallet</0> to start trading in this market.",
  "You need at least {{requiredStake}} VEGA staked to generate a referral code and participate in the referral program.": "You need at least {{requiredStake}} VEGA staked to generate a referral code and participate in the referral program.",
  "You will no longer be able to hold a position on this market when it closes in {{duration}}.": "You will no longer be able to hold a position on this market when it closes in {{duration}}.",
-  "youAreJoiningTheGroup": "You are joining the group shown, but will not have access to benefits until you have completed at least {{count}} epochs.",
-  "youAreJoiningTheGroup_one": "You are joining the group shown, but will not have access to benefits until you have completed at least {{count}} epoch.",
-  "youAreJoiningTheGroup_other": "You are joining the group shown, but will not have access to benefits until you have completed at least {{count}} epochs.",
  "Your code has been rejected": "Your code has been rejected",
  "Your identity is always anonymous on Vega": "Your identity is always anonymous on Vega",
  "Your referral code": "Your referral code",
-  "Your tier": "Your tier"
+  "Your tier": "Your tier",
+  "youAreJoiningTheGroup": "You are joining the group shown, but will not have access to benefits until you have completed at least {{count}} epochs.",
+  "youAreJoiningTheGroup_one": "You are joining the group shown, but will not have access to benefits until you have completed at least {{count}} epoch.",
+  "youAreJoiningTheGroup_other": "You are joining the group shown, but will not have access to benefits until you have completed at least {{count}} epochs."
 }
@@ -4,8 +4,8 @@
  "Collapse": "Collapse",
  "Copied": "Copied",
  "Dark mode": "Dark mode",
-  "Dismiss all": "Dismiss all",
  "Dismiss all toasts": "Dismiss all toasts",
+  "Dismiss all": "Dismiss all",
  "Exit view as": "Exit view as",
  "Expand": "Expand",
  "Light mode": "Light mode",
@@ -1,15 +1,15 @@
 {
-  "{{field}} accepts up to {{decimals}} decimal places": "{{field}} accepts up to {{decimals}} decimal places",
-  "{{field}} must be a multiple of {{step}} for this market": "{{field}} must be a multiple of {{step}} for this market",
-  "{{field}} must be whole numbers for this market": "{{field}} must be whole numbers for this market",
-  "Expired": "Expired",
  "Expired on {{date}}": "Expired on {{date}}",
+  "Not time-based": "Not time-based",
+  "Expired": "Expired",
+  "Mark": "Mark",
+  "Required": "Required",
  "Invalid Ethereum address": "Invalid Ethereum address",
  "Invalid Vega key": "Invalid Vega key",
-  "Mark": "Mark",
-  "Must be valid JSON": "Must be valid JSON",
-  "Not time-based": "Not time-based",
-  "Required": "Required",
+  "Value is below minimum": "Value is below minimum",
  "Value is above maximum": "Value is above maximum",
-  "Value is below minimum": "Value is below minimum"
+  "Must be valid JSON": "Must be valid JSON",
+  "{{field}} must be a multiple of {{step}} for this market": "{{field}} must be a multiple of {{step}} for this market",
+  "{{field}} must be whole numbers for this market": "{{field}} must be whole numbers for this market",
+  "{{field}} accepts up to {{decimals}} decimal places": "{{field}} accepts up to {{decimals}} decimal places"
 }
@@ -1,63 +1,63 @@
 {
-  "<0>No running Desktop App/CLI detected. Open your app now to connect or enter a</0> <1>custom wallet location</1>": "<0>No running Desktop App/CLI detected. Open your app now to connect or enter a</0> <1>custom wallet location</1>",
  "About the Vega wallet": "About the Vega wallet",
-  "Advanced / Other options...": "Advanced / Other options...",
-  "An unknown error occurred": "An unknown error occurred",
-  "Approve the connection from your Vega wallet app.": "Approve the connection from your Vega wallet app.",
-  "Approve the connection from your Vega wallet app. If you have multiple wallets you'll need to choose which to connect with.": "Approve the connection from your Vega wallet app. If you have multiple wallets you'll need to choose which to connect with.",
-  "Browse from the perspective of another Vega user in read-only mode.": "Browse from the perspective of another Vega user in read-only mode.",
-  "Browse network": "Browse network",
-  "Cancel": "Cancel",
-  "Checking wallet version": "Checking wallet version",
-  "Checking your wallet is compatible with this app": "Checking your wallet is compatible with this app",
-  "Connect": "Connect",
-  "Connect directly via Metamask with the Vega Snap for single key support without advanced features.": "Connect directly via Metamask with the Vega Snap for single key support without advanced features.",
-  "Connect securely, deposit funds and approve or reject transactions with the Vega wallet": "Connect securely, deposit funds and approve or reject transactions with the Vega wallet",
-  "Connect the App/CLI": "Connect the App/CLI",
+  "Supported browsers": "Supported browsers",
  "Connect Vega wallet": "Connect Vega wallet",
-  "Connect via Vega MetaMask Snap": "Connect via Vega MetaMask Snap",
-  "Connect with Vega Wallet extension for {{browserName}} to access all features including key management and detailed transaction views from your browser.": "Connect with Vega Wallet extension for {{browserName}} to access all features including key management and detailed transaction views from your browser.",
-  "Connecting...": "Connecting...",
-  "Connection in progress": "Connection in progress",
-  "Copy": "Copy",
-  "Could not connect to Vega MetaMask Snap": "Could not connect to Vega MetaMask Snap",
-  "Custom wallet location": "Custom wallet location",
-  "Disconnect all keys": "Disconnect all keys",
-  "Enter a custom wallet location": "Enter a custom wallet location",
  "Get a Vega wallet": "Get a Vega wallet",
-  "Get the Vega Wallet": "Get the Vega Wallet",
-  "Go back": "Go back",
-  "I agree": "I agree",
-  "Install Metamask with the Vega Snap for single key support without advanced features.": "Install Metamask with the Vega Snap for single key support without advanced features.",
-  "Install Vega MetaMask Snap": "Install Vega MetaMask Snap",
+  "Connect securely, deposit funds and approve or reject transactions with the Vega wallet": "Connect securely, deposit funds and approve or reject transactions with the Vega wallet",
+  "Connect": "Connect",
+  "Vega Wallet <0>full featured<0>": "Vega Wallet <0>full featured<0>",
+  "your browser": "your browser",
+  "Connect with Vega Wallet extension for {{browserName}} to access all features including key management and detailed transaction views from your browser.": "Connect with Vega Wallet extension for {{browserName}} to access all features including key management and detailed transaction views from your browser.",
  "Install Vega Wallet extension for {{browserName}} to access all features including key management and detailed transaction views from your browser.": "Install Vega Wallet extension for {{browserName}} to access all features including key management and detailed transaction views from your browser.",
  "Metamask Snap <0>quick start</0>": "Metamask Snap <0>quick start</0>",
+  "Connect directly via Metamask with the Vega Snap for single key support without advanced features.": "Connect directly via Metamask with the Vega Snap for single key support without advanced features.",
+  "Connect via Vega MetaMask Snap": "Connect via Vega MetaMask Snap",
+  "Install Metamask with the Vega Snap for single key support without advanced features.": "Install Metamask with the Vega Snap for single key support without advanced features.",
+  "Install Vega MetaMask Snap": "Install Vega MetaMask Snap",
  "No MetaMask version that supports snaps detected. Learn more about <0>MetaMask Snaps</0>": "No MetaMask version that supports snaps detected. Learn more about <0>MetaMask Snaps</0>",
-  "No Vega Wallet application running": "No Vega Wallet application running",
-  "No wallet application running at {{connectorUrl}}": "No wallet application running at {{connectorUrl}}",
+  "Advanced / Other options...": "Advanced / Other options...",
+  "View as party": "View as party",
+  "Get the Vega Wallet": "Get the Vega Wallet",
+  "Custom wallet location": "Custom wallet location",
+  "Go back": "Go back",
+  "Connect the App/CLI": "Connect the App/CLI",
+  "Use the Desktop App/CLI": "Use the Desktop App/CLI",
+  "Enter a custom wallet location": "Enter a custom wallet location",
+  "<0>No running Desktop App/CLI detected. Open your app now to connect or enter a</0> <1>custom wallet location</1>": "<0>No running Desktop App/CLI detected. Open your app now to connect or enter a</0> <1>custom wallet location</1>",
+  "Verifying chain": "Verifying chain",
+  "Successfully connected": "Successfully connected",
+  "Connecting...": "Connecting...",
+  "Approve the connection from your Vega wallet app. If you have multiple wallets you'll need to choose which to connect with.": "Approve the connection from your Vega wallet app. If you have multiple wallets you'll need to choose which to connect with.",
+  "Understand the risk": "Understand the risk",
+  "Cancel": "Cancel",
+  "I agree": "I agree",
+  "Something went wrong": "Something went wrong",
+  "An unknown error occurred": "An unknown error occurred",
+  "Try again": "Try again",
+  "User rejected": "User rejected",
+  "The user rejected the wallet connection": "The user rejected the wallet connection",
+  "Wrong network": "Wrong network",
  "No wallet detected": "No wallet detected",
+  "Vega browser extension not installed": "Vega browser extension not installed",
+  "Snap failed": "Snap failed",
+  "Could not connect to Vega MetaMask Snap": "Could not connect to Vega MetaMask Snap",
+  "No wallet application running at {{connectorUrl}}": "No wallet application running at {{connectorUrl}}",
+  "No Vega Wallet application running": "No Vega Wallet application running",
+  "Read the docs to troubleshoot": "Read the docs to troubleshoot",
+  "Connection in progress": "Connection in progress",
+  "Approve the connection from your Vega wallet app.": "Approve the connection from your Vega wallet app.",
+  "To complete your wallet connection, set your wallet network in your app to \"{{appChainId}}\".": "To complete your wallet connection, set your wallet network in your app to \"{{appChainId}}\".",
+  "SELECT A VEGA KEY": "SELECT A VEGA KEY",
+  "Select": "Select",
+  "Copy": "Copy",
+  "Disconnect all keys": "Disconnect all keys",
  "Pubkey must be 64 characters in length": "Pubkey must be 64 characters in length",
  "Pubkey must be be valid hex": "Pubkey must be be valid hex",
-  "Read the docs to troubleshoot": "Read the docs to troubleshoot",
-  "Required": "Required",
-  "Select": "Select",
-  "SELECT A VEGA KEY": "SELECT A VEGA KEY",
-  "Snap failed": "Snap failed",
-  "Something went wrong": "Something went wrong",
-  "Successfully connected": "Successfully connected",
-  "Supported browsers": "Supported browsers",
-  "The user rejected the wallet connection": "The user rejected the wallet connection",
-  "To complete your wallet connection, set your wallet network in your app to \"{{appChainId}}\".": "To complete your wallet connection, set your wallet network in your app to \"{{appChainId}}\".",
-  "Try again": "Try again",
-  "Understand the risk": "Understand the risk",
-  "Use the Desktop App/CLI": "Use the Desktop App/CLI",
-  "User rejected": "User rejected",
-  "Vega browser extension not installed": "Vega browser extension not installed",
-  "Vega Wallet <0>full featured<0>": "Vega Wallet <0>full featured<0>",
-  "Verifying chain": "Verifying chain",
-  "View as party": "View as party",
  "VIEW AS VEGA USER": "VIEW AS VEGA USER",
-  "Wrong Network": "Wrong Network",
-  "Wrong network": "Wrong network",
-  "your browser": "your browser"
+  "Browse from the perspective of another Vega user in read-only mode.": "Browse from the perspective of another Vega user in read-only mode.",
+  "Required": "Required",
+  "Browse network": "Browse network",
+  "Checking wallet version": "Checking wallet version",
+  "Checking your wallet is compatible with this app": "Checking your wallet is compatible with this app",
+  "Wrong Network": "Wrong Network"
 }
@@ -5,13 +5,13 @@
  "Available to withdraw in {{availableTimestamp}}": "Available to withdraw in {{availableTimestamp}}",
  "Balance available": "Balance available",
  "Complete the withdrawal to release your funds": "Complete the withdrawal to release your funds",
-  "Complete withdrawal": "Complete withdrawal",
-  "Completed": "Completed",
  "completeWithdrawals": "Complete these {{count}} withdrawals to release your funds",
  "completeWithdrawals_one": "Complete these {{count}} withdrawal to release your funds",
  "completeWithdrawals_other": "Complete these {{count}} withdrawals to release your funds",
-  "Connect": "Connect",
+  "Complete withdrawal": "Complete withdrawal",
+  "Completed": "Completed",
  "Connect Ethereum wallet to complete": "Connect Ethereum wallet to complete",
+  "Connect": "Connect",
  "Created": "Created",
  "Delay time": "Delay time",
  "Delayed (ready in {{readyIn}})": "Delayed (ready in {{readyIn}})",
@@ -40,9 +40,9 @@
  "Verifying withdrawal approval": "Verifying withdrawal approval",
  "View withdrawal details": "View withdrawal details",
  "View withdrawals": "View withdrawals",
-  "Withdraw": "Withdraw",
  "Withdraw {{amount}} {{symbol}}": "Withdraw {{amount}} {{symbol}}",
  "Withdraw funds": "Withdraw funds",
+  "Withdraw": "Withdraw",
  "Withdrawal ready": "Withdrawal ready",
  "Withdrawals of {{threshold}} {{symbol}} or more will be delayed for {{delay}}.": "Withdrawals of {{threshold}} {{symbol}} or more will be delayed for {{delay}}.",
  "Withdrawals ready": "Withdrawals ready",
@@ -119,8 +119,6 @@ describe('getLiquidityProvision', () => {
        createdAt: '2022-12-16T09:28:29.071781Z',
        id: 'dde288688af2aeb5feb349dd72d3679a7a9be34c7375f6a4a48ef2f6140e7e59',
        fee: '0.001',
-        partyId:
-          'dde288688af2aeb5feb349dd72d3679a7a9be34c7375f6a4a48ef2f6140e7e59',
        party: {
          __typename: 'Party',
          accountsConnection: {
@@ -159,14 +159,7 @@ export const getLiquidityProvision = (
      const liquidityProvider = liquidityProviders.find(
        (f) => liquidityProvision.party.id === f.partyId
      );
-
-      if (!liquidityProvider) {
-        return {
-          ...liquidityProvision,
-          partyId: liquidityProvision.party.id,
-        };
-      }
-
+      if (!liquidityProvider) return liquidityProvision;
      const accounts = compact(
        liquidityProvision.party.accountsConnection?.edges
      ).map((e) => e.node);
@@ -93,13 +93,13 @@ describe('LiquidityTable', () => {
      'Commitment ()',
      'Obligation',
      'Fee',
-      'Adjusted stake',
+      'Adjusted stake share',
      'Share',
      'Live supplied liquidity',
      'Fees accrued this epoch',
      'Live time on book',
-      'Live liquidity score (%)',
-      'Last time on book',
+      'Live liquidity quality score (%)',
+      'Last time on the book',
      'Last fee penalty',
      'Last bond penalty',
      'Created',
@@ -357,12 +357,10 @@ export const LiquidityTable = ({
            },
          },
          {
-            headerName: t('Adjusted stake'),
+            headerName: t('Adjusted stake share'),
            field: 'feeShare.virtualStake',
            type: 'rightAligned',
-            headerTooltip: t(
-              'The effective stake of the liquidity provider, adjusted for length of commitment and impact on equity like share.'
-            ),
+            headerTooltip: t('The virtual stake of the liquidity provider.'),

            valueFormatter: assetDecimalsQuantumFormatter,
            tooltipValueGetter: assetDecimalsFormatter,
@@ -429,12 +427,10 @@ export const LiquidityTable = ({
            valueFormatter: percentageFormatter,
          },
          {
-            headerName: t('Live liquidity score (%)'),
+            headerName: t('Live liquidity quality score (%)'),
            field: 'feeShare.averageScore',
            type: 'rightAligned',
-            headerTooltip: t(
-              'The liquidity score of the provider, used to determine allocation of fees to the best performing LPs. Posting volume closer to the mid on both sides of the book will improve this score.'
-            ),
+            headerTooltip: t('The average score of the liquidity provider.'),
            valueFormatter: percentageFormatter,
          },
        ],
@@ -444,30 +440,24 @@ export const LiquidityTable = ({
        marryChildren: true,
        children: [
          {
-            headerName: t(`Last time on book`),
+            headerName: t(`Last time on the book`),
            field: 'sla.lastEpochFractionOfTimeOnBook',
            type: 'rightAligned',
-            headerTooltip: t(
-              'Fraction of time on the book at the end of the last epoch.'
-            ),
+            headerTooltip: t('Last epoch fraction of time on the book.'),
            valueFormatter: percentageFormatter,
          },
          {
            headerName: t(`Last fee penalty`),
            field: 'sla.lastEpochFeePenalty',
            type: 'rightAligned',
-            headerTooltip: t(
-              'Penalty applied on the fees a liquidity provider collected in the last epoch. This percentage increased if an LP did not meet the SLA, or if they met it but other LPs outscored them in the previous epoch.'
-            ),
+            headerTooltip: t('Last epoch fee penalty.'),
            valueFormatter: percentageFormatter,
          },
          {
            headerName: t(`Last bond penalty`),
            field: 'sla.lastEpochBondPenalty',
            type: 'rightAligned',
-            headerTooltip: t(
-              `Penalty applied on a provider's bond penalty at the end of the last epoch. This percentage increased if an LP: had a shortfall and their bond needed to be used to cover it, did not meet the SLA, and/or reduced their commitment to the point that the market was below its target stake.`
-            ),
+            headerTooltip: t('Last epoch bond penalty.'),
            valueFormatter: percentageFormatter,
          },
        ],
@@ -10,7 +10,6 @@ export interface LoggerProps extends LoggerConf {

 export const useLogger = ({ dsn, env, ...props }: LoggerProps) => {
  const logger = useRef<LocalLogger | null>(null);
-
  if (!logger.current) {
    logger.current = localLoggerFactory(props);
    if (dsn) {
@@ -25,7 +25,6 @@ describe('LocalLogger', () => {
  beforeEach(() => {
    jest.clearAllMocks();
  });
-
  it('logger should be properly instantiate', () => {
    const logger = localLoggerFactory({});
    expect(logger).toBeInstanceOf(LocalLogger);
@@ -51,7 +50,7 @@ describe('LocalLogger', () => {
      logger[method]('test', 'test2');
      // eslint-disable-next-line no-console
      expect(console[consoleMethod]).toHaveBeenCalledWith(
-        `trading:${methodToLevel[i]}:`,
+        `trading:${methodToLevel[i]}: `,
        'test',
        'test2'
      );
@@ -111,7 +110,7 @@ describe('LocalLogger', () => {

    // eslint-disable-next-line no-console
    expect(console.debug).toHaveBeenCalledWith(
-      'trading:debug:',
+      'trading:debug: ',
      'test',
      'test1'
    );
@@ -62,7 +62,6 @@ export class LocalLogger {
  }
  private tags: string[] = [];
  private _application = 'trading';
-
  constructor(conf: LoggerConf) {
    if (conf.application) {
      this._application = conf.application;
@@ -70,7 +69,6 @@ export class LocalLogger {
    this.tags = [...(conf.tags || [])];
    this._logLevel = conf.logLevel || this._logLevel;
  }
-
  public debug(...args: ConsoleArg[]) {
    this._log('debug', 'debug', args);
  }
@@ -103,7 +101,7 @@ export class LocalLogger {
    ) {
      // eslint-disable-next-line no-console
      console[logMethod].apply(console, [
-        `${this._application}:${level}:`,
+        `${this._application}:${level}: `,
        ...args,
      ]);
    }
@@ -632,9 +632,13 @@ export const RiskFactorsInfoPanel = ({

    const { short, long } = market.riskFactors;

-    const maxLeverageLong = new BigNumber(1).dividedBy(long);
+    const maxLeverageLong = new BigNumber(1).dividedBy(
+      new BigNumber(market.linearSlippageFactor).plus(long)
+    );

-    const maxLeverageShort = new BigNumber(1).dividedBy(short);
+    const maxLeverageShort = new BigNumber(1).dividedBy(
+      new BigNumber(market.linearSlippageFactor).plus(short)
+    );

    const maxInitialLeverageLong = !market.tradableInstrument.marginCalculator
      ? undefined
@@ -98,7 +98,7 @@ export const tradesProvider = makeDataProvider<
  pagination: {
    getPageInfo,
    append,
-    last: MAX_TRADES,
+    first: MAX_TRADES,
  },
  fetchPolicy: 'no-cache',
  getSubscriptionVariables: ({ marketId }) => ({ marketId }),
@@ -37,6 +37,8 @@ export function Dialog({
    'w-full h-full'
  );
  const wrapperClasses = classNames(
+    // Positions the modal in the center of screen
+    'z-20 relative rounded top-[10vh]',
    // Dimensions
    'max-w-[90vw] p-4 md:p-8',
    // Need to apply background and text colors again as content is rendered in a portal
@@ -70,34 +72,27 @@ export function Dialog({
          onInteractOutside={onInteractOutside}
          data-testid={dataTestId}
        >
-          <div
-            className={classNames(
-              // Positions the modal in the center of screen
-              'z-20 relative rounded top-[5vw] pb-[5vw] lg:top-[10vh] lg:pb-[10vh]'
+          <div className={wrapperClasses}>
+            {onChange && (
+              <DialogPrimitives.Close
+                className="absolute p-2 top-0 right-0 md:top-2 md:right-2"
+                data-testid="dialog-close"
+              >
+                <VegaIcon name={VegaIconNames.CROSS} size={24} />
+              </DialogPrimitives.Close>
            )}
-          >
-            <div className={wrapperClasses}>
-              {onChange && (
-                <DialogPrimitives.Close
-                  className="absolute p-2 top-0 right-0 md:top-2 md:right-2"
-                  data-testid="dialog-close"
-                >
-                  <VegaIcon name={VegaIconNames.CROSS} size={24} />
-                </DialogPrimitives.Close>
-              )}
-              <div className="flex gap-4 max-w-full">
-                {icon && <div className="fill-current">{icon}</div>}
-                <div data-testid="dialog-content" className="flex-1 max-w-full">
-                  {title && (
-                    <h1
-                      className="text-xl uppercase mb-4 pr-2"
-                      data-testid="dialog-title"
-                    >
-                      {title}
-                    </h1>
-                  )}
-                  <div>{children}</div>
-                </div>
+            <div className="flex gap-4 max-w-full">
+              {icon && <div className="fill-current">{icon}</div>}
+              <div data-testid="dialog-content" className="flex-1 max-w-full">
+                {title && (
+                  <h1
+                    className="text-xl uppercase mb-4 pr-2"
+                    data-testid="dialog-title"
+                  >
+                    {title}
+                  </h1>
+                )}
+                <div>{children}</div>
              </div>
            </div>
          </div>
@@ -57,20 +57,12 @@ interface RadioProps {
  value: string;
  label: string;
  disabled?: boolean;
-  className?: string;
 }

-export const TradingRadio = ({
-  id,
-  value,
-  label,
-  disabled,
-  className,
-}: RadioProps) => {
+export const TradingRadio = ({ id, value, label, disabled }: RadioProps) => {
  const wrapperClasses = classNames(
    'flex items-center gap-1.5 text-xs',
-    labelClasses,
-    className
+    labelClasses
  );
  const itemClasses = classNames(
    'flex justify-center items-center',
@@ -4,7 +4,6 @@ import {
  shorten,
  titlefy,
  stripFullStops,
-  ensureSuffix,
 } from './strings';

 describe('truncateByChars', () => {
@@ -89,15 +88,3 @@ describe('stripFullStops', () => {
    });
  });
 });
-
-describe('ensureSuffix', () => {
-  it.each([
-    ['', 'abc', 'abc'],
-    ['abc', '', 'abc'],
-    ['def', 'abc', 'abcdef'],
-    ['ąę', 'ae', 'aeąę'],
-    ['🥪', '🍞+🔪=', '🍞+🔪=🥪'],
-  ])('ensures "%s" at the end of "%s": "%s"', (suffix, input, expected) => {
-    expect(ensureSuffix(input, suffix)).toEqual(expected);
-  });
-});
@@ -33,9 +33,3 @@ export function titlefy(words: (string | null | undefined)[]) {
 export function stripFullStops(input: string) {
  return input.replace(/\./g, '');
 }
-
-export function ensureSuffix(input: string, suffix: string) {
-  const maybeSuffix = input.substring(input.length - suffix.length);
-  if (maybeSuffix === suffix) return input;
-  return input + suffix;
-}
@@ -205,13 +205,9 @@ const MultipleReadyToWithdrawToastContent = ({
    <>
      <ToastHeading>{t('Withdrawals ready')}</ToastHeading>
      <p>
-        {t(
-          'completeWithdrawals',
-          'Complete these {{count}} withdrawals to release your funds',
-          {
-            count,
-          }
-        )}
+        {t('Complete these {{count}} withdrawals to release your funds', {
+          count,
+        })}
      </p>
      <p className="mt-2">
        <Button
				`@@ -1 +0,0 @@`
				`export { ErrorBoundary } from './error-boundary';`