chore: co locate child market selector components

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

@@ -19,7 +19,6 @@ describe('AssetDropdown', () => {
         checkedAssets={[]}
         assets={assets}
         onSelect={mockOnSelect}
-        onReset={jest.fn()}
       />
     );
     await userEvent.click(screen.getByRole('button'));
@@ -39,7 +38,6 @@ describe('AssetDropdown', () => {
         checkedAssets={[assets[0].id]}
         assets={assets}
         onSelect={mockOnSelect}
-        onReset={jest.fn()}
       />
     );
     await userEvent.click(screen.getByRole('button'));
@@ -48,35 +46,9 @@ describe('AssetDropdown', () => {
     expect(mockOnSelect).toHaveBeenCalledWith(assets[0].id, false);
   });
 
-  it('can be reset clearing all assets', async () => {
-    const mockOnSelect = jest.fn();
-    const mockOnReset = jest.fn();
-    render(
-      <AssetDropdown
-        checkedAssets={assets.map((a) => a.id)}
-        assets={assets}
-        onSelect={mockOnSelect}
-        onReset={mockOnReset}
-      />
-    );
-    await userEvent.click(screen.getByRole('button'));
-    const items = screen.getAllByRole('menuitemcheckbox');
-    // all should be checked
-    items.forEach((item) => {
-      expect(item).toBeChecked();
-    });
-    await userEvent.click(screen.getByText('Reset'));
-    expect(mockOnReset).toHaveBeenCalled();
-  });
-
   it('doesnt render if no assets provided', async () => {
     const { container } = render(
-      <AssetDropdown
-        checkedAssets={[]}
-        assets={[]}
-        onSelect={jest.fn()}
-        onReset={jest.fn()}
-      />
+      <AssetDropdown checkedAssets={[]} assets={[]} onSelect={jest.fn()} />
     );
     expect(container).toBeEmptyDOMElement();
   });

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

@@ -240,7 +240,7 @@ describe('MarketSelector', () => {
 
     await userEvent.click(screen.getByTestId('sort-trigger'));
     const options = screen.getAllByTestId(/sort-item/);
-    expect(options.map((o) => o.textContent)).toEqual(
+    expect(options.map((o) => o.textContent?.trim())).toEqual(
       Object.entries(Sort)
         .filter(([key]) => key !== Sort.None)
         .map(([key]) => SortTypeMapping[key as SortType])

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

@@ -10,15 +10,12 @@ import {
 import type { CSSProperties } from 'react';
 import { useCallback, useState, useMemo } from 'react';
 import { FixedSizeList } from 'react-window';
-import { useMarketSelectorList } from '../../client-pages/market/use-market-selector-list';
-import type { ProductType } from '../../client-pages/market/product-selector';
-import {
-  Product,
-  ProductSelector,
-} from '../../client-pages/market/product-selector';
-import { AssetDropdown } from '../../client-pages/market/asset-dropdown';
-import type { SortType } from '../../client-pages/market/sort-dropdown';
-import { Sort, SortDropdown } from '../../client-pages/market/sort-dropdown';
+import { useMarketSelectorList } from './use-market-selector-list';
+import type { ProductType } from './product-selector';
+import { Product, ProductSelector } from './product-selector';
+import { AssetDropdown } from './asset-dropdown';
+import type { SortType } from './sort-dropdown';
+import { Sort, SortDropdown } from './sort-dropdown';
 import { MarketSelectorItem } from './market-selector-item';
 import classNames from 'classnames';
 

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

@@ -4,7 +4,7 @@ import {
   isMarketActive,
   useMarketSelectorList,
 } from './use-market-selector-list';
-import { Product } from './product-selector';
+import { Product } from '../../components/market-selector/product-selector';
 import { Sort } from './sort-dropdown';
 import { createMarketFragment } from '@vegaprotocol/mock';
 import { MarketState } from '@vegaprotocol/types';