chore: fix type import, ignore useless constructor lint rule

chore: ignore use-less constructor lint error
chore: add missing i18n
2023-12-04 23:41:50 -08:00 · 2023-12-04 20:20:35 -08:00 · 2023-12-04 20:15:07 -08:00 · 2023-12-04 20:12:34 -08:00 · 2023-12-04 18:33:46 -08:00 · 2023-12-04 18:28:56 -08:00
39 changed files with 584 additions and 897 deletions
@@ -77,6 +77,7 @@
            "fixStyle": "inline-type-imports"
          }
        ],
+        "@typescript-eslint/no-useless-constructor": 0,
        "curly": ["error", "multi-line"]
      }
    },
@@ -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>
@@ -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,
@@ -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>
        )}

@@ -1,8 +1,9 @@
+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();
@@ -10,13 +11,17 @@ export const Fees = () => {
  const { updateTitle } = usePageTitleStore((store) => ({
    updateTitle: store.updateTitle,
  }));
+
  useEffect(() => {
    updateTitle(titlefy([title]));
  }, [updateTitle, title]);
+
  return (
-    <div className="container p-4 mx-auto">
-      <h1 className="px-4 pb-4 text-2xl">{title}</h1>
-      <FeesContainer />
-    </div>
+    <ErrorBoundary feature="fees">
+      <div className="container p-4 mx-auto">
+        <h1 className="px-4 pb-4 text-2xl">{title}</h1>
+        <FeesContainer />
+      </div>
+    </ErrorBoundary>
  );
 };
