fix: hide transfer button in raed-only

2023-03-14 12:46:05 +00:00
186 changed files with 3461 additions and 5849 deletions
@@ -3,7 +3,7 @@ NX_TENDERMINT_URL=http://localhost:26617
 NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket
 NX_VEGA_URL=http://localhost:3028/query
 NX_VEGA_ENV=CUSTOM
-NX_VEGA_CONFIG_URL=
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/capsule-network.json

 CYPRESS_VEGA_TENDERMINT_URL=http://localhost:26617

@@ -6,10 +6,18 @@ context('Home Page', function () {
  describe('Stats page', { tags: '@smoke' }, function () {
    const statsValue = '[data-testid="stats-value"]';

+    it('Should show connected environment', function () {
+      const deployedEnv = Cypress.env('environment').toUpperCase();
+      cy.get('[data-testid="stats-environment"]').should(
+        'have.text',
+        `/ ${deployedEnv}`
+      );
+    });
+
    it('should show connected environment stats', function () {
      const statTitles = {
        0: 'Status',
-        1: 'Block height',
+        1: 'Height',
        2: 'Uptime',
        3: 'Total nodes',
        4: 'Total staked',
@@ -28,27 +36,27 @@ context('Home Page', function () {

      cy.get('[data-testid="stats-title"]')
        .each(($list, index) => {
-          cy.wrap($list).should('contain.text', statTitles[index]);
+          cy.wrap($list).should('have.text', statTitles[index]);
        })
        .then(($list) => {
          cy.wrap($list).should('have.length', 16);
        });

-      cy.get(statsValue).eq(0).should('contain.text', 'CONNECTED');
+      cy.get(statsValue).eq(0).should('have.text', 'CONNECTED');
      cy.get(statsValue).eq(1).should('not.be.empty');
      cy.get(statsValue)
        .eq(2)
        .invoke('text')
        .should('match', /\d+d \d+h \d+m \d+s/i);
-      cy.get(statsValue).eq(3).should('contain.text', '2');
+      cy.get(statsValue).eq(3).should('have.text', '2');
      cy.get(statsValue)
        .eq(4)
        .invoke('text')
        .should('match', /\d+\.\d\d(?!\d)/i);
-      cy.get(statsValue).eq(5).should('contain.text', '0');
-      cy.get(statsValue).eq(6).should('contain.text', '0');
-      cy.get(statsValue).eq(7).should('contain.text', '0');
-      cy.get(statsValue).eq(8).should('contain.text', '0');
+      cy.get(statsValue).eq(5).should('have.text', '0');
+      cy.get(statsValue).eq(6).should('have.text', '0');
+      cy.get(statsValue).eq(7).should('have.text', '0');
+      cy.get(statsValue).eq(8).should('have.text', '0');
      cy.get(statsValue).eq(9).should('not.be.empty');
      cy.get(statsValue).eq(10).should('not.be.empty');
      cy.get(statsValue).eq(11).should('not.be.empty');
@@ -78,4 +86,75 @@ context('Home Page', function () {
        });
    });
  });
+
+  describe('Git info', function () {
+    it('git info is rendered on the footer of the page', function () {
+      cy.getByTestId('git-info').within(() => {
+        cy.getByTestId('git-network-data').within(() => {
+          cy.contains('Reading network data from').should('be.visible');
+          cy.get('span').should('have.text', Cypress.env('networkQueryUrl'));
+          cy.getByTestId('link').should('be.visible');
+        });
+
+        cy.getByTestId('git-eth-data').within(() => {
+          cy.contains('Reading Ethereum data from').should('be.visible');
+          cy.get('span').should('have.text', Cypress.env('ethUrl'));
+        });
+
+        cy.getByTestId('git-commit-hash').within(() => {
+          cy.contains('Version/commit hash:').should('be.visible');
+          cy.getByTestId('link').should('have.text', Cypress.env('commitHash'));
+        });
+      });
+    });
+  });
+
+  describe('Search bar', function () {
+    it('Successful search for specific id by block id', function () {
+      const blockId = '973624';
+      search(blockId);
+      cy.url().should('include', blockId);
+    });
+
+    it('Successful search for specific id by tx hash', function () {
+      const txHash =
+        '9ED3718AA8308E7E08EC588EE7AADAF49711D2138860D8914B4D81A2054D9FB8';
+      search(txHash);
+      cy.url().should('include', txHash);
+    });
+
+    it('Successful search for specific id by tx id', function () {
+      const txId =
+        '0x61DCCEBB955087F50D0B85382DAE138EDA9631BF1A4F92E563D528904AA38898';
+      search(txId);
+      cy.url().should('include', txId);
+    });
+
+    it('Error message displayed when invalid search by wrong string length', function () {
+      search('9ED3718AA8308E7E08EC588EE7AADAF497D2138860D8914B4D81A2054D9FB8');
+      validateSearchError("Something doesn't look right");
+    });
+
+    it('Error message displayed when invalid search by invalid hash', function () {
+      search(
+        '9ED3718AA8308E7E08ECht8EE753DAF49711D2138860D8914B4D81A2054D9FB8'
+      );
+      validateSearchError('Transaction is not hexadecimal');
+    });
+
+    it('Error message displayed when searching empty field', function () {
+      cy.get('[data-testid="search"]').clear();
+      cy.get('[data-testid="search-button"]').click();
+      validateSearchError('Search required');
+    });
+
+    function search(searchTxt) {
+      cy.get('[data-testid="search"]').clear().type(searchTxt);
+      cy.get('[data-testid="search-button"]').click();
+    }
+
+    function validateSearchError(expectedError) {
+      cy.get('[data-testid="search-error"]').should('have.text', expectedError);
+    }
+  });
 });
@@ -1,6 +1,6 @@
 NX_TENDERMINT_URL=https://tm.n00.stagnet3.vega.xyz
 NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n00.stagnet3.vega.xyz/websocket
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json
 NX_VEGA_NETWORKS='{"SANDBOX":"https://sandbox.explorer.vega.xyz","STAGNET1":"https://stagnet1.token.vega.xyz", "STAGNET3":"https://stagnet3.explorer.vega.xyz","VALIDATOR_TESTNET":"https://validator-testnet.fairground.wtf","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_VEGA_ENV=STAGNET3
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
@@ -1,10 +1,10 @@
 # App configuration variables
 NX_TENDERMINT_URL=https://tm.be.devnet1.vega.xyz/tm
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.devnet1.vega.xyz/websocket
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/devnet-network.json
 NX_VEGA_ENV=DEVNET
 NX_BLOCK_EXPLORER=https://be.devnet1.vega.xyz/rest
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_VEGA_GOVERNANCE_URL=https://dev.token.vega.xyz
 NX_VEGA_URL=https://api.devnet1.vega.xyz/graphql
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/devnet1-network.json
@@ -1,8 +1,8 @@
 # App configuration variables
 NX_TENDERMINT_URL=https://be.explorer.vega.xyz
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.explorer.vega.xyz/websocket
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/mainnet1/mainnet1.toml
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/mainnet-network.json
 NX_VEGA_ENV=MAINNET
 NX_BLOCK_EXPLORER=https://be.explorer.vega.xyz/rest/
 NX_ETHERSCAN_URL=https://etherscan.io
-NX_VEGA_GOVERNANCE_URL=https://token.vega.xyz
+NX_VEGA_GOVERNANCE_URL=https://token.vega.xyz
@@ -1,7 +1,7 @@
 # App configuration variables
 NX_TENDERMINT_URL=https://tm.be.mainnet-mirror.vega.xyz
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.mainnet-mirror.vega.xyz/websocket
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/mainnet-mirror/vegawallet-mainnet-mirror.toml
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/mirror-network.json
 NX_VEGA_ENV=MIRROR
 NX_BLOCK_EXPLORER=https://be.mainnet-mirror.vega.xyz/rest/
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
@@ -1,6 +1,6 @@
 # App configuration variables
 NX_VEGA_ENV=SANDBOX
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/sandbox/vegawallet-sandbox.toml
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/sandbox-network.json
 NX_VEGA_EXPLORER_URL=https://sandbox.explorer.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
@@ -1,7 +1,7 @@
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet1-network.json
 NX_VEGA_ENV=STAGNET1
 NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
 NX_VEGA_TOKEN_URL=https://stagnet1.token.vega.xyz
@@ -1,6 +1,6 @@
 NX_TENDERMINT_URL=https://tm.n00.stagnet3.vega.xyz
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.stagnet3.vega.xyz/websocket
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json
 NX_VEGA_ENV=STAGNET3
 NX_BLOCK_EXPLORER=https://be.stagnet3.vega.xyz/rest
 NX_VEGA_GOVERNANCE_URL=https://stagnet3.token.vega.xyz
@@ -2,9 +2,9 @@
 NX_TENDERMINT_URL=https://tm.be.testnet.vega.xyz
 NX_BLOCK_EXPLORER=https://be.testnet.vega.xyz/rest
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.testnet.vega.xyz/websocket
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/testnet-network.json
 NX_VEGA_ENV=TESTNET
 NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_VEGA_GOVERNANCE_URL=https://token.fairground.wtf
+NX_VEGA_GOVERNANCE_URL=https://token.fairground.wtf
@@ -1,12 +1,12 @@
 # App configuration variables
 NX_VEGA_ENV=VALIDATOR_TESTNET
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/testnet2/testnet2.toml
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/validator-testnet-network.json
 NX_VEGA_URL=https://api-validators-testnet.vega.rocks/graphql
-NX_VEGA_REST=https://api-validators-testnet.vega.rocks/
+NX_VEGA_REST=https://api.validators-testnet.vega.xyz/
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io

 NX_VEGA_GOVERNANCE_URL=https://validator-testnet.governance.vega.xyz
-NX_TENDERMINT_URL=https://tm-be.validators-testnet.vega.rocks
-NX_BLOCK_EXPLORER=https://be.validators-testnet.vega.rocks/
+NX_TENDERMINT_URL=https://tm.be.validators-testnet.vega.xyz
+NX_BLOCK_EXPLORER=https://be.validators-testnet.vega.xyz/rest
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.xyz/websocket
@@ -1,21 +1,87 @@
 import { NetworkLoader, useInitializeEnv } from '@vegaprotocol/environment';
+import { Header } from './components/header';
+import { Main } from './components/main';
 import { TendermintWebsocketProvider } from './contexts/websocket/tendermint-websocket-provider';
-import { Loader, Splash } from '@vegaprotocol/ui-toolkit';
+import { Footer } from './components/footer/footer';
+import {
+  AnnouncementBanner,
+  ExternalLink,
+  Icon,
+} from '@vegaprotocol/ui-toolkit';
+import {
+  AssetDetailsDialog,
+  useAssetDetailsDialogStore,
+} from '@vegaprotocol/assets';
 import { DEFAULT_CACHE_CONFIG } from '@vegaprotocol/apollo-client';
-import { RouterProvider } from 'react-router-dom';
-import { router } from './routes/router-config';
+import classNames from 'classnames';
+import { useState } from 'react';

-const splashLoading = (
-  <Splash>
-    <Loader />
-  </Splash>
-);
+const DialogsContainer = () => {
+  const { isOpen, id, trigger, asJson, setOpen } = useAssetDetailsDialogStore();
+  return (
+    <AssetDetailsDialog
+      assetId={id}
+      trigger={trigger || null}
+      asJson={asJson}
+      open={isOpen}
+      onChange={setOpen}
+    />
+  );
+};
+
+const MainnetSimAd = () => {
+  const [shouldDisplayBanner, setShouldDisplayBanner] = useState<boolean>(true);
+
+  // Return an empty div so that the grid layout in _app.page.ts
+  // renders correctly
+  if (!shouldDisplayBanner) {
+    return <div />;
+  }
+
+  return (
+    <AnnouncementBanner>
+      <div className="grid grid-cols-[auto_1fr] gap-4 font-alpha calt uppercase text-center text-lg text-white">
+        <button
+          className="flex items-center"
+          onClick={() => setShouldDisplayBanner(false)}
+        >
+          <Icon name="cross" className="w-6 h-6" ariaLabel="dismiss" />
+        </button>
+        <div>
+          <span className="pr-4">Mainnet sim 3 is live!</span>
+          <ExternalLink href="https://fairground.wtf/">Learn more</ExternalLink>
+        </div>
+      </div>
+    </AnnouncementBanner>
+  );
+};

 function App() {
  return (
    <TendermintWebsocketProvider>
      <NetworkLoader cache={DEFAULT_CACHE_CONFIG}>
-        <RouterProvider router={router} fallbackElement={splashLoading} />
+        <div
+          className={classNames(
+            'max-w-[1500px] min-h-[100vh]',
+            'mx-auto my-0',
+            'grid grid-rows-[auto_1fr_auto] grid-cols-1',
+            'border-vega-light-200 dark:border-vega-dark-200 lg:border-l lg:border-r',
+            'antialiased text-black dark:text-white',
+            'overflow-hidden relative'
+          )}
+        >
+          <div>
+            <Header />
+            <MainnetSimAd />
+          </div>
+          <div>
+            <Main />
+          </div>
+          <div>
+            <Footer />
+          </div>
+        </div>
+        <DialogsContainer />
      </NetworkLoader>
    </TendermintWebsocketProvider>
  );
@@ -10,7 +10,7 @@ export const Footer = () => {
  const [nodeSwitcherOpen, setNodeSwitcherOpen] = useState(false);
  const { screenSize } = useScreenDimensions();
  const showFullFeedbackLabel = useMemo(
-    () => ['lg', 'xl', 'xxl', 'xxxl'].includes(screenSize),
+    () => ['lg', 'xl'].includes(screenSize),
    [screenSize]
  );

@@ -13,7 +13,7 @@ jest.mock('../search', () => ({
 }));

 const renderComponent = () => (
-  <MemoryRouter initialEntries={['/txs']}>
+  <MemoryRouter>
    <Header />
  </MemoryRouter>
 );
@@ -24,7 +24,6 @@ describe('Header', () => {

    expect(screen.getByTestId('navigation')).toHaveTextContent('Explorer');
  });
-
  it('should render search', () => {
    render(renderComponent());

@@ -1,4 +1,4 @@
-import { matchPath, useLocation, useMatch } from 'react-router-dom';
+import { matchPath, useLocation } from 'react-router-dom';
 import {
  ThemeSwitcher,
  Navigation,
@@ -13,26 +13,23 @@ import { t } from '@vegaprotocol/i18n';
 import { Routes } from '../../routes/route-names';
 import { NetworkSwitcher } from '@vegaprotocol/environment';
 import type { Navigable } from '../../routes/router-config';
-import { isNavigable } from '../../routes/router-config';
-import { routerConfig } from '../../routes/router-config';
+import routerConfig from '../../routes/router-config';
 import { useMemo } from 'react';
 import compact from 'lodash/compact';
 import { Search } from '../search';

 const routeToNavigationItem = (r: Navigable) => (
-  <NavigationItem key={r.handle.name}>
-    <NavigationLink to={r.path}>{r.handle.text}</NavigationLink>
+  <NavigationItem key={r.name}>
+    <NavigationLink to={r.path}>{r.text}</NavigationLink>
  </NavigationItem>
 );

 export const Header = () => {
-  const isHome = Boolean(useMatch(Routes.HOME));
-  const pages = routerConfig[0].children || [];
  const mainItems = compact(
    [Routes.TX, Routes.BLOCKS, Routes.ORACLES, Routes.VALIDATORS].map((n) =>
-      pages.find((r) => r.path === n)
+      routerConfig.find((r) => r.path === n)
    )
-  ).filter(isNavigable);
+  );

  const groupedItems = compact(
    [
@@ -42,8 +39,8 @@ export const Header = () => {
      Routes.GOVERNANCE,
      Routes.NETWORK_PARAMETERS,
      Routes.GENESIS,
-    ].map((n) => pages.find((r) => r.path === n))
-  ).filter(isNavigable);
+    ].map((n) => routerConfig.find((r) => r.path === n))
+  );

  const { pathname } = useLocation();

@@ -70,7 +67,7 @@ export const Header = () => {
      actions={
        <>
          <ThemeSwitcher />
-          {!isHome && <Search />}
+          <Search />
        </>
      }
      onResize={(width, el) => {
@@ -93,7 +90,7 @@ export const Header = () => {
        hide={[NavigationBreakpoint.Small, NavigationBreakpoint.Narrow]}
      >
        {mainItems.map(routeToNavigationItem)}
-        {groupedItems && groupedItems.length > 0 && (
+        {groupedItems && (
          <NavigationItem>
            <NavigationTrigger isActive={Boolean(isOnOther)}>
              {t('Other')}
@@ -0,0 +1,9 @@
+import { AppRouter } from '../../routes';
+
+export const Main = () => {
+  return (
+    <main className="p-4">
+      <AppRouter />
+    </main>
+  );
+};
@@ -1,52 +1,143 @@
+import {
+  addDecimalsFormatNumber,
+  formatNumberPercentage,
+  getMarketExpiryDateFormatted,
+} from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import type { MarketInfoWithData } from '@vegaprotocol/market-info';
-import { LiquidityInfoPanel } from '@vegaprotocol/market-info';
-import { LiquidityMonitoringParametersInfoPanel } from '@vegaprotocol/market-info';
-import {
-  InstrumentInfoPanel,
-  KeyDetailsInfoPanel,
-  LiquidityPriceRangeInfoPanel,
-  MetadataInfoPanel,
-  OracleInfoPanel,
-  RiskFactorsInfoPanel,
-  RiskModelInfoPanel,
-  RiskParametersInfoPanel,
-  SettlementAssetInfoPanel,
-} from '@vegaprotocol/market-info';
 import { MarketInfoTable } from '@vegaprotocol/market-info';
+import {
+  MarketStateMapping,
+  MarketTradingModeMapping,
+} from '@vegaprotocol/types';
+import { AssetDetailsTable, useAssetDataProvider } from '@vegaprotocol/assets';
+import { Splash } from '@vegaprotocol/ui-toolkit';
+import BigNumber from 'bignumber.js';
+import { useMemo } from 'react';
 import { Link } from 'react-router-dom';

 export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
+  const quoteUnit = market?.tradableInstrument.instrument.product.quoteName;
+  const assetId = useMemo(
+    () => market?.tradableInstrument.instrument.product?.settlementAsset.id,
+    [market]
+  );
+  const { data: asset } = useAssetDataProvider(assetId ?? '');
+
  if (!market) return null;

+  const keyDetails = {
+    decimalPlaces: market.decimalPlaces,
+    positionDecimalPlaces: market.positionDecimalPlaces,
+    tradingMode: market.tradingMode,
+    state: MarketStateMapping[market.state],
+  };
+  const assetDecimals =
+    market.tradableInstrument.instrument.product.settlementAsset.decimals;
+
+  const liquidityPriceRange = formatNumberPercentage(
+    new BigNumber(market.lpPriceRange).times(100)
+  );
+
  const panels = [
    {
      title: t('Key details'),
-      content: <KeyDetailsInfoPanel noBorder={false} market={market} />,
+      content: (
+        <MarketInfoTable
+          noBorder={false}
+          data={{
+            name: market.tradableInstrument.instrument.name,
+            marketID: market.id,
+            tradingMode:
+              keyDetails.tradingMode &&
+              MarketTradingModeMapping[keyDetails.tradingMode],
+            marketDecimalPlaces: market.decimalPlaces,
+            positionDecimalPlaces: market.positionDecimalPlaces,
+            settlementAssetDecimalPlaces: assetDecimals,
+          }}
+        />
+      ),
    },
    {
      title: t('Instrument'),
-      content: <InstrumentInfoPanel noBorder={false} market={market} />,
+      content: (
+        <MarketInfoTable
+          noBorder={false}
+          data={{
+            marketName: market.tradableInstrument.instrument.name,
+            code: market.tradableInstrument.instrument.code,
+            productType:
+              market.tradableInstrument.instrument.product.__typename,
+            ...market.tradableInstrument.instrument.product,
+          }}
+        />
+      ),
    },
    {
      title: t('Settlement asset'),
-      content: <SettlementAssetInfoPanel market={market} noBorder={false} />,
+      content: asset ? (
+        <AssetDetailsTable
+          asset={asset}
+          inline={true}
+          noBorder={false}
+          dtClassName="text-black dark:text-white text-ui !px-0 !font-normal"
+          ddClassName="text-black dark:text-white text-ui !px-0 !font-normal max-w-full"
+        />
+      ) : (
+        <Splash>{t('No data')}</Splash>
+      ),
    },
    {
      title: t('Metadata'),
-      content: <MetadataInfoPanel noBorder={false} market={market} />,
+      content: (
+        <MarketInfoTable
+          noBorder={false}
+          data={{
+            expiryDate: getMarketExpiryDateFormatted(
+              market.tradableInstrument.instrument.metadata.tags
+            ),
+            ...market.tradableInstrument.instrument.metadata.tags
+              ?.map((tag) => {
+                const [key, value] = tag.split(':');
+                return { [key]: value };
+              })
+              .reduce((acc, curr) => ({ ...acc, ...curr }), {}),
+          }}
+        />
+      ),
    },
    {
      title: t('Risk model'),
-      content: <RiskModelInfoPanel noBorder={false} market={market} />,
+      content: (
+        <MarketInfoTable
+          noBorder={false}
+          data={market.tradableInstrument.riskModel}
+          unformatted={true}
+          omits={[]}
+        />
+      ),
    },
    {
      title: t('Risk parameters'),
-      content: <RiskParametersInfoPanel noBorder={false} market={market} />,
+      content: (
+        <MarketInfoTable
+          noBorder={false}
+          data={market.tradableInstrument.riskModel.params}
+          unformatted={true}
+          omits={[]}
+        />
+      ),
    },
    {
      title: t('Risk factors'),
-      content: <RiskFactorsInfoPanel noBorder={false} market={market} />,
+      content: (
+        <MarketInfoTable
+          noBorder={false}
+          data={market.riskFactors}
+          unformatted={true}
+          omits={['market', '__typename']}
+        />
+      ),
    },
    ...(market.priceMonitoringSettings?.parameters?.triggers || []).map(
      (trigger, i) => ({
@@ -67,10 +158,7 @@ export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
          <MarketInfoTable
            noBorder={false}
            data={{ referencePrice: trigger.referencePrice }}
-            decimalPlaces={
-              market.tradableInstrument.instrument.product.settlementAsset
-                .decimals
-            }
+            decimalPlaces={assetDecimals}
          />
        </>
      ),
@@ -78,26 +166,64 @@ export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
    {
      title: t('Liquidity monitoring parameters'),
      content: (
-        <LiquidityMonitoringParametersInfoPanel
+        <MarketInfoTable
          noBorder={false}
-          market={market}
+          data={{
+            triggeringRatio:
+              market.liquidityMonitoringParameters.triggeringRatio,
+            ...market.liquidityMonitoringParameters.targetStakeParameters,
+          }}
        />
      ),
    },
-    {
-      title: t('Liquidity'),
-      content: <LiquidityInfoPanel market={market} noBorder={false} />,
-    },
    {
      title: t('Liquidity price range'),
      content: (
-        <LiquidityPriceRangeInfoPanel market={market} noBorder={false} />
+        <>
+          <p className="text-xs mb-4">
+            {`For liquidity orders to count towards a commitment, they must be
+            within the liquidity monitoring bounds.`}
+          </p>
+          <p className="text-xs mb-4">
+            {`The liquidity price range is a ${liquidityPriceRange} difference from the mid
+        price.`}
+          </p>
+          <MarketInfoTable
+            noBorder={false}
+            data={{
+              liquidityPriceRange: `${liquidityPriceRange} of mid price`,
+              lowestPrice:
+                market.data?.midPrice &&
+                `${addDecimalsFormatNumber(
+                  new BigNumber(1)
+                    .minus(market.lpPriceRange)
+                    .times(market.data.midPrice)
+                    .toString(),
+                  market.decimalPlaces
+                )} ${quoteUnit}`,
+              highestPrice:
+                market.data?.midPrice &&
+                `${addDecimalsFormatNumber(
+                  new BigNumber(1)
+                    .plus(market.lpPriceRange)
+                    .times(market.data.midPrice)
+                    .toString(),
+                  market.decimalPlaces
+                )} ${quoteUnit}`,
+            }}
+          ></MarketInfoTable>
+        </>
      ),
    },
    {
      title: t('Oracle'),
      content: (
-        <OracleInfoPanel noBorder={false} market={market}>
+        <MarketInfoTable
+          noBorder={false}
+          data={
+            market.tradableInstrument.instrument.product.dataSourceSpecBinding
+          }
+        >
          <Link
            className="text-xs hover:underline"
            to={`/oracles#${market.tradableInstrument.instrument.product.dataSourceSpecForSettlementData.id}`}
@@ -110,7 +236,7 @@ export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
          >
            {t('View termination oracle specification')}
          </Link>
-        </OracleInfoPanel>
+        </MarketInfoTable>
      ),
    },
  ];
@@ -118,7 +244,7 @@ export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
  return (
    <>
      {panels.map((p) => (
-        <div key={p.title} className="mb-3">
+        <div className="mb-3">
          <h2 className="font-alpha calt text-xl">{p.title}</h2>
          {p.content}
        </div>
@@ -1,5 +1,4 @@
 import { t } from '@vegaprotocol/i18n';
-import { Button } from '@vegaprotocol/ui-toolkit';
 import { StatusMessage } from '../status-message';

 interface RenderFetchedProps {
@@ -8,7 +7,6 @@ interface RenderFetchedProps {
  loading: boolean | undefined;
  className?: string;
  errorMessage?: string;
-  refetch?: () => void;
 }

 export const RenderFetched = ({
@@ -17,7 +15,6 @@ export const RenderFetched = ({
  children,
  className,
  errorMessage = t('Error retrieving data'),
-  refetch,
 }: RenderFetchedProps) => {
  if (loading) {
    return (
@@ -26,20 +23,7 @@ export const RenderFetched = ({
  }

  if (error) {
-    return (
-      <>
-        <StatusMessage className={className}>{errorMessage}</StatusMessage>
-        {refetch && (
-          <Button
-            onClick={() => {
-              refetch();
-            }}
-          >
-            {t('Try again')}
-          </Button>
-        )}
-      </>
-    );
+    return <StatusMessage className={className}>{errorMessage}</StatusMessage>;
  }

  return children;
@@ -0,0 +1,32 @@
+import { t } from '@vegaprotocol/i18n';
+import React from 'react';
+
+interface RouteErrorBoundaryProps {
+  children: React.ReactElement;
+}
+
+export class RouteErrorBoundary extends React.Component<
+  RouteErrorBoundaryProps,
+  { hasError: boolean }
+> {
+  constructor(props: RouteErrorBoundaryProps) {
+    super(props);
+    this.state = { hasError: false };
+  }
+
+  static getDerivedStateFromError() {
+    return { hasError: true };
+  }
+
+  override componentDidCatch(error: Error) {
+    console.log(`Error caught in App error boundary ${error.message}`, error);
+  }
+
+  override render() {
+    if (this.state.hasError) {
+      return <h1>{t('Something went wrong')}</h1>;
+    }
+
+    return this.props.children;
+  }
+}
@@ -1,70 +1,189 @@
 import {
-  determineType,
+  detectTypeByFetching,
+  detectTypeFromQuery,
+  getSearchType,
  isBlock,
+  isHexadecimal,
  isNetworkParty,
+  isNonHex,
  SearchTypes,
-  isHash,
+  toHex,
+  toNonHex,
 } from './detect-search';
+import { DATA_SOURCES } from '../../config';

 global.fetch = jest.fn();

 describe('Detect Search', () => {
-  it.each([
-    ['0000000000000000000000000000000000000000000000000000000000000000', true],
-    ['0000000000000000000000000000000000000000000000000000000000000001', true],
-    [
-      'LOOONG0000000000000000000000000000000000000000000000000000000000000000',
-      false,
-    ],
-    ['xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx', false],
-    ['something else', false],
-  ])("should detect that it's a hash", (input, expected) => {
-    expect(isHash(input)).toBe(expected);
+  it("should detect that it's a hexadecimal", () => {
+    const expected = true;
+    const testString =
+      '0x073ceaab59e5f2dd0561dec4883e7ee5bc7165cd4de34717a3ab8f2cbe3007f9';
+    const actual = isHexadecimal(testString);
+    expect(actual).toBe(expected);
+  });
+
+  it("should detect that it's not hexadecimal", () => {
+    const expected = true;
+    const testString =
+      '073ceaab59e5f2dd0561dec4883e7ee5bc7165cd4de34717a3ab8f2cbe3007f9';
+    const actual = isNonHex(testString);
+    expect(actual).toBe(expected);
  });

  it("should detect that it's a network party", () => {
-    expect(isNetworkParty('network')).toBe(true);
-    expect(isNetworkParty('web')).toBe(false);
+    const expected = true;
+    const testString = 'network';
+    const actual = isNetworkParty(testString);
+    expect(actual).toBe(expected);
  });

  it("should detect that it's a block", () => {
-    expect(isBlock('123')).toBe(true);
-    expect(isBlock('x123')).toBe(false);
+    const expected = true;
+    const testString = '3188';
+    const actual = isBlock(testString);
+    expect(actual).toBe(expected);
  });

-  it.each([
-    [
-      '0000000000000000000000000000000000000000000000000000000000000000',
-      SearchTypes.Transaction,
-    ],
-    [
-      '0000000000000000000000000000000000000000000000000000000000000001',
-      SearchTypes.Party,
-    ],
-    ['123', SearchTypes.Block],
-    ['network', SearchTypes.Party],
-    ['something else', SearchTypes.Unknown],
-  ])(
-    "detectTypeByFetching should call fetch with non-hex query it's a transaction",
-    async (input, type) => {
-      // @ts-ignore issue related to polyfill
-      fetch.mockImplementation(
-        jest.fn(() =>
-          Promise.resolve({
-            ok:
-              input ===
-              '0000000000000000000000000000000000000000000000000000000000000000',
-            json: () =>
-              Promise.resolve({
-                transaction: {
-                  hash: input,
-                },
-              }),
-          })
-        )
-      );
-      const result = await determineType(input);
-      expect(result).toBe(type);
-    }
-  );
+  it('should convert from non-hex to hex', () => {
+    const expected = '0x123';
+    const testString = '123';
+    const actual = toHex(testString);
+    expect(actual).toBe(expected);
+  });
+
+  it('should convert from hex to non-hex', () => {
+    const expected = '123';
+    const testString = '0x123';
+    const actual = toNonHex(testString);
+    expect(actual).toBe(expected);
+  });
+
+  it("should detect type client side from query if it's a hexadecimal", () => {
+    const expected = [SearchTypes.Party, SearchTypes.Transaction];
+    const testString =
+      '0x4624293CFE3D8B67A0AB448BAFF8FBCF1A1B770D9D5F263761D3D6CBEA94D97F';
+    const actual = detectTypeFromQuery(testString);
+    expect(actual).toStrictEqual(expected);
+  });
+
+  it("should detect type client side from query if it's a non hex", () => {
+    const expected = [SearchTypes.Party, SearchTypes.Transaction];
+    const testString =
+      '4624293CFE3D8B67A0AB448BAFF8FBCF1A1B770D9D5F263761D3D6CBEA94D97F';
+    const actual = detectTypeFromQuery(testString);
+    expect(actual).toStrictEqual(expected);
+  });
+
+  it("should detect type client side from query if it's a network party", () => {
+    const expected = [SearchTypes.Party];
+    const testString = 'network';
+    const actual = detectTypeFromQuery(testString);
+    expect(actual).toStrictEqual(expected);
+  });
+
+  it("should detect type client side from query if it's a block (number)", () => {
+    const expected = [SearchTypes.Block];
+    const testString = '23432';
+    const actual = detectTypeFromQuery(testString);
+    expect(actual).toStrictEqual(expected);
+  });
+
+  it("detectTypeByFetching should call fetch with non-hex query it's a transaction", async () => {
+    const query = '0xabc';
+    const type = SearchTypes.Transaction;
+    // @ts-ignore issue related to polyfill
+    fetch.mockImplementation(
+      jest.fn(() =>
+        Promise.resolve({
+          ok: true,
+          json: () =>
+            Promise.resolve({
+              transaction: {
+                hash: query,
+              },
+            }),
+        })
+      )
+    );
+    const result = await detectTypeByFetching(query);
+    expect(fetch).toHaveBeenCalledWith(
+      `${DATA_SOURCES.blockExplorerUrl}/transactions/${toNonHex(query)}`
+    );
+    expect(result).toBe(type);
+  });
+
+  it("detectTypeByFetching should call fetch with non-hex query it's a party", async () => {
+    const query = 'abc';
+    const type = SearchTypes.Party;
+    // @ts-ignore issue related to polyfill
+    fetch.mockImplementation(
+      jest.fn(() =>
+        Promise.resolve({
+          ok: false,
+        })
+      )
+    );
+    const result = await detectTypeByFetching(query);
+    expect(result).toBe(type);
+  });
+
+  it('getSearchType should return party from fetch response', async () => {
+    const query =
+      '0x4624293CFE3D8B67A0AB448BAFF8FBCF1A1B770D9D5F263761D3D6CBEA94D97F';
+    const expected = SearchTypes.Party;
+    // @ts-ignore issue related to polyfill
+    fetch.mockImplementation(
+      jest.fn(() =>
+        Promise.resolve({
+          ok: false,
+        })
+      )
+    );
+    const result = await getSearchType(query);
+    expect(result).toBe(expected);
+  });
+
+  it('getSearchType should return transaction from fetch response', async () => {
+    const query =
+      '4624293CFE3D8B67A0AB448BAFF8FBCF1A1B770D9D5F263761D3D6CBEA94D97F';
+    const expected = SearchTypes.Transaction;
+    // @ts-ignore issue related to polyfill
+    fetch.mockImplementation(
+      jest.fn(() =>
+        Promise.resolve({
+          ok: true,
+          json: () =>
+            Promise.resolve({
+              transaction: {
+                hash: query,
+              },
+            }),
+        })
+      )
+    );
+    const result = await getSearchType(query);
+    expect(result).toBe(expected);
+  });
+
+  it('getSearchType should return undefined from transaction response', async () => {
+    const query = 'u';
+    const expected = undefined;
+    const result = await getSearchType(query);
+    expect(result).toBe(expected);
+  });
+
+  it('getSearchType should return block if query is number', async () => {
+    const query = '123';
+    const expected = SearchTypes.Block;
+    const result = await getSearchType(query);
+    expect(result).toBe(expected);
+  });
+
+  it('getSearchType should return party if query is network', async () => {
+    const query = 'network';
+    const expected = SearchTypes.Party;
+    const result = await getSearchType(query);
+    expect(result).toBe(expected);
+  });
 });
@@ -1,4 +1,3 @@
-import { remove0x } from '@vegaprotocol/utils';
 import { DATA_SOURCES } from '../../config';
 import type { BlockExplorerTransaction } from '../../routes/types/block-explorer-response';

@@ -7,20 +6,15 @@ export enum SearchTypes {
  Party = 'party',
  Block = 'block',
  Order = 'order',
-  Unknown = 'unknown',
 }

-export const HASH_LENGTH = 64;
-
-export const isHash = (value: string) =>
-  /[0-9a-fA-F]+/.test(remove0x(value)) &&
-  remove0x(value).length === HASH_LENGTH;
+export const TX_LENGTH = 64;

 export const isHexadecimal = (search: string) =>
-  search.startsWith('0x') && search.length === 2 + HASH_LENGTH;
+  search.startsWith('0x') && search.length === 2 + TX_LENGTH;

 export const isNonHex = (search: string) =>
-  !search.startsWith('0x') && search.length === HASH_LENGTH;
+  !search.startsWith('0x') && search.length === TX_LENGTH;

 export const isBlock = (search: string) => !Number.isNaN(Number(search));

@@ -29,44 +23,121 @@ export const isNetworkParty = (search: string) => search === 'network';
 export const toHex = (query: string) =>
  isHexadecimal(query) ? query : `0x${query}`;

-export const toNonHex = remove0x;
+export const toNonHex = (query: string) =>
+  isNonHex(query) ? query : `${query.replace('0x', '')}`;

-/**
- * Determine the type of the given query
- */
-export const determineType = async (query: string): Promise<SearchTypes> => {
-  const value = query.toLowerCase();
-  if (isHash(value)) {
-    // it can be either `SearchTypes.Party` or `SearchTypes.Transaction`
-    if (await isTransactionHash(value)) {
-      return SearchTypes.Transaction;
-    } else {
-      return SearchTypes.Party;
-    }
-  } else if (isNetworkParty(value)) {
-    return SearchTypes.Party;
-  } else if (isBlock(value)) {
-    return SearchTypes.Block;
+export const detectTypeFromQuery = (
+  query: string
+): SearchTypes[] | undefined => {
+  const i = query.toLowerCase();
+
+  if (isHexadecimal(i) || isNonHex(i)) {
+    return [SearchTypes.Party, SearchTypes.Transaction];
+  } else if (isNetworkParty(i)) {
+    return [SearchTypes.Party];
+  } else if (isBlock(i)) {
+    return [SearchTypes.Block];
  }
-  return SearchTypes.Unknown;
+
+  return undefined;
 };

-/**
- * Checks if given input is a transaction hash by querying the transactions
- * endpoint
- */
-export const isTransactionHash = async (input: string): Promise<boolean> => {
-  const hash = remove0x(input);
+export const detectTypeByFetching = async (
+  query: string
+): Promise<SearchTypes | undefined> => {
+  const hash = toNonHex(query);
  const request = await fetch(
    `${DATA_SOURCES.blockExplorerUrl}/transactions/${hash}`
  );

  if (request?.ok) {
    const body: BlockExplorerTransaction = await request.json();
+
    if (body?.transaction) {
-      return true;
+      return SearchTypes.Transaction;
    }
  }

-  return false;
+  return SearchTypes.Party;
+};
+
+// Code commented out because the current solution to detect a hex is temporary (by process of elimination)
+// export const detectTypeByFetching = async (
+//   query: string,
+//   type: SearchTypes
+// ): Promise<SearchTypes | undefined> => {
+//   const TYPES = [SearchTypes.Party, SearchTypes.Transaction];
+//
+//   if (!TYPES.includes(type)) {
+//     throw new Error('Search type provided not recognised');
+//   }
+//
+//   if (type === SearchTypes.Transaction) {
+//     const hash = toNonHex(query);
+//     const request = await fetch(
+//       `${DATA_SOURCES.blockExplorerUrl}/transactions/${hash}`
+//     );
+//
+//     if (request?.ok) {
+//       const body: BlockExplorerTransaction = await request.json();
+//
+//       if (body?.transaction) {
+//         return SearchTypes.Transaction;
+//       }
+//     }
+//   } else if (type === SearchTypes.Party) {
+//     const party = toNonHex(query);
+//
+//     const request = await fetch(
+//       `${DATA_SOURCES.blockExplorerUrl}/transactions?limit=1&filters[tx.submitter]=${party}`
+//     );
+//
+//     if (request.ok) {
+//       const body: BlockExplorerTransactions = await request.json();
+//
+//       if (body?.transactions?.length) {
+//         return SearchTypes.Party;
+//       }
+//     }
+//   }
+//
+//   return undefined;
+// };
+
+// export const getSearchType = async (
+//   query: string
+// ): Promise<SearchTypes | undefined> => {
+//   const searchTypes = detectTypeFromQuery(query);
+//   const hasResults = searchTypes?.length;
+//
+//   if (hasResults) {
+//     if (hasResults > 1) {
+//       const promises = searchTypes.map((type) =>
+//         detectTypeByFetching(query, type)
+//       );
+//       const results = await Promise.all(promises);
+//       return results.find((result) => result !== undefined);
+//     }
+//
+//     return searchTypes[0];
+//   }
+//
+//   return undefined;
+// };
+
+export const getSearchType = async (
+  query: string
+): Promise<SearchTypes | undefined> => {
+  const searchTypes = detectTypeFromQuery(query);
+  const hasResults = searchTypes?.length;
+
+  if (hasResults) {
+    if (hasResults > 1) {
+      return await detectTypeByFetching(query);
+    }
+
+    return searchTypes[0];
+  }
+
+  return undefined;
 };
@@ -1,82 +1,157 @@
-import {
-  act,
-  fireEvent,
-  render,
-  screen,
-  waitFor,
-} from '@testing-library/react';
-import { SearchForm } from './search';
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { Search } from './search';
 import { MemoryRouter } from 'react-router-dom';
 import { Routes } from '../../routes/route-names';
+import { SearchTypes, getSearchType } from './detect-search';

-global.fetch = jest.fn();
 const mockedNavigate = jest.fn();
+const mockGetSearchType = getSearchType as jest.MockedFunction<
+  typeof getSearchType
+>;
+
 jest.mock('react-router-dom', () => ({
  ...jest.requireActual('react-router-dom'),
  useNavigate: () => mockedNavigate,
 }));

+jest.mock('./detect-search', () => ({
+  ...jest.requireActual('./detect-search'),
+  getSearchType: jest.fn(),
+}));
+
 beforeEach(() => {
  mockedNavigate.mockClear();
 });

-const renderComponent = () =>
-  render(
-    <MemoryRouter>
-      <SearchForm />
-    </MemoryRouter>
-  );
+const renderComponent = () => (
+  <MemoryRouter>
+    <Search />
+  </MemoryRouter>
+);

-describe('SearchForm', () => {
+const getInputs = () => ({
+  input: screen.getByTestId('search'),
+  button: screen.getByTestId('search-button'),
+});
+
+describe('Search', () => {
  it('should render search input and button', () => {
-    renderComponent();
+    render(renderComponent());
    expect(screen.getByTestId('search')).toBeInTheDocument();
    expect(screen.getByTestId('search-button')).toHaveTextContent('Search');
  });

-  it.each([
-    [
-      Routes.TX,
-      '0000000000000000000000000000000000000000000000000000000000000000',
-    ],
-    [
-      Routes.PARTIES,
-      '0000000000000000000000000000000000000000000000000000000000000001',
-    ],
-    [Routes.BLOCKS, '123'],
-    [undefined, 'something else'],
-  ])('should redirect to %s', async (route, input) => {
-    // @ts-ignore issue related to polyfill
-    fetch.mockImplementation(
-      jest.fn(() =>
-        Promise.resolve({
-          ok:
-            input ===
-            '0000000000000000000000000000000000000000000000000000000000000000',
-          json: () =>
-            Promise.resolve({
-              transaction: {
-                hash: input,
-              },
-            }),
-        })
-      )
+  it('should render error if input is not known', async () => {
+    render(renderComponent());
+    const { button, input } = getInputs();
+    fireEvent.change(input, { target: { value: 'asd' } });
+    fireEvent.click(button);
+
+    expect(await screen.findByTestId('search-error')).toHaveTextContent(
+      'Transaction type is not recognised'
    );
-    renderComponent();
-    await act(async () => {
-      fireEvent.change(screen.getByTestId('search'), {
-        target: {
-          value: input,
-        },
-      });
-      fireEvent.click(screen.getByTestId('search-button'));
+  });
+
+  it('should render error if no input is given', async () => {
+    render(renderComponent());
+    const { button } = getInputs();
+
+    fireEvent.click(button);
+
+    expect(await screen.findByTestId('search-error')).toHaveTextContent(
+      'Search query required'
+    );
+  });
+
+  it('should redirect to transactions page', async () => {
+    render(renderComponent());
+    const { button, input } = getInputs();
+    mockGetSearchType.mockResolvedValue(SearchTypes.Transaction);
+    fireEvent.change(input, {
+      target: {
+        value:
+          '0x1234567890123456789012345678901234567890123456789012345678901234',
+      },
    });
+
+    fireEvent.click(button);
    await waitFor(() => {
-      expect(mockedNavigate).toBeCalledTimes(route ? 1 : 0);
-      if (route) {
-        // eslint-disable-next-line jest/no-conditional-expect
-        expect(mockedNavigate).toBeCalledWith(`${route}/${input}`);
-      }
+      expect(mockedNavigate).toBeCalledWith(
+        `${Routes.TX}/0x1234567890123456789012345678901234567890123456789012345678901234`
+      );
+    });
+  });
+
+  it('should redirect to transactions page without proceeding 0x', async () => {
+    render(renderComponent());
+    const { button, input } = getInputs();
+    mockGetSearchType.mockResolvedValue(SearchTypes.Transaction);
+    fireEvent.change(input, {
+      target: {
+        value:
+          '1234567890123456789012345678901234567890123456789012345678901234',
+      },
+    });
+
+    fireEvent.click(button);
+    await waitFor(() => {
+      expect(mockedNavigate).toBeCalledWith(
+        `${Routes.TX}/0x1234567890123456789012345678901234567890123456789012345678901234`
+      );
+    });
+  });
+
+  it('should redirect to parties page', async () => {
+    render(renderComponent());
+    const { button, input } = getInputs();
+    mockGetSearchType.mockResolvedValue(SearchTypes.Party);
+    fireEvent.change(input, {
+      target: {
+        value:
+          '0x1234567890123456789012345678901234567890123456789012345678901234',
+      },
+    });
+
+    fireEvent.click(button);
+    await waitFor(() => {
+      expect(mockedNavigate).toBeCalledWith(
+        `${Routes.PARTIES}/0x1234567890123456789012345678901234567890123456789012345678901234`
+      );
+    });
+  });
+
+  it('should redirect to parties page without proceeding 0x', async () => {
+    render(renderComponent());
+    const { button, input } = getInputs();
+    mockGetSearchType.mockResolvedValue(SearchTypes.Party);
+    fireEvent.change(input, {
+      target: {
+        value:
+          '1234567890123456789012345678901234567890123456789012345678901234',
+      },
+    });
+
+    fireEvent.click(button);
+    await waitFor(() => {
+      expect(mockedNavigate).toBeCalledWith(
+        `${Routes.PARTIES}/0x1234567890123456789012345678901234567890123456789012345678901234`
+      );
+    });
+  });
+
+  it('should redirect to blocks page if passed a number', async () => {
+    render(renderComponent());
+    const { button, input } = getInputs();
+    mockGetSearchType.mockResolvedValue(SearchTypes.Block);
+    fireEvent.change(input, {
+      target: {
+        value: '123',
+      },
+    });
+
+    fireEvent.click(button);
+    await waitFor(() => {
+      expect(mockedNavigate).toBeCalledWith(`${Routes.BLOCKS}/123`);
    });
  });
 });
@@ -1,13 +1,12 @@
-import { useCallback } from 'react';
+import { useCallback, useState } from 'react';
 import { t } from '@vegaprotocol/i18n';
 import { Button, Input, InputError } from '@vegaprotocol/ui-toolkit';
 import { useForm } from 'react-hook-form';
 import { useNavigate } from 'react-router-dom';
+import { getSearchType, SearchTypes, toHex } from './detect-search';
 import { Routes } from '../../routes/route-names';
 import * as DropdownMenu from '@radix-ui/react-dropdown-menu';
 import classNames from 'classnames';
-import { remove0x } from '@vegaprotocol/utils';
-import { determineType, isBlock, isHash, SearchTypes } from './detect-search';

 interface FormFields {
  search: string;
@@ -31,26 +30,101 @@ const MagnifyingGlass = () => (
  </svg>
 );

-const Clear = () => (
-  <svg
-    className="w-3 h-3"
-    viewBox="0 0 12 12"
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-  >
-    <path
-      d="M11.3748 1.37478L1.37478 11.3748L0.625244 10.6252L10.6252 0.625244L11.3748 1.37478Z"
-      fill="currentColor"
-    />
-    <path
-      d="M1.37478 0.625244L11.3748 10.6252L10.6252 11.3748L0.625244 1.37478L1.37478 0.625244Z"
-      fill="currentColor"
-    />
-  </svg>
-);
-
 export const Search = () => {
-  const searchForm = <SearchForm />;
+  const { register, handleSubmit } = useForm<FormFields>();
+  const navigate = useNavigate();
+  const [error, setError] = useState<Error | null>(null);
+
+  const onSubmit = useCallback(
+    async (fields: FormFields) => {
+      setError(null);
+
+      const query = fields.search;
+
+      if (!query) {
+        return setError(new Error(t('Search query required')));
+      }
+
+      const result = await getSearchType(query);
+      const urlAsHex = toHex(query);
+      const unrecognisedError = new Error(
+        t('Transaction type is not recognised')
+      );
+
+      if (result) {
+        switch (result) {
+          case SearchTypes.Party:
+            return navigate(`${Routes.PARTIES}/${urlAsHex}`);
+          case SearchTypes.Transaction:
+            return navigate(`${Routes.TX}/${urlAsHex}`);
+          case SearchTypes.Block:
+            return navigate(`${Routes.BLOCKS}/${Number(query)}`);
+          default:
+            return setError(unrecognisedError);
+        }
+      }
+
+      return setError(unrecognisedError);
+    },
+    [navigate]
+  );
+
+  const searchForm = (
+    <form className="block min-w-[290px]" onSubmit={handleSubmit(onSubmit)}>
+      <div className="flex relative items-stretch gap-2 text-xs">
+        <label htmlFor="search" className="sr-only">
+          {t('Search by block number or transaction hash')}
+        </label>
+        <button
+          className={classNames(
+            'absolute top-[50%] translate-y-[-50%] left-2',
+            'text-vega-light-300 dark:text-vega-dark-300'
+          )}
+        >
+          <MagnifyingGlass />
+        </button>
+        <Input
+          {...register('search')}
+          id="search"
+          data-testid="search"
+          className={classNames(
+            'peer',
+            'pl-8 py-2 text-xs',
+            'border rounded border-vega-light-200 dark:border-vega-dark-200'
+          )}
+          hasError={Boolean(error?.message)}
+          type="text"
+          placeholder={t('Enter block number, public key or transaction hash')}
+        />
+        {error?.message && (
+          <div
+            className={classNames(
+              'hidden peer-focus:block',
+              'bg-white dark:bg-black',
+              'border rounded-b border-t-0 border-vega-light-200 dark:border-vega-dark-200',
+              'absolute top-[100%] flex-1 w-full pb-2 px-2 text-black dark:text-white'
+            )}
+          >
+            <InputError
+              data-testid="search-error"
+              intent="danger"
+              className="text-xs"
+            >
+              {error.message}
+            </InputError>
+          </div>
+        )}
+        <Button
+          className="hidden [.search-dropdown_&]:block"
+          type="submit"
+          size="xs"
+          data-testid="search-button"
+        >
+          {t('Search')}
+        </Button>
+      </div>
+    </form>
+  );

  const searchTrigger = (
    <DropdownMenu.Root>
@@ -80,135 +154,10 @@ export const Search = () => {

  return (
    <>
-      <div className="hidden [.nav-search-full_&]:block min-w-[290px]">
-        {searchForm}
-      </div>
+      <div className="hidden [.nav-search-full_&]:block">{searchForm}</div>
      <div className="hidden [.nav-search-compact_&]:block">
        {searchTrigger}
      </div>
    </>
  );
 };
-
-export const SearchForm = () => {
-  const {
-    register,
-    handleSubmit,
-    setValue,
-    setError,
-    clearErrors,
-    formState,
-    watch,
-  } = useForm<FormFields>();
-  const navigate = useNavigate();
-
-  const onSubmit = useCallback(
-    async (fields: FormFields) => {
-      clearErrors();
-      const type = await determineType(fields.search);
-      if (type) {
-        switch (type) {
-          case SearchTypes.Party:
-            return navigate(`${Routes.PARTIES}/${remove0x(fields.search)}`);
-          case SearchTypes.Transaction:
-            return navigate(`${Routes.TX}/${remove0x(fields.search)}`);
-          case SearchTypes.Block:
-            return navigate(`${Routes.BLOCKS}/${Number(fields.search)}`);
-        }
-      }
-
-      setError('search', new Error(t('The search term is not a valid query')));
-    },
-    [clearErrors, navigate, setError]
-  );
-
-  const searchQuery = watch('search', '');
-
-  return (
-    <form className="block min-w-[200px]" onSubmit={handleSubmit(onSubmit)}>
-      <div className="flex relative items-stretch gap-2 text-xs">
-        <div className="relative w-full">
-          <label htmlFor="search" className="sr-only">
-            {t('Search by block number or transaction hash')}
-          </label>
-          <button
-            className={classNames(
-              'absolute top-[50%] translate-y-[-50%] left-2',
-              'text-vega-light-300 dark:text-vega-dark-300'
-            )}
-          >
-            <MagnifyingGlass />
-          </button>
-          <button
-            onClick={(e) => {
-              e.preventDefault();
-              setValue('search', '');
-              clearErrors();
-            }}
-            className={classNames(
-              { hidden: searchQuery.length === 0 },
-              'absolute top-[50%] translate-y-[-50%] right-2',
-              'text-vega-light-300 dark:text-vega-dark-300'
-            )}
-          >
-            <Clear />
-          </button>
-          <Input
-            {...register('search', {
-              required: t('Search query is required'),
-              validate: (value) =>
-                isHash(value) ||
-                isBlock(value) ||
-                t('Search query has to be a number or a 64 character hash'),
-              onBlur: () => clearErrors('search'),
-            })}
-            id="search"
-            data-testid="search"
-            className={classNames(
-              'pl-8 py-2 text-xs',
-              { 'pr-8': searchQuery.length > 1 },
-              'border rounded border-vega-light-200 dark:border-vega-dark-200',
-              {
-                'border-vega-pink dark:border-vega-pink': Boolean(
-                  formState.errors.search
-                ),
-              }
-            )}
-            hasError={Boolean(formState.errors.search)}
-            type="text"
-            placeholder={t(
-              'Enter block number, public key or transaction hash'
-            )}
-          />
-        </div>
-        {formState.errors.search && (
-          <div
-            className={classNames(
-              '[nav_&]:border [nav_&]:rounded [nav_&]:border-vega-light-300 [nav_&]:dark:border-vega-light-300',
-              '[.search-dropdown_&]:border [.search-dropdown_&]:rounded [.search-dropdown_&]:border-vega-light-300 [.search-dropdown_&]:dark:border-vega-light-300',
-              'bg-white dark:bg-black',
-              'absolute top-[100%] flex-1 w-full pb-2 px-2 text-black dark:text-white'
-            )}
-          >
-            <InputError
-              data-testid="search-error"
-              intent="danger"
-              className="text-xs"
-            >
-              {formState.errors.search.message}
-            </InputError>
-          </div>
-        )}
-        <Button
-          variant="primary"
-          type="submit"
-          size="xs"
-          data-testid="search-button"
-          className="[nav_&]:hidden"
-        >
-          {t('Search')}
-        </Button>
-      </div>
-    </form>
-  );
-};
@@ -1,19 +1,14 @@
 import { StatsManager } from '@vegaprotocol/network-stats';
-import { SearchForm } from '../../components/search';
 import { useDocumentTitle } from '../../hooks/use-document-title';

 const Home = () => {
-  const classnames = 'mt-4 mb-4';
+  const classnames = 'mt-4 grid grid-cols-1 lg:grid-cols-2 lg:gap-4';
+
  useDocumentTitle();

  return (
    <section>
-      <div className="p-20 max-sm:py-10 max-sm:px-0">
-        <SearchForm />
-      </div>
-      <div className="px-20 max-sm:px-0">
-        <StatsManager className={classnames} />
-      </div>
+      <StatsManager className={classnames} />
    </section>
  );
 };
@@ -0,0 +1,26 @@
+import React from 'react';
+import { useRoutes } from 'react-router-dom';
+import { RouteErrorBoundary } from '../components/router-error-boundary';
+
+import routerConfig from './router-config';
+import { Loader, Splash } from '@vegaprotocol/ui-toolkit';
+
+export interface RouteChildProps {
+  name: string;
+}
+
+export const AppRouter = () => {
+  const routes = useRoutes(routerConfig);
+
+  const splashLoading = (
+    <Splash>
+      <Loader />
+    </Splash>
+  );
+
+  return (
+    <RouteErrorBoundary>
+      <React.Suspense fallback={splashLoading}>{routes}</React.Suspense>
+    </RouteErrorBoundary>
+  );
+};
@@ -1,187 +0,0 @@
-import {
-  AssetDetailsDialog,
-  useAssetDetailsDialogStore,
-} from '@vegaprotocol/assets';
-import { t } from '@vegaprotocol/i18n';
-import {
-  AnnouncementBanner,
-  BackgroundVideo,
-  BreadcrumbsContainer,
-  ButtonLink,
-  ExternalLink,
-  Icon,
-} from '@vegaprotocol/ui-toolkit';
-import classNames from 'classnames';
-import { useState } from 'react';
-import {
-  isRouteErrorResponse,
-  Link,
-  Outlet,
-  useMatch,
-  useRouteError,
-} from 'react-router-dom';
-import { Footer } from '../components/footer/footer';
-import { Header } from '../components/header';
-import { Routes } from './route-names';
-
-const DialogsContainer = () => {
-  const { isOpen, id, trigger, asJson, setOpen } = useAssetDetailsDialogStore();
-  return (
-    <AssetDetailsDialog
-      assetId={id}
-      trigger={trigger || null}
-      asJson={asJson}
-      open={isOpen}
-      onChange={setOpen}
-    />
-  );
-};
-
-const MainnetSimAd = () => {
-  const [shouldDisplayBanner, setShouldDisplayBanner] = useState<boolean>(true);
-
-  // Return an empty div so that the grid layout in _app.page.ts
-  // renders correctly
-  if (!shouldDisplayBanner) {
-    return <div />;
-  }
-
-  return (
-    <AnnouncementBanner>
-      <div className="grid grid-cols-[auto_1fr] gap-4 font-alpha calt uppercase text-center text-lg text-white">
-        <button
-          className="flex items-center"
-          onClick={() => setShouldDisplayBanner(false)}
-        >
-          <Icon name="cross" className="w-6 h-6" ariaLabel="dismiss" />
-        </button>
-        <div>
-          <span className="pr-4">Mainnet sim 3 is live!</span>
-          <ExternalLink href="https://fairground.wtf/">Learn more</ExternalLink>
-        </div>
-      </div>
-    </AnnouncementBanner>
-  );
-};
-
-export const Layout = () => {
-  const isHome = Boolean(useMatch(Routes.HOME));
-  return (
-    <>
-      <div
-        className={classNames(
-          'max-w-[1500px] min-h-[100vh]',
-          'mx-auto my-0',
-          'grid grid-rows-[auto_1fr_auto] grid-cols-1',
-          'border-vega-light-200 dark:border-vega-dark-200 lg:border-l lg:border-r',
-          'antialiased text-black dark:text-white',
-          'overflow-hidden relative'
-        )}
-      >
-        <div>
-          <MainnetSimAd />
-          <Header />
-        </div>
-        <div>
-          <main className="p-4">
-            {!isHome && <BreadcrumbsContainer className="mb-4" />}
-            <Outlet />
-          </main>
-        </div>
-        <div>
-          <Footer />
-        </div>
-      </div>
-      <DialogsContainer />
-    </>
-  );
-};
-
-export const ErrorBoundary = () => {
-  const error = useRouteError();
-
-  const errorTitle = isRouteErrorResponse(error)
-    ? `${error.status} ${error.statusText}`
-    : t('Something went wrong');
-
-  const errorMessage = isRouteErrorResponse(error)
-    ? error.error?.message
-    : (error as Error).message || JSON.stringify(error);
-
-  return (
-    <>
-      <BackgroundVideo className="brightness-50" />
-      <div
-        className={classNames(
-          'max-w-[620px] p-2 mt-[10vh]',
-          'mx-auto my-0',
-          'antialiased text-white',
-          'overflow-hidden relative',
-          'flex flex-col gap-2'
-        )}
-      >
-        <div className="flex gap-4">
-          <div>{GHOST}</div>
-          <h1 className="text-[2.7rem] font-alpha calt break-words uppercase">
-            {errorTitle}
-          </h1>
-        </div>
-        <div className="text-sm mt-10 overflow-auto break-all font-mono">
-          {errorMessage}
-        </div>
-        <div>
-          <ButtonLink onClick={() => window.location.reload()}>
-            {t('Try refreshing')}
-          </ButtonLink>{' '}
-          {t('or go back to')}{' '}
-          <Link className="underline" to="/">
-            {t('Home')}
-          </Link>
-        </div>
-      </div>
-    </>
-  );
-};
-
-const GHOST = (
-  <svg
-    width="56"
-    height="85"
-    viewBox="0 0 56 85"
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-  >
-    <path d="M41 0.5H3V60.5H41V0.5Z" fill="white" />
-    <path d="M15 18.5H13V20.5H15V18.5Z" fill="black" />
-    <path d="M17 20.5H15V22.5H17V20.5Z" fill="black" />
-    <path d="M19 18.5H17V20.5H19V18.5Z" fill="black" />
-    <path d="M15 22.5H13V24.5H15V22.5Z" fill="black" />
-    <path d="M19 22.5H17V24.5H19V22.5Z" fill="black" />
-    <path d="M29 28.5H15V30.5H29V28.5Z" fill="black" />
-    <path d="M27 18.5H25V20.5H27V18.5Z" fill="black" />
-    <path d="M29 20.5H27V22.5H29V20.5Z" fill="black" />
-    <path d="M31 18.5H29V20.5H31V18.5Z" fill="black" />
-    <path d="M27 22.5H25V24.5H27V22.5Z" fill="black" />
-    <path d="M31 22.5H29V24.5H31V22.5Z" fill="black" />
-    <path d="M31 26.5H29V28.5H31V26.5Z" fill="black" />
-    <path d="M19 60.5H17V84.5H19V60.5Z" fill="black" />
-    <path d="M27 60.5H25V84.5H27V60.5Z" fill="black" />
-    <path
-      d="M3 42.5V58.64V60.5V64.5H21V60.5H23V64.5H41V60.5V58.64V42.5H3Z"
-      fill="#FF077F"
-    />
-    <path d="M35 46.5H41V42.5H3V46.5H31H35Z" fill="#CB0666" />
-    <path d="M3 32.32V29.5L0 32.5V60.5H2V33.33L3 32.32Z" fill="black" />
-    <path d="M41 31.8V29.49L54.79 21.53L55.79 23.26L41 31.8Z" fill="black" />
-    <path d="M36 54.5H35V55.5H36V54.5Z" fill="black" />
-    <path d="M35 53.5H34V54.5H35V53.5Z" fill="black" />
-    <path d="M34 48.5H33V53.5H34V48.5Z" fill="black" />
-    <path d="M38 48.5H37V52.5H38V48.5Z" fill="black" />
-    <path d="M37 53.5H36V54.5H37V53.5Z" fill="black" />
-    <path d="M39 52.5H38V53.5H39V52.5Z" fill="black" />
-    <path
-      d="M55.7901 23.27L53.0601 22.54L45.1001 8.75L46.8301 7.75L55.7901 23.27Z"
-      fill="black"
-    />
-  </svg>
-);
@@ -8,7 +8,7 @@ import { useScrollToLocation } from '../../hooks/scroll-to-location';
 import { useDocumentTitle } from '../../hooks/use-document-title';
 import compact from 'lodash/compact';
 import { JsonViewerDialog } from '../../components/dialogs/json-viewer-dialog';
-import { marketInfoWithDataProvider } from '@vegaprotocol/market-info';
+import { marketInfoProvider } from '@vegaprotocol/market-info';
 import { PageTitle } from '../../components/page-helpers/page-title';

 export const MarketPage = () => {
@@ -17,7 +17,7 @@ export const MarketPage = () => {
  const { marketId } = useParams<{ marketId: string }>();

  const { data, loading, error } = useDataProvider({
-    dataProvider: marketInfoWithDataProvider,
+    dataProvider: marketInfoProvider,
    skipUpdates: true,
    variables: {
      marketId: marketId || '',
@@ -8,6 +8,7 @@ import { Oracle } from './oracles/id';
 import Party from './parties';
 import { Parties } from './parties/home';
 import { Party as PartySingle } from './parties/id';
+import Txs from './txs';
 import { ValidatorsPage } from './validators';
 import Genesis from './genesis';
 import { Block } from './blocks/id';
@@ -19,55 +20,23 @@ import flags from '../config/flags';
 import { t } from '@vegaprotocol/i18n';
 import { Routes } from './route-names';
 import { NetworkParameters } from './network-parameters';
-import type { Params, RouteObject } from 'react-router-dom';
-import { createBrowserRouter } from 'react-router-dom';
-import { Link } from 'react-router-dom';
+import type { RouteObject } from 'react-router-dom';
 import { MarketPage, MarketsPage } from './markets';
-import type { ReactNode } from 'react';
-import { ErrorBoundary, Layout } from './layout';
-import compact from 'lodash/compact';
-import { AssetLink, MarketLink } from '../components/links';
-import { truncateMiddle } from '@vegaprotocol/ui-toolkit';
-import { remove0x } from '@vegaprotocol/utils';

 export type Navigable = {
  path: string;
-  handle: {
-    name: string;
-    text: string;
-  };
-};
-export const isNavigable = (item: RouteObject): item is Navigable =>
-  (item as Navigable).path !== undefined &&
-  (item as Navigable).handle !== undefined &&
-  (item as Navigable).handle.name !== undefined &&
-  (item as Navigable).handle.text !== undefined;
-
-export type Breadcrumbable = {
-  handle: { breadcrumb: (data?: Params<string>) => ReactNode | string };
-};
-export const isBreadcrumbable = (item: RouteObject): item is Breadcrumbable =>
-  (item as Breadcrumbable).handle !== undefined &&
-  (item as Breadcrumbable).handle.breadcrumb !== undefined;
-
-type RouteItem =
-  | RouteObject
-  | (RouteObject & Navigable)
-  | (RouteObject & Breadcrumbable);
-type Route = RouteItem & {
-  children?: RouteItem[];
+  name: string;
+  text: string;
 };
+type Route = RouteObject & Navigable;

 const partiesRoutes: Route[] = flags.parties
  ? [
      {
        path: Routes.PARTIES,
+        name: t('Parties'),
+        text: t('Parties'),
        element: <Party />,
-        handle: {
-          name: t('Parties'),
-          text: t('Parties'),
-          breadcrumb: () => <Link to={Routes.PARTIES}>{t('Parties')}</Link>,
-        },
        children: [
          {
            index: true,
@@ -76,13 +45,6 @@ const partiesRoutes: Route[] = flags.parties
          {
            path: ':party',
            element: <PartySingle />,
-            handle: {
-              breadcrumb: (params: Params<string>) => (
-                <Link to={linkTo(Routes.PARTIES, params.party)}>
-                  {truncateMiddle(params.party as string)}
-                </Link>
-              ),
-            },
          },
        ],
      },
@@ -93,11 +55,8 @@ const assetsRoutes: Route[] = flags.assets
  ? [
      {
        path: Routes.ASSETS,
-        handle: {
-          name: t('Assets'),
-          text: t('Assets'),
-          breadcrumb: () => <Link to={Routes.ASSETS}>{t('Assets')}</Link>,
-        },
+        text: t('Assets'),
+        name: t('Assets'),
        children: [
          {
            index: true,
@@ -106,11 +65,6 @@ const assetsRoutes: Route[] = flags.assets
          {
            path: ':assetId',
            element: <AssetPage />,
-            handle: {
-              breadcrumb: (params: Params<string>) => (
-                <AssetLink assetId={params.assetId as string} />
-              ),
-            },
          },
        ],
      },
@@ -121,13 +75,8 @@ const genesisRoutes: Route[] = flags.genesis
  ? [
      {
        path: Routes.GENESIS,
-        handle: {
-          name: t('Genesis'),
-          text: t('Genesis Parameters'),
-          breadcrumb: () => (
-            <Link to={Routes.GENESIS}>{t('Genesis Parameters')}</Link>
-          ),
-        },
+        name: t('Genesis'),
+        text: t('Genesis Parameters'),
        element: <Genesis />,
      },
    ]
@@ -137,13 +86,8 @@ const governanceRoutes: Route[] = flags.governance
  ? [
      {
        path: Routes.GOVERNANCE,
-        handle: {
-          name: t('Governance proposals'),
-          text: t('Governance Proposals'),
-          breadcrumb: () => (
-            <Link to={Routes.GOVERNANCE}>{t('Governance Proposals')}</Link>
-          ),
-        },
+        name: t('Governance proposals'),
+        text: t('Governance Proposals'),
        element: <Proposals />,
      },
    ]
@@ -153,11 +97,8 @@ const marketsRoutes: Route[] = flags.markets
  ? [
      {
        path: Routes.MARKETS,
-        handle: {
-          name: t('Markets'),
-          text: t('Markets'),
-          breadcrumb: () => <Link to={Routes.MARKETS}>{t('Markets')}</Link>,
-        },
+        name: t('Markets'),
+        text: t('Markets'),
        children: [
          {
            index: true,
@@ -166,11 +107,6 @@ const marketsRoutes: Route[] = flags.markets
          {
            path: ':marketId',
            element: <MarketPage />,
-            handle: {
-              breadcrumb: (params: Params<string>) => (
-                <MarketLink id={params.marketId as string} />
-              ),
-            },
          },
        ],
      },
@@ -181,15 +117,8 @@ const networkParametersRoutes: Route[] = flags.networkParameters
  ? [
      {
        path: Routes.NETWORK_PARAMETERS,
-        handle: {
-          name: t('NetworkParameters'),
-          text: t('Network Parameters'),
-          breadcrumb: () => (
-            <Link to={Routes.NETWORK_PARAMETERS}>
-              {t('Network Parameters')}
-            </Link>
-          ),
-        },
+        name: t('NetworkParameters'),
+        text: t('Network Parameters'),
        element: <NetworkParameters />,
      },
    ]
@@ -199,133 +128,80 @@ const validators: Route[] = flags.validators
  ? [
      {
        path: Routes.VALIDATORS,
-        handle: {
-          name: t('Validators'),
-          text: t('Validators'),
-          breadcrumb: () => (
-            <Link to={Routes.VALIDATORS}>{t('Validators')}</Link>
-          ),
-        },
+        name: t('Validators'),
+        text: t('Validators'),
        element: <ValidatorsPage />,
      },
    ]
  : [];

-const linkTo = (...segments: (string | undefined)[]) =>
-  compact(segments).join('/');
-
-export const routerConfig: Route[] = [
+const routerConfig: Route[] = [
  {
    path: Routes.HOME,
-    element: <Layout />,
-    handle: {
-      name: t('Home'),
-      text: t('Home'),
-      breadcrumb: () => <Link to={Routes.HOME}>{t('Home')}</Link>,
-    },
-    errorElement: <ErrorBoundary />,
+    name: t('Home'),
+    text: t('Home'),
+    element: <Home />,
+    index: true,
+  },
+  {
+    path: Routes.TX,
+    name: t('Txs'),
+    text: t('Transactions'),
+    element: <Txs />,
+    children: [
+      {
+        path: 'pending',
+        element: <PendingTxs />,
+      },
+      {
+        path: ':txHash',
+        element: <Tx />,
+      },
+      {
+        index: true,
+        element: <TxsList />,
+      },
+    ],
+  },
+  {
+    path: Routes.BLOCKS,
+    name: t('Blocks'),
+    text: t('Blocks'),
+    element: <BlockPage />,
    children: [
      {
        index: true,
-        element: <Home />,
+        element: <Blocks />,
      },
      {
-        path: Routes.TX,
-        handle: {
-          name: t('Txs'),
-          text: t('Transactions'),
-          breadcrumb: () => <Link to={Routes.TX}>{t('Transactions')}</Link>,
-        },
-        children: [
-          {
-            path: 'pending',
-            element: <PendingTxs />,
-            handle: {
-              breadcrumb: () => (
-                <Link to={linkTo(Routes.TX, 'pending')}>
-                  {t('Pending transactions')}
-                </Link>
-              ),
-            },
-          },
-          {
-            path: ':txHash',
-            element: <Tx />,
-            handle: {
-              breadcrumb: (params: Params<string>) => (
-                <Link to={linkTo(Routes.TX, params.txHash)}>
-                  {truncateMiddle(remove0x(params.txHash as string))}
-                </Link>
-              ),
-            },
-          },
-          {
-            index: true,
-            element: <TxsList />,
-          },
-        ],
+        path: ':block',
+        element: <Block />,
      },
-      {
-        path: Routes.BLOCKS,
-        handle: {
-          name: t('Blocks'),
-          text: t('Blocks'),
-          breadcrumb: () => <Link to={Routes.BLOCKS}>{t('Blocks')}</Link>,
-        },
-        element: <BlockPage />,
-        children: [
-          {
-            index: true,
-            element: <Blocks />,
-          },
-          {
-            path: ':block',
-            element: <Block />,
-            handle: {
-              breadcrumb: (params: Params<string>) => (
-                <Link to={linkTo(Routes.BLOCKS, params.block)}>
-                  {params.block}
-                </Link>
-              ),
-            },
-          },
-        ],
-      },
-      {
-        path: Routes.ORACLES,
-        handle: {
-          name: t('Oracles'),
-          text: t('Oracles'),
-          breadcrumb: () => <Link to={Routes.ORACLES}>{t('Oracles')}</Link>,
-        },
-        element: <OraclePage />,
-        children: [
-          {
-            index: true,
-            element: <Oracles />,
-          },
-          {
-            path: ':id',
-            element: <Oracle />,
-            handle: {
-              breadcrumb: (params: Params<string>) => (
-                <Link to={linkTo(Routes.ORACLES, params.id)}>
-                  {truncateMiddle(params.id as string)}
-                </Link>
-              ),
-            },
-          },
-        ],
-      },
-      ...partiesRoutes,
-      ...assetsRoutes,
-      ...genesisRoutes,
-      ...governanceRoutes,
-      ...marketsRoutes,
-      ...networkParametersRoutes,
-      ...validators,
    ],
  },
+  {
+    path: Routes.ORACLES,
+    name: t('Oracles'),
+    text: t('Oracles'),
+    element: <OraclePage />,
+    children: [
+      {
+        index: true,
+        element: <Oracles />,
+      },
+      {
+        path: ':id',
+        element: <Oracle />,
+      },
+    ],
+  },
+  ...partiesRoutes,
+  ...assetsRoutes,
+  ...genesisRoutes,
+  ...governanceRoutes,
+  ...marketsRoutes,
+  ...networkParametersRoutes,
+  ...validators,
 ];

-export const router = createBrowserRouter(routerConfig);
+export default routerConfig;
@@ -1,4 +1,5 @@
-import { useParams } from 'react-router-dom';
+import React from 'react';
+import { Link, useParams } from 'react-router-dom';
 import { remove0x } from '@vegaprotocol/utils';
 import { useFetch } from '@vegaprotocol/react-helpers';
 import { DATA_SOURCES } from '../../../config';
@@ -7,6 +8,9 @@ import { TxDetails } from './tx-details';
 import type { BlockExplorerTransaction } from '../../../routes/types/block-explorer-response';
 import { toNonHex } from '../../../components/search/detect-search';
 import { PageHeader } from '../../../components/page-header';
+import { Routes } from '../../../routes/route-names';
+import { IconNames } from '@blueprintjs/icons';
+import { Icon } from '@vegaprotocol/ui-toolkit';
 import { useDocumentTitle } from '../../../hooks/use-document-title';

 const Tx = () => {
@@ -18,7 +22,6 @@ const Tx = () => {

  const {
    state: { data, loading, error },
-    refetch,
  } = useFetch<BlockExplorerTransaction>(
    `${DATA_SOURCES.blockExplorerUrl}/transactions/${toNonHex(hash)}`
  );
@@ -31,6 +34,17 @@ const Tx = () => {

  return (
    <section>
+      <Link
+        className="font-normal underline underline-offset-4 block mb-5"
+        to={`/${Routes.TX}`}
+      >
+        <Icon
+          className="text-vega-light-150 dark:text-vega-light-150"
+          name={IconNames.CHEVRON_LEFT}
+        />
+        All Transactions
+      </Link>
+
      <PageHeader
        title="transaction"
        truncateStart={5}
@@ -42,7 +56,6 @@ const Tx = () => {
        error={error}
        loading={loading}
        errorMessage={errorMessage}
-        refetch={refetch}
      >
        <TxDetails
          className="mb-28"
@@ -21,7 +21,7 @@ import { JsonViewerDialog } from '../../components/dialogs/json-viewer-dialog';
 import { PageTitle } from '../../components/page-helpers/page-title';
 import BigNumber from 'bignumber.js';
 import {
-  EtherscanLink,
+  ContractAddressLink,
  DApp,
  TOKEN_VALIDATOR,
  useLinks,
@@ -224,7 +224,7 @@ export const ValidatorsPage = () => {
                        <KeyValueTableRow>
                          <div>{t('Ethereum address')}</div>
                          <div className="break-all text-xs">
-                            <EtherscanLink address={v.ethereumAddress} />{' '}
+                            <ContractAddressLink address={v.ethereumAddress} />{' '}
                            <CopyWithTooltip text={v.ethereumAddress}>
                              <button title={t('Copy address to clipboard')}>
                                <Icon size={3} name="duplicate" />
@@ -1,4 +1,5 @@
 import { createRoot } from 'react-dom/client';
+import { BrowserRouter } from 'react-router-dom';
 import './styles.css';

 import App from './app/app';
@@ -9,6 +10,8 @@ const root = rootElement && createRoot(rootElement);

 root?.render(
  <StrictMode>
-    <App />
+    <BrowserRouter>
+      <App />
+    </BrowserRouter>
  </StrictMode>
 );
@@ -2,8 +2,6 @@
  "changes": {
    "decimalPlaces": "5",
    "positionDecimalPlaces": "5",
-    "linearSlippageFactor": "0.001",
-    "quadraticSlippageFactor": "0",
    "lpPriceRange": "10",
    "instrument": {
      "name": "Token test market",
@@ -1,7 +1,5 @@
 {
  "lpPriceRange": "10",
-  "linearSlippageFactor": "0.001",
-  "quadraticSlippageFactor": "0",
  "instrument": {
    "code": "TEST.24h",
    "future": {
@@ -1,103 +0,0 @@
-const vegaAssetAddress = '0x67175Da1D5e966e40D11c4B2519392B2058373de';
-const vegaWalletUnstakedBalance =
-  '[data-testid="vega-wallet-balance-unstaked"]';
-const rewardsTable = 'epoch-total-rewards-table';
-const txTimeout = Cypress.env('txTimeout');
-const rewardsTimeOut = { timeout: 60000 };
-
-context('rewards - flow', { tags: '@slow' }, function () {
-  before('set up environment to allow rewards', function () {
-    cy.visit('/');
-    cy.wait_for_spinner();
-    cy.deposit_asset(vegaAssetAddress, '1000');
-    cy.validatorsSelfDelegate();
-    cy.ethereum_wallet_connect();
-    cy.connectVegaWallet();
-    topUpRewardsPool();
-    cy.navigate_to('validators');
-    cy.vega_wallet_teardown();
-    cy.staking_page_associate_tokens('6000');
-    cy.get(vegaWalletUnstakedBalance, txTimeout).should(
-      'contain',
-      '6,000.0',
-      txTimeout
-    );
-    cy.get('button').contains('Select a validator to nominate').click();
-    cy.click_on_validator_from_list(0);
-    cy.staking_validator_page_add_stake('3000');
-    cy.close_staking_dialog();
-    cy.navigate_to('validators');
-    cy.click_on_validator_from_list(1);
-    cy.staking_validator_page_add_stake('3000');
-    cy.close_staking_dialog();
-    cy.navigate_to('rewards');
-  });
-
-  it('Should display rewards per epoch', function () {
-    cy.getByTestId(rewardsTable, rewardsTimeOut).should('exist');
-    cy.getByTestId(rewardsTable)
-      .first()
-      .within(() => {
-        cy.getByTestId('asset').should('have.text', 'Vega');
-        cy.getByTestId('ACCOUNT_TYPE_GLOBAL_REWARD').should('have.text', '1');
-        cy.getByTestId('ACCOUNT_TYPE_FEES_INFRASTRUCTURE').should(
-          'have.text',
-          '0'
-        );
-        cy.getByTestId('total').should('have.text', '1');
-      });
-  });
-
-  it('Should update when epoch starts', function () {
-    cy.getByTestId(rewardsTable)
-      .first()
-      .within(() => {
-        cy.get('h2').first().invoke('text').as('epochNumber');
-      });
-    cy.wait_for_beginning_of_epoch();
-    cy.get('@epochNumber').then((epochNumber) => {
-      cy.getByTestId(rewardsTable)
-        .first()
-        .within(() => {
-          cy.get('h2').first().invoke('text').should('not.equal', epochNumber);
-        });
-    });
-  });
-
-  // 2002-SINC-009 2002-SINC-010 2002-SINC-011 2002-SINC-012
-  it('Should display table of rewards earned by connected vega wallet', function () {
-    cy.getByTestId('epoch-reward-view-toggle-individual').click();
-    cy.getByTestId('connected-vega-key')
-      .find('span')
-      .should('have.text', Cypress.env('vegaWalletPublicKey'));
-    cy.getByTestId('epoch-individual-rewards-table')
-      .first()
-      .within(() => {
-        cy.get('h2').first().should('contain.text', 'EPOCH');
-        cy.getByTestId('individual-rewards-asset').should('have.text', 'Vega');
-        cy.getByTestId('ACCOUNT_TYPE_GLOBAL_REWARD')
-          .should('contain.text', '0.4415')
-          .and('contain.text', '(44.15%)');
-        cy.getByTestId('ACCOUNT_TYPE_FEES_INFRASTRUCTURE')
-          .should('contain.text', '0.0004')
-          .and('contain.text', '(44.15%)');
-        cy.getByTestId('total').should('have.text', '0.4419');
-      });
-  });
-
-  function topUpRewardsPool() {
-    // Must ensure that test wallet contains assets already and that the tests are within the start and end epochs
-    cy.exec(
-      `vega wallet transaction send --wallet ${Cypress.env(
-        'vegaWalletName'
-      )} --pubkey ${Cypress.env(
-        'vegaWalletPublicKey'
-      )} -p "./src/fixtures/wallet/passphrase" --network DV '{"transfer":{"fromAccountType":4,"toAccountType":12,"to":"0000000000000000000000000000000000000000000000000000000000000000","asset":"b4f2726571fbe8e33b442dc92ed2d7f0d810e21835b7371a7915a365f07ccd9b","amount":"1000000000000000000","recurring":{"startEpoch":30, "endEpoch": 200, "factor":"1"}}}' --home ${Cypress.env(
-        'vegaWalletLocation'
-      )}`,
-      { failOnNonZeroExit: false }
-    )
-      .its('stderr')
-      .should('contain', '');
-  }
-});
@@ -27,7 +27,7 @@ context(
  function () {
    before('visit withdrawals and connect vega wallet', function () {
      cy.updateCapsuleMultiSig(); // When running tests locally, will fail if run without restarting capsule
-      cy.deposit_asset(usdcEthAddress, '100000000000000000000');
+      cy.deposit_asset(usdcEthAddress);
    });

    beforeEach('Navigate to withdrawal page', function () {
@@ -73,7 +73,7 @@ context(
              .should('be.visible')
              .and(
                'have.text',
-                'Rewards are credited less than a minute after the epoch ends.This delay is set by a network parameter'
+                'Rewards are credited 5 minutes after the epoch ends.This delay is set by a network parameter'
              );
          });
          it('should have toggle for seeing total vs individual rewards', () => {
@@ -83,7 +83,6 @@ context('Staking Page - verify elements on page', function () {
          .should('contain', 'Normalised voting power: 0.10%');
      });

-      // 2002-SINC-018
      it('Should be able to see validator total penalties', function () {
        cy.get('[col-id="totalPenalties"] > div > span > span')
          .should('have.length.at.least', 1)
@@ -10,7 +10,7 @@ Cypress.Commands.add(
 );

 const navigation = {
-  section: '[data-testid="navigation"]',
+  section: 'nav',
  vesting: '[href="/token/redeem"]',
  validators: '[href="/validators"]',
  rewards: '[href="/rewards"]',
@@ -47,14 +47,13 @@ beforeEach(function () {
  cy.wrap(this.vestingContract).as('vestingContract');
 });

-Cypress.Commands.add('deposit_asset', function (assetEthAddress, amount) {
-  cy.highlight('Depositing asset into vegawallet');
+Cypress.Commands.add('deposit_asset', function (assetEthAddress) {
  cy.get('@signer', { log: false }).then((signer) => {
    // Approve asset
    cy.wrap(
      new TokenFaucetable(assetEthAddress, signer).approve(
        Erc20BridgeAddress,
-        amount + '0'.repeat(19)
+        '10000000000'
      )
    )
      .then((tx) => {
@@ -68,7 +67,7 @@ Cypress.Commands.add('deposit_asset', function (assetEthAddress, amount) {
          cy.wrap(
            bridge.deposit_asset(
              assetEthAddress,
-              amount + '0'.repeat(18),
+              '1000000000',
              '0x' + vegaWalletPubKey
            ),
            { timeout: transactionTimeout, log: false }
@@ -110,9 +109,10 @@ Cypress.Commands.add('vega_wallet_teardown', function () {
    }
  });
  cy.get(vegaWalletContainer).within(() => {
-    cy.get('[data-testid="vega-wallet-balance-unstaked"]', {
-      timeout: 30000,
-    }).should('contain.text', '0.00');
+    cy.get('[data-testid="associated-amount"]', { timeout: 30000 }).should(
+      'contain.text',
+      '0.00'
+    );
  });
 });

@@ -1,6 +1,6 @@
 # App configuration variables
 NX_VEGA_ENV=STAGNET3
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json
 NX_VEGA_URL=https://api.stagnet3.vega.xyz/graphql
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
@@ -1,6 +1,6 @@
 # App configuration variables
 NX_VEGA_ENV=DEVNET
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/devnet-network.json
 NX_VEGA_URL=https://api.n00.devnet1.vega.xyz/graphql
 NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
@@ -9,4 +9,4 @@ NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_EXPLORER_URL=https://dev.explorer.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_DELEGATIONS_PAGINATION=50
-NX_TRANCHES_SERVICE_URL=https://tranches-devnet1-k8s.ops.vega.xyz
+NX_TRANCHES_SERVICE_URL=https://tranches-devnet1-k8s.ops.vega.xyz
@@ -1,6 +1,6 @@
 # App configuration variables
 NX_VEGA_ENV=MAINNET
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/mainnet1/mainnet1.toml
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/mainnet-network.json
 NX_VEGA_URL=https://api.vega.xyz/query
 NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_ETHEREUM_PROVIDER_URL=https://mainnet.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
@@ -10,4 +10,4 @@ NX_VEGA_EXPLORER_URL=https://explorer.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40:87edc2605e544f888305d7fc4a9141bd@o286262.ingest.sentry.io/5882996
 NX_DELEGATIONS_PAGINATION=50
-NX_TRANCHES_SERVICE_URL=https://tranches-mainnet-k8s.ops.vega.xyz
+NX_TRANCHES_SERVICE_URL=https://tranches-mainnet-k8s.ops.vega.xyz
@@ -1,6 +1,6 @@
 # App configuration variables
 NX_VEGA_ENV=MIRROR
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/mainnet-mirror/vegawallet-mainnet-mirror.toml
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/mirror-network.json
 NX_VEGA_URL=https://api.n00.mainnet-mirror.vega.xyz/graphql
 NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
@@ -2,7 +2,7 @@
 NX_VEGA_URL=https://api.sandbox.vega.xyz/graphql
 NX_VEGA_ENV=SANDBOX
 NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","STAGNET1":"https://stagnet1.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/sandbox/vegawallet-sandbox.toml
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/sandbox-network.json
 NX_VEGA_EXPLORER_URL=https://sandbox.explorer.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_DELEGATIONS_PAGINATION=50
@@ -2,8 +2,8 @@
 NX_VEGA_URL=https://api.n00.stagnet1.vega.xyz/graphql
 NX_VEGA_ENV=STAGNET1
 NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","STAGNET1":"https://stagnet1.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet1-network.json
 NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_DELEGATIONS_PAGINATION=50
-NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
+NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
@@ -2,9 +2,9 @@
 NX_VEGA_URL=https://api.stagnet3.vega.xyz/graphql
 NX_VEGA_ENV=STAGNET3
 NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json
 NX_VEGA_EXPLORER_URL=https://stagnet3.explorer.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_DELEGATIONS_PAGINATION=50
-NX_TRANCHES_SERVICE_URL=https://tranches-stagnet3-k8s.ops.vega.xyz
+NX_TRANCHES_SERVICE_URL=https://tranches-stagnet3-k8s.ops.vega.xyz
@@ -1,6 +1,6 @@
 # App configuration variables
 NX_VEGA_ENV=TESTNET
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/testnet-network.json
 NX_VEGA_URL=https://api.n08.testnet.vega.xyz/graphql
 NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
@@ -10,4 +10,4 @@ NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_DELEGATIONS_PAGINATION=50
-NX_TRANCHES_SERVICE_URL=https://tranches-testnet-k8s.ops.vega.xyz
+NX_TRANCHES_SERVICE_URL=https://tranches-testnet-k8s.ops.vega.xyz
@@ -1,8 +1,8 @@
 # App configuration variables
 NX_VEGA_ENV=VALIDATOR_TESTNET
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/testnet2/testnet2.toml
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/validator-testnet-network.json
 NX_VEGA_URL=https://api-validators-testnet.vega.rocks/graphql
-NX_VEGA_REST=https://api-validators-testnet.vega.rocks/
+NX_VEGA_REST=https://api.validators-testnet.vega.xyz/
 NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
@@ -21,9 +21,9 @@ export function TemplateSidebar({ children, sidebar }: TemplateSidebarProps) {
    <>
      <AnnouncementBanner>
        <div className="font-alpha calt uppercase text-center text-lg text-white">
-          <span className="pr-4">Wait no longer, SIM3 is here!</span>
-          <ExternalLink href="https://fairground.wtf/sim3">
-            Learn more
+          <span className="pr-4">Mainnet sim 3 is live!</span>
+          <ExternalLink href="https://fairground.wtf/">
+            Come help stress test the network
          </ExternalLink>
        </div>
      </AnnouncementBanner>
@@ -43,7 +43,7 @@ export const EpochIndividualRewards = () => {
      data={data}
      render={() => (
        <div>
-          <p data-testid="connected-vega-key" className="mb-10">
+          <p className="mb-10">
            {t('Connected Vega key')}:{' '}
            <span className="text-white">{pubKey}</span>
          </p>
@@ -2,7 +2,7 @@ import type { Dispatch, SetStateAction } from 'react';
 import { forwardRef, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
-import { Button, Icon } from '@vegaprotocol/ui-toolkit';
+import { Button } from '@vegaprotocol/ui-toolkit';
 import { AgGridDynamic as AgGrid } from '@vegaprotocol/datagrid';
 import { useAppState } from '../../../../contexts/app-state/app-state-context';
 import { BigNumber } from '../../../../lib/bignumber';
@@ -87,12 +87,7 @@ const TopThirdCellRenderer = (
        <div className="mb-4">
          <Button
            data-testid="show-all-validators"
-            rightIcon={
-              <Icon
-                name="arrow-right"
-                className="fill-current mr-2 align-text-top"
-              />
-            }
+            rightIcon="arrow-right"
            className="inline-flex items-center"
          >
            {t('Reveal top validators')}
@@ -1,6 +1,7 @@
 import {
  KeyValueTable,
  KeyValueTableRow,
+  Link,
  RoundedWrapper,
 } from '@vegaprotocol/ui-toolkit';
 import { Link as RouterLink } from 'react-router-dom';
@@ -10,7 +11,7 @@ import { useParams } from 'react-router';
 import { Navigate } from 'react-router-dom';
 import { formatNumber } from '@vegaprotocol/utils';

-import { EtherscanLink } from '@vegaprotocol/environment';
+import { useEnvironment } from '@vegaprotocol/environment';
 import { TrancheItem } from '../redemption/tranche-item';
 import Routes from '../routes';
 import { TrancheLabel } from './tranche-label';
@@ -18,6 +19,7 @@ import { useTranches } from '../../lib/tranches/tranches-store';

 export const Tranche = () => {
  const tranches = useTranches((state) => state.tranches);
+  const { ETHERSCAN_URL } = useEnvironment();
  const { t } = useTranslation();
  const { trancheId } = useParams<{ trancheId: string; address: string }>();
  const { chainId } = useWeb3React();
@@ -57,15 +59,25 @@ export const Tranche = () => {
            </KeyValueTableRow>
            {tranche.users.map((user) => (
              <KeyValueTableRow key={user}>
-                <EtherscanLink address={user} data-testid="link" />
-                <RouterLink
-                  className="underline"
-                  title={t('View vesting information')}
-                  to={`${Routes.REDEEM}/${user}`}
-                  data-testid="redeem-link"
-                >
-                  {t('View vesting information')}
-                </RouterLink>
+                {
+                  <Link
+                    title={t('View on Etherscan (opens in a new tab)')}
+                    href={`${ETHERSCAN_URL}/address/${user}`}
+                    target="_blank"
+                  >
+                    {user}
+                  </Link>
+                }
+                {
+                  <RouterLink
+                    className="underline"
+                    title={t('View vesting information')}
+                    to={`${Routes.REDEEM}/${user}`}
+                    data-testid="redeem-link"
+                  >
+                    {t('View vesting information')}
+                  </RouterLink>
+                }
              </KeyValueTableRow>
            ))}
          </KeyValueTable>
@@ -17,7 +17,7 @@ NX_INCOMING_HOOK_BODY=$INCOMING_HOOK_BODY
 NX_URL=$URL
 NX_DEPLOY_URL=$DEPLOY_URL
 NX_DEPLOY_PRIME_URL=$DEPLOY_PRIME_URL
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
+NX_VEGA_CONFIG_URL="https://static.vega.xyz/assets/testnet-network.json"
 NX_VEGA_ENV = 'TESTNET'
 NX_VEGA_URL="https://api.n11.testnet.vega.xyz/graphql"
 NX_VEGA_WALLET_URL=http://localhost:1789
@@ -1,8 +1,8 @@
 # App configuration variables
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/devnet-network.json
 NX_VEGA_URL=https://api.n04.d.vega.xyz/graphql
 NX_VEGA_ENV=DEVNET
 NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_VEGA_EXPLORER_URL=https://dev.explorer.vega.xyz
+NX_VEGA_EXPLORER_URL=https://dev.explorer.vega.xyz
@@ -1,5 +1,5 @@
 # App configuration variables
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/mainnet1/mainnet1.toml
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/mainnet-network.json
 NX_VEGA_URL=https://api.vega.xyz/query
 NX_VEGA_ENV=MAINNET
 NX_VEGA_NETWORKS={\"MAINNET\":\"https://alpha.console.vega.xyz\",\"TESTNET\":\"https://console.fairground.wtf\"}
@@ -1,5 +1,5 @@
 # App configuration variables
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet1-network.json
 NX_VEGA_URL=https://api.n00.stagnet1.vega.xyz/graphql
 NX_VEGA_ENV=STAGNET1
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
@@ -1,8 +1,8 @@
 # App configuration variables
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json
 NX_VEGA_URL=https://api.stagnet3.vega.xyz/graphql
 NX_VEGA_ENV=STAGNET3
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_VEGA_EXPLORER_URL=https://staging2.explorer.vega.xyz
-NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
+NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
@@ -1,5 +1,5 @@
 # App configuration variables
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/testnet-network.json
 NX_VEGA_URL=https://api.n11.testnet.vega.xyz/graphql
 NX_VEGA_ENV=TESTNET
 NX_VEGA_NETWORKS={\"MAINNET\":\"https://alpha.console.vega.xyz\",\"TESTNET\":\"https://console.fairground.wtf\"}
@@ -5,7 +5,6 @@ import * as Schema from '@vegaprotocol/types';
 import { t } from '@vegaprotocol/i18n';

 import { Indicator } from '../indicator';
-import type { AuctionTrigger } from '@vegaprotocol/types';

 export const Status = ({
  tradingMode,
@@ -32,8 +31,7 @@ export const Status = ({
  };

  const status = getStatus();
-  const tooltipDescription =
-    tradingMode && getTooltipDescription(tradingMode, trigger);
+  const tooltipDescription = t(getTooltipDescription(status));

  return (
    <div>
@@ -54,43 +52,24 @@ export const Status = ({
  );
 };

-const getTooltipDescription = (
-  status: Schema.MarketTradingMode,
-  trigger?: Schema.AuctionTrigger
-) => {
+const getTooltipDescription = (status: string) => {
+  let tooltipDescription = '';
  switch (status) {
-    case Schema.MarketTradingMode.TRADING_MODE_CONTINUOUS:
-      return t(
-        'This is the standard trading mode where trades are executed whenever orders are received'
-      );
-    case Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION:
-      return getMonitoringDescriptionTooltip(trigger);
-    case Schema.MarketTradingMode.TRADING_MODE_OPENING_AUCTION:
-      return t(
-        'This is a new market in an opening auction to determine a fair mid-price before starting continuous trading.'
-      );
+    case Schema.MarketTradingModeMapping.TRADING_MODE_CONTINUOUS:
+      tooltipDescription =
+        'This is the standard trading mode where trades are executed whenever orders are received';
+      break;
+    case `${Schema.MarketTradingModeMapping.TRADING_MODE_MONITORING_AUCTION} - ${Schema.AuctionTriggerMapping.AUCTION_TRIGGER_LIQUIDITY}`:
+      tooltipDescription =
+        'This market is in auction until it reaches sufficient liquidity';
+      break;
+    case Schema.MarketTradingModeMapping.TRADING_MODE_OPENING_AUCTION:
+      tooltipDescription =
+        'This is a new market in an opening auction to determine a fair mid-price before starting continuous trading.';
+      break;
    default:
-      return '';
+      break;
  }
-};

-const getMonitoringDescriptionTooltip = (trigger?: AuctionTrigger) => {
-  switch (trigger) {
-    case Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET:
-      return t(
-        `This market is in auction until it reaches sufficient liquidity.`
-      );
-    case Schema.AuctionTrigger.AUCTION_TRIGGER_UNABLE_TO_DEPLOY_LP_ORDERS:
-      return t(
-        `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.`
-      );
-    case Schema.AuctionTrigger.AUCTION_TRIGGER_PRICE:
-      return t(`This market is in auction due to high price volatility.`);
-    case Schema.AuctionTrigger.AUCTION_TRIGGER_OPENING:
-      return t(
-        `This is a new market in an opening auction to determine a fair mid-price before starting continuous trading`
-      );
-    default:
-      return '';
-  }
+  return tooltipDescription;
 };
@@ -1,5 +1,5 @@
 NX_VEGA_URL=https://api.stagnet3.vega.xyz/graphql
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json
 NX_VEGA_NETWORKS='{"TESTNET":"https://multisig-signer.fairground.wtf","MAINNET":"https://multisig-signer.vega.xyz"}'
 NX_VEGA_ENV=STAGNET3

@@ -1,5 +1,5 @@
 # App configuration variables
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/devnet-network.json
 NX_VEGA_URL=https://api.n04.d.vega.xyz/graphql
 NX_VEGA_NETWORKS='{"TESTNET":"https://multisig-signer.fairground.wtf","MAINNET":"https://multisig-signer.vega.xyz"}'
 NX_VEGA_ENV=DEVNET
@@ -1,5 +1,5 @@
 # App configuration variables
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/mainnet1/mainnet1.toml
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/mainnet-network.json
 NX_VEGA_URL=https://api.vega.xyz/query
 NX_VEGA_NETWORKS='{"TESTNET":"https://multisig-signer.fairground.wtf","MAINNET":"https://multisig-signer.vega.xyz"}'
 NX_VEGA_ENV=MAINNET
@@ -1,5 +1,5 @@
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/sandbox/vegawallet-sandbox.toml
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/sandbox-network.json
 NX_VEGA_URL=https://api.sandbox.vega.xyz/graphql
 NX_VEGA_ENV=SANDBOX
 NX_VEGA_NETWORKS={\"DEVNET\":\"https://dev.token.vega.xyz\",\"STAGNET3\":\"https://stagnet3.token.vega.xyz\",\"STAGNET1\":\"https://stagnet1.token.vega.xyz\",\"TESTNET\":\"https://token.fairground.wtf\",\"MAINNET\":\"https://token.vega.xyz\"}
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/sandbox/vegawallet-sandbox.toml
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/sandbox-network.json
@@ -1,5 +1,5 @@
 # App configuration variables
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json
 NX_VEGA_URL=https://api.stagnet3.vega.xyz/graphql
 NX_VEGA_NETWORKS='{"TESTNET":"https://multisig-signer.fairground.wtf","MAINNET":"https://multisig-signer.vega.xyz"}'
 NX_VEGA_ENV=STAGNET3
@@ -1,5 +1,5 @@
 # App configuration variables
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/testnet-network.json
 NX_VEGA_URL=https://api.n09.testnet.vega.xyz/graphql
 NX_VEGA_NETWORKS='{"TESTNET":"https://multisig-signer.fairground.wtf","MAINNET":"https://multisig-signer.vega.xyz"}'
 NX_VEGA_ENV=TESTNET
@@ -1,5 +1,5 @@
 # App configuration variables
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/testnet2/testnet2.tom
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/validator-testnet-network.json
 NX_VEGA_URL=https://api-validators-testnet.vega.rocks/graphql
 NX_VEGA_NETWORKS='{"TESTNET":"https://multisig-signer.fairground.wtf","MAINNET":"https://multisig-signer.vega.xyz"}'
 NX_VEGA_ENV=VALIDATOR_TESTNET
@@ -1,3 +1,3 @@
 {
-  "hosts": ["https://api-n04.d.vega.rocks/graphql"]
+  "hosts": ["https://api.n04.d.vega.xyz/graphql"]
 }
@@ -1,3 +1,3 @@
 {
-  "hosts": ["https://api-n00.mainnet-mirror.vega.rocks/graphql"]
+  "hosts": ["https://api.n00.mainnet-mirror.vega.xyz/graphql"]
 }
@@ -1,3 +1,3 @@
 {
-  "hosts": ["https://api-n01.sandbox.vega.rocks/graphql"]
+  "hosts": ["https://api.n01.sandbox.vega.xyz/graphql"]
 }
@@ -1,3 +1,3 @@
 {
-  "hosts": ["https://api-n00.stagnet1.vega.rocks/graphql"]
+  "hosts": ["https://api.n00.stagnet1.vega.xyz/graphql"]
 }
@@ -1,3 +1,3 @@
 {
-  "hosts": ["https://api-stagnet3.vega.rocks/graphql"]
+  "hosts": ["https://api.stagnet3.vega.xyz/graphql"]
 }
@@ -1,11 +1,11 @@
 {
  "hosts": [
-    "https://api-n06.testnet.vega.rocks/graphql",
-    "https://api-n07.testnet.vega.rocks/graphql",
-    "https://api-n08.testnet.vega.rocks/graphql",
-    "https://api-n09.testnet.vega.rocks/graphql",
-    "https://api-n10.testnet.vega.rocks/graphql",
-    "https://api-n11.testnet.vega.rocks/graphql",
-    "https://api-n12.testnet.vega.rocks/graphql"
+    "https://api.n06.testnet.vega.xyz/graphql",
+    "https://api.n07.testnet.vega.xyz/graphql",
+    "https://api.n08.testnet.vega.xyz/graphql",
+    "https://api.n09.testnet.vega.xyz/graphql",
+    "https://api.n10.testnet.vega.xyz/graphql",
+    "https://api.n11.testnet.vega.xyz/graphql",
+    "https://api.n12.testnet.vega.xyz/graphql"
  ]
 }
@@ -1,7 +1,7 @@
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_ENV=STAGNET3
 NX_VEGA_EXPLORER_URL=https://stagnet3.explorer.vega.xyz
@@ -7,10 +7,6 @@ const externalLink = 'external-link';
 const accordionContent = 'accordion-content';

 describe('market info is displayed', { tags: '@smoke' }, () => {
-  beforeEach(() => {
-    cy.mockTradingPage();
-  });
-
  before(() => {
    cy.mockTradingPage();
    cy.mockSubscription();
@@ -75,8 +71,7 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
    validateMarketDataRow(3, 'Quote Name', 'BTC');
  });

-  // need to check why data are not visible
-  it.skip('settlement asset displayed', () => {
+  it('settlement asset displayed', () => {
    cy.getByTestId(marketTitle).contains('Settlement asset').click();
    cy.window().then((win) => {
      cy.stub(win, 'prompt').returns('DISABLED WINDOW PROMPT');
@@ -21,7 +21,7 @@ describe('Market proposal notification', { tags: '@smoke' }, () => {
    cy.mockTradingPage(
      Schema.MarketState.STATE_ACTIVE,
      Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
-      Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
+      Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY
    );
    cy.mockGQL((req) => {
      aliasGQLQuery(
@@ -62,7 +62,7 @@ describe('Market trading page', () => {
    cy.mockTradingPage(
      Schema.MarketState.STATE_ACTIVE,
      Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
-      Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
+      Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY
    );
    cy.mockSubscription();
    cy.visit('/#/markets/market-0');
@@ -148,7 +148,7 @@ describe('Market trading page', () => {
          cy.getByTestId(itemHeader).should('have.text', 'Trading mode');
          cy.getByTestId(itemValue).should(
            'have.text',
-            'Monitoring auction - liquidity (target not met)'
+            'Monitoring auction - liquidity'
          );
        });
      });
@@ -216,60 +216,6 @@ describe('Market trading page', () => {
        });
    });
  });
-
-  describe('market bottom panel', { tags: '@smoke' }, () => {
-    it('on xxl screen should be splitted out into two tables', () => {
-      cy.getByTestId('tab-positions').should(
-        'have.attr',
-        'data-state',
-        'active'
-      );
-      cy.getByTestId('tab-orders').should(
-        'have.attr',
-        'data-state',
-        'inactive'
-      );
-      cy.getByTestId('tab-fills').should('have.attr', 'data-state', 'inactive');
-      cy.getByTestId('tab-accounts').should(
-        'have.attr',
-        'data-state',
-        'inactive'
-      );
-
-      cy.viewport(1801, 1000);
-      cy.getByTestId('tab-positions').should(
-        'have.attr',
-        'data-state',
-        'active'
-      );
-      cy.getByTestId('tab-orders').should('have.attr', 'data-state', 'active');
-      cy.getByTestId('tab-fills').should('have.attr', 'data-state', 'inactive');
-      cy.getByTestId('tab-accounts').should(
-        'have.attr',
-        'data-state',
-        'inactive'
-      );
-
-      cy.getByTestId('Fills').click();
-      cy.getByTestId('Collateral').click();
-      cy.getByTestId('tab-positions').should(
-        'have.attr',
-        'data-state',
-        'inactive'
-      );
-      cy.getByTestId('tab-orders').should(
-        'have.attr',
-        'data-state',
-        'inactive'
-      );
-      cy.getByTestId('tab-fills').should('have.attr', 'data-state', 'active');
-      cy.getByTestId('tab-accounts').should(
-        'have.attr',
-        'data-state',
-        'active'
-      );
-    });
-  });
 });

 describe('market states not accepting orders', { tags: '@smoke' }, function () {
@@ -12,7 +12,7 @@ describe('markets table', { tags: '@smoke' }, () => {
      cy.mockTradingPage(
        Schema.MarketState.STATE_ACTIVE,
        Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
-        Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
+        Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY
      );
      cy.mockSubscription();
      cy.visit('/');
@@ -161,7 +161,7 @@ describe(
      cy.mockTradingPage(
        Schema.MarketState.STATE_SUSPENDED,
        Schema.MarketTradingMode.TRADING_MODE_BATCH_AUCTION,
-        Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
+        Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY
      );
      cy.mockSubscription();
      cy.visit('/#/markets/market-0');
@@ -230,7 +230,7 @@ describe(
      cy.mockTradingPage(
        Schema.MarketState.STATE_SUSPENDED,
        Schema.MarketTradingMode.TRADING_MODE_OPENING_AUCTION,
-        Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
+        Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY
      );
      cy.mockSubscription();
      cy.visit('/#/markets/market-0');
@@ -299,7 +299,7 @@ describe(
      cy.mockTradingPage(
        Schema.MarketState.STATE_SUSPENDED,
        Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
-        Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
+        Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY
      );
      cy.mockSubscription();
      cy.visit('/#/markets/market-0');
@@ -585,7 +585,7 @@ describe('suspended market validation', { tags: '@regression' }, () => {
    cy.mockTradingPage(
      Schema.MarketState.STATE_SUSPENDED,
      Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
-      Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
+      Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY
    );
    const accounts = accountsQuery();
    cy.mockGQL((req) => {
@@ -30,6 +30,9 @@ describe('orders list', { tags: '@smoke' }, () => {
    cy.setVegaWallet();
    cy.visit('/#/markets/market-0');
    cy.getByTestId('Orders').click();
+    cy.wait('@Orders').then(() => {
+      expect(subscriptionMocks.OrdersUpdate).to.be.calledThrice;
+    });
    cy.wait('@Markets');
  });

@@ -132,19 +135,14 @@ describe('subscribe orders', { tags: '@smoke' }, () => {
    cy.setVegaWallet();
    cy.visit('/#/markets/market-0');
    cy.getByTestId('Orders').click();
-    cy.getByTestId('tab-orders').within(() => {
-      cy.get('[col-id="status"][role="columnheader"]')
-        .focus()
-        .find('.ag-header-cell-menu-button')
-        .click();
-      cy.get('.ag-filter-apply-panel-button').click();
+    cy.wait('@Orders').then(() => {
+      expect(subscriptionMocks.OrdersUpdate).to.be.calledThrice;
    });
  });
  const orderId = '1234567890';
  // 7002-SORD-053
  // 7002-SORD-040
  // 7003-MORD-001
-
  it('must see an active order', () => {
    // 7002-SORD-041
    updateOrder({
@@ -153,7 +151,6 @@ describe('subscribe orders', { tags: '@smoke' }, () => {
    });
    cy.getByTestId(`order-status-${orderId}`).should('have.text', 'Active');
  });
-
  it('must see an expired order', () => {
    // 7002-SORD-042
    updateOrder({
@@ -356,12 +353,8 @@ describe('amend and cancel order', { tags: '@smoke' }, () => {
    cy.setVegaWallet();
    cy.visit('/#/markets/market-0');
    cy.getByTestId('Orders').click();
-    cy.getByTestId('tab-orders').within(() => {
-      cy.get('[col-id="status"][role="columnheader"]')
-        .focus()
-        .find('.ag-header-cell-menu-button')
-        .click();
-      cy.get('.ag-filter-apply-panel-button').click();
+    cy.wait('@Orders').then(() => {
+      expect(subscriptionMocks.OrdersUpdate).to.be.calledThrice;
    });
    cy.mockVegaWalletTransaction();
  });
@@ -1,58 +0,0 @@
-import { connectEthereumWallet } from '../support/ethereum-wallet';
-
-const connectEthWalletBtn = 'connect-eth-wallet-btn';
-
-describe('ethereum wallet', { tags: '@smoke' }, () => {
-  beforeEach(() => {
-    cy.mockWeb3Provider();
-    // Using portfolio withdrawals tab is it requires Ethereum wallet connection
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.setVegaWallet();
-    cy.visit('/#/portfolio');
-    cy.get('main[data-testid="/portfolio"]').should('exist');
-    cy.getByTestId('Withdrawals').click();
-  });
-
-  it('can connect', () => {
-    // 0004-EWAL-001
-
-    cy.wait('@NetworkParams');
-    cy.getByTestId('Deposits').click();
-    cy.getByTestId('deposit-button').click();
-    cy.getByTestId('connect-eth-wallet-btn').click();
-    cy.getByTestId('web3-connector-list').should('exist');
-    cy.getByTestId('web3-connector-MetaMask').click();
-    cy.getByTestId('web3-connector-list').should('not.exist');
-    cy.getByTestId('tab-deposits').should('not.be.empty');
-  });
-
-  it('should see an option to cancel the attempted connection', () => {
-    // 0004-EWAL-003
-
-    cy.wait('@NetworkParams');
-    cy.getByTestId('Deposits').click();
-    cy.getByTestId('deposit-button').click();
-    cy.getByTestId('connect-eth-wallet-btn').click();
-    cy.getByTestId('web3-connector-list').should('exist');
-    cy.getByTestId('web3-connector-WalletConnect').click();
-    cy.get('#walletconnect-qrcode-text').should('exist');
-    cy.get('#walletconnect-qrcode-close').click();
-  });
-
-  it('able to disconnect eth wallet', () => {
-    // 0004-EWAL-004
-    // 0004-EWAL-005
-    // 0004-EWAL-006
-
-    const ethWalletAddress = Cypress.env('ETHEREUM_WALLET_ADDRESS');
-    cy.getByTestId('Deposits').click();
-    cy.getByTestId('deposit-button').click();
-    connectEthereumWallet('MetaMask');
-    cy.getByTestId('ethereum-address').should('have.text', ethWalletAddress);
-    cy.getByTestId('disconnect-ethereum-wallet')
-      .should('have.text', 'Disconnect')
-      .click();
-    cy.getByTestId(connectEthWalletBtn).should('exist');
-  });
-});
@@ -1,8 +1,7 @@
-import {
-  mockConnectWallet,
-  mockConnectWalletWithUserError,
-} from '@vegaprotocol/cypress';
+import { mockConnectWallet } from '@vegaprotocol/cypress';
+import { connectEthereumWallet } from '../support/ethereum-wallet';

+const connectEthWalletBtn = 'connect-eth-wallet-btn';
 const connectVegaBtn = 'connect-vega-wallet';
 const manageVegaBtn = 'manage-vega-wallet';
 const form = 'rest-connector-form';
@@ -128,21 +127,6 @@ describe('connect vega wallet', { tags: '@smoke' }, () => {
    cy.getByTestId(manageVegaBtn).should('exist');
  });

-  it('can not connect', () => {
-    // 0002-WCON-002
-    // 0002-WCON-005
-    // 0002-WCON-007
-
-    mockConnectWalletWithUserError();
-    cy.getByTestId(connectVegaBtn).click();
-    cy.getByTestId('connectors-list')
-      .find('[data-testid="connector-jsonRpc"]')
-      .click();
-    cy.getByTestId('dialog-content')
-      .should('contain.text', 'User error')
-      .and('contain.text', 'the user rejected the wallet connection');
-  });
-
  it('can change selected public key and disconnect', () => {
    // 0002-WCON-022
    // 0002-WCON-023
@@ -180,3 +164,39 @@ describe('connect vega wallet', { tags: '@smoke' }, () => {
    );
  });
 });
+
+describe('ethereum wallet', { tags: '@smoke' }, () => {
+  beforeEach(() => {
+    cy.mockWeb3Provider();
+    // Using portfolio withdrawals tab is it requires Ethereum wallet connection
+    cy.mockTradingPage();
+    cy.mockSubscription();
+    cy.setVegaWallet();
+    cy.visit('/#/portfolio');
+    cy.get('main[data-testid="/portfolio"]').should('exist');
+    cy.getByTestId('Withdrawals').click();
+  });
+
+  it('can connect', () => {
+    cy.wait('@NetworkParams');
+    cy.getByTestId('Deposits').click();
+    cy.getByTestId('deposit-button').click();
+    cy.getByTestId('connect-eth-wallet-btn').click();
+    cy.getByTestId('web3-connector-list').should('exist');
+    cy.getByTestId('web3-connector-MetaMask').click();
+    cy.getByTestId('web3-connector-list').should('not.exist');
+    cy.getByTestId('tab-deposits').should('not.be.empty');
+  });
+
+  it('able to disconnect eth wallet', () => {
+    const ethWalletAddress = Cypress.env('ETHEREUM_WALLET_ADDRESS');
+    cy.getByTestId('Deposits').click();
+    cy.getByTestId('deposit-button').click();
+    connectEthereumWallet('MetaMask');
+    cy.getByTestId('ethereum-address').should('have.text', ethWalletAddress);
+    cy.getByTestId('disconnect-ethereum-wallet')
+      .should('have.text', 'Disconnect')
+      .click();
+    cy.getByTestId(connectEthWalletBtn).should('exist');
+  });
+});
@@ -1,7 +1,7 @@
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json
 NX_VEGA_ENV=STAGNET3
 NX_VEGA_EXPLORER_URL=https://stagnet3.explorer.vega.xyz
 NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
@@ -1,7 +1,7 @@
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/devnet-network.json
 NX_VEGA_ENV=DEVNET
 NX_VEGA_EXPLORER_URL=https://dev.explorer.vega.xyz
 NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
@@ -9,4 +9,3 @@ NX_VEGA_TOKEN_URL=https://token.fairground.wtf
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega-dev-releases/releases
-NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
@@ -1,6 +1,6 @@
 NX_ETHEREUM_PROVIDER_URL=https://mainnet.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://etherscan.io
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/mainnet1/mainnet1.toml
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/mainnet-network.json
 NX_VEGA_ENV=MAINNET
 NX_VEGA_EXPLORER_URL=https://explorer.vega.xyz
 NX_VEGA_NETWORKS={\"MAINNET\":\"https://alpha.console.vega.xyz\",\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
@@ -8,4 +8,3 @@ NX_VEGA_TOKEN_URL=https://token.vega.xyz
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
-NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
@@ -1,7 +1,7 @@
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/mainnet-mirror/vegawallet-mainnet-mirror.toml
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/mirror-network.json
 NX_VEGA_ENV=MIRROR
 NX_VEGA_EXPLORER_URL=https://mainnet-mirror.explorer.vega.xyz
 NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
@@ -9,4 +9,3 @@ NX_VEGA_TOKEN_URL=https://mainnet-mirror.token.vega.xyz
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
-NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
@@ -1,10 +1,10 @@
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_HOSTED_WALLET_URL=https://wallet.sandbox.vega.xyz
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/sandbox/vegawallet-sandbox.toml
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/sandbox-network.json
 NX_VEGA_ENV=SANDBOX
 NX_VEGA_NETWORKS={\"DEVNET\":\"https://dev.token.vega.xyz\",\"STAGNET3\":\"https://stagnet3.token.vega.xyz\",\"STAGNET1\":\"https://stagnet1.token.vega.xyz\",\"TESTNET\":\"https://token.fairground.wtf\",\"MAINNET\":\"https://token.vega.xyz\"}
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/sandbox-network.json
 NX_VEGA_EXPLORER_URL=https://sandbox.explorer.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
-NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
@@ -1,7 +1,7 @@
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet1-network.json
 NX_VEGA_ENV=STAGNET1
 NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
 NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
@@ -9,4 +9,3 @@ NX_VEGA_TOKEN_URL=https://stagnet1.token.vega.xyz
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
-NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
@@ -1,7 +1,7 @@
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json
 NX_VEGA_ENV=STAGNET3
 NX_VEGA_EXPLORER_URL=https://stagnet3.explorer.vega.xyz
 NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
@@ -9,4 +9,3 @@ NX_VEGA_TOKEN_URL=https://token.fairground.wtf
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega-dev-releases/releases
-NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
@@ -1,7 +1,7 @@
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/testnet-network.json
 NX_VEGA_ENV=TESTNET
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
 NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
@@ -9,4 +9,3 @@ NX_VEGA_TOKEN_URL=https://token.fairground.wtf
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
-NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
@@ -1,7 +1,7 @@
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/testnet2/testnet2.toml
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/validator-testnet-network.json
 NX_VEGA_ENV=VALIDATOR_TESTNET
 NX_VEGA_EXPLORER_URL=https://validator-testnet.explorer.vega.xyz
 NX_VEGA_NETWORKS={\"STAGNET3\":\"https://stagnet3.console.vega.xyz\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"TESTNET\":\"https://console.fairground.wtf\"}
@@ -9,4 +9,4 @@ NX_VEGA_TOKEN_URL=https://validator-testnet.governance.fairground.wtf
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
-NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
+
@@ -282,7 +282,7 @@ export const LiquidityViewContainer = ({
            <div className="break-word">{marketId}</div>
          </HeaderStat>
        </Header>
-        <Tabs defaultValue={getActiveDefaultId()}>
+        <Tabs active={getActiveDefaultId()}>
          <Tab
            id={LiquidityTabs.MyLiquidityProvision}
            name={t('My liquidity provision')}
@@ -1,9 +1,9 @@
-import React, { useCallback, useEffect, useMemo } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import debounce from 'lodash/debounce';
 import { addDecimalsFormatNumber, titlefy } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import {
  useDataProvider,
-  useScreenDimensions,
  useThrottledDataProvider,
 } from '@vegaprotocol/react-helpers';
 import { AsyncRenderer, ExternalLink, Splash } from '@vegaprotocol/ui-toolkit';
@@ -61,8 +61,7 @@ export const MarketPage = () => {
  const { marketId } = useParams();
  const navigate = useNavigate();

-  const { screenSize } = useScreenDimensions();
-  const largeScreen = ['lg', 'xl', 'xxl', 'xxxl'].includes(screenSize);
+  const { w } = useWindowSize();
  const update = useGlobalStore((store) => store.update);
  const lastMarketId = useGlobalStore((store) => store.marketId);

@@ -88,7 +87,7 @@ export const MarketPage = () => {
  }, [update, lastMarketId, data?.id]);

  const tradeView = useMemo(() => {
-    if (largeScreen) {
+    if (w > 960) {
      return (
        <TradeGrid
          market={data}
@@ -106,7 +105,7 @@ export const MarketPage = () => {
        onClickCollateral={() => navigate('/portfolio')}
      />
    );
-  }, [largeScreen, data, onSelect, navigate]);
+  }, [w, data, onSelect, navigate]);
  if (!data && marketId) {
    return (
      <Splash>
@@ -141,3 +140,37 @@ export const MarketPage = () => {
    </AsyncRenderer>
  );
 };
+
+const useWindowSize = () => {
+  const [windowSize, setWindowSize] = useState(() => {
+    if (typeof window !== 'undefined') {
+      return {
+        w: window.innerWidth,
+        h: window.innerHeight,
+      };
+    }
+
+    // Something sensible for server rendered page
+    return {
+      w: 1200,
+      h: 900,
+    };
+  });
+
+  useEffect(() => {
+    const handleResize = debounce(({ target }) => {
+      setWindowSize({
+        w: target.innerWidth,
+        h: target.innerHeight,
+      });
+    }, 300);
+
+    window.addEventListener('resize', handleResize);
+
+    return () => {
+      window.removeEventListener('resize', handleResize);
+    };
+  }, []);
+
+  return windowSize;
+};
@@ -8,13 +8,13 @@ import { TradesContainer } from '@vegaprotocol/trades';
 import { LayoutPriority } from 'allotment';
 import classNames from 'classnames';
 import AutoSizer from 'react-virtualized-auto-sizer';
-import { memo, useCallback, useState } from 'react';
+import { memo, useState } from 'react';
 import type { ReactNode, ComponentProps } from 'react';
 import { DepthChartContainer } from '@vegaprotocol/market-depth';
 import { CandlesChartContainer } from '@vegaprotocol/candles-chart';
 import {
  Tab,
-  LocalStoragePersistTabs as Tabs,
+  Tabs,
  ResizableGrid,
  ResizableGridPanel,
  Splash,
@@ -29,7 +29,6 @@ import { LiquidityContainer } from '../liquidity/liquidity';
 import { useNavigate } from 'react-router-dom';
 import { Links, Routes } from '../../pages/client-router';
 import type { PinnedAsset } from '@vegaprotocol/accounts';
-import { useScreenDimensions } from '@vegaprotocol/react-helpers';

 type MarketDependantView =
  | typeof CandlesChartContainer
@@ -70,204 +69,129 @@ interface TradeGridProps {
  pinnedAsset?: PinnedAsset;
 }

-interface BottomPanelProps {
+const MainGrid = ({
+  marketId,
+  onSelect,
+  pinnedAsset,
+}: {
  marketId: string;
+  onSelect?: (marketId: string) => void;
  pinnedAsset?: PinnedAsset;
-}
-
-const MarketBottomPanel = memo(
-  ({ marketId, pinnedAsset }: BottomPanelProps) => {
-    const { screenSize } = useScreenDimensions();
-    const navigate = useNavigate();
-    const onMarketClick = useCallback(
-      (marketId: string) => {
-        navigate(Links[Routes.MARKET](marketId), {
-          replace: true,
-        });
-      },
-      [navigate]
-    );
-
-    return 'xxxl' === screenSize ? (
-      <ResizableGrid proportionalLayout minSize={200}>
-        <ResizableGridPanel
-          priority={LayoutPriority.Low}
-          preferredSize="50%"
-          minSize={50}
-        >
-          <TradeGridChild>
-            <Tabs storageKey="console-trade-grid-orders">
-              <Tab id="orders" name={t('Orders')}>
-                <VegaWalletContainer>
-                  <TradingViews.Orders
+}) => {
+  const navigate = useNavigate();
+  const onMarketClick = (marketId: string) => {
+    navigate(Links[Routes.MARKET](marketId), {
+      replace: true,
+    });
+  };
+  return (
+    <ResizableGrid vertical>
+      <ResizableGridPanel minSize={75} priority={LayoutPriority.High}>
+        <ResizableGrid proportionalLayout={false} minSize={200}>
+          <ResizableGridPanel
+            priority={LayoutPriority.High}
+            minSize={200}
+            preferredSize="50%"
+          >
+            <TradeGridChild>
+              <Tabs>
+                <Tab id="chart" name={t('Chart')}>
+                  <TradingViews.Candles marketId={marketId} />
+                </Tab>
+                <Tab id="depth" name={t('Depth')}>
+                  <TradingViews.Depth marketId={marketId} />
+                </Tab>
+                <Tab id="liquidity" name={t('Liquidity')}>
+                  <TradingViews.Liquidity marketId={marketId} />
+                </Tab>
+              </Tabs>
+            </TradeGridChild>
+          </ResizableGridPanel>
+          <ResizableGridPanel
+            priority={LayoutPriority.Low}
+            preferredSize={330}
+            minSize={300}
+          >
+            <TradeGridChild>
+              <Tabs>
+                <Tab id="ticket" name={t('Ticket')}>
+                  <TradingViews.Ticket
                    marketId={marketId}
-                    onMarketClick={onMarketClick}
+                    onClickCollateral={() => navigate('/portfolio')}
                  />
-                </VegaWalletContainer>
-              </Tab>
-              <Tab id="fills" name={t('Fills')}>
-                <VegaWalletContainer>
-                  <TradingViews.Fills
+                </Tab>
+                <Tab id="info" name={t('Info')}>
+                  <TradingViews.Info
                    marketId={marketId}
-                    onMarketClick={onMarketClick}
+                    onSelect={(id: string) => {
+                      onSelect?.(id);
+                    }}
                  />
-                </VegaWalletContainer>
-              </Tab>
-            </Tabs>
-          </TradeGridChild>
-        </ResizableGridPanel>
-        <ResizableGridPanel
-          priority={LayoutPriority.Low}
-          preferredSize="50%"
-          minSize={50}
-        >
-          <TradeGridChild>
-            <Tabs storageKey="console-trade-grid-positions">
-              <Tab id="positions" name={t('Positions')}>
-                <VegaWalletContainer>
-                  <TradingViews.Positions
-                    onMarketClick={onMarketClick}
-                    noBottomPlaceholder
-                  />
-                </VegaWalletContainer>
-              </Tab>
-              <Tab id="accounts" name={t('Collateral')}>
-                <VegaWalletContainer>
-                  <TradingViews.Collateral
-                    pinnedAsset={pinnedAsset}
-                    noBottomPlaceholder
-                    hideButtons
-                  />
-                </VegaWalletContainer>
-              </Tab>
-            </Tabs>
-          </TradeGridChild>
-        </ResizableGridPanel>
-      </ResizableGrid>
-    ) : (
-      <TradeGridChild>
-        <Tabs storageKey="console-trade-grid-positions">
-          <Tab id="positions" name={t('Positions')}>
-            <VegaWalletContainer>
-              <TradingViews.Positions onMarketClick={onMarketClick} />
-            </VegaWalletContainer>
-          </Tab>
-          <Tab id="orders" name={t('Orders')}>
-            <VegaWalletContainer>
-              <TradingViews.Orders
-                marketId={marketId}
-                onMarketClick={onMarketClick}
-              />
-            </VegaWalletContainer>
-          </Tab>
-          <Tab id="fills" name={t('Fills')}>
-            <VegaWalletContainer>
-              <TradingViews.Fills
-                marketId={marketId}
-                onMarketClick={onMarketClick}
-              />
-            </VegaWalletContainer>
-          </Tab>
-          <Tab id="accounts" name={t('Collateral')}>
-            <VegaWalletContainer>
-              <TradingViews.Collateral pinnedAsset={pinnedAsset} hideButtons />
-            </VegaWalletContainer>
-          </Tab>
-        </Tabs>
-      </TradeGridChild>
-    );
-  }
-);
-MarketBottomPanel.displayName = 'MarketBottomPanel';
-
-const MainGrid = memo(
-  ({
-    marketId,
-    onSelect,
-    pinnedAsset,
-  }: {
-    marketId: string;
-    onSelect?: (marketId: string) => void;
-    pinnedAsset?: PinnedAsset;
-  }) => {
-    const navigate = useNavigate();
-    return (
-      <ResizableGrid vertical>
-        <ResizableGridPanel minSize={75} priority={LayoutPriority.High}>
-          <ResizableGrid proportionalLayout={false} minSize={200}>
-            <ResizableGridPanel
-              priority={LayoutPriority.High}
-              minSize={200}
-              preferredSize="50%"
-            >
-              <TradeGridChild>
-                <Tabs storageKey="console-trade-grid-chart">
-                  <Tab id="chart" name={t('Chart')}>
-                    <TradingViews.Candles marketId={marketId} />
-                  </Tab>
-                  <Tab id="depth" name={t('Depth')}>
-                    <TradingViews.Depth marketId={marketId} />
-                  </Tab>
-                  <Tab id="liquidity" name={t('Liquidity')}>
-                    <TradingViews.Liquidity marketId={marketId} />
-                  </Tab>
-                </Tabs>
-              </TradeGridChild>
-            </ResizableGridPanel>
-            <ResizableGridPanel
-              priority={LayoutPriority.Low}
-              preferredSize={330}
-              minSize={300}
-            >
-              <TradeGridChild>
-                <Tabs storageKey="console-trade-grid-ticket">
-                  <Tab id="ticket" name={t('Ticket')}>
-                    <TradingViews.Ticket
-                      marketId={marketId}
-                      onClickCollateral={() => navigate('/portfolio')}
-                    />
-                  </Tab>
-                  <Tab id="info" name={t('Info')}>
-                    <TradingViews.Info
-                      marketId={marketId}
-                      onSelect={(id: string) => {
-                        onSelect?.(id);
-                      }}
-                    />
-                  </Tab>
-                </Tabs>
-              </TradeGridChild>
-            </ResizableGridPanel>
-            <ResizableGridPanel
-              priority={LayoutPriority.Low}
-              preferredSize={430}
-              minSize={200}
-            >
-              <TradeGridChild>
-                <Tabs storageKey="console-trade-grid-orderbook">
-                  <Tab id="orderbook" name={t('Orderbook')}>
-                    <TradingViews.Orderbook marketId={marketId} />
-                  </Tab>
-                  <Tab id="trades" name={t('Trades')}>
-                    <TradingViews.Trades marketId={marketId} />
-                  </Tab>
-                </Tabs>
-              </TradeGridChild>
-            </ResizableGridPanel>
-          </ResizableGrid>
-        </ResizableGridPanel>
-        <ResizableGridPanel
-          priority={LayoutPriority.Low}
-          preferredSize="25%"
-          minSize={50}
-        >
-          <MarketBottomPanel marketId={marketId} pinnedAsset={pinnedAsset} />
-        </ResizableGridPanel>
-      </ResizableGrid>
-    );
-  }
-);
-MainGrid.displayName = 'MainGrid';
+                </Tab>
+              </Tabs>
+            </TradeGridChild>
+          </ResizableGridPanel>
+          <ResizableGridPanel
+            priority={LayoutPriority.Low}
+            preferredSize={430}
+            minSize={200}
+          >
+            <TradeGridChild>
+              <Tabs>
+                <Tab id="orderbook" name={t('Orderbook')}>
+                  <TradingViews.Orderbook marketId={marketId} />
+                </Tab>
+                <Tab id="trades" name={t('Trades')}>
+                  <TradingViews.Trades marketId={marketId} />
+                </Tab>
+              </Tabs>
+            </TradeGridChild>
+          </ResizableGridPanel>
+        </ResizableGrid>
+      </ResizableGridPanel>
+      <ResizableGridPanel
+        priority={LayoutPriority.Low}
+        preferredSize="25%"
+        minSize={50}
+      >
+        <TradeGridChild>
+          <Tabs>
+            <Tab id="positions" name={t('Positions')}>
+              <VegaWalletContainer>
+                <TradingViews.Positions onMarketClick={onMarketClick} />
+              </VegaWalletContainer>
+            </Tab>
+            <Tab id="orders" name={t('Orders')}>
+              <VegaWalletContainer>
+                <TradingViews.Orders
+                  marketId={marketId}
+                  onMarketClick={onMarketClick}
+                />
+              </VegaWalletContainer>
+            </Tab>
+            <Tab id="fills" name={t('Fills')}>
+              <VegaWalletContainer>
+                <TradingViews.Fills
+                  marketId={marketId}
+                  onMarketClick={onMarketClick}
+                />
+              </VegaWalletContainer>
+            </Tab>
+            <Tab id="accounts" name={t('Collateral')}>
+              <VegaWalletContainer>
+                <TradingViews.Collateral
+                  pinnedAsset={pinnedAsset}
+                  hideButtons
+                />
+              </VegaWalletContainer>
+            </Tab>
+          </Tabs>
+        </TradeGridChild>
+      </ResizableGridPanel>
+    </ResizableGrid>
+  );
+};
+const MainGridWrapped = memo(MainGrid);

 export const TradeGrid = ({
  market,
@@ -277,7 +201,7 @@ export const TradeGrid = ({
  return (
    <div className="h-full grid grid-rows-[min-content_1fr]">
      <TradeMarketHeader market={market} onSelect={onSelect} />
-      <MainGrid
+      <MainGridWrapped
        marketId={market?.id || ''}
        onSelect={onSelect}
        pinnedAsset={pinnedAsset}
@@ -1,7 +1,7 @@
 import React, { useEffect } from 'react';
 import { titlefy } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
-import { LocalStoragePersistTabs as Tabs, Tab } from '@vegaprotocol/ui-toolkit';
+import { Tabs, Tab } from '@vegaprotocol/ui-toolkit';
 import { Markets } from './markets';
 import { Proposed } from './proposed';
 import { usePageTitleStore } from '../../stores';
@@ -14,7 +14,7 @@ export const MarketsPage = () => {
    updateTitle(titlefy(['Markets']));
  }, [updateTitle]);
  return (
-    <Tabs storageKey="console-markets">
+    <Tabs>
      <Tab id="all-markets" name={t('All markets')}>
        <Markets />
      </Tab>
@@ -25,8 +25,7 @@ export const DepositsContainer = () => {
      <div className="h-full relative">
        <DepositsTable
          rowData={data || []}
-          suppressLoadingOverlay
-          suppressNoRowsOverlay
+          noRowsOverlayComponent={() => null}
          ref={gridRef}
          {...bottomPlaceholderProps}
        />
@@ -2,11 +2,7 @@ import { titlefy } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { PositionsContainer } from '@vegaprotocol/positions';
 import { OrderListContainer } from '@vegaprotocol/orders';
-import {
-  ResizableGridPanel,
-  Tab,
-  LocalStoragePersistTabs as Tabs,
-} from '@vegaprotocol/ui-toolkit';
+import { ResizableGridPanel, Tab, Tabs } from '@vegaprotocol/ui-toolkit';
 import { WithdrawalsContainer } from './withdrawals-container';
 import { FillsContainer } from '@vegaprotocol/fills';
 import type { ReactNode } from 'react';
@@ -45,7 +41,7 @@ export const Portfolio = () => {
      <ResizableGrid vertical>
        <ResizableGridPanel minSize={75}>
          <PortfolioGridChild>
-            <Tabs storageKey="console-portfolio-account-history">
+            <Tabs>
              <Tab id="account-history" name={t('Account history')}>
                <VegaWalletContainer>
                  <AccountHistoryContainer />
@@ -83,7 +79,7 @@ export const Portfolio = () => {
          minSize={50}
        >
          <PortfolioGridChild>
-            <Tabs storageKey="console-portfolio-collateral">
+            <Tabs>
              <Tab id="collateral" name={t('Collateral')}>
                <VegaWalletContainer>
                  <AccountsContainer />
@@ -24,8 +24,7 @@ export const WithdrawalsContainer = () => {
        <WithdrawalsTable
          data-testid="withdrawals-history"
          rowData={data}
-          suppressLoadingOverlay
-          suppressNoRowsOverlay
+          noRowsOverlayComponent={() => null}
        />
        <div className="pointer-events-none absolute inset-0">
          <AsyncRenderer
@@ -12,11 +12,9 @@ import { useDepositDialog } from '@vegaprotocol/deposits';
 export const AccountsContainer = ({
  pinnedAsset,
  hideButtons,
-  noBottomPlaceholder,
 }: {
  pinnedAsset?: PinnedAsset;
  hideButtons?: boolean;
-  noBottomPlaceholder?: boolean;
 }) => {
  const { pubKey, isReadOnly } = useVegaWallet();
  const { open: openAssetDetailsDialog } = useAssetDetailsDialogStore();
@@ -48,7 +46,6 @@ export const AccountsContainer = ({
        onClickDeposit={openDepositDialog}
        isReadOnly={isReadOnly}
        pinnedAsset={pinnedAsset}
-        noBottomPlaceholder={noBottomPlaceholder}
      />
      {!isReadOnly && !hideButtons && (
        <div className="flex gap-2 justify-end p-2 px-[11px] absolute lg:fixed bottom-0 right-3 dark:bg-black/75 bg-white/75 rounded">
@@ -1,38 +1,20 @@
-import { render, screen, waitFor } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { NodeHealth, NodeUrl, HealthIndicator } from './footer';
-import { MockedProvider } from '@apollo/client/testing';
-import { Intent } from '@vegaprotocol/ui-toolkit';
-
-jest.mock('@vegaprotocol/environment', () => ({
-  ...jest.requireActual('@vegaprotocol/environment'),
-  useEnvironment: jest.fn().mockImplementation(() => ({
-    VEGA_URL: 'https://vega-url.wtf',
-    VEGA_INCIDENT_URL: 'https://blog.vega.community',
-  })),
-}));
-
-const mockSetNodeSwitcher = jest.fn();
-jest.mock('../../stores', () => ({
-  ...jest.requireActual('../../stores'),
-  useGlobalStore: () => mockSetNodeSwitcher,
-}));

 describe('NodeHealth', () => {
  it('controls the node switcher dialog', async () => {
-    render(<NodeHealth />, { wrapper: MockedProvider });
-    await waitFor(() => {
-      expect(screen.getByRole('button')).toBeInTheDocument();
-    });
+    const mockOnClick = jest.fn();
+    render(
+      <NodeHealth
+        onClick={mockOnClick}
+        url={'https://api.n99.somenetwork.vega.xyz'}
+        blockHeight={100}
+        blockDiff={0}
+      />
+    );
    await userEvent.click(screen.getByRole('button'));
-    expect(mockSetNodeSwitcher).toHaveBeenCalled();
-  });
-
-  it('External link to blog should be present', () => {
-    render(<NodeHealth />, { wrapper: MockedProvider });
-    expect(
-      screen.getByRole('link', { name: /^Mainnet status & incidents/ })
-    ).toBeInTheDocument();
+    expect(mockOnClick).toHaveBeenCalled();
  });
 });

@@ -49,22 +31,14 @@ describe('NodeUrl', () => {

 describe('HealthIndicator', () => {
  const cases = [
-    {
-      intent: Intent.Success,
-      text: 'Operational',
-      classname: 'bg-vega-green-550',
-    },
-    {
-      intent: Intent.Warning,
-      text: '5 Blocks behind',
-      classname: 'bg-warning',
-    },
-    { intent: Intent.Danger, text: 'Non operational', classname: 'bg-danger' },
+    { diff: 0, classname: 'bg-vega-green-550', text: 'Operational' },
+    { diff: 5, classname: 'bg-warning', text: '5 Blocks behind' },
+    { diff: null, classname: 'bg-danger', text: 'Non operational' },
  ];
  it.each(cases)(
    'renders correct text and indicator color for $diff block difference',
    (elem) => {
-      render(<HealthIndicator text={elem.text} intent={elem.intent} />);
+      render(<HealthIndicator blockDiff={elem.diff} />);
      expect(screen.getByTestId('indicator')).toHaveClass(elem.classname);
      expect(screen.getByText(elem.text)).toBeInTheDocument();
    }
@@ -1,61 +1,59 @@
-import { useCallback } from 'react';
 import { useEnvironment, useNodeHealth } from '@vegaprotocol/environment';
+import { useNavigatorOnline } from '@vegaprotocol/react-helpers';
 import { t } from '@vegaprotocol/i18n';
-import type { Intent } from '@vegaprotocol/ui-toolkit';
-import { Indicator, ExternalLink } from '@vegaprotocol/ui-toolkit';
+import { Indicator, Intent } from '@vegaprotocol/ui-toolkit';
 import classNames from 'classnames';
 import type { ButtonHTMLAttributes, ReactNode } from 'react';
 import { useGlobalStore } from '../../stores';

 export const Footer = () => {
+  const { VEGA_URL } = useEnvironment();
+  const setNodeSwitcher = useGlobalStore(
+    (store) => (open: boolean) => store.update({ nodeSwitcherDialog: open })
+  );
+  const { blockDiff, datanodeBlockHeight } = useNodeHealth();
+
  return (
    <footer className="px-4 py-1 text-xs border-t border-default text-vega-light-300 dark:text-vega-dark-300 lg:fixed bottom-0 left-0 border-r bg-white dark:bg-black">
      {/* Pull left to align with top nav, due to button padding */}
      <div className="-ml-2">
-        <NodeHealth />
+        {VEGA_URL && (
+          <NodeHealth
+            url={VEGA_URL}
+            blockHeight={datanodeBlockHeight}
+            blockDiff={blockDiff}
+            onClick={() => setNodeSwitcher(true)}
+          />
+        )}
      </div>
    </footer>
  );
 };
+interface NodeHealthProps {
+  url: string;
+  blockHeight: number | undefined;
+  blockDiff: number | null;
+  onClick: () => void;
+}

-export const NodeHealth = () => {
-  const { VEGA_URL, VEGA_INCIDENT_URL } = useEnvironment();
-  const setNodeSwitcher = useGlobalStore(
-    (store) => (open: boolean) => store.update({ nodeSwitcherDialog: open })
-  );
-  const { datanodeBlockHeight, text, intent } = useNodeHealth();
-  const onClick = useCallback(() => {
-    setNodeSwitcher(true);
-  }, [setNodeSwitcher]);
-  const incidentsLink = VEGA_INCIDENT_URL && (
-    <ExternalLink className="ml-1" href={VEGA_INCIDENT_URL}>
-      {t('Mainnet status & incidents')}
-    </ExternalLink>
-  );
+export const NodeHealth = ({
+  url,
+  blockHeight,
+  blockDiff,
+  onClick,
+}: NodeHealthProps) => {
  return (
-    <>
-      {VEGA_URL && (
-        <FooterButton onClick={onClick} data-testid="node-health">
-          <FooterButtonPart>
-            <HealthIndicator text={text} intent={intent} />
-          </FooterButtonPart>
-          <FooterButtonPart>
-            <NodeUrl url={VEGA_URL} />
-          </FooterButtonPart>
-          {/* create a monospace effect - avoiding jumps of width */}
-          <FooterButtonPart
-            width={`${
-              datanodeBlockHeight
-                ? String(datanodeBlockHeight).length + 'ch'
-                : 'auto'
-            }`}
-          >
-            <span title={t('Block height')}>{datanodeBlockHeight}</span>
-          </FooterButtonPart>
-        </FooterButton>
-      )}
-      {incidentsLink}
-    </>
+    <FooterButton onClick={onClick} data-testid="node-health">
+      <FooterButtonPart>
+        <HealthIndicator blockDiff={blockDiff} />
+      </FooterButtonPart>
+      <FooterButtonPart>
+        <NodeUrl url={url} />
+      </FooterButtonPart>
+      <FooterButtonPart>
+        <span title={t('Block height')}>{blockHeight}</span>
+      </FooterButtonPart>
+    </FooterButton>
  );
 };

@@ -71,11 +69,31 @@ export const NodeUrl = ({ url }: NodeUrlProps) => {
 };

 interface HealthIndicatorProps {
-  text: string;
-  intent: Intent;
+  blockDiff: number | null;
 }

-export const HealthIndicator = ({ text, intent }: HealthIndicatorProps) => {
+// How many blocks behind the most advanced block that is
+// deemed acceptable for "Good" status
+const BLOCK_THRESHOLD = 3;
+
+export const HealthIndicator = ({ blockDiff }: HealthIndicatorProps) => {
+  const online = useNavigatorOnline();
+
+  let intent = Intent.Success;
+  let text = 'Operational';
+
+  if (!online) {
+    text = t('Offline');
+    intent = Intent.Danger;
+  } else if (blockDiff === null) {
+    // Block height query failed and null was returned
+    text = t('Non operational');
+    intent = Intent.Danger;
+  } else if (blockDiff >= BLOCK_THRESHOLD) {
+    text = t(`${blockDiff} Blocks behind`);
+    intent = Intent.Warning;
+  }
+
  return (
    <span title={t('Node health')}>
      <Indicator variant={intent} />
@@ -95,16 +113,9 @@ const FooterButton = (props: FooterButtonProps) => {
  return <button {...props} className={buttonClasses} />;
 };

-const FooterButtonPart = ({
-  width = 'auto',
-  children,
-}: {
-  children: ReactNode;
-  width?: string;
-}) => {
+const FooterButtonPart = ({ children }: { children: ReactNode }) => {
  return (
    <span
-      style={{ width }}
      className={classNames(
        'relative inline-block mr-2 last:mr-0 pr-2 last:pr-0',
        'last:after:hidden',
--- a/Show More
+++ b/Show More