feat(1447): add headings and enable anchors to network parameters

2023-09-04 17:57:08 +01:00
29 changed files with 620 additions and 576 deletions
@@ -1 +1,2 @@
 export * from './network-parameters';
+export * from './structure-network-params';
@@ -1,82 +1,105 @@
 import { render, screen } from '@testing-library/react';
 import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
 import { NetworkParametersTable } from './network-parameters';
+import { MemoryRouter } from 'react-router-dom';
+
+const renderComponent = (data: NetworkParamsQuery | undefined) => {
+  return render(
+    <MemoryRouter>
+      <NetworkParametersTable data={data} loading={false} />
+    </MemoryRouter>
+  );
+};
+
+const mockData = {
+  networkParametersConnection: {
+    edges: [
+      {
+        node: {
+          key: 'spam.protection.delegation.min.tokens',
+          value: '3',
+        },
+      },
+      {
+        node: {
+          key: 'spam.protection.voting.min.tokens',
+          value: '1',
+        },
+      },
+      {
+        node: {
+          key: 'reward.staking.delegation.minimumValidatorStake',
+          value: '2',
+        },
+      },
+      {
+        node: {
+          key: 'reward.asset',
+          value:
+            'fc7fd956078fb1fc9db5c19b88f0874c4299b2a7639ad05a47a28c0aef291b55',
+        },
+      },
+    ],
+  },
+};

 describe('NetworkParametersTable', () => {
-  it('renders correctly when it has network params', () => {
-    const data: NetworkParamsQuery = {
-      networkParametersConnection: {
-        edges: [
-          {
-            node: {
-              __typename: 'NetworkParameter',
-              key: 'market.liquidityProvision.minLpStakeQuantumMultiple',
-              value: '1',
-            },
-          },
-          {
-            node: {
-              __typename: 'NetworkParameter',
-              key: 'market.fee.factors.infrastructureFee',
-              value: '0.0005',
-            },
-          },
-        ],
+  it('renders headers correctly', () => {
+    renderComponent(mockData);
+
+    const allHeadings = screen.getAllByRole('heading');
+    expect(
+      allHeadings.map((h) => {
+        return {
+          text: h.textContent,
+          level: h.tagName,
+          testId: h.getAttribute('data-testid'),
+        };
+      })
+    ).toEqual([
+      {
+        text: 'Network Parameters',
+        level: 'H1',
+        testId: 'network-param-header',
      },
-    };
-    render(<NetworkParametersTable data={data} loading={false} />);
-    expect(screen.getByTestId('network-param-header')).toHaveTextContent(
-      'Network Parameters'
-    );
-    const rows = screen.getAllByTestId('key-value-table-row');
-    expect(rows[0].children[0]).toHaveTextContent(
-      'market.fee.factors.infrastructureFee'
-    );
-    expect(rows[1].children[0]).toHaveTextContent(
-      'market.liquidityProvision.minLpStakeQuantumMultiple'
-    );
-    expect(rows[0].children[1]).toHaveTextContent('0.0005');
-    expect(rows[1].children[1]).toHaveTextContent('1');
+      { text: 'Spam', level: 'H1', testId: 'spam' },
+      { text: 'Protection', level: 'H2', testId: 'spam-protection' },
+      { text: 'Delegation', level: 'H3', testId: 'spam-protection-delegation' },
+      { text: 'Min', level: 'H4', testId: 'spam-protection-delegation-min' },
+      { text: 'Voting', level: 'H3', testId: 'spam-protection-voting' },
+      { text: 'Min', level: 'H4', testId: 'spam-protection-voting-min' },
+      { text: 'Reward', level: 'H1', testId: 'reward' },
+      { text: 'Staking', level: 'H2', testId: 'reward-staking' },
+      { text: 'Delegation', level: 'H3', testId: 'reward-staking-delegation' },
+    ]);
  });

-  it('renders the rows in ascending order', () => {
-    const data: NetworkParamsQuery = {
-      networkParametersConnection: {
-        edges: [
-          {
-            node: {
-              __typename: 'NetworkParameter',
-              key: 'market.fee.factors.infrastructureFee',
-              value: '0.0005',
-            },
-          },
-          {
-            node: {
-              __typename: 'NetworkParameter',
-              key: 'market.liquidityProvision.minLpStakeQuantumMultiple',
-              value: '1',
-            },
-          },
-        ],
-      },
-    };
-    render(<NetworkParametersTable data={data} loading={false} />);
-    expect(screen.getByTestId('network-param-header')).toHaveTextContent(
-      'Network Parameters'
+  it('renders network params correctly', () => {
+    renderComponent(mockData);
+
+    const delegationMinTokensRow = screen.getByTestId(
+      'spam-protection-delegation-min-tokens'
    );
-    const rows = screen.getAllByTestId('key-value-table-row');
-    expect(rows[0].children[0]).toHaveTextContent(
-      'market.fee.factors.infrastructureFee'
+    expect(delegationMinTokensRow).toHaveTextContent('0.000000000000000003');
+
+    const votingMinTokensRow = screen.getByTestId(
+      'spam-protection-voting-min-tokens'
    );
-    expect(rows[1].children[0]).toHaveTextContent(
-      'market.liquidityProvision.minLpStakeQuantumMultiple'
+    expect(votingMinTokensRow).toHaveTextContent('0.000000000000000001');
+
+    const minimumValidatorStakeRow = screen.getByTestId(
+      'reward-staking-delegation-minimumValidatorStake'
+    );
+    expect(minimumValidatorStakeRow).toHaveTextContent('2');
+
+    const assetRow = screen.getByTestId('reward-asset');
+    expect(assetRow).toHaveTextContent(
+      'fc7fd956078fb1fc9db5c19b88f0874c4299b2a7639ad05a47a28c0aef291b55'
    );
-    expect(rows[0].children[1]).toHaveTextContent('0.0005');
-    expect(rows[1].children[1]).toHaveTextContent('1');
  });

  it('does not render rows when is loading', () => {
-    render(<NetworkParametersTable data={undefined} loading={true} />);
+    renderComponent(undefined);
    expect(screen.getByTestId('network-param-header')).toHaveTextContent(
      'Network Parameters'
    );
@@ -1,6 +1,8 @@
+import startCase from 'lodash/startCase';
+import classNames from 'classnames';
+import { Link } from 'react-router-dom';
 import {
  AsyncRenderer,
-  KeyValueTable,
  KeyValueTableRow,
  SyntaxHighlighter,
 } from '@vegaprotocol/ui-toolkit';
@@ -12,11 +14,12 @@ import {
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { RouteTitle } from '../../components/route-title';
-import orderBy from 'lodash/orderBy';
 import { useNetworkParamsQuery } from '@vegaprotocol/network-parameters';
-import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
 import { useScrollToLocation } from '../../hooks/scroll-to-location';
 import { useDocumentTitle } from '../../hooks/use-document-title';
+import { structureNetworkParams } from './structure-network-params';
+import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
+import type { GroupedParams } from './structure-network-params';

 const PERCENTAGE_PARAMS = [
  'governance.proposal.asset.requiredMajority',
@@ -58,6 +61,54 @@ const BIG_NUMBER_PARAMS = [
  'governance.proposal.updateAsset.minVoterBalance',
 ];

+export const renderGroupedParams = (
+  group: GroupedParams,
+  level: number,
+  parentKeys: string[] = []
+) => {
+  const Header = `h${level}` as keyof JSX.IntrinsicElements;
+  const headerStyles = classNames('uppercase font-semibold', {
+    'pt-6 text-3xl underline': level === 1,
+    'pt-3 text-2xl': level === 2,
+    'pt-2 text-lg': level === 3,
+    'pt-2 text-default': level === 4,
+  });
+
+  return Object.entries(group).map(([key, value]) => {
+    const fullPath = [...parentKeys, key].join('.');
+    const isLeafNode = typeof value !== 'object';
+    const id = parentKeys.concat([key]).join('-');
+
+    return (
+      <div key={key}>
+        {!isLeafNode && (
+          <div id={id}>
+            <Link to={`#${id}`}>
+              <Header className={headerStyles} data-testid={id}>
+                {startCase(key)}
+              </Header>
+            </Link>
+          </div>
+        )}
+        {isLeafNode ? (
+          typeof value === 'string' ? (
+            <div data-testid={id}>
+              <NetworkParameterRow
+                key={fullPath}
+                row={{ key: fullPath, value: value }}
+              />
+            </div>
+          ) : null
+        ) : (
+          <div className="pb-1">
+            {renderGroupedParams(value, level + 1, [...parentKeys, key])}
+          </div>
+        )}
+      </div>
+    );
+  });
+};
+
 export const NetworkParameterRow = ({
  row: { key, value },
 }: {
@@ -77,7 +128,9 @@ export const NetworkParameterRow = ({
    >
      {key}
      {isSyntaxRow ? (
-        <SyntaxHighlighter data={JSON.parse(value)} />
+        <div className="pb-2">
+          <SyntaxHighlighter data={JSON.parse(value)} />
+        </div>
      ) : isNaN(Number(value)) ? (
        value
      ) : BIG_NUMBER_PARAMS.includes(key) ? (
@@ -113,17 +166,12 @@ export const NetworkParametersTable = ({
      loading={loading}
      error={error}
      render={(data) => {
-        const ascParams = orderBy(
-          removePaginationWrapper(data.networkParametersConnection.edges),
-          (param) => param.key,
-          'asc'
+        const flatParams = removePaginationWrapper(
+          data.networkParametersConnection.edges
        );
+        const groupedParams = structureNetworkParams(flatParams);
        return (
-          <KeyValueTable data-testid="parameters">
-            {(ascParams || []).map((row) => (
-              <NetworkParameterRow key={row.key} row={row} />
-            ))}
-          </KeyValueTable>
+          <div className="-mt-6">{renderGroupedParams(groupedParams, 1)}</div>
        );
      }}
    />
@@ -0,0 +1,109 @@
+import type { GroupedParams } from './structure-network-params';
+import {
+  structureParams,
+  sortGroupedParams,
+  structureNetworkParams,
+} from './structure-network-params';
+
+describe('structureParams', () => {
+  it('should correctly structure params', () => {
+    const input = [
+      { key: 'spam.protection.delegation.min.tokens', value: '10' },
+      { key: 'spam.protection.voting.min.tokens', value: '5' },
+    ];
+    const output: GroupedParams = {
+      spam: {
+        protection: {
+          delegation: {
+            min: {
+              tokens: '10',
+            },
+          },
+          voting: {
+            min: {
+              tokens: '5',
+            },
+          },
+        },
+      },
+    };
+    expect(structureParams(input)).toEqual(output);
+  });
+
+  it('should handle top-level keys correctly', () => {
+    const input = [{ key: 'levelOne', value: '10' }];
+    const output = {
+      levelOne: '10',
+    };
+    expect(structureParams(input)).toEqual(output);
+  });
+});
+
+describe('sortGroupedParams', () => {
+  it('should correctly sort grouped params', () => {
+    const input: GroupedParams = {
+      spam: {
+        protection: {
+          delegation: {
+            min: {
+              tokens: '10',
+            },
+          },
+        },
+      },
+      reward: '50',
+    };
+    const output: GroupedParams = {
+      reward: '50',
+      spam: {
+        protection: {
+          delegation: {
+            min: {
+              tokens: '10',
+            },
+          },
+        },
+      },
+    };
+    expect(sortGroupedParams(input)).toEqual(output);
+  });
+
+  it('should handle already sorted keys', () => {
+    const input = {
+      a: '10',
+      b: {
+        c: '5',
+        d: '6',
+      },
+    };
+    expect(sortGroupedParams(input)).toEqual(input);
+  });
+});
+
+describe('structureNetworkParams', () => {
+  it('should structure and sort network params correctly', () => {
+    const input = [
+      { key: 'spam.protection.delegation.min.tokens', value: '10' },
+      { key: 'reward.asset', value: '50' },
+    ];
+    const output: GroupedParams = {
+      reward: {
+        asset: '50',
+      },
+      spam: {
+        protection: {
+          delegation: {
+            min: {
+              tokens: '10',
+            },
+          },
+        },
+      },
+    };
+    expect(structureNetworkParams(input)).toEqual(output);
+  });
+
+  it('should return an empty object if no params are provided', () => {
+    expect(structureNetworkParams([])).toEqual({});
+  });
+});
@@ -0,0 +1,107 @@
+/**
+ * Categorizes and sorts an array of key-value pairs of network params into a nested object structure.
+ *
+ * The function takes an array of network params where keys are dot-delimited
+ * strings representing nested categories (e.g., 'spam.protection.delegation.min.tokens').
+ *
+ * Why this is necessary:
+ * A flat key-value structure wouldn't provide the hierarchical information needed.
+ * Organizing network parameters like this allows the rendering of nested headers
+ * and their corresponding network params.
+ *
+ * It also ensures that items with the minimum amount of nesting are ordered first. This
+ * allows us to render these items first, before more deeply nested items are rendered with
+ * subheaders. This creates a more intuitive UI.
+ *
+ * For example, given the input:
+ * [
+ *   { key: 'spam.protection.delegation.min.tokens', value: '10' },
+ *   { key: 'spam.protection.voting.min.tokens', value: '5' },
+ *   { key: 'reward.staking.delegation.minimumValidatorStake', value: '2' }
+ *   { key: 'reward.asset', value: 'fc7fd956078fb1fc9db5c19b88f0874c4299b2a7639ad05a47a28c0aef291b55' }
+ * ]
+ *
+ * The output will be:
+ * {
+ *   spam: {
+ *     protection: {
+ *       delegation: {
+ *         min: {
+ *           tokens: '10'
+ *         }
+ *       },
+ *       voting: {
+ *         min: {
+ *           tokens: '5'
+ *         }
+ *       }
+ *     }
+ *   },
+ *   reward: {
+ *     asset: 'fc7fd956078fb1fc9db5c19b88f0874c4299b2a7639ad05a47a28c0aef291b55',
+ *     staking: {
+ *       delegation: {
+ *         minimumValidatorStake: '2'
+ *       }
+ *     }
+ *   }
+ * }
+ *
+ * @param {Array} params - An array of key-value pairs to categorize and sort.
+ * @returns {GroupedParams} - A nested object that groups the key-value pairs.
+ */
+
+export type GroupedParams = {
+  [key: string]: string | GroupedParams;
+};
+
+export const structureParams = (
+  params: { key: string; value: string }[]
+): GroupedParams => {
+  const grouped: GroupedParams = {};
+
+  params.forEach(({ key, value }) => {
+    const parts = key.split('.');
+    let node: GroupedParams = grouped;
+
+    parts.forEach((part, i) => {
+      if (typeof node[part] === 'undefined') {
+        node[part] = i === parts.length - 1 ? value : {};
+      }
+
+      if (typeof node[part] === 'object') {
+        node = node[part] as GroupedParams;
+      }
+    });
+  });
+
+  return grouped;
+};
+
+export const sortGroupedParams = (
+  groupedParams: GroupedParams
+): GroupedParams => {
+  const sorted: GroupedParams = {};
+
+  // Sort top-level keys first
+  Object.entries(groupedParams).forEach(([key, value]) => {
+    if (typeof value === 'string') {
+      sorted[key] = value;
+    }
+  });
+
+  Object.entries(groupedParams).forEach(([key, value]) => {
+    if (typeof value === 'object') {
+      sorted[key] = sortGroupedParams(value);
+    }
+  });
+
+  return sorted;
+};
+
+export const structureNetworkParams = (
+  params: { key: string; value: string }[]
+) => {
+  const grouped = structureParams(params);
+  return sortGroupedParams(grouped);
+};
@@ -262,7 +262,9 @@ describe('MarketSelector', () => {
    await userEvent.click(screen.getByTestId('sort-trigger'));
    const options = screen.getAllByTestId(/sort-item/);
    expect(options.map((o) => o.textContent?.trim())).toEqual(
-      Object.entries(Sort).map(([key]) => SortTypeMapping[key as SortType])
+      Object.entries(Sort)
+        .filter(([key]) => key !== Sort.None)
+        .map(([key]) => SortTypeMapping[key as SortType])
    );
    await userEvent.click(screen.getByTestId('sort-item-Gained'));
    expect(
@@ -40,7 +40,7 @@ export const MarketSelector = ({
  const [filter, setFilter] = useState<Filter>({
    searchTerm: '',
    product: Product.All,
-    sort: Sort.TopTraded,
+    sort: Sort.None,
    assets: [],
  });
  const allProducts = filter.product === Product.All;
@@ -53,7 +53,7 @@ export const MarketSelector = ({

  return (
    <div data-testid="market-selector">
-      <div className="px-2 pt-2 mb-2">
+      <div className="pt-2 px-2 mb-2">
        <ProductSelector
          product={filter.product}
          onSelect={(product) => {
@@ -106,6 +106,9 @@ export const MarketSelector = ({
            currentSort={filter.sort}
            onSelect={(sort) => {
              setFilter((curr) => {
+                if (curr.sort === sort) {
+                  return { ...curr, sort: Sort.None };
+                }
                return {
                  ...curr,
                  sort,
@@ -291,9 +294,9 @@ const List = ({

 const Skeleton = () => {
  return (
-    <div className="px-2 mb-2">
-      <div className="p-4 rounded-lg bg-vega-light-100 dark:bg-vega-dark-100">
-        <div className="w-full h-3 mb-2 bg-vega-light-200 dark:bg-vega-dark-200" />
+    <div className="mb-2 px-2">
+      <div className="bg-vega-light-100 dark:bg-vega-dark-100 rounded-lg p-4">
+        <div className="w-full h-3 bg-vega-light-200 dark:bg-vega-dark-200 mb-2" />
        <div className="w-2/3 h-3 bg-vega-light-200 dark:bg-vega-dark-200" />
      </div>
    </div>
@@ -1,3 +1,4 @@
+import { t } from '@vegaprotocol/i18n';
 import {
  DropdownMenu,
  DropdownMenuContent,
@@ -10,6 +11,7 @@ import {
 } from '@vegaprotocol/ui-toolkit';

 export const Sort = {
+  None: 'None',
  Gained: 'Gained',
  Lost: 'Lost',
  New: 'New',
@@ -21,15 +23,17 @@ export type SortType = keyof typeof Sort;
 export const SortTypeMapping: {
  [key in SortType]: string;
 } = {
-  [Sort.TopTraded]: 'Top traded',
+  [Sort.None]: 'None',
  [Sort.Gained]: 'Top gaining',
  [Sort.Lost]: 'Top losing',
  [Sort.New]: 'New markets',
+  [Sort.TopTraded]: 'Top traded',
 };

 const SortIconMapping: {
  [key in SortType]: VegaIconNames;
 } = {
+  [Sort.None]: null as unknown as VegaIconNames, // not shown in list
  [Sort.Gained]: VegaIconNames.TREND_UP,
  [Sort.Lost]: VegaIconNames.TREND_DOWN,
  [Sort.New]: VegaIconNames.STAR,
@@ -47,8 +51,10 @@ export const SortDropdown = ({
    <DropdownMenu
      trigger={
        <DropdownMenuTrigger data-testid="sort-trigger">
-          <span className="flex items-center justify-between gap-1">
-            {SortTypeMapping[currentSort]}
+          <span className="flex justify-between items-center">
+            {currentSort === SortTypeMapping.None
+              ? t('Sort')
+              : SortTypeMapping[currentSort]}{' '}
            <VegaIcon name={VegaIconNames.CHEVRON_DOWN} />
          </span>
        </DropdownMenuTrigger>
@@ -59,22 +65,24 @@ export const SortDropdown = ({
          value={currentSort}
          onValueChange={(value) => onSelect(value as SortType)}
        >
-          {Object.keys(Sort).map((key) => {
-            return (
-              <DropdownMenuRadioItem
-                inset
-                key={key}
-                value={key}
-                data-testid={`sort-item-${key}`}
-              >
-                <span className="flex gap-2">
-                  <VegaIcon name={SortIconMapping[key as SortType]} />{' '}
-                  {SortTypeMapping[key as SortType]}
-                </span>
-                <DropdownMenuItemIndicator />
-              </DropdownMenuRadioItem>
-            );
-          })}
+          {Object.keys(Sort)
+            .filter((s) => s !== Sort.None)
+            .map((key) => {
+              return (
+                <DropdownMenuRadioItem
+                  inset
+                  key={key}
+                  value={key}
+                  data-testid={`sort-item-${key}`}
+                >
+                  <span className="flex gap-2">
+                    <VegaIcon name={SortIconMapping[key as SortType]} />{' '}
+                    {SortTypeMapping[key as SortType]}
+                  </span>
+                  <DropdownMenuItemIndicator />
+                </DropdownMenuRadioItem>
+              );
+            })}
        </DropdownMenuRadioGroup>
      </DropdownMenuContent>
    </DropdownMenu>
@@ -12,10 +12,7 @@ import { useMarketList } from '@vegaprotocol/markets';
 import type { Filter } from '../../components/market-selector';
 import { subDays } from 'date-fns';

-jest.mock('@vegaprotocol/markets', () => ({
-  ...jest.requireActual('@vegaprotocol/markets'),
-  useMarketList: jest.fn(),
-}));
+jest.mock('@vegaprotocol/markets');
 const mockUseMarketList = useMarketList as jest.Mock;

 describe('useMarketSelectorList', () => {
@@ -23,7 +20,7 @@ describe('useMarketSelectorList', () => {
    const defaultArgs: Filter = {
      searchTerm: '',
      product: Product.Future,
-      sort: Sort.TopTraded,
+      sort: Sort.None,
      assets: [],
    };
    return renderHook((args) => useMarketSelectorList(args), {
@@ -112,21 +109,21 @@ describe('useMarketSelectorList', () => {
    rerender({
      searchTerm: '',
      product: Product.Spot as 'Future',
-      sort: Sort.TopTraded,
+      sort: Sort.None,
      assets: [],
    });
    expect(result.current.markets).toEqual([markets[1]]);
    rerender({
      searchTerm: '',
      product: Product.Perpetual as 'Future',
-      sort: Sort.TopTraded,
+      sort: Sort.None,
      assets: [],
    });
    expect(result.current.markets).toEqual([markets[2]]);
    rerender({
      searchTerm: '',
      product: Product.All,
-      sort: Sort.TopTraded,
+      sort: Sort.None,
      assets: [],
    });
    expect(result.current.markets).toEqual(markets);
@@ -192,7 +189,7 @@ describe('useMarketSelectorList', () => {
    const { result, rerender } = setup({
      searchTerm: '',
      product: Product.Future,
-      sort: Sort.TopTraded,
+      sort: Sort.None,
      assets: ['asset-0'],
    });
    expect(result.current.markets).toEqual([markets[0], markets[1]]);
@@ -200,7 +197,7 @@ describe('useMarketSelectorList', () => {
    rerender({
      searchTerm: '',
      product: Product.Future,
-      sort: Sort.TopTraded,
+      sort: Sort.None,
      assets: ['asset-0', 'asset-1'],
    });

@@ -213,7 +210,7 @@ describe('useMarketSelectorList', () => {
    rerender({
      searchTerm: '',
      product: Product.Future,
-      sort: Sort.TopTraded,
+      sort: Sort.None,
      assets: ['asset-0', 'asset-1', 'asset-2'],
    });

@@ -223,7 +220,7 @@ describe('useMarketSelectorList', () => {
    rerender({
      searchTerm: '',
      product: Product.Future,
-      sort: Sort.TopTraded,
+      sort: Sort.None,
      assets: ['asset-invalid'],
    });

@@ -278,28 +275,28 @@ describe('useMarketSelectorList', () => {
    const { result, rerender } = setup({
      searchTerm: 'abc',
      product: Product.Future,
-      sort: Sort.TopTraded,
+      sort: Sort.None,
      assets: [],
    });
    expect(result.current.markets).toEqual([markets[0]]);
    rerender({
      searchTerm: 'def',
      product: Product.Future,
-      sort: Sort.TopTraded,
+      sort: Sort.None,
      assets: [],
    });
    expect(result.current.markets).toEqual([markets[1], markets[2]]);
    rerender({
      searchTerm: 'defg',
      product: Product.Future,
-      sort: Sort.TopTraded,
+      sort: Sort.None,
      assets: [],
    });
    expect(result.current.markets).toEqual([markets[2]]);
    rerender({
      searchTerm: 'zzz',
      product: Product.Future,
-      sort: Sort.TopTraded,
+      sort: Sort.None,
      assets: [],
    });
    expect(result.current.markets).toEqual([]);
@@ -308,14 +305,14 @@ describe('useMarketSelectorList', () => {
    rerender({
      searchTerm: 'aaa',
      product: Product.Future,
-      sort: Sort.TopTraded,
+      sort: Sort.None,
      assets: [],
    });
    expect(result.current.markets).toEqual([markets[0]]);
    rerender({
      searchTerm: 'ggg',
      product: Product.Future,
-      sort: Sort.TopTraded,
+      sort: Sort.None,
      assets: [],
    });
    expect(result.current.markets).toEqual([
@@ -325,15 +322,11 @@ describe('useMarketSelectorList', () => {
    ]);
  });

-  it('sorts by top traded by default', () => {
+  it('sorts by state and volume by default', () => {
    const markets = [
      createMarketFragment({
        id: 'market-0',
-        state: MarketState.STATE_ACTIVE,
-        // @ts-ignore data not on fragment
-        data: {
-          markPrice: '1',
-        },
+        state: MarketState.STATE_PENDING,
        // @ts-ignore candles not on fragment
        candles: [
          {
@@ -344,10 +337,16 @@ describe('useMarketSelectorList', () => {
      createMarketFragment({
        id: 'market-1',
        state: MarketState.STATE_ACTIVE,
-        // @ts-ignore data not on fragment
-        data: {
-          markPrice: '1',
-        },
+        // @ts-ignore candles not on fragment
+        candles: [
+          {
+            volume: '200',
+          },
+        ],
+      }),
+      createMarketFragment({
+        id: 'market-2',
+        state: MarketState.STATE_ACTIVE,
        // @ts-ignore candles not on fragment
        candles: [
          {
@@ -356,30 +355,12 @@ describe('useMarketSelectorList', () => {
        ],
      }),
      createMarketFragment({
-        id: 'market-2',
-        state: MarketState.STATE_ACTIVE,
-        // @ts-ignore data not on fragment
-        data: {
-          markPrice: '1',
-        },
-        // @ts-ignore candles not on fragment
-        candles: [
-          {
-            volume: '300',
-          },
-        ],
-      }),
-      createMarketFragment({
+        state: MarketState.STATE_PENDING,
        id: 'market-3',
-        state: MarketState.STATE_ACTIVE,
-        // @ts-ignore data not on fragment
-        data: {
-          markPrice: '1',
-        },
        // @ts-ignore candles not on fragment
        candles: [
          {
-            volume: '400',
+            volume: '100',
          },
        ],
      }),
@@ -394,15 +375,14 @@ describe('useMarketSelectorList', () => {
    const { result } = setup({
      searchTerm: '',
      product: Product.Future,
-      sort: Sort.TopTraded,
+      sort: Sort.None,
      assets: [],
    });
-
    expect(result.current.markets).toEqual([
-      markets[3],
+      markets[1],
      markets[2],
      markets[0],
-      markets[1],
+      markets[3],
    ]);
  });

@@ -1,7 +1,11 @@
 import { useMemo } from 'react';
 import orderBy from 'lodash/orderBy';
 import { MarketState } from '@vegaprotocol/types';
-import { calcTradedFactor, useMarketList } from '@vegaprotocol/markets';
+import {
+  calcCandleVolume,
+  calcTradedFactor,
+  useMarketList,
+} from '@vegaprotocol/markets';
 import { priceChangePercentage } from '@vegaprotocol/utils';
 import type { Filter } from '../../components/market-selector/market-selector';
 import { Sort } from './sort-dropdown';
@@ -56,6 +60,22 @@ export const useMarketSelectorList = ({
        return false;
      });

+    if (sort === Sort.None) {
+      // Sort by market state primarily and AtoZ secondarily
+      return orderBy(
+        markets,
+        [
+          (m) => MARKET_TEMPLATE.indexOf(m.state),
+          (m) => {
+            if (!m.candles?.length) return 0;
+            const vol = calcCandleVolume(m.candles);
+            return Number(vol || 0);
+          },
+        ],
+        ['asc', 'desc']
+      );
+    }
+
    if (sort === Sort.Gained || sort === Sort.Lost) {
      const dir = sort === Sort.Gained ? 'desc' : 'asc';
      return orderBy(
@@ -24,8 +24,8 @@ export const Settings = () => {
      >
        <Switch
          name="settings-telemetry-switch"
-          onCheckedChange={(isOn) => setIsApproved(isOn ? 'true' : 'false')}
-          checked={isApproved === 'true'}
+          onCheckedChange={(isOn) => setIsApproved(isOn)}
+          checked={isApproved}
        />
      </SettingsGroup>
      <SettingsGroup label={t('Toast location')}>
@@ -23,7 +23,6 @@ import { Links, Routes } from '../../pages/client-router';
 import { useGlobalStore } from '../../stores';
 import { useSidebar, ViewType } from '../sidebar';
 import * as constants from '../constants';
-import { useOnboardingStore } from './welcome-dialog';

 interface Props {
  lead?: string;
@@ -36,7 +35,7 @@ const GetStartedButton = ({ step }: { step: OnboardingStep }) => {
    constants.ONBOARDING_VIEWED_KEY
  );

-  const dismiss = useOnboardingStore((store) => store.dismiss);
+  const update = useGlobalStore((store) => store.update);
  const marketId = useGlobalStore((store) => store.marketId);
  const link = marketId ? Links[Routes.MARKET](marketId) : Links[Routes.HOME]();
  const openVegaWalletDialog = useVegaWalletDialogStore(
@@ -62,7 +61,7 @@ const GetStartedButton = ({ step }: { step: OnboardingStep }) => {
    onClickHandle = () => {
      navigate(link);
      setView({ type: ViewType.Deposit });
-      dismiss();
+      update({ onBoardingDismissed: true });
    };
  } else if (step === OnboardingStep.ONBOARDING_ORDER_STEP) {
    buttonText = t('Dismiss');
@@ -2,35 +2,29 @@ import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { TelemetryApproval } from './telemetry-approval';

-describe('TelemetryApproval', () => {
-  it('click on buttons should be properly handled', async () => {
-    const mockSetTelemetryValue = jest.fn();
-    render(
-      <TelemetryApproval
-        telemetryValue="false"
-        setTelemetryValue={mockSetTelemetryValue}
-      />
-    );
-    expect(
-      screen.getByRole('button', { name: 'No thanks' })
-    ).toBeInTheDocument();
-    await userEvent.click(screen.getByRole('button', { name: 'No thanks' }));
-    expect(mockSetTelemetryValue).toHaveBeenCalledWith('false');
-    expect(screen.getByText('Share data')).toBeInTheDocument();
-    await userEvent.click(screen.getByText('Share data'));
-    expect(mockSetTelemetryValue).toHaveBeenCalledWith('true');
-  });
+jest.mock('@vegaprotocol/logger', () => ({
+  SentryInit: () => undefined,
+  SentryClose: () => undefined,
+}));

-  it('confirm button should have proper text', async () => {
-    const mockSetTelemetryValue = jest.fn();
-    render(
-      <TelemetryApproval
-        telemetryValue="true"
-        setTelemetryValue={mockSetTelemetryValue}
-      />
+jest.mock('@vegaprotocol/environment', () => ({
+  useEnvironment: () => ({ VEGA_ENV: 'test', SENTRY_DSN: 'sentry-dsn' }),
+}));
+
+describe('TelemetryApproval', () => {
+  it('click on checkbox should be properly handled', async () => {
+    const helpText = 'My help text';
+    render(<TelemetryApproval helpText={helpText} />);
+    expect(screen.getByRole('checkbox')).toHaveAttribute(
+      'data-state',
+      'unchecked'
    );
-    expect(screen.getByText('Continue sharing data')).toBeInTheDocument();
-    await userEvent.click(screen.getByText('Continue sharing data'));
-    expect(mockSetTelemetryValue).toHaveBeenCalledWith('true');
+    await userEvent.click(screen.getByRole('checkbox'));
+    expect(screen.getByRole('checkbox')).toHaveAttribute(
+      'data-state',
+      'checked'
+    );
+    expect(screen.getByText('Share usage data')).toBeInTheDocument();
+    expect(screen.getByText(helpText)).toBeInTheDocument();
  });
 });
@@ -1,66 +1,21 @@
-import {
-  Intent,
-  TradingButton,
-  VegaIcon,
-  VegaIconNames,
-} from '@vegaprotocol/ui-toolkit';
+import { TradingCheckbox } from '@vegaprotocol/ui-toolkit';
 import { t } from '@vegaprotocol/i18n';
+import { useTelemetryApproval } from '../../lib/hooks/use-telemetry-approval';

-interface Props {
-  telemetryValue: string;
-  setTelemetryValue: (value: string) => void;
-}
-
-export const TelemetryApproval = ({
-  telemetryValue,
-  setTelemetryValue,
-}: Props) => {
+export const TelemetryApproval = ({ helpText }: { helpText: string }) => {
+  const [isApproved, setIsApproved] = useTelemetryApproval();
  return (
    <div className="flex flex-col py-3">
      <div className="mr-4" role="form">
-        <div className="mt-2">
-          {t(
-            'Help us identify bugs and improve Vega Governance by sharing anonymous usage data.'
-          )}
-        </div>
-        <div className="flex items-center mt-2">
-          <VegaIcon name={VegaIconNames.EYE_OFF} size={24} />
-          <div className="flex flex-col gap-1 ml-6">
-            <div className="font-semibold">{t('Anonymous')}</div>
-            <div>{t('Your identity is always anonymous on Vega')}</div>
-          </div>
-        </div>
-
-        <div className="flex items-center mt-2">
-          <VegaIcon name={VegaIconNames.COG} size={24} />
-          <div className="flex flex-col gap-1 ml-6">
-            <div className="font-semibold">{t('Optional')}</div>
-            <div>{t('You can opt out any time via settings')}</div>
-          </div>
-        </div>
-        <div className="flex flex-col justify-around items-center mt-10 gap-4 w-full px-4">
-          <TradingButton
-            onClick={() => setTelemetryValue('false')}
-            size="small"
-            intent={Intent.None}
-            data-testid="do-not-share-data-button"
-            fill
-          >
-            {t('No thanks')}
-          </TradingButton>
-
-          <TradingButton
-            onClick={() => setTelemetryValue('true')}
-            intent={Intent.Info}
-            data-testid="share-data-button"
-            size="small"
-            fill
-          >
-            {telemetryValue === 'true'
-              ? t('Continue sharing data')
-              : t('Share data')}
-          </TradingButton>
-        </div>
+        <TradingCheckbox
+          label={<span className="text-lg pl-1">{t('Share usage data')}</span>}
+          checked={isApproved}
+          name="telemetry-approval"
+          onCheckedChange={() => setIsApproved(!isApproved)}
+        />
+      </div>
+      <div className="text-sm text-vega-light-300 dark:text-vega-dark-300 ml-6">
+        <span>{helpText}</span>
      </div>
    </div>
  );
@@ -5,17 +5,17 @@ import { useNavigate } from 'react-router-dom';
 import { Links, Routes } from '../../pages/client-router';
 import { Networks, useEnvironment } from '@vegaprotocol/environment';
 import type { ReactNode } from 'react';
-import { useOnboardingStore } from './welcome-dialog';
+import { useGlobalStore } from '../../stores';

 export const WelcomeDialogContent = () => {
  const { VEGA_ENV } = useEnvironment();

-  const dismiss = useOnboardingStore((store) => store.dismiss);
+  const update = useGlobalStore((store) => store.update);
  const navigate = useNavigate();
  const browseMarkets = () => {
    const link = Links[Routes.MARKETS]();
    navigate(link);
-    dismiss();
+    update({ onBoardingDismissed: true });
  };
  const lead =
    VEGA_ENV === Networks.MAINNET
@@ -1,9 +1,7 @@
+import React from 'react';
 import { useNavigate } from 'react-router-dom';
-import type { Toast } from '@vegaprotocol/ui-toolkit';
-import { Dialog, Intent, useToasts } from '@vegaprotocol/ui-toolkit';
+import { Dialog, Intent } from '@vegaprotocol/ui-toolkit';
 import { t } from '@vegaprotocol/i18n';
-import { create } from 'zustand';
-import { persist } from 'zustand/middleware';
 import { useEnvironment } from '@vegaprotocol/environment';
 import { useLocalStorage } from '@vegaprotocol/react-helpers';
 import { WelcomeDialogContent } from './welcome-dialog-content';
@@ -14,41 +12,15 @@ import {
  OnboardingStep,
 } from './use-get-onboarding-step';
 import * as constants from '../constants';
-import { TelemetryApproval } from './telemetry-approval';
-import { useTelemetryApproval } from '../../lib/hooks/use-telemetry-approval';
-import { useCallback } from 'react';

-const ONBOARDING_STORAGE_KEY = 'vega_onboarding_dismiss_store';
-export const useOnboardingStore = create<{
-  dismissed: boolean;
-  dismiss: () => void;
-}>()(
-  persist(
-    (set) => ({
-      dismissed: false,
-      dismiss: () => set(() => ({ dismissed: true })),
-    }),
-    {
-      name: ONBOARDING_STORAGE_KEY,
-    }
-  )
-);
-
-const TELEMETRY_APPROVAL_TOAST_ID = 'telemetry_tost_id';
 export const WelcomeDialog = () => {
  const { VEGA_ENV } = useEnvironment();
-  const navigate = useNavigate();
-  const [telemetryValue, setTelemetryValue, isTelemetryNeeded, closeTelemetry] =
-    useTelemetryApproval();
  const [onBoardingViewed] = useLocalStorage(constants.ONBOARDING_VIEWED_KEY);
-  const dismiss = useOnboardingStore((store) => store.dismiss);
-  const dismissed = useOnboardingStore((store) => store.dismissed);
+  const update = useGlobalStore((store) => store.update);
+  const dismissed = useGlobalStore((store) => store.onBoardingDismissed);
  const currentStep = useGetOnboardingStep();
-  const isTelemetryPopupNeeded =
-    isTelemetryNeeded &&
-    (onBoardingViewed === 'true' ||
-      currentStep > OnboardingStep.ONBOARDING_ORDER_STEP);

+  const navigate = useNavigate();
  const isOnboardingDialogNeeded =
    onBoardingViewed !== 'true' &&
    currentStep &&
@@ -57,58 +29,12 @@ export const WelcomeDialog = () => {
  const marketId = useGlobalStore((store) => store.marketId);

  const onClose = () => {
-    if (isTelemetryPopupNeeded) {
-      closeTelemetry();
-    } else {
-      const link = marketId
-        ? Links[Routes.MARKET](marketId)
-        : Links[Routes.HOME]();
-      navigate(link);
-      dismiss();
-    }
+    const link = marketId
+      ? Links[Routes.MARKET](marketId)
+      : Links[Routes.HOME]();
+    navigate(link);
+    update({ onBoardingDismissed: true });
  };
-
-  const [setToast, hasToast, removeToast] = useToasts((store) => [
-    store.setToast,
-    store.hasToast,
-    store.remove,
-  ]);
-  const onApprovalClose = useCallback(() => {
-    closeTelemetry();
-    removeToast(TELEMETRY_APPROVAL_TOAST_ID);
-  }, [removeToast, closeTelemetry]);
-
-  const setTelemetryApprovalAndClose = useCallback(
-    (value: string) => {
-      setTelemetryValue(value);
-      onApprovalClose();
-    },
-    [setTelemetryValue, onApprovalClose]
-  );
-
-  if (isTelemetryPopupNeeded) {
-    const toast: Toast = {
-      id: TELEMETRY_APPROVAL_TOAST_ID,
-      intent: Intent.Primary,
-      content: (
-        <>
-          <h3 className="text-sm uppercase mb-1">
-            {t('Improve vega console')}
-          </h3>
-          <TelemetryApproval
-            telemetryValue={telemetryValue}
-            setTelemetryValue={setTelemetryApprovalAndClose}
-          />
-        </>
-      ),
-      onClose: onApprovalClose,
-    };
-    if (!hasToast(TELEMETRY_APPROVAL_TOAST_ID)) {
-      setToast(toast);
-    }
-    return;
-  }
-
  const title = (
    <span className="font-alpha calt" data-testid="welcome-title">
      {t('Console')}{' '}
@@ -1,40 +1,19 @@
 import { renderHook, act, waitFor } from '@testing-library/react';
 import { useLocalStorage } from '@vegaprotocol/react-helpers';
 import { SentryInit, SentryClose } from '@vegaprotocol/logger';
-import {
-  STORAGE_KEY,
-  STORAGE_SECOND_KEY,
-  useTelemetryApproval,
-} from './use-telemetry-approval';
-import { Networks } from '@vegaprotocol/environment';
+import { STORAGE_KEY, useTelemetryApproval } from './use-telemetry-approval';

 const mockSetValue = jest.fn();
-let mockStorageHookApprovalResult: [string | null, jest.Mock] = [
-  null,
-  mockSetValue,
-];
-const mockSetSecondValue = jest.fn();
-let mockStorageHookViewedResult: [string | null, jest.Mock] = [
-  null,
-  mockSetSecondValue,
-];
+const mockRemoveValue = jest.fn();
 jest.mock('@vegaprotocol/logger');
 jest.mock('@vegaprotocol/react-helpers', () => ({
  ...jest.requireActual('@vegaprotocol/react-helpers'),
-  useLocalStorage: jest.fn((key: string) => {
-    if (key === 'vega_telemetry_approval') {
-      return mockStorageHookApprovalResult;
-    }
-    return mockStorageHookViewedResult;
-  }),
+  useLocalStorage: jest
+    .fn()
+    .mockImplementation(() => [false, mockSetValue, mockRemoveValue]),
 }));
-let mockVegaEnv = 'test';
 jest.mock('@vegaprotocol/environment', () => ({
-  ...jest.requireActual('@vegaprotocol/environment'),
-  useEnvironment: jest.fn(() => ({
-    VEGA_ENV: mockVegaEnv,
-    SENTRY_DSN: 'sentry-dsn',
-  })),
+  useEnvironment: () => ({ VEGA_ENV: 'test', SENTRY_DSN: 'sentry-dsn' }),
 }));

 describe('useTelemetryApproval', () => {
@@ -42,71 +21,32 @@ describe('useTelemetryApproval', () => {
    jest.clearAllMocks();
  });

-  it('when empty hook should return proper array', () => {
+  it('hook should return proper array', () => {
    const { result } = renderHook(() => useTelemetryApproval());
-    expect(result.current[0]).toEqual('');
+    expect(result.current[0]).toEqual(false);
    expect(result.current[1]).toEqual(expect.any(Function));
-    expect(result.current[2]).toEqual(true);
-    expect(result.current[3]).toEqual(expect.any(Function));
    expect(useLocalStorage).toHaveBeenCalledWith(STORAGE_KEY);
-    expect(useLocalStorage).toHaveBeenCalledWith(STORAGE_SECOND_KEY);
-    expect(mockSetValue).toHaveBeenCalledWith('true');
-    expect(mockSetSecondValue).not.toHaveBeenCalledWith('true');
-  });
-
-  it('when approval not empty but viewed is empty should return proper array', () => {
-    mockStorageHookApprovalResult = ['false', mockSetValue];
-    const { result } = renderHook(() => useTelemetryApproval());
-    expect(result.current[0]).toEqual('false');
-    expect(result.current[1]).toEqual(expect.any(Function));
-    expect(result.current[2]).toEqual(true);
-    expect(result.current[3]).toEqual(expect.any(Function));
-    expect(useLocalStorage).toHaveBeenCalledWith(STORAGE_KEY);
-    expect(useLocalStorage).toHaveBeenCalledWith(STORAGE_SECOND_KEY);
-    expect(mockSetValue).not.toHaveBeenCalled();
-    expect(mockSetSecondValue).not.toHaveBeenCalled();
-  });
-
-  it('when NOT empty hook should return proper array', () => {
-    mockStorageHookApprovalResult = ['false', mockSetValue];
-    mockStorageHookViewedResult = ['true', mockSetSecondValue];
-    const { result } = renderHook(() => useTelemetryApproval());
-    expect(result.current[0]).toEqual('false');
-    expect(result.current[1]).toEqual(expect.any(Function));
-    expect(result.current[2]).toEqual(false);
-    expect(result.current[3]).toEqual(expect.any(Function));
-    expect(useLocalStorage).toHaveBeenCalledWith(STORAGE_KEY);
-    expect(mockSetValue).not.toHaveBeenCalled();
-  });
-
-  it('on mainnet hook should init properly', () => {
-    mockStorageHookApprovalResult = [null, mockSetValue];
-    mockVegaEnv = Networks.MAINNET;
-    renderHook(() => useTelemetryApproval());
-    expect(mockSetValue).toHaveBeenCalledWith('false');
  });

  it('hook should init stuff properly', async () => {
    const { result } = renderHook(() => useTelemetryApproval());
    await act(() => {
-      result.current[1]('true');
+      result.current[1](true);
    });
    await waitFor(() => {
      expect(SentryInit).toHaveBeenCalled();
-      expect(mockSetValue).toHaveBeenCalledWith('true');
-      expect(mockSetSecondValue).toHaveBeenCalledWith('true');
+      expect(mockSetValue).toHaveBeenCalledWith('1');
    });
  });

  it('hook should close stuff properly', async () => {
    const { result } = renderHook(() => useTelemetryApproval());
    await act(() => {
-      result.current[1]('false');
+      result.current[1](false);
    });
    await waitFor(() => {
      expect(SentryClose).toHaveBeenCalled();
-      expect(mockSetValue).toHaveBeenCalledWith('false');
-      expect(mockSetSecondValue).toHaveBeenCalledWith('true');
+      expect(mockRemoveValue).toHaveBeenCalledWith();
    });
  });
 });
@@ -1,51 +1,25 @@
 import { useLocalStorage } from '@vegaprotocol/react-helpers';
-import { useCallback, useEffect, useState } from 'react';
+import { useCallback } from 'react';
 import { SentryInit, SentryClose } from '@vegaprotocol/logger';
-import { Networks, useEnvironment } from '@vegaprotocol/environment';
-
+import { useEnvironment } from '@vegaprotocol/environment';
 export const STORAGE_KEY = 'vega_telemetry_approval';
-export const STORAGE_SECOND_KEY = 'vega_telemetry_viewed';

 export const useTelemetryApproval = (): [
-  value: string,
-  setValue: (value: string) => void,
-  shouldOpen: boolean,
-  close: () => void
+  value: boolean,
+  setValue: (value: boolean) => void
 ] => {
  const { VEGA_ENV, SENTRY_DSN } = useEnvironment();
-  const defaultTelemetryValue =
-    VEGA_ENV === Networks.MAINNET ? 'false' : 'true';
-  const [value, setValue] = useLocalStorage(STORAGE_KEY);
-  const [viewedValue, setViewedValue] = useLocalStorage(STORAGE_SECOND_KEY);
-  const [shouldOpen, setShouldOpen] = useState(!value || !viewedValue);
-  const close = useCallback(() => {
-    setShouldOpen(false);
-    setViewedValue('true');
-  }, [setViewedValue]);
-  const manageValue = useCallback(
-    (value: string) => {
-      if (value === 'true' && SENTRY_DSN) {
+  const [value, setValue, removeValue] = useLocalStorage(STORAGE_KEY);
+  const setApprove = useCallback(
+    (value: boolean) => {
+      if (value && SENTRY_DSN) {
        SentryInit(SENTRY_DSN, VEGA_ENV);
-        return setValue('true');
+        return setValue('1');
      }
      SentryClose();
-      setValue('false');
+      removeValue();
    },
-    [setValue, SENTRY_DSN, VEGA_ENV]
+    [setValue, removeValue, SENTRY_DSN, VEGA_ENV]
  );
-  const setTelemetryValue = useCallback(
-    (value: string) => {
-      setShouldOpen(false);
-      setViewedValue('true');
-      manageValue(value);
-    },
-    [manageValue, setViewedValue]
-  );
-  useEffect(() => {
-    if (!value) {
-      manageValue(defaultTelemetryValue);
-    }
-  }, [value, manageValue, defaultTelemetryValue]);
-
-  return [value || '', setTelemetryValue, shouldOpen, close];
+  return [Boolean(value), setApprove];
 };
@@ -4,6 +4,7 @@ import produce from 'immer';

 interface GlobalStore {
  marketId: string | null;
+  onBoardingDismissed: boolean;
  eagerConnecting: boolean;
  update: (store: Partial<Omit<GlobalStore, 'update'>>) => void;
 }
@@ -15,6 +16,7 @@ interface PageTitleStore {

 export const useGlobalStore = create<GlobalStore>()((set) => ({
  marketId: LocalStorage.getItem('marketId') || null,
+  onBoardingDismissed: false,
  eagerConnecting: false,
  update: (newState) => {
    set(
@@ -65,8 +65,6 @@ export function addSetVegaWallet() {
  Cypress.Commands.add('setVegaWallet', () => {
    cy.window().then((win) => {
      win.localStorage.setItem('vega_onboarding_viewed', 'true');
-      win.localStorage.setItem('vega_telemetry_approval', 'false');
-      win.localStorage.setItem('vega_telemetry_viewed', 'true');
      win.localStorage.setItem(
        'vega_wallet_config',
        JSON.stringify({
@@ -83,8 +81,6 @@ export function addSetOnBoardingViewed() {
  Cypress.Commands.add('setOnBoardingViewed', () => {
    cy.window().then((win) => {
      win.localStorage.setItem('vega_onboarding_viewed', 'true');
-      win.localStorage.setItem('vega_telemetry_approval', 'false');
-      win.localStorage.setItem('vega_telemetry_viewed', 'true');
    });
  });
 }
@@ -26,36 +26,22 @@ export const ProtocolUpgradeInProgressNotification = () => {
  const [nextUpgrade] = useLocalStorageSnapshot(
    NEXT_PROTOCOL_UPGRADE_PROPOSAL_SNAPSHOT
  );
+  const { blocksRising, block } = useBlockRising();
  const detailsLink = useProtocolUpgradeProposalLink();

  let vegaReleaseTag: string | undefined;
  let upgradeBlockHeight: string | undefined;

-  const hasData = data && !error;
-  const hasStoredData = nextUpgrade && ALLOW_STORED_PROPOSAL_DATA;
-
-  if (hasData) {
-    // gets tag and height from the data api
-    vegaReleaseTag = data.vegaReleaseTag;
-    upgradeBlockHeight = data.upgradeBlockHeight;
-  } else if (hasStoredData) {
-    // gets tag and height from stored value if data api is unavailable
+  if (error && !data && nextUpgrade && ALLOW_STORED_PROPOSAL_DATA) {
    try {
      const stored = JSON.parse(nextUpgrade) as StoredNextProtocolUpgradeData;
      vegaReleaseTag = stored.vegaReleaseTag;
      upgradeBlockHeight = stored.upgradeBlockHeight;
    } catch {
-      // NOOP - could not parse stored data
+      // no op
    }
  }

-  const hasUpgradeInfo = vegaReleaseTag && upgradeBlockHeight;
-
-  const { blocksRising, block } = useBlockRising(
-    // skips querying blocks if there's no upgrade information available
-    !hasUpgradeInfo
-  );
-
  /**
   * If upgrade is in progress then none of the nodes should produce blocks,
   * same should be with the tendermint block info otherwise it's a network
@@ -64,7 +50,10 @@ export const ProtocolUpgradeInProgressNotification = () => {
   * Once the networks is back then the notification disappears.
   */
  const upgradeInProgress =
-    hasUpgradeInfo && !blocksRising && block <= Number(upgradeBlockHeight);
+    vegaReleaseTag &&
+    upgradeBlockHeight &&
+    !blocksRising &&
+    block <= Number(upgradeBlockHeight);

  if (!upgradeInProgress) return null;

@@ -15,33 +15,31 @@ const CHECK_INTERVAL = 5000; // ms
 */
 const ALLOW_STALE = 2; // times -> MAX(this, 1) * CHECK_INTERVAL ~> min check time

-export const useBlockRising = (skip = false) => {
+export const useBlockRising = () => {
  const [blocksRising, setBlocksRising] = useState(true);
  const [block, setBlock] = useState(0);
  const nodes = useEnvironment((state) => state.nodes);
  const clients = useMemo(() => {
-    return nodes.map((n) => {
-      if (n && n.length > 0) {
-        const client = createClient({
+    return nodes.map(
+      (n) =>
+        n &&
+        n.length > 0 &&
+        createClient({
          url: n,
          cacheConfig: undefined,
          retry: false,
          connectToDevTools: false,
          connectToHeaderStore: true,
-        });
-        return client;
-      }
-      return undefined;
-    });
+        })
+    );
  }, [nodes]);

  const { refetch: fetchBlockInfo } = useBlockInfo();
  useEffect(() => {
-    if (skip) return;
    let stale = 0;
    let prev = 0;
    const check = async () => {
-      const queries = clients.map((client) =>
+      const queries = clients.map((client, index) =>
        client
          ? client
              .query<BlockStatisticsQuery>({
@@ -49,16 +47,18 @@ export const useBlockRising = (skip = false) => {
                fetchPolicy: 'network-only',
                errorPolicy: 'ignore',
              })
-              .catch(() => {
-                // NOOP - could not retrieve statistics for that node (network error)
-              })
+              .catch((err) =>
+                Promise.reject(
+                  `could not retrieve statistics from ${nodes[index]}`
+                )
+              )
          : undefined
      );

      const blockInfo = await fetchBlockInfo();
      const results = (await Promise.allSettled(compact(queries))).map(
        (res) => {
-          if (res && res.status === 'fulfilled' && res.value) {
+          if (res && res.status === 'fulfilled') {
            return res.value.data.statistics;
          } else {
            return undefined;
@@ -86,7 +86,7 @@ export const useBlockRising = (skip = false) => {
    return () => {
      clearInterval(interval);
    };
-  }, [clients, fetchBlockInfo, blocksRising, nodes, skip]);
+  }, [clients, fetchBlockInfo, blocksRising, nodes]);

  return { blocksRising, block };
 };
@@ -1,7 +0,0 @@
-export const IconEyeOff = ({ size = 16 }: { size: number }) => {
-  return (
-    <svg width={size} height={size} viewBox="0 0 16 16">
-      <path d="M16 7.97v-.02-.01-.02-.02a.672.672 0 00-.17-.36c-.49-.63-1.07-1.2-1.65-1.72l-3.16 2.26a2.978 2.978 0 01-2.98 2.9c-.31 0-.6-.06-.88-.15L5.09 12.3c.44.19.9.36 1.37.47.97.23 1.94.24 2.92.05.88-.17 1.74-.54 2.53-.98 1.25-.7 2.39-1.67 3.38-2.75.18-.2.37-.41.53-.62.09-.1.15-.22.17-.36v-.02-.02-.01-.02-.03c.01-.02.01-.03.01-.04zm-.43-4.17c.25-.18.43-.46.43-.8 0-.55-.45-1-1-1-.22 0-.41.08-.57.2l-.01-.01-2.67 1.91c-.69-.38-1.41-.69-2.17-.87a6.8 6.8 0 00-2.91-.05c-.88.18-1.74.54-2.53.99-1.25.7-2.39 1.67-3.38 2.75-.18.2-.37.41-.53.62-.23.29-.23.63-.01.92.51.66 1.11 1.25 1.73 1.79.18.16.38.29.56.44l-2.09 1.5.01.01c-.25.18-.43.46-.43.8 0 .55.45 1 1 1 .22 0 .41-.08.57-.2l.01.01 14-10-.01-.01zm-10.41 5a3.03 3.03 0 01-.11-.8 2.99 2.99 0 012.99-2.98c.62 0 1.19.21 1.66.53L5.16 8.8z" />
-    </svg>
-  );
-};
@@ -15,7 +15,6 @@ import { IconDeposit } from './svg-icons/icon-deposit';
 import { IconEdit } from './svg-icons/icon-edit';
 import { IconExclaimationMark } from './svg-icons/icon-exclaimation-mark';
 import { IconEye } from './svg-icons/icon-eye';
-import { IconEyeOff } from './svg-icons/icon-eye-off';
 import { IconForum } from './svg-icons/icon-forum';
 import { IconGlobe } from './svg-icons/icon-globe';
 import { IconInfo } from './svg-icons/icon-info';
@@ -56,7 +55,6 @@ export enum VegaIconNames {
  EDIT = 'edit',
  EXCLAIMATION_MARK = 'exclaimation-mark',
  EYE = 'eye',
-  EYE_OFF = 'eye-off',
  FORUM = 'forum',
  GLOBE = 'globe',
  INFO = 'info',
@@ -92,7 +90,6 @@ export const VegaIconNameMap: Record<
  'chevron-down': IconChevronDown,
  'chevron-left': IconChevronLeft,
  'chevron-up': IconChevronUp,
-  'eye-off': IconEyeOff,
  'exclaimation-mark': IconExclaimationMark,
  'open-external': IconOpenExternal,
  'question-mark': IconQuestionMark,
@@ -1,7 +1,6 @@
 import classNames from 'classnames';
 import {
  Dialog,
-  ExternalLink,
  Intent,
  Pill,
  TradingButton,
@@ -40,7 +39,7 @@ import { useVegaWallet } from '../use-vega-wallet';
 import { InjectedConnectorForm } from './injected-connector-form';
 import { isBrowserWalletInstalled } from '../utils';
 import { useIsWalletServiceRunning } from '../use-is-wallet-service-running';
-import { SnapStatus, useSnapStatus } from '../use-snap-status';
+import { useIsSnapRunning } from '../use-is-snap-running';
 import { useVegaWalletDialogStore } from './vega-wallet-dialog-store';

 export const CLOSE_DELAY = 1700;
@@ -159,7 +158,7 @@ const ConnectDialogContainer = ({
    appChainId
  );

-  const snapStatus = useSnapStatus(
+  const isSnapRunning = useIsSnapRunning(
    DEFAULT_SNAP_ID,
    Boolean(connectors['snap'])
  );
@@ -184,7 +183,7 @@ const ConnectDialogContainer = ({
            setWalletUrl={setWalletUrl}
            onSelect={handleSelect}
            isDesktopWalletRunning={isDesktopWalletRunning}
-            snapStatus={snapStatus}
+            isSnapRunning={isSnapRunning}
          />
        )}
      </ConnectDialogContent>
@@ -199,14 +198,14 @@ const ConnectorList = ({
  walletUrl,
  setWalletUrl,
  isDesktopWalletRunning,
-  snapStatus,
+  isSnapRunning,
 }: {
  connectors: Connectors;
  onSelect: (type: WalletType) => void;
  walletUrl: string;
  setWalletUrl: (value: string) => void;
  isDesktopWalletRunning: boolean | null;
-  snapStatus: SnapStatus;
+  isSnapRunning: boolean | null;
 }) => {
  const { pubKey, links } = useVegaWallet();
  const title = isBrowserWalletInstalled()
@@ -250,7 +249,7 @@ const ConnectorList = ({
        </div>
        {connectors['snap'] !== undefined ? (
          <div>
-            {snapStatus === SnapStatus.INSTALLED ? (
+            {isSnapRunning ? (
              <ConnectionOption
                type="snap"
                text={
@@ -268,34 +267,22 @@ const ConnectorList = ({
                }}
              />
            ) : (
-              <>
-                <ConnectionOption
-                  type="snap"
-                  disabled={snapStatus === SnapStatus.NOT_SUPPORTED}
-                  text={
-                    <>
-                      <div className="flex items-center justify-center w-full h-full text-base gap-1">
-                        {t('Install Vega MetaMask Snap')}
-                      </div>
-                      <div className="absolute top-0 flex items-center h-8 right-1">
-                        <VegaIcon name={VegaIconNames.METAMASK} size={24} />
-                      </div>
-                    </>
-                  }
-                  onClick={() => {
-                    requestSnap(DEFAULT_SNAP_ID);
-                  }}
-                />
-                {snapStatus === SnapStatus.NOT_SUPPORTED ? (
-                  <p className="pt-2 text-sm text-default">
-                    {t('No MetaMask version that supports snaps detected.')}{' '}
-                    {t('Learn more about')}{' '}
-                    <ExternalLink href="https://metamask.io/snaps/">
-                      MetaMask Snaps
-                    </ExternalLink>
-                  </p>
-                ) : null}
-              </>
+              <ConnectionOption
+                type="snap"
+                text={
+                  <>
+                    <div className="flex items-center justify-center w-full h-full text-base gap-1">
+                      {t('Install Vega MetaMask Snap')}
+                    </div>
+                    <div className="absolute top-0 flex items-center h-8 right-1">
+                      <VegaIcon name={VegaIconNames.METAMASK} size={24} />
+                    </div>
+                  </>
+                }
+                onClick={() => {
+                  requestSnap(DEFAULT_SNAP_ID);
+                }}
+              />
            )}
          </div>
        ) : null}
@@ -118,10 +118,14 @@ export const getSnap = async (
  snapId: string,
  version?: string
 ): Promise<Snap | undefined> => {
-  const snaps = await getSnaps();
-  return Object.values(snaps).find(
-    (snap) => snap.id === snapId && (!version || snap.version === version)
-  );
+  try {
+    const snaps = await getSnaps();
+    return Object.values(snaps).find(
+      (snap) => snap.id === snapId && (!version || snap.version === version)
+    );
+  } catch (e) {
+    return undefined;
+  }
 };

 export const invokeSnap = async <T>(
@@ -0,0 +1,27 @@
+import { useEffect, useState } from 'react';
+import { getSnap } from './connectors';
+
+const INTERVAL = 2_000;
+
+export const useIsSnapRunning = (snapId: string, shouldCheck: boolean) => {
+  const [running, setRunning] = useState(false);
+  useEffect(() => {
+    if (!shouldCheck) return;
+
+    const checkState = async () => {
+      const snap = await getSnap(snapId);
+      setRunning(!!snap);
+    };
+
+    const i = setInterval(() => {
+      checkState();
+    }, INTERVAL);
+
+    checkState();
+
+    return () => {
+      clearInterval(i);
+    };
+  }, [snapId, shouldCheck]);
+  return running;
+};
@@ -1,37 +0,0 @@
-import { useEffect, useState } from 'react';
-import { getSnap } from './connectors';
-
-const INTERVAL = 2_000;
-
-export enum SnapStatus {
-  NOT_SUPPORTED,
-  INSTALLED,
-  NOT_INSTALLED,
-}
-
-export const useSnapStatus = (snapId: string, shouldCheck: boolean) => {
-  const [status, setStatus] = useState<SnapStatus>(SnapStatus.NOT_INSTALLED);
-  useEffect(() => {
-    if (!shouldCheck) return;
-
-    const checkState = async () => {
-      try {
-        const snap = await getSnap(snapId);
-        setStatus(snap ? SnapStatus.INSTALLED : SnapStatus.NOT_INSTALLED);
-      } catch (err) {
-        setStatus(SnapStatus.NOT_SUPPORTED);
-      }
-    };
-
-    const i = setInterval(() => {
-      checkState();
-    }, INTERVAL);
-
-    checkState();
-
-    return () => {
-      clearInterval(i);
-    };
-  }, [snapId, shouldCheck]);
-  return status;
-};
@@ -23,16 +23,13 @@
 - **Must** There is a link to try out trading on Fairground when I'm on Mainnet (<a name="0007-FUGS-008" href="#0007-FUGS-008">0007-FUGS-008</a>)
 - **Must** There is a link to trade with real funds on Mainnet when I am on Fairground (<a name="0007-FUGS-010" href="#0007-FUGS-010">0007-FUGS-010</a>)
 - **Must** When I am on the Fairground version, I can see a warning / call out that this is Fairground meaning I can try out with virtual assets at no risk (<a name="0007-FUGS-011" href="#0007-FUGS-011">0007-FUGS-011</a>)
- If I dismiss the popup, I **must** not see it anymore (<a name="0007-FUGS-018" href="#0007-FUGS-018">0007-FUGS-018</a>)
+- If I dismiss the popup, I **must** not see it unless I NOT accomplish full "onboarding"
 - If I dismiss the popup, I land on the default market (<a name="0007-FUGS-012" href="#0007-FUGS-012">0007-FUGS-012</a>)

 ## When the popup has been dismissed:

 - **Must** I can see the steps to get started with a visible call to action (according to my progress) in the context of the deal ticket, deposit, withdraw, transfer components in the sidebar (<a name="0007-FUGS-013" href="#0007-FUGS-013">0007-FUGS-013</a>)
- **Must** We've replaced "connect wallet" in the top right with "get started" (<a name="0007-FUGS-014" href="#0007-FUGS-014">0007-FUGS-014</a>)
- **Must** When I press the get started CTA, I see the wallet connect popup (<a name="0007-FUGS-015" href="#0007-FUGS-015">0007-FUGS-015</a>)
- **Must** If I have a wallet installed already I don't see this quick start onboarding, and instead call(s) to action in Console revert to connect wallet, not "get started" (button in nav header) (<a name="0007-FUGS-016" href="#0007-FUGS-016">0007-FUGS-016</a>)
-
-## When onboarding process has been accomplished:
-
- I can see telemetry approval toast: on environment other than mainnet telemetry is enabled by default (<a name="0007-FUGS-018" href="#0007-FUGS-018">0007-FUGS-018</a>)
+- **Must** Remove buttons from pane containers that prompt to connect wallet (<a name="0007-FUGS-014" href="#0007-FUGS-014">0007-FUGS-014</a>)
+- **Must** We've replaced "connect wallet" in the top right with "get started" (<a name="0007-FUGS-015" href="#0007-FUGS-015">0007-FUGS-015</a>)
+- **Must** When I press the get started CTA, I see the wallet connect popup (<a name="0007-FUGS-016" href="#0007-FUGS-016">0007-FUGS-016</a>)
+- **Must** If I have a wallet installed already I don't see this quick start onboarding, and instead call(s) to action in Console revert to connect wallet, not "get started" (button in nav header) (<a name="0007-FUGS-017" href="#0007-FUGS-017">0007-FUGS-017</a>)