@@ -6,6 +6,7 @@ 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',
@@ -58,19 +59,28 @@ export const LiquidityViewContainer = ({
            name={t('My liquidity provision')}
            hidden={!pubKey}
          >
-            <LiquidityContainer
-              marketId={marketId}
-              filter={{ partyId: pubKey || undefined }}
-            />
+            <ErrorBoundary feature="liquidity-party">
+              <LiquidityContainer
+                marketId={marketId}
+                filter={{ partyId: pubKey || undefined }}
+              />
+            </ErrorBoundary>
          </Tab>
          <Tab id={LiquidityTabs.Active} name={t('Active')}>
-            <LiquidityContainer marketId={marketId} filter={{ active: true }} />
+            <ErrorBoundary feature="liquidity-active">
+              <LiquidityContainer
+                marketId={marketId}
+                filter={{ active: true }}
+              />
+            </ErrorBoundary>
          </Tab>
          <Tab id={LiquidityTabs.Inactive} name={t('Inactive')}>
-            <LiquidityContainer
-              marketId={marketId}
-              filter={{ active: false }}
-            />
+            <ErrorBoundary feature="liquidity-inactive">
+              <LiquidityContainer
+                marketId={marketId}
+                filter={{ active: false }}
+              />
+            </ErrorBoundary>
          </Tab>
        </Tabs>
      </div>
@@ -20,6 +20,7 @@ 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;
@@ -62,28 +63,38 @@ const MainGrid = memo(
                    name={t('Chart')}
                    menu={<TradingViews.candles.menu />}
                  >
-                    <TradingViews.candles.component marketId={marketId} />
+                    <ErrorBoundary feature="chart">
+                      <TradingViews.candles.component marketId={marketId} />
+                    </ErrorBoundary>
                  </Tab>
                  <Tab id="depth" name={t('Depth')}>
-                    <TradingViews.depth.component marketId={marketId} />
+                    <ErrorBoundary feature="depth">
+                      <TradingViews.depth.component marketId={marketId} />
+                    </ErrorBoundary>
                  </Tab>
                  <Tab id="liquidity" name={t('Liquidity')}>
-                    <TradingViews.liquidity.component marketId={marketId} />
+                    <ErrorBoundary feature="liquidity">
+                      <TradingViews.liquidity.component marketId={marketId} />
+                    </ErrorBoundary>
                  </Tab>
                  {market &&
                  market.tradableInstrument.instrument.product.__typename ===
                    'Perpetual' ? (
                    <Tab id="funding-history" name={t('Funding history')}>
-                      <TradingViews.funding.component marketId={marketId} />
+                      <ErrorBoundary feature="funding-history">
+                        <TradingViews.funding.component marketId={marketId} />
+                      </ErrorBoundary>
                    </Tab>
                  ) : null}
                  {market &&
                  market.tradableInstrument.instrument.product.__typename ===
                    'Perpetual' ? (
                    <Tab id="funding-payments" name={t('Funding payments')}>
-                      <TradingViews.fundingPayments.component
-                        marketId={marketId}
-                      />
+                      <ErrorBoundary feature="funding-payments">
+                        <TradingViews.fundingPayments.component
+                          marketId={marketId}
+                        />
+                      </ErrorBoundary>
                    </Tab>
                  ) : null}
                </Tabs>
@@ -96,10 +107,14 @@ const MainGrid = memo(
              <TradeGridChild>
                <Tabs storageKey="console-trade-grid-main-right">
                  <Tab id="orderbook" name={t('Orderbook')}>
-                    <TradingViews.orderbook.component marketId={marketId} />
+                    <ErrorBoundary feature="orderbook">
+                      <TradingViews.orderbook.component marketId={marketId} />
+                    </ErrorBoundary>
                  </Tab>
                  <Tab id="trades" name={t('Trades')}>
-                    <TradingViews.trades.component marketId={marketId} />
+                    <ErrorBoundary feature="trades">
+                      <TradingViews.trades.component marketId={marketId} />
+                    </ErrorBoundary>
                  </Tab>
                </Tabs>
              </TradeGridChild>
@@ -118,31 +133,43 @@ const MainGrid = memo(
                name={t('Positions')}
                menu={<TradingViews.positions.menu />}
              >
-                <TradingViews.positions.component />
+                <ErrorBoundary feature="positions">
+                  <TradingViews.positions.component />
+                </ErrorBoundary>
              </Tab>
              <Tab
                id="open-orders"
                name={t('Open')}
                menu={<TradingViews.activeOrders.menu />}
              >
-                <TradingViews.activeOrders.component />
+                <ErrorBoundary feature="activeOrders">
+                  <TradingViews.activeOrders.component />
+                </ErrorBoundary>
              </Tab>
              <Tab id="closed-orders" name={t('Closed')}>
-                <TradingViews.closedOrders.component />
+                <ErrorBoundary feature="closedOrders">
+                  <TradingViews.closedOrders.component />
+                </ErrorBoundary>
              </Tab>
              <Tab id="rejected-orders" name={t('Rejected')}>
-                <TradingViews.rejectedOrders.component />
+                <ErrorBoundary feature="rejectedOrders">
+                  <TradingViews.rejectedOrders.component />
+                </ErrorBoundary>
              </Tab>
              <Tab
                id="orders"
                name={t('All')}
                menu={<TradingViews.orders.menu />}
              >
-                <TradingViews.orders.component />
+                <ErrorBoundary feature="orders">
+                  <TradingViews.orders.component />
+                </ErrorBoundary>
              </Tab>
              {FLAGS.STOP_ORDERS ? (
                <Tab id="stop-orders" name={t('Stop orders')}>
-                  <TradingViews.stopOrders.component />
+                  <ErrorBoundary feature="stop-orders">
+                    <TradingViews.stopOrders.component />
+                  </ErrorBoundary>
                </Tab>
              ) : null}
              <Tab id="fills" name={t('Fills')}>
@@ -153,7 +180,11 @@ const MainGrid = memo(
                name={t('Collateral')}
                menu={<TradingViews.collateral.menu />}
              >
-                <TradingViews.collateral.component pinnedAsset={pinnedAsset} />
+                <ErrorBoundary feature="collateral">
+                  <TradingViews.collateral.component
+                    pinnedAsset={pinnedAsset}
+                  />
+                </ErrorBoundary>
              </Tab>
            </Tabs>
          </TradeGridChild>
@@ -1,19 +1,20 @@
-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 { FLAGS } from '@vegaprotocol/environment';
-import { useT } from '../../lib/use-t';
-import { Splash } from '@vegaprotocol/ui-toolkit';
+import { ErrorBoundary } from '../../components/error-boundary';
+import { type TradingView } from './trade-views';
+import { TradingViews } from './trade-views';

 interface TradePanelsProps {
  market: Market | null;
@@ -34,7 +35,11 @@ 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 <Component marketId={market?.id} pinnedAsset={pinnedAsset} />;
+    return (
+      <ErrorBoundary feature={view}>
+        <Component marketId={market?.id} pinnedAsset={pinnedAsset} />;
+      </ErrorBoundary>
+    );
  };

  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,6 +15,7 @@ import {
  useLinks,
 } from '@vegaprotocol/environment';
 import { useT } from '../../lib/use-t';
+import { ErrorBoundary } from '../../components/error-boundary';

 export const MarketsPage = () => {
  const t = useT();
@@ -34,7 +35,9 @@ 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')}>
-            <OpenMarkets />
+            <ErrorBoundary feature="markets-open">
+              <OpenMarkets />
+            </ErrorBoundary>
          </Tab>
          <Tab
            id="proposed-markets"
@@ -49,10 +52,14 @@ export const MarketsPage = () => {
              </TradingAnchorButton>
            }
          >
-            <Proposed />
+            <ErrorBoundary feature="markets-proposed">
+              <Proposed />
+            </ErrorBoundary>
          </Tab>
          <Tab id="closed-markets" name={t('Closed markets')}>
-            <Closed />
+            <ErrorBoundary feature="markets-closed">
+              <Closed />
+            </ErrorBoundary>
          </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,6 +25,7 @@ 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();
@@ -72,19 +73,29 @@ export const Portfolio = () => {
                name={t('Positions')}
                menu={<PositionsMenu />}
              >
-                <PositionsContainer allKeys />
+                <ErrorBoundary feature="portfolio-positions">
+                  <PositionsContainer allKeys />
+                </ErrorBoundary>
              </Tab>
              <Tab id="orders" name={t('Orders')}>
-                <OrdersContainer />
+                <ErrorBoundary feature="portfolio-orders">
+                  <OrdersContainer />
+                </ErrorBoundary>
              </Tab>
              <Tab id="fills" name={t('Fills')}>
-                <FillsContainer />
+                <ErrorBoundary feature="portfolio-fills">
+                  <FillsContainer />
+                </ErrorBoundary>
              </Tab>
              <Tab id="funding-payments" name={t('Funding payments')}>
-                <FundingPaymentsContainer />
+                <ErrorBoundary feature="portfolio-funding-payments">
+                  <FundingPaymentsContainer />
+                </ErrorBoundary>
              </Tab>
              <Tab id="ledger-entries" name={t('Ledger entries')}>
-                <LedgerContainer />
+                <ErrorBoundary feature="portfolio-ledger">
+                  <LedgerContainer />
+                </ErrorBoundary>
              </Tab>
            </Tabs>
          </PortfolioGridChild>
@@ -101,10 +112,14 @@ export const Portfolio = () => {
                name={t('Collateral')}
                menu={<AccountsMenu />}
              >
-                <AccountsContainer />
+                <ErrorBoundary feature="portfolio-accounts">
+                  <AccountsContainer />
+                </ErrorBoundary>
              </Tab>
              <Tab id="deposits" name={t('Deposits')} menu={<DepositsMenu />}>
-                <DepositsContainer />
+                <ErrorBoundary feature="portfolio-deposit">
+                  <DepositsContainer />
+                </ErrorBoundary>
              </Tab>
              <Tab
                id="withdrawals"
@@ -112,7 +127,9 @@ export const Portfolio = () => {
                indicator={<WithdrawalsIndicator />}
                menu={<WithdrawalsMenu />}
              >
-                <WithdrawalsContainer />
+                <ErrorBoundary feature="portfolio-deposit">
+                  <WithdrawalsContainer />
+                </ErrorBoundary>
              </Tab>
            </Tabs>
          </PortfolioGridChild>
@@ -18,6 +18,7 @@ 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();
@@ -65,7 +66,7 @@ export const Referrals = () => {
  }, [updateTitle, t]);

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

      {showNav && <Nav />}
@@ -107,6 +108,6 @@ export const Referrals = () => {
          </TradingAnchorButton>
        </div>
      </div>
-    </>
+    </ErrorBoundary>
  );
 };
@@ -1,8 +1,9 @@
+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 { titlefy } from '@vegaprotocol/utils';
-import { useEffect } from 'react';
+import { ErrorBoundary } from '../../components/error-boundary';

 export const Rewards = () => {
  const t = useT();
@@ -14,9 +15,11 @@ export const Rewards = () => {
    updateTitle(titlefy([title]));
  }, [updateTitle, title]);
  return (
-    <div className="container mx-auto p-4">
-      <h1 className="px-4 pb-4 text-2xl">{title}</h1>
-      <RewardsContainer />
-    </div>
+    <ErrorBoundary feature="rewards">
+      <div className="container mx-auto p-4">
+        <h1 className="px-4 pb-4 text-2xl">{title}</h1>
+        <RewardsContainer />
+      </div>
+    </ErrorBoundary>
  );
 };
@@ -0,0 +1,79 @@
+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();
+  });
+});
@@ -0,0 +1,53 @@
+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>;
+};
@@ -0,0 +1 @@
+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')}
@@ -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,6 +16,7 @@ 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',
@@ -163,12 +164,14 @@ export const SidebarContent = () => {
    if (params.marketId) {
      return (
        <ContentWrapper>
-          <DealTicketContainer
-            marketId={params.marketId}
-            onDeposit={(assetId) =>
-              setViews({ type: ViewType.Deposit, assetId }, currentRouteId)
-            }
-          />
+          <ErrorBoundary feature="deal-ticket">
+            <DealTicketContainer
+              marketId={params.marketId}
+              onDeposit={(assetId) =>
+                setViews({ type: ViewType.Deposit, assetId }, currentRouteId)
+              }
+            />
+          </ErrorBoundary>
          <GetStarted />
        </ContentWrapper>
      );
@@ -181,7 +184,9 @@ export const SidebarContent = () => {
    if (params.marketId) {
      return (
        <ContentWrapper>
-          <MarketInfoAccordionContainer marketId={params.marketId} />
+          <ErrorBoundary feature="market-info">
+            <MarketInfoAccordionContainer marketId={params.marketId} />
+          </ErrorBoundary>
        </ContentWrapper>
      );
    } else {
@@ -192,7 +197,9 @@ export const SidebarContent = () => {
  if (view.type === ViewType.Deposit) {
    return (
      <ContentWrapper title={t('Deposit')}>
-        <DepositContainer assetId={view.assetId} />
+        <ErrorBoundary feature="deposit">
+          <DepositContainer assetId={view.assetId} />
+        </ErrorBoundary>
      </ContentWrapper>
    );
  }
@@ -200,7 +207,9 @@ export const SidebarContent = () => {
  if (view.type === ViewType.Withdraw) {
    return (
      <ContentWrapper title={t('Withdraw')}>
-        <WithdrawContainer assetId={view.assetId} />
+        <ErrorBoundary feature="withdraw">
+          <WithdrawContainer assetId={view.assetId} />
+        </ErrorBoundary>
      </ContentWrapper>
    );
  }
@@ -208,7 +217,9 @@ export const SidebarContent = () => {
  if (view.type === ViewType.Transfer) {
    return (
      <ContentWrapper title={t('Transfer')}>
-        <TransferContainer assetId={view.assetId} />
+        <ErrorBoundary feature="transfer">
+          <TransferContainer assetId={view.assetId} />
+        </ErrorBoundary>
      </ContentWrapper>
    );
  }
@@ -216,7 +227,9 @@ export const SidebarContent = () => {
  if (view.type === ViewType.Settings) {
    return (
      <ContentWrapper title={t('Settings')}>
-        <Settings />
+        <ErrorBoundary feature="settings">
+          <Settings />
+        </ErrorBoundary>
      </ContentWrapper>
    );
  }
@@ -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(
@@ -1161,7 +1161,7 @@ profile = ["pytest-profiling", "snakeviz"]
 type = "git"
 url = "https://github.com/vegaprotocol/vega-market-sim.git"
 reference = "HEAD"
-resolved_reference = "fbcb974b2055bbc80169cdfd69987f087f9969fb"
+resolved_reference = "e93f7dfa8463c59cfd0e299362b845511cebeef6"

 [[package]]
 name = "websocket-client"
@@ -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

@@ -197,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")
@@ -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_have_text("Funding Rate / Countdown-Unknown")
-    expect(page.get_by_test_id("index-price")).to_have_text("Index Price-")
-    expect(page.get_by_test_id("deal-ticket-error-message-summary")).to_have_text("This market is closed and not accepting orders")
@@ -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),
  }));

@@ -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);
@@ -413,9 +413,14 @@ export const LiquidityTable = ({
              },
              'text-red-500': ({ data }: { data: LiquidityProvisionData }) => {
                if (!data.sla) return false;
-                return new BigNumber(
-                  data.sla.currentEpochFractionOfTimeOnBook
-                ).isLessThan(data.commitmentMinTimeFraction);
+                return (
+                  new BigNumber(
+                    data.sla.currentEpochFractionOfTimeOnBook
+                  ).isLessThan(data.commitmentMinTimeFraction) &&
+                  new BigNumber(
+                    data.sla.currentEpochFractionOfTimeOnBook
+                  ).isGreaterThan(0)
+                );
              },
            },
          },
@@ -10,6 +10,7 @@ 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,6 +25,7 @@ describe('LocalLogger', () => {
  beforeEach(() => {
    jest.clearAllMocks();
  });
+
  it('logger should be properly instantiate', () => {
    const logger = localLoggerFactory({});
    expect(logger).toBeInstanceOf(LocalLogger);
@@ -50,7 +51,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'
      );
@@ -110,7 +111,7 @@ describe('LocalLogger', () => {

    // eslint-disable-next-line no-console
    expect(console.debug).toHaveBeenCalledWith(
-      'trading:debug: ',
+      'trading:debug:',
      'test',
      'test1'
    );
@@ -62,6 +62,7 @@ export class LocalLogger {
  }
  private tags: string[] = [];
  private _application = 'trading';
+
  constructor(conf: LoggerConf) {
    if (conf.application) {
      this._application = conf.application;
@@ -69,6 +70,7 @@ export class LocalLogger {
    this.tags = [...(conf.tags || [])];
    this._logLevel = conf.logLevel || this._logLevel;
  }
+
  public debug(...args: ConsoleArg[]) {
    this._log('debug', 'debug', args);
  }
@@ -101,7 +103,7 @@ export class LocalLogger {
    ) {
      // eslint-disable-next-line no-console
      console[logMethod].apply(console, [
-        `${this._application}:${level}: `,
+        `${this._application}:${level}:`,
        ...args,
      ]);
    }
Author	SHA1	Message	Date
Matthew Russell	04d3a8fa18	chore: fix type import, ignore useless constructor lint rule	2023-12-04 23:41:50 -08:00
Matthew Russell	ce536c895a	chore: ignore use-less constructor lint error	2023-12-04 20:20:35 -08:00
Matthew Russell	cfb43b257b	chore: add missing i18n	2023-12-04 20:15:07 -08:00
Matthew Russell	5522cf3c89	test: add unit test for error-boundary component	2023-12-04 20:12:34 -08:00
Matthew Russell	1e0dc96216	test: update assertion after removing trailing space	2023-12-04 18:33:46 -08:00
Matthew Russell	73d4527033	feat: add error boundaries for other panes and pages	2023-12-04 18:28:56 -08:00
Matthew Russell	89850be39f	feat: add error boundaries to trade-grid	2023-12-03 23:59:03 -08:00
				`@@ -0,0 +1 @@`
				`export { ErrorBoundary } from './error-boundary';`