chore: use random with seed to fix hydration warning

CODEOWNERS

@@ -1,2 +1,2 @@
-* @vegaprotocol/frontend
+* @vegaprotocol/frontend @vegaprotocol/frontend-qa
 *.graphql @vegaprotocol/core

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

@@ -133,7 +133,7 @@ export const ErrorBoundary = () => {
   );
 };
 
-export const GHOST = (
+const GHOST = (
   <svg
     width="56"
     height="85"

apps/explorer/src/app/routes/restricted/index.tsx

@@ -1,108 +0,0 @@
-import { BackgroundVideo } from '@vegaprotocol/ui-toolkit';
-import classNames from 'classnames';
-
-const RestrictedPage = () => {
-  const errorTitle = '451 Unavailable';
-  const errorMessage =
-    'Due to uncertainty about the legal and regulatory status of the content hosted on this site, it is not available to visitors in your jurisdiction.';
-
-  return (
-    <div>
-      <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 font-mono">
-          {errorMessage}
-        </div>
-      </div>
-    </div>
-  );
-};
-
-const GHOST = (
-  <svg
-    width="56"
-    height="85"
-    viewBox="0 0 150 234"
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-  >
-    <path
-      d="M10.43 93.6821L0 104.097V172.435H5.13793V106.2L14.0779 97.3247L10.43 93.6821Z"
-      fill="black"
-    />
-    <path d="M105.328 18.521H7.70703V172.435H105.328V18.521Z" fill="white" />
-    <path d="M38.5364 64.6953H33.3984V69.8258H38.5364V64.6953Z" fill="black" />
-    <path d="M43.6731 69.8257H38.5352V74.9561H43.6731V69.8257Z" fill="black" />
-    <path d="M48.8098 74.9561H43.6719V80.0865H48.8098V74.9561Z" fill="black" />
-    <path d="M38.5364 74.9561H33.3984V80.0865H38.5364V74.9561Z" fill="black" />
-    <path d="M48.8098 64.6953H43.6719V69.8258H48.8098V64.6953Z" fill="black" />
-    <path d="M69.3606 64.6953H64.2227V69.8258H69.3606V64.6953Z" fill="black" />
-    <path d="M74.5012 69.8257H69.3633V74.9561H74.5012V69.8257Z" fill="black" />
-    <path d="M79.6379 74.9561H74.5V80.0865H79.6379V74.9561Z" fill="black" />
-    <path d="M69.3606 74.9561H64.2227V80.0865H69.3606V74.9561Z" fill="black" />
-    <path d="M79.6379 64.6953H74.5V69.8258H79.6379V64.6953Z" fill="black" />
-    <path d="M79.6398 90.3477H33.3984V95.4781H79.6398V90.3477Z" fill="black" />
-    <path d="M48.8098 172.435H43.6719V234H48.8098V172.435Z" fill="black" />
-    <path d="M69.3606 172.435H64.2227V234H69.3606V172.435Z" fill="black" />
-    <path
-      d="M129.87 0.00408026L92.0273 14.3682L111.195 64.7203L149.038 50.3562L129.87 0.00408026Z"
-      fill="#FF0081"
-    />
-    <path
-      d="M108.565 21.7836L103.762 23.6064L105.587 28.4024L110.39 26.5795L108.565 21.7836Z"
-      fill="white"
-    />
-    <path
-      d="M115.189 24.7596L110.387 26.583L112.213 31.3785L117.015 29.5551L115.189 24.7596Z"
-      fill="white"
-    />
-    <path
-      d="M121.826 27.7348L117.023 29.5576L118.849 34.3536L123.652 32.5307L121.826 27.7348Z"
-      fill="white"
-    />
-    <path
-      d="M128.447 30.7059L123.645 32.5293L125.471 37.3247L130.273 35.5014L128.447 30.7059Z"
-      fill="white"
-    />
-    <path
-      d="M135.084 33.6854L130.281 35.5083L132.107 40.3043L136.91 38.4814L135.084 33.6854Z"
-      fill="white"
-    />
-    <path
-      d="M124.799 21.1156L119.996 22.939L121.822 27.7344L126.625 25.911L124.799 21.1156Z"
-      fill="white"
-    />
-    <path
-      d="M127.775 14.492L122.973 16.3154L124.799 21.1109L129.601 19.2875L127.775 14.492Z"
-      fill="white"
-    />
-    <path
-      d="M118.838 34.3499L114.035 36.1733L115.861 40.9688L120.664 39.1454L118.838 34.3499Z"
-      fill="white"
-    />
-    <path
-      d="M115.857 40.9691L111.055 42.7925L112.881 47.5879L117.683 45.7645L115.857 40.9691Z"
-      fill="white"
-    />
-    <path
-      d="M129.938 52.3822L139.906 91.5276L100.703 101.429L101.988 106.406L146.174 95.2215L134.922 51.0996L129.938 52.3822Z"
-      fill="black"
-    />
-  </svg>
-);
-
-export default RestrictedPage;

apps/explorer/src/app/routes/route-names.tsx

@@ -1,6 +1,5 @@
 export const Routes = {
   HOME: '/',
-  RESTRICTED: '/restricted',
   TX: 'txs',
   BLOCKS: 'blocks',
   PARTIES: 'parties',

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

@@ -30,7 +30,6 @@ import { remove0x } from '@vegaprotocol/utils';
 import { PartyAccountsByAsset } from './parties/id/accounts';
 import { Disclaimer } from './pages/disclaimer';
 import { FLAGS } from '@vegaprotocol/environment';
-import RestrictedPage from './restricted';
 
 export type Navigable = {
   path: string;
@@ -357,14 +356,6 @@ export const routerConfig: Route[] = [
       ...validators,
     ],
   },
-  {
-    path: Routes.RESTRICTED,
-    element: <RestrictedPage />,
-    handle: {
-      name: t('Restricted'),
-      text: t('Restricted'),
-    },
-  },
 ];
 
 export const router = createBrowserRouter(routerConfig);

apps/governance/src/app.tsx

@@ -106,7 +106,6 @@ const Web3Container = ({
     useEthWithdrawApprovalsManager();
     return null;
   };
-
   const [connectors, initializeConnectors] = useWeb3ConnectStore((store) => [
     store.connectors,
     store.initialize,
@@ -240,9 +239,6 @@ const AppContainer = () => {
     store.setDialogOpen,
   ]);
 
-  // Hacky skip all the loading & web3 init for geo restricted users
-  const isRestricted = document?.location?.pathname?.includes('/restricted');
-
   useEffect(() => {
     if (ENV.dsn && telemetryOn === 'true') {
       Sentry.init({
@@ -308,14 +304,6 @@ const AppContainer = () => {
     }
   }, [GIT_COMMIT_HASH, GIT_BRANCH, VEGA_ENV, telemetryOn]);
 
-  if (isRestricted) {
-    return (
-      <Router>
-        <AppRouter />
-      </Router>
-    );
-  }
-
   return (
     <Router>
       <ScrollToTop />

apps/governance/src/i18n/translations/dev.json

@@ -9,7 +9,6 @@
   "pageTitleRedemptionTranche": "Redeem from Tranche",
   "pageTitleTranches": "Vesting tranches",
   "pageTitle404": "Page not found",
-  "pageTitle451": "451 unavailable",
   "pageTitleNotPermitted": "Can not proceed!",
   "pageTitleDisassociate": "Disassociate $VEGA tokens from a Vega key",
   "pageTitleProposals": "Proposals",

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

@@ -12,19 +12,18 @@ import {
   generateProposal,
   generateYesVotes,
 } from '../../test-helpers/generate-proposals';
-import { ProposalHeader, NewTransferSummary } from './proposal-header';
+import { ProposalHeader } from './proposal-header';
 import {
   lastWeek,
   nextWeek,
   mockWalletContext,
   createUserVoteQueryMock,
 } from '../../test-helpers/mocks';
+import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
+import type { MockedResponse } from '@apollo/client/testing';
 import { FLAGS } from '@vegaprotocol/environment';
 import { BrowserRouter } from 'react-router-dom';
 import { VoteState } from '../vote-details/use-user-vote';
-import { useNewTransferProposalDetails } from '@vegaprotocol/proposals';
-import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
-import type { MockedResponse } from '@apollo/client/testing';
 
 jest.mock('@vegaprotocol/proposals', () => ({
   ...jest.requireActual('@vegaprotocol/proposals'),
@@ -32,7 +31,6 @@ jest.mock('@vegaprotocol/proposals', () => ({
     code: 'PARENT_CODE',
     parentMarketId: 'PARENT_ID',
   }),
-  useNewTransferProposalDetails: jest.fn(),
 }));
 
 const renderComponent = (
@@ -420,78 +418,3 @@ describe('Proposal header', () => {
     expect(await screen.findByTestId('user-voted-yes')).toBeInTheDocument();
   });
 });
-
-jest.mock('@vegaprotocol/proposals');
-
-describe('<NewTransferSummary />', () => {
-  it('renders null if no details are provided', () => {
-    (useNewTransferProposalDetails as jest.Mock).mockReturnValue(null);
-    const { container } = render(<NewTransferSummary proposalId="1" />);
-    expect(container.firstChild).toBeNull();
-  });
-
-  it('handles OneOffGovernanceTransfer', () => {
-    (useNewTransferProposalDetails as jest.Mock).mockReturnValue({
-      kind: { __typename: 'OneOffGovernanceTransfer', deliverOn: null },
-      source: '0x123',
-      sourceType: 'wallet',
-      destination: '0x456',
-      destinationType: 'contract',
-    });
-    const { getByText } = render(<NewTransferSummary proposalId="1" />);
-    const textMatch = (content: string) => content.includes('One off transfer');
-    expect(getByText(textMatch)).toBeInTheDocument();
-  });
-
-  it('handles RecurringGovernanceTransfer', () => {
-    (useNewTransferProposalDetails as jest.Mock).mockReturnValue({
-      kind: {
-        __typename: 'RecurringGovernanceTransfer',
-        startEpoch: 1,
-        endEpoch: 5,
-      },
-      source: '0x123',
-      sourceType: 'wallet',
-      destination: '0x456',
-      destinationType: 'contract',
-    });
-    const { getByText } = render(<NewTransferSummary proposalId="1" />);
-    const textMatch = (content: string) =>
-      content.includes('Recurring transfer');
-    expect(getByText(textMatch)).toBeInTheDocument();
-  });
-
-  it('should fallback to translated sourceType when source is not set', () => {
-    (useNewTransferProposalDetails as jest.Mock).mockReturnValue({
-      kind: {
-        __typename: 'RecurringGovernanceTransfer',
-        startEpoch: 1,
-        endEpoch: 5,
-      },
-      source: undefined,
-      sourceType: 'ACCOUNT_TYPE_GENERAL',
-      destination: '0x456',
-      destinationType: 'ACCOUNT_TYPE_GENERAL',
-    });
-
-    render(<NewTransferSummary proposalId="1" />);
-    expect(screen.getByText('General account')).toBeInTheDocument();
-  });
-
-  it('should fallback to translated destinationType when destination is not set', () => {
-    (useNewTransferProposalDetails as jest.Mock).mockReturnValue({
-      kind: {
-        __typename: 'RecurringGovernanceTransfer',
-        startEpoch: 1,
-        endEpoch: 5,
-      },
-      source: '0x123',
-      sourceType: 'ACCOUNT_TYPE_GENERAL',
-      destination: undefined,
-      destinationType: 'ACCOUNT_TYPE_GLOBAL_INSURANCE',
-    });
-
-    render(<NewTransferSummary proposalId="1" />);
-    expect(screen.getByText('Global insurance account')).toBeInTheDocument();
-  });
-});

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

@@ -237,11 +237,7 @@ export const ProposalHeader = ({
   );
 };
 
-export const SuccessorCode = ({
-  proposalId,
-}: {
-  proposalId?: string | null;
-}) => {
+const SuccessorCode = ({ proposalId }: { proposalId?: string | null }) => {
   const { t } = useTranslation();
   const successor = useSuccessorMarketProposalDetails(proposalId);
 
@@ -258,11 +254,7 @@ export const SuccessorCode = ({
   ) : null;
 };
 
-export const NewTransferSummary = ({
-  proposalId,
-}: {
-  proposalId?: string | null;
-}) => {
+const NewTransferSummary = ({ proposalId }: { proposalId?: string | null }) => {
   const { t } = useTranslation();
   const details = useNewTransferProposalDetails(proposalId);
 
@@ -273,21 +265,14 @@ export const NewTransferSummary = ({
       {GovernanceTransferKindMapping[details.kind.__typename]}{' '}
       {t('transfer from')}{' '}
       <Lozenge>
-        {details.source
-          ? truncateMiddle(details.source)
-          : t(details.sourceType)}
+        {truncateMiddle(details.source) || t(details.sourceType)}
       </Lozenge>{' '}
-      {t('to')}{' '}
-      <Lozenge>
-        {details.destination
-          ? truncateMiddle(details.destination)
-          : t(details.destinationType)}
-      </Lozenge>
+      {t('to')} <Lozenge>{truncateMiddle(details.destination)}</Lozenge>
     </span>
   );
 };
 
-export const CancelTransferSummary = ({
+const CancelTransferSummary = ({
   proposalId,
 }: {
   proposalId?: string | null;

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

@@ -1,112 +0,0 @@
-import { useTranslation } from 'react-i18next';
-import { useDocumentTitle } from '../../hooks/use-document-title';
-import type { RouteChildProps } from '..';
-import { BackgroundVideo } from '@vegaprotocol/ui-toolkit';
-import classNames from 'classnames';
-
-const Restricted = ({ name }: RouteChildProps) => {
-  useDocumentTitle(name);
-  const { t } = useTranslation();
-  const errorMessage =
-    'Due to uncertainty about the legal and regulatory status of the content hosted on this site, it is not available to visitors in your jurisdiction.';
-
-  return (
-    <div>
-      <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="leading-relaxed  mb-0 text-[2.7rem] font-alpha calt break-words uppercase">
-            {t('pageTitle451')}
-          </h1>
-        </div>
-        <div className="text-sm mt-10 overflow-auto font-mono">
-          {errorMessage}
-        </div>
-      </div>
-    </div>
-  );
-};
-
-const GHOST = (
-  <svg
-    width="56"
-    height="85"
-    viewBox="0 0 150 234"
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-  >
-    <path
-      d="M10.43 93.6821L0 104.097V172.435H5.13793V106.2L14.0779 97.3247L10.43 93.6821Z"
-      fill="black"
-    />
-    <path d="M105.328 18.521H7.70703V172.435H105.328V18.521Z" fill="white" />
-    <path d="M38.5364 64.6953H33.3984V69.8258H38.5364V64.6953Z" fill="black" />
-    <path d="M43.6731 69.8257H38.5352V74.9561H43.6731V69.8257Z" fill="black" />
-    <path d="M48.8098 74.9561H43.6719V80.0865H48.8098V74.9561Z" fill="black" />
-    <path d="M38.5364 74.9561H33.3984V80.0865H38.5364V74.9561Z" fill="black" />
-    <path d="M48.8098 64.6953H43.6719V69.8258H48.8098V64.6953Z" fill="black" />
-    <path d="M69.3606 64.6953H64.2227V69.8258H69.3606V64.6953Z" fill="black" />
-    <path d="M74.5012 69.8257H69.3633V74.9561H74.5012V69.8257Z" fill="black" />
-    <path d="M79.6379 74.9561H74.5V80.0865H79.6379V74.9561Z" fill="black" />
-    <path d="M69.3606 74.9561H64.2227V80.0865H69.3606V74.9561Z" fill="black" />
-    <path d="M79.6379 64.6953H74.5V69.8258H79.6379V64.6953Z" fill="black" />
-    <path d="M79.6398 90.3477H33.3984V95.4781H79.6398V90.3477Z" fill="black" />
-    <path d="M48.8098 172.435H43.6719V234H48.8098V172.435Z" fill="black" />
-    <path d="M69.3606 172.435H64.2227V234H69.3606V172.435Z" fill="black" />
-    <path
-      d="M129.87 0.00408026L92.0273 14.3682L111.195 64.7203L149.038 50.3562L129.87 0.00408026Z"
-      fill="#FF0081"
-    />
-    <path
-      d="M108.565 21.7836L103.762 23.6064L105.587 28.4024L110.39 26.5795L108.565 21.7836Z"
-      fill="white"
-    />
-    <path
-      d="M115.189 24.7596L110.387 26.583L112.213 31.3785L117.015 29.5551L115.189 24.7596Z"
-      fill="white"
-    />
-    <path
-      d="M121.826 27.7348L117.023 29.5576L118.849 34.3536L123.652 32.5307L121.826 27.7348Z"
-      fill="white"
-    />
-    <path
-      d="M128.447 30.7059L123.645 32.5293L125.471 37.3247L130.273 35.5014L128.447 30.7059Z"
-      fill="white"
-    />
-    <path
-      d="M135.084 33.6854L130.281 35.5083L132.107 40.3043L136.91 38.4814L135.084 33.6854Z"
-      fill="white"
-    />
-    <path
-      d="M124.799 21.1156L119.996 22.939L121.822 27.7344L126.625 25.911L124.799 21.1156Z"
-      fill="white"
-    />
-    <path
-      d="M127.775 14.492L122.973 16.3154L124.799 21.1109L129.601 19.2875L127.775 14.492Z"
-      fill="white"
-    />
-    <path
-      d="M118.838 34.3499L114.035 36.1733L115.861 40.9688L120.664 39.1454L118.838 34.3499Z"
-      fill="white"
-    />
-    <path
-      d="M115.857 40.9691L111.055 42.7925L112.881 47.5879L117.683 45.7645L115.857 40.9691Z"
-      fill="white"
-    />
-    <path
-      d="M129.938 52.3822L139.906 91.5276L100.703 101.429L101.988 106.406L146.174 95.2215L134.922 51.0996L129.938 52.3822Z"
-      fill="black"
-    />
-  </svg>
-);
-
-export default Restricted;

apps/governance/src/routes/router-config.tsx

@@ -4,7 +4,6 @@ import Home from './token';
 import NotFound from './not-found';
 import NotPermitted from './not-permitted';
 import Routes from './routes';
-import Restricted from './restricted';
 
 const LazyTranches = React.lazy(
   () =>
@@ -361,14 +360,9 @@ const routerConfig = [
     path: Routes.DISCLAIMER,
     element: <LazyDisclaimer name="Disclaimer" />,
   },
-  {
-    path: Routes.RESTRICTED,
-    // Not lazy as loaded when a user first hits the site
-    element: <Restricted name="451 Unavailable" />,
-  },
   {
     path: '*',
-    // Also not lazy as loaded when a user first hits the site
+    // Not lazy as loaded when a user first hits the site
     element: <NotFound name="NotFound" />,
   },
   ...redirects,

apps/governance/src/routes/routes.ts

@@ -7,7 +7,6 @@ const Routes = {
   PROPOSALS_REJECTED: '/proposals/rejected',
   PROTOCOL_UPGRADES: '/protocol-upgrades',
   NOT_PERMITTED: '/not-permitted',
-  RESTRICTED: '/restricted',
   NOT_FOUND: '/not-found',
   CONTRACTS: '/contracts',
   TOKEN: '/token',
@@ -34,10 +33,6 @@ export const TOP_LEVEL_ROUTES = [
     name: 'Rewards',
     path: Routes.REWARDS,
   },
-  {
-    name: 'Restricted',
-    path: Routes.RESTRICTED,
-  },
 ];
 
 export const TOKEN_DROPDOWN_ROUTES = [

apps/trading/components/market-banner/market-successor-banner.spec.tsx

@@ -21,7 +21,6 @@ const market = {
 } as unknown as Market;
 
 let mockDataSuccessorMarket: PartialDeep<Market> | null = null;
-let mockDataMarketState: Market['state'] | null = null;
 jest.mock('@vegaprotocol/data-provider', () => ({
   ...jest.requireActual('@vegaprotocol/data-provider'),
   useDataProvider: jest.fn().mockImplementation((args) => {
@@ -44,12 +43,6 @@ jest.mock('@vegaprotocol/utils', () => ({
 let mockCandles = {};
 jest.mock('@vegaprotocol/markets', () => ({
   ...jest.requireActual('@vegaprotocol/markets'),
-  useMarketState: (marketId: string) =>
-    marketId
-      ? {
-          data: mockDataMarketState,
-        }
-      : { data: undefined },
   useSuccessorMarket: (marketId: string) =>
     marketId
       ? {
@@ -88,6 +81,30 @@ describe('MarketSuccessorBanner', () => {
       });
       expect(container).toBeEmptyDOMElement();
     });
+
+    it('successor market not in continuous mode', () => {
+      mockDataSuccessorMarket = {
+        ...mockDataSuccessorMarket,
+        tradingMode: Types.MarketTradingMode.TRADING_MODE_NO_TRADING,
+      };
+      const { container } = render(<MarketSuccessorBanner market={market} />, {
+        wrapper: MockedProvider,
+      });
+      expect(container).toBeEmptyDOMElement();
+      expect(allUtils.getMarketExpiryDate).toHaveBeenCalled();
+    });
+
+    it('successor market is not active', () => {
+      mockDataSuccessorMarket = {
+        ...mockDataSuccessorMarket,
+        state: Types.MarketState.STATE_PENDING,
+      };
+      const { container } = render(<MarketSuccessorBanner market={market} />, {
+        wrapper: MockedProvider,
+      });
+      expect(container).toBeEmptyDOMElement();
+      expect(allUtils.getMarketExpiryDate).toHaveBeenCalled();
+    });
   });
 
   describe('should be displayed', () => {
@@ -103,17 +120,6 @@ describe('MarketSuccessorBanner', () => {
       ).toHaveAttribute('href', '/#/markets/successorMarketID');
     });
 
-    it('no successor market data, market settled', () => {
-      mockDataSuccessorMarket = null;
-      mockDataMarketState = Types.MarketState.STATE_SETTLED;
-      render(<MarketSuccessorBanner market={market} />, {
-        wrapper: MockedProvider,
-      });
-      expect(
-        screen.getByText('This market has been settled')
-      ).toBeInTheDocument();
-    });
-
     it('should display optionally successor volume', () => {
       mockDataSuccessorMarket = {
         ...mockDataSuccessorMarket,
@@ -131,9 +137,7 @@ describe('MarketSuccessorBanner', () => {
       render(<MarketSuccessorBanner market={market} />, {
         wrapper: MockedProvider,
       });
-      expect(
-        screen.getByText('has a 24h trading volume of 101.367')
-      ).toBeInTheDocument();
+      expect(screen.getByText('has 101.367 24h vol.')).toBeInTheDocument();
     });
 
     it('should display optionally duration', () => {

apps/trading/components/market-banner/market-successor-banner.tsx

@@ -4,7 +4,6 @@ import type { Market } from '@vegaprotocol/markets';
 import {
   calcCandleVolume,
   useCandles,
-  useMarketState,
   useSuccessorMarket,
 } from '@vegaprotocol/markets';
 import {
@@ -30,9 +29,7 @@ export const MarketSuccessorBanner = ({
 }: {
   market: Market | null;
 }) => {
-  const { data: marketState } = useMarketState(market?.id);
-  const isSettled = marketState === Types.MarketState.STATE_SETTLED;
-  const { data: successorData, loading } = useSuccessorMarket(market?.id);
+  const { data: successorData } = useSuccessorMarket(market?.id);
 
   const [visible, setVisible] = useState(true);
 
@@ -48,6 +45,11 @@ export const MarketSuccessorBanner = ({
       ? intervalToDuration({ start: new Date(), end: expiry })
       : null;
 
+  const isInContinuesMode =
+    successorData?.state === Types.MarketState.STATE_ACTIVE &&
+    successorData?.tradingMode ===
+      Types.MarketTradingMode.TRADING_MODE_CONTINUOUS;
+
   const { oneDayCandles } = useCandles({
     marketId: successorData?.id,
   });
@@ -64,7 +66,7 @@ export const MarketSuccessorBanner = ({
         )
       : null;
 
-  if (!loading && (isSettled || successorData) && visible) {
+  if (isInContinuesMode && visible) {
     return (
       <NotificationBanner
         intent={Intent.Primary}
@@ -72,47 +74,34 @@ export const MarketSuccessorBanner = ({
           setVisible(false);
         }}
       >
-        <div className="uppercase">
-          {successorData
-            ? t('This market has been succeeded')
-            : t('This market has been settled')}
+        <div className="uppercase mb-1">
+          {t('This market has been succeeded')}
+        </div>
+        <div>
+          {duration && (
+            <span>
+              {t('This market expires in %s.', [
+                formatDuration(duration, {
+                  format: [
+                    'years',
+                    'months',
+                    'weeks',
+                    'days',
+                    'hours',
+                    'minutes',
+                  ],
+                }),
+              ])}
+            </span>
+          )}{' '}
+          {t('The successor market')}{' '}
+          <ExternalLink href={`/#/markets/${successorData?.id}`}>
+            {successorData?.tradableInstrument.instrument.name}
+          </ExternalLink>
+          {successorVolume && (
+            <span> {t('has %s 24h vol.', [successorVolume])}</span>
+          )}
         </div>
-        {(duration || successorData) && (
-          <div className="mt-1">
-            {duration && (
-              <span>
-                {t('This market expires in %s.', [
-                  formatDuration(duration, {
-                    format: [
-                      'years',
-                      'months',
-                      'weeks',
-                      'days',
-                      'hours',
-                      'minutes',
-                    ],
-                  }),
-                ])}
-              </span>
-            )}
-            {successorData && (
-              <>
-                {' '}
-                {t('The successor market')}
-                {!successorVolume ? ' is ' : ' '}
-                <ExternalLink href={`/#/markets/${successorData?.id}`}>
-                  {successorData?.tradableInstrument.instrument.name}
-                </ExternalLink>
-                {successorVolume && (
-                  <span>
-                    {' '}
-                    {t('has a 24h trading volume of %s', [successorVolume])}
-                  </span>
-                )}
-              </>
-            )}
-          </div>
-        )}
       </NotificationBanner>
     );
   }

apps/trading/components/market-selector/market-selector-item.tsx

@@ -56,7 +56,6 @@ const MarketData = ({
     variables: {
       marketId: market.id,
     },
-    fetchPolicy: 'no-cache',
   });
 
   const marketData = data?.marketsData[0];
@@ -71,8 +70,6 @@ const MarketData = ({
 
   const marketTradingMode = marketData
     ? marketData.marketTradingMode
-    : market.data
-    ? market.data.marketTradingMode
     : market.tradingMode;
 
   const mode = [
@@ -98,7 +95,7 @@ const MarketData = ({
     <>
       <div className="w-2/5" role="gridcell">
         <h3 className="flex items-baseline">
-          <span className="overflow-hidden text-sm lg:text-base text-ellipsis whitespace-nowrap">
+          <span className="text-sm lg:text-base text-ellipsis whitespace-nowrap overflow-hidden">
             {market.tradableInstrument.instrument.code}
           </span>
           {allProducts && productType && (

apps/trading/components/market-selector/market-selector.spec.tsx

@@ -2,10 +2,7 @@ import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { MarketSelector } from './market-selector';
 import { useMarketList } from '@vegaprotocol/markets';
-import {
-  createMarketFragment,
-  createMarketsDataFragment,
-} from '@vegaprotocol/mock';
+import { createMarketFragment } from '@vegaprotocol/mock';
 import { MarketState } from '@vegaprotocol/types';
 import { MemoryRouter } from 'react-router-dom';
 import type { ReactNode } from 'react';
@@ -39,10 +36,6 @@ describe('MarketSelector', () => {
   const markets = [
     createMarketFragment({
       id: 'market-0',
-      // @ts-ignore candles get joined outside this type
-      data: createMarketsDataFragment({
-        marketState: MarketState.STATE_ACTIVE,
-      }),
       tradableInstrument: {
         instrument: {
           code: 'a',
@@ -63,10 +56,7 @@ describe('MarketSelector', () => {
     }),
     createMarketFragment({
       id: 'market-1',
-      // @ts-ignore candles get joined outside this type
-      data: createMarketsDataFragment({
-        marketState: MarketState.STATE_SUSPENDED,
-      }),
+      state: MarketState.STATE_SUSPENDED,
       tradableInstrument: {
         instrument: {
           code: 'b',
@@ -87,10 +77,7 @@ describe('MarketSelector', () => {
     }),
     createMarketFragment({
       id: 'market-2',
-      // @ts-ignore candles get joined outside this type
-      data: createMarketsDataFragment({
-        marketState: MarketState.STATE_CLOSED,
-      }),
+      state: MarketState.STATE_CLOSED,
       tradableInstrument: {
         instrument: {
           product: {
@@ -104,10 +91,7 @@ describe('MarketSelector', () => {
     }),
     createMarketFragment({
       id: 'market-3',
-      // @ts-ignore candles get joined outside this type
-      data: createMarketsDataFragment({
-        marketState: MarketState.STATE_ACTIVE,
-      }),
+      state: MarketState.STATE_ACTIVE,
       tradableInstrument: {
         instrument: {
           code: 'c',
@@ -128,10 +112,6 @@ describe('MarketSelector', () => {
     }),
     createMarketFragment({
       id: 'market-4',
-      // @ts-ignore candles get joined outside this type
-      data: createMarketsDataFragment({
-        marketState: MarketState.STATE_ACTIVE,
-      }),
       tradableInstrument: {
         instrument: {
           code: 'cd',
@@ -152,10 +132,7 @@ describe('MarketSelector', () => {
     }),
   ];
 
-  const activeMarkets = markets.filter((m) =>
-    // @ts-ignore candles get joined outside this type
-    isMarketActive(m.data.marketState)
-  );
+  const activeMarkets = markets.filter((m) => isMarketActive(m.state));
   mockUseMarketList.mockReturnValue({
     data: markets,
     loading: false,

apps/trading/components/market-selector/use-market-selector-list.spec.tsx

@@ -4,10 +4,7 @@ import { useMarketSelectorList } from './use-market-selector-list';
 import { isMarketActive } from '../../lib/utils';
 import { Product } from './product-selector';
 import { Sort } from './sort-dropdown';
-import {
-  createMarketFragment,
-  createMarketsDataFragment,
-} from '@vegaprotocol/mock';
+import { createMarketFragment } from '@vegaprotocol/mock';
 import { MarketState } from '@vegaprotocol/types';
 import { useMarketList } from '@vegaprotocol/markets';
 import type { Filter } from './market-selector';
@@ -34,40 +31,22 @@ describe('useMarketSelectorList', () => {
 
   it('returns all markets active and suspended markets', () => {
     const markets = [
-      createMarketFragment({
-        id: 'market-0',
-        // @ts-ignore candles get joined outside this type
-        data: createMarketsDataFragment({
-          marketState: MarketState.STATE_ACTIVE,
-        }),
-      }),
+      createMarketFragment({ id: 'market-0' }),
       createMarketFragment({
         id: 'market-1',
-        // @ts-ignore candles get joined outside this type
-        data: createMarketsDataFragment({
-          marketState: MarketState.STATE_SUSPENDED,
-        }),
+        state: MarketState.STATE_SUSPENDED,
       }),
       createMarketFragment({
         id: 'market-2',
-        // @ts-ignore candles get joined outside this type
-        data: createMarketsDataFragment({
-          marketState: MarketState.STATE_CLOSED,
-        }),
+        state: MarketState.STATE_CLOSED,
       }),
       createMarketFragment({
         id: 'market-3',
-        // @ts-ignore candles get joined outside this type
-        data: createMarketsDataFragment({
-          marketState: MarketState.STATE_CLOSED,
-        }),
+        state: MarketState.STATE_CLOSED,
       }),
       createMarketFragment({
         id: 'market-4',
-        // @ts-ignore candles get joined outside this type
-        data: createMarketsDataFragment({
-          marketState: MarketState.STATE_PENDING,
-        }),
+        state: MarketState.STATE_PENDING,
       }),
     ];
     mockUseMarketList.mockReturnValue({
@@ -77,8 +56,7 @@ describe('useMarketSelectorList', () => {
     });
     const { result } = setup();
     const expectedFilteredMarkets = markets.filter((m) =>
-      // @ts-ignore candles get joined outside this type
-      isMarketActive(m.data.marketState)
+      isMarketActive(m.state)
     );
     expect(result.current).toEqual({
       data: markets,
@@ -92,10 +70,6 @@ describe('useMarketSelectorList', () => {
     const markets = [
       createMarketFragment({
         id: 'market-0',
-        // @ts-ignore candles get joined outside this type
-        data: createMarketsDataFragment({
-          marketState: MarketState.STATE_ACTIVE,
-        }),
         tradableInstrument: {
           instrument: {
             product: {
@@ -116,10 +90,6 @@ describe('useMarketSelectorList', () => {
       // }),
       createMarketFragment({
         id: 'market-2',
-        // @ts-ignore candles get joined outside this type
-        data: createMarketsDataFragment({
-          marketState: MarketState.STATE_ACTIVE,
-        }),
         tradableInstrument: {
           instrument: {
             product: {
@@ -165,10 +135,6 @@ describe('useMarketSelectorList', () => {
     const markets = [
       createMarketFragment({
         id: 'market-0',
-        // @ts-ignore candles get joined outside this type
-        data: createMarketsDataFragment({
-          marketState: MarketState.STATE_ACTIVE,
-        }),
         tradableInstrument: {
           instrument: {
             product: {
@@ -182,10 +148,6 @@ describe('useMarketSelectorList', () => {
       }),
       createMarketFragment({
         id: 'market-1',
-        // @ts-ignore candles get joined outside this type
-        data: createMarketsDataFragment({
-          marketState: MarketState.STATE_ACTIVE,
-        }),
         tradableInstrument: {
           instrument: {
             product: {
@@ -199,10 +161,6 @@ describe('useMarketSelectorList', () => {
       }),
       createMarketFragment({
         id: 'market-2',
-        // @ts-ignore candles get joined outside this type
-        data: createMarketsDataFragment({
-          marketState: MarketState.STATE_ACTIVE,
-        }),
         tradableInstrument: {
           instrument: {
             product: {
@@ -216,10 +174,6 @@ describe('useMarketSelectorList', () => {
       }),
       createMarketFragment({
         id: 'market-3',
-        // @ts-ignore candles get joined outside this type
-        data: createMarketsDataFragment({
-          marketState: MarketState.STATE_ACTIVE,
-        }),
         tradableInstrument: {
           instrument: {
             product: {
@@ -284,10 +238,6 @@ describe('useMarketSelectorList', () => {
     const markets = [
       createMarketFragment({
         id: 'market-0',
-        // @ts-ignore candles get joined outside this type
-        data: createMarketsDataFragment({
-          marketState: MarketState.STATE_ACTIVE,
-        }),
         tradableInstrument: {
           instrument: {
             code: 'abc',
@@ -297,10 +247,6 @@ describe('useMarketSelectorList', () => {
       }),
       createMarketFragment({
         id: 'market-1',
-        // @ts-ignore candles get joined outside this type
-        data: createMarketsDataFragment({
-          marketState: MarketState.STATE_ACTIVE,
-        }),
         tradableInstrument: {
           instrument: {
             code: 'def',
@@ -310,10 +256,6 @@ describe('useMarketSelectorList', () => {
       }),
       createMarketFragment({
         id: 'market-2',
-        // @ts-ignore candles get joined outside this type
-        data: createMarketsDataFragment({
-          marketState: MarketState.STATE_ACTIVE,
-        }),
         tradableInstrument: {
           instrument: {
             code: 'defg',
@@ -323,10 +265,6 @@ describe('useMarketSelectorList', () => {
       }),
       createMarketFragment({
         id: 'market-3',
-        // @ts-ignore candles get joined outside this type
-        data: createMarketsDataFragment({
-          marketState: MarketState.STATE_ACTIVE,
-        }),
         tradableInstrument: {
           instrument: {
             code: 'ggg',
@@ -395,11 +333,11 @@ describe('useMarketSelectorList', () => {
     const markets = [
       createMarketFragment({
         id: 'market-0',
+        state: MarketState.STATE_ACTIVE,
         // @ts-ignore data not on fragment
-        data: createMarketsDataFragment({
-          marketState: MarketState.STATE_ACTIVE,
+        data: {
           markPrice: '1',
-        }),
+        },
         // @ts-ignore candles not on fragment
         candles: [
           {
@@ -411,10 +349,9 @@ describe('useMarketSelectorList', () => {
         id: 'market-1',
         state: MarketState.STATE_ACTIVE,
         // @ts-ignore data not on fragment
-        data: createMarketsDataFragment({
-          marketState: MarketState.STATE_ACTIVE,
+        data: {
           markPrice: '1',
-        }),
+        },
         // @ts-ignore candles not on fragment
         candles: [
           {
@@ -426,10 +363,9 @@ describe('useMarketSelectorList', () => {
         id: 'market-2',
         state: MarketState.STATE_ACTIVE,
         // @ts-ignore data not on fragment
-        data: createMarketsDataFragment({
-          marketState: MarketState.STATE_ACTIVE,
+        data: {
           markPrice: '1',
-        }),
+        },
         // @ts-ignore candles not on fragment
         candles: [
           {
@@ -441,10 +377,9 @@ describe('useMarketSelectorList', () => {
         id: 'market-3',
         state: MarketState.STATE_ACTIVE,
         // @ts-ignore data not on fragment
-        data: createMarketsDataFragment({
-          marketState: MarketState.STATE_ACTIVE,
+        data: {
           markPrice: '1',
-        }),
+        },
         // @ts-ignore candles not on fragment
         candles: [
           {
@@ -479,10 +414,6 @@ describe('useMarketSelectorList', () => {
     const markets = [
       createMarketFragment({
         id: 'market-0',
-        // @ts-ignore data not on fragment
-        data: createMarketsDataFragment({
-          marketState: MarketState.STATE_ACTIVE,
-        }),
         // @ts-ignore actual fragment doesn't contain candles and is joined later
         candles: [
           {
@@ -495,10 +426,6 @@ describe('useMarketSelectorList', () => {
       }),
       createMarketFragment({
         id: 'market-1',
-        // @ts-ignore data not on fragment
-        data: createMarketsDataFragment({
-          marketState: MarketState.STATE_ACTIVE,
-        }),
         // @ts-ignore actual fragment doesn't contain candles and is joined later
         candles: [
           {
@@ -511,10 +438,6 @@ describe('useMarketSelectorList', () => {
       }),
       createMarketFragment({
         id: 'market-2',
-        // @ts-ignore data not on fragment
-        data: createMarketsDataFragment({
-          marketState: MarketState.STATE_ACTIVE,
-        }),
         // @ts-ignore actual fragment doesn't contain candles and is joined later
         candles: [
           {
@@ -559,30 +482,18 @@ describe('useMarketSelectorList', () => {
     const markets = [
       createMarketFragment({
         id: 'market-0',
-        // @ts-ignore data not on fragment
-        data: createMarketsDataFragment({
-          marketState: MarketState.STATE_ACTIVE,
-        }),
         marketTimestamps: {
           open: subDays(new Date(), 3).toISOString(),
         },
       }),
       createMarketFragment({
         id: 'market-1',
-        // @ts-ignore data not on fragment
-        data: createMarketsDataFragment({
-          marketState: MarketState.STATE_ACTIVE,
-        }),
         marketTimestamps: {
           open: subDays(new Date(), 1).toISOString(),
         },
       }),
       createMarketFragment({
         id: 'market-2',
-        // @ts-ignore data not on fragment
-        data: createMarketsDataFragment({
-          marketState: MarketState.STATE_ACTIVE,
-        }),
         marketTimestamps: {
           open: subDays(new Date(), 2).toISOString(),
         },

apps/trading/components/market-selector/use-market-selector-list.ts

@@ -22,12 +22,8 @@ export const useMarketSelectorList = ({
   const markets = useMemo(() => {
     if (!data?.length) return [];
     const markets = data
-      // show only active markets, using m.data.marketState as this will be
-      // data that will get refreshed when calling reload
-      .filter((m) => {
-        if (!m.data) return false;
-        return isMarketActive(m.data.marketState);
-      })
+      // only active
+      .filter((m) => isMarketActive(m.state))
       // only selected product type
       .filter((m) => {
         if (

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

@@ -10,19 +10,6 @@ import type { DataGridStore } from '../../stores/datagrid-store-slice';
 import { OrderStatus } from '@vegaprotocol/types';
 import { Links } from '../../lib/links';
 
-const resolveNoRowsMessage = (filter?: Filter) => {
-  switch (filter) {
-    case Filter.Open:
-      return t('No open orders');
-    case Filter.Closed:
-      return t('No closed orders');
-    case Filter.Rejected:
-      return t('No rejected orders');
-    default:
-      return t('No orders');
-  }
-};
-
 export const FilterStatusValue = {
   [Filter.Open]: [OrderStatus.STATUS_ACTIVE, OrderStatus.STATUS_PARKED],
   [Filter.Closed]: [
@@ -56,7 +43,6 @@ export const OrdersContainer = ({ filter }: OrderContainerProps) => {
   if (!pubKey) {
     return <Splash>{t('Please connect Vega wallet')}</Splash>;
   }
-  const noRowsMessage = resolveNoRowsMessage(filter);
 
   return (
     <OrderListManager
@@ -70,7 +56,6 @@ export const OrdersContainer = ({ filter }: OrderContainerProps) => {
       }
       isReadOnly={isReadOnly}
       gridProps={gridStoreCallbacks}
-      noRowsMessage={noRowsMessage}
     />
   );
 };

libs/assets/src/lib/asset-details-table.tsx

@@ -57,16 +57,7 @@ export const rows: Rows = [
     key: AssetDetail.ID,
     label: t('ID'),
     tooltip: '',
-    value: (asset) => (
-      <>
-        {truncateMiddle(asset.id)}{' '}
-        <CopyWithTooltip text={asset.id}>
-          <button title={t('Copy id to clipboard')}>
-            <VegaIcon size={14} name={VegaIconNames.COPY} />
-          </button>
-        </CopyWithTooltip>
-      </>
-    ),
+    value: (asset) => truncateMiddle(asset.id),
   },
   {
     key: AssetDetail.TYPE,

libs/candles-chart/src/lib/candles-chart.tsx

@@ -63,9 +63,7 @@ export const CandlesChartContainer = ({
                 overlays,
                 studies,
                 notEnoughDataText: (
-                  <span className="text-xs text-center">
-                    {t('No open orders')}
-                  </span>
+                  <span className="text-xs text-center">{t('No data')}</span>
                 ),
                 initialNumCandlesToDisplay: candlesCount,
                 studySize: STUDY_SIZE,

libs/datagrid/src/lib/cells/market-name-cell.tsx

@@ -14,17 +14,16 @@ export const MarketProductPill = ({
 }: {
   productType?: ProductType;
 }) => {
-  if (!productType) {
-    return null;
-  }
   return (
-    <Pill
-      size="xxs"
-      className="uppercase ml-0.5"
-      title={ProductTypeMapping[productType]}
-    >
-      {ProductTypeShortName[productType]}
-    </Pill>
+    productType && (
+      <Pill
+        size="xxs"
+        className="uppercase ml-0.5"
+        title={ProductTypeMapping[productType]}
+      >
+        {ProductTypeShortName[productType]}
+      </Pill>
+    )
   );
 };
 

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

@@ -238,7 +238,7 @@ export const DepthChartContainer = ({ marketId }: DepthChartManagerProps) => {
           volumeFormat={volumeFormat}
           priceFormat={priceFormat}
           notEnoughDataText={
-            <span className="text-xs text-center">{t('No open orders')}</span>
+            <span className="text-xs text-center">{t('No data')}</span>
           }
         />
       )}

libs/market-depth/src/lib/orderbook-manager.tsx

@@ -11,8 +11,14 @@ import type {
   MarketDepthQuery,
   MarketDepthQueryVariables,
   MarketDepthUpdateSubscription,
+  PriceLevelFieldsFragment,
 } from './__generated__/MarketDepth';
 
+export type OrderbookData = {
+  asks: PriceLevelFieldsFragment[];
+  bids: PriceLevelFieldsFragment[];
+};
+
 interface OrderbookManagerProps {
   marketId: string;
   onClick: (args: { price?: string; size?: string }) => void;

libs/market-depth/src/lib/orderbook.tsx

@@ -238,7 +238,7 @@ export const Orderbook = ({
                   </>
                 ) : (
                   <div className="absolute inset-0">
-                    <Splash>{t('No open orders')}</Splash>
+                    <Splash>{t('No data')}</Splash>
                   </div>
                 )}
               </div>

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

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

libs/markets/src/lib/market-data-provider.ts

@@ -126,16 +126,6 @@ export const marketTradingModeProvider = makeDerivedDataProvider<
     (parts[0] as ReturnType<typeof getData>)?.marketTradingMode
 );
 
-export const marketStateProvider = makeDerivedDataProvider<
-  MarketDataFieldsFragment['marketState'] | undefined,
-  never,
-  MarketDataQueryVariables
->(
-  [marketDataProvider],
-  (parts, variables, prevData) =>
-    (parts[0] as ReturnType<typeof getData>)?.marketState
-);
-
 export const fundingRateProvider = makeDerivedDataProvider<
   string,
   never,
@@ -186,11 +176,3 @@ export const useMarketTradingMode = (marketId?: string, skip?: boolean) => {
     skip: skip || !marketId,
   });
 };
-
-export const useMarketState = (marketId?: string, skip?: boolean) => {
-  return useDataProvider({
-    dataProvider: marketStateProvider,
-    variables: { marketId: marketId || '' },
-    skip: skip || !marketId,
-  });
-};

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

@@ -7,7 +7,6 @@ fragment MarketsDataFields on MarketData {
   markPrice
   trigger
   staticMidPrice
-  marketState
   marketTradingMode
   indicativeVolume
   indicativePrice

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

@@ -34,7 +34,6 @@ export const createMarketsDataFragment = (
       __typename: 'Market',
     },
     marketTradingMode: Schema.MarketTradingMode.TRADING_MODE_CONTINUOUS,
-    marketState: Schema.MarketState.STATE_ACTIVE,
     staticMidPrice: '0',
     indicativePrice: '0',
     bestStaticBidPrice: '0',

libs/orders/src/lib/components/order-list-manager/order-list-manager.spec.tsx

@@ -1,18 +1,23 @@
-import { render, screen } from '@testing-library/react';
-import type { OrderListManagerProps } from './order-list-manager';
-import { OrderListManager, Filter } from './order-list-manager';
+import { render, screen, act } from '@testing-library/react';
+import { OrderListManager } from './order-list-manager';
 import * as useDataProviderHook from '@vegaprotocol/data-provider';
 import type { OrderFieldsFragment } from '../';
+import * as orderListMock from '../order-list/order-list';
+import { forwardRef } from 'react';
 import type { VegaWalletContextShape } from '@vegaprotocol/wallet';
 import { VegaWalletContext } from '@vegaprotocol/wallet';
 import { MockedProvider } from '@apollo/client/testing';
 
-const generateJsx = (props: Partial<OrderListManagerProps> | null = null) => {
+// @ts-ignore OrderList is read only but we need to override with the forwardRef to
+// avoid warnings about padding refs
+orderListMock.OrderListTable = forwardRef(() => <div>OrderList</div>);
+
+const generateJsx = () => {
   const pubKey = '0x123';
   return (
     <MockedProvider>
       <VegaWalletContext.Provider value={{ pubKey } as VegaWalletContextShape}>
-        <OrderListManager partyId={pubKey} isReadOnly={false} {...props} />
+        <OrderListManager partyId={pubKey} isReadOnly={false} />
       </VegaWalletContext.Provider>
     </MockedProvider>
   );
@@ -28,46 +33,9 @@ describe('OrderListManager', () => {
       reload: jest.fn(),
       load: jest.fn(),
     });
-    render(generateJsx());
-
-    expect(
-      await screen.getByRole('treegrid', {
-        name: (_, element) => element.classList.contains('ag-root'),
-      })
-    ).toBeInTheDocument();
-  });
-
-  it('should display order info', async () => {
-    jest.spyOn(useDataProviderHook, 'useDataProvider').mockReturnValue({
-      data: [{ id: '1' } as OrderFieldsFragment],
-      loading: false,
-      error: new Error('Query error'),
-      flush: jest.fn(),
-      reload: jest.fn(),
-      load: jest.fn(),
+    await act(async () => {
+      render(generateJsx());
     });
-
-    render(generateJsx());
-
-    expect(
-      await screen.getByText('Something went wrong: Query error')
-    ).toBeInTheDocument();
-  });
-
-  it('should display no rows overlay', async () => {
-    jest.spyOn(useDataProviderHook, 'useDataProvider').mockReturnValue({
-      data: [],
-      loading: false,
-      error: undefined,
-      flush: jest.fn(),
-      reload: jest.fn(),
-      load: jest.fn(),
-    });
-
-    render(
-      generateJsx({ filter: Filter.Closed, noRowsMessage: 'no rows message' })
-    );
-
-    expect(screen.getByText('no rows message')).toBeInTheDocument();
+    expect(await screen.findByText('OrderList')).toBeInTheDocument();
   });
 });

libs/orders/src/lib/components/order-list-manager/order-list-manager.tsx

@@ -1,8 +1,7 @@
 import { t } from '@vegaprotocol/i18n';
-import { useCallback, useRef, useState, useEffect } from 'react';
+import { useCallback, useRef, useState } from 'react';
 import type { AgGridReact } from 'ag-grid-react';
-import type { FilterChangedEvent } from 'ag-grid-community';
-import { OrderListTable } from '../order-list';
+import { OrderListTable } from '../order-list/order-list';
 import type { useDataGridEvents } from '@vegaprotocol/datagrid';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import { ordersWithMarketProvider } from '../order-data-provider/order-data-provider';
@@ -12,7 +11,6 @@ import type { OrderTxUpdateFieldsFragment } from '@vegaprotocol/web3';
 import { OrderEditDialog } from '../order-list/order-edit-dialog';
 import type { Order } from '../order-data-provider';
 import { OrderViewDialog } from '../order-list/order-view-dialog';
-import { Splash } from '@vegaprotocol/ui-toolkit';
 
 export enum Filter {
   'Open' = 'Open',
@@ -27,7 +25,6 @@ export interface OrderListManagerProps {
   isReadOnly: boolean;
   filter?: Filter;
   gridProps?: ReturnType<typeof useDataGridEvents>;
-  noRowsMessage?: string;
 }
 
 export const OrderListManager = ({
@@ -37,7 +34,6 @@ export const OrderListManager = ({
   isReadOnly,
   filter,
   gridProps,
-  noRowsMessage,
 }: OrderListManagerProps) => {
   const gridRef = useRef<AgGridReact | null>(null);
   const [editOrder, setEditOrder] = useState<Order | null>(null);
@@ -60,29 +56,6 @@ export const OrderListManager = ({
     },
   });
 
-  const onFilterChanged = useCallback(
-    (event: FilterChangedEvent) => {
-      gridProps?.onFilterChanged?.(event);
-      if (event.api) {
-        const isEmpty = event.api.getDisplayedRowCount() === 0;
-        if (isEmpty) {
-          event.api.showNoRowsOverlay();
-        } else {
-          event.api.hideOverlay();
-        }
-      }
-    },
-    [gridProps]
-  );
-
-  useEffect(() => {
-    if (!data || !data.length) {
-      gridRef.current?.api?.showNoRowsOverlay();
-    } else {
-      gridRef.current?.api?.hideOverlay();
-    }
-  }, [data]);
-
   const cancel = useCallback(
     (order: Order) => {
       if (!order.market) return;
@@ -96,10 +69,6 @@ export const OrderListManager = ({
     [create]
   );
 
-  if (error) {
-    return <Splash>{t(`Something went wrong: ${error.message}`)}</Splash>;
-  }
-
   return (
     <>
       <div className="h-full relative">
@@ -113,9 +82,8 @@ export const OrderListManager = ({
           onMarketClick={onMarketClick}
           onOrderTypeClick={onOrderTypeClick}
           isReadOnly={isReadOnly}
-          overlayNoRowsTemplate={noRowsMessage || t('No orders')}
+          overlayNoRowsTemplate={error ? error.message : t('No orders')}
           {...gridProps}
-          onFilterChanged={onFilterChanged}
         />
       </div>
       {editOrder && (

libs/orders/src/lib/components/order-list/order-list.tsx

@@ -34,7 +34,7 @@ import type {
 } from '@vegaprotocol/datagrid';
 import type { AgGridReact } from 'ag-grid-react';
 import type { Order } from '../order-data-provider';
-import { Filter } from '../order-list-manager/order-list-manager';
+import { Filter } from '../order-list-manager';
 import type { ColDef } from 'ag-grid-community';
 
 const defaultColDef = {

libs/react-helpers/src/hooks/use-theme-switcher.ts

@@ -58,7 +58,7 @@ type ThemeStore = {
   setTheme: (theme?: Theme) => void;
 };
 
-const useThemeStore = create<ThemeStore>()((set) => ({
+const useThemeStore = create<ThemeStore>((set) => ({
   theme: getCurrentTheme(),
   setTheme: (newTheme) => {
     set((state) => {

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

@@ -2,8 +2,8 @@ import { render, act, screen } from '@testing-library/react';
 import { AsyncRenderer } from './async-renderer';
 
 describe('AsyncRenderer', () => {
-  const reload = jest.fn();
   it('timeout error should render button', async () => {
+    const reload = jest.fn();
     await act(() => {
       render(
         <AsyncRenderer
@@ -20,22 +20,4 @@ describe('AsyncRenderer', () => {
     });
     expect(reload).toHaveBeenCalled();
   });
-
-  it('errors should be handled properly', async () => {
-    const message = 'Node has been collapsed';
-    await act(() => {
-      render(
-        <AsyncRenderer
-          reload={reload}
-          error={new Error(message)}
-          loading={false}
-          data={[]}
-        />
-      );
-    });
-
-    expect(
-      screen.getByText(`Something went wrong: ${message}`)
-    ).toBeInTheDocument();
-  });
 });

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

@@ -29,7 +29,7 @@ export function AsyncRenderer<T = object>({
   reload,
 }: AsyncRendererProps<T>) {
   if (error) {
-    if (!data || (Array.isArray(data) && !data.length)) {
+    if (!data) {
       return (
         <div className="h-full flex items-center justify-center">
           <div className="h-12 flex flex-col  items-center">

libs/wallet/src/connectors/snap-connector.ts

@@ -41,7 +41,7 @@ const ethereumRequest = <T>(args: RequestArguments): Promise<T> => {
 
 export const LOCAL_SNAP_ID = 'local:http://localhost:8080';
 export const DEFAULT_SNAP_ID = 'npm:@vegaprotocol/snap';
-export const DEFAULT_SNAP_VERSION = '0.3.1';
+export const DEFAULT_SNAP_VERSION = '0.2.0';
 
 type GetSnapsResponse = Record<string, Snap>;