chore: error suggestion

fix(proposals): parsing block duration value
2023-08-28 14:25:47 +02:00 · 2023-08-24 09:32:13 +02:00
44 changed files with 186 additions and 626 deletions
@@ -22,6 +22,8 @@ NX_VEGA_REST_URL=https://api.n00.stagnet1.vega.xyz/api/v2/
 NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket

+NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
+NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/pl/firefox/addon/vega-wallet

 #Test configuration variables
 CYPRESS_FAIRGROUND=false
@@ -19,9 +19,6 @@ NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
 NX_VEGA_REST_URL=http://localhost:3008/api/v2/

-NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/pl/firefox/addon/vega-wallet
-
 NX_TENDERMINT_URL=http://localhost:26617
 NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket

@@ -29,4 +26,4 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket
 CYPRESS_FAIRGROUND=false

 # Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=false
+NX_SUCCESSOR_MARKETS=false
@@ -14,11 +14,8 @@ NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/annou
 NX_VEGA_REST_URL=https://api.n00.devnet1.vega.xyz/api/v2/
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996

-NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/pl/firefox/addon/vega-wallet
-
 NX_TENDERMINT_URL=https://tm.be.devnet1.vega.xyz/
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.devnet1.vega.xyz/websocket

 # Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=true
+NX_SUCCESSOR_MARKETS=true
@@ -14,11 +14,9 @@ NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-mainnet-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
 NX_VEGA_REST_URL=https://api.vega.community/api/v2/
-NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/pl/firefox/addon/vega-wallet

 NX_TENDERMINT_URL=https://be.vega.community
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket

 # Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=false
+NX_SUCCESSOR_MARKETS=false
@@ -13,11 +13,9 @@ NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-mainnet-mirror-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
 NX_VEGA_REST_URL=https://api.mainnet-mirror.vega.rocks/api/v2/
-NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/pl/firefox/addon/vega-wallet

 NX_TENDERMINT_URL=https://be.mainnet-mirror.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.mainnet-mirror.vega.rocks/websocket

 # Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=false
+NX_SUCCESSOR_MARKETS=false
@@ -10,11 +10,8 @@ NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_REST_URL=https://api.n00.stagnet1.vega.xyz/api/v2/

-NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/pl/firefox/addon/vega-wallet
-
 NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket

 # Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=true
+NX_SUCCESSOR_MARKETS=true
@@ -15,11 +15,8 @@ NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/annou
 NX_VEGA_REST_URL=https://api.n07.testnet.vega.xyz/api/v2/
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996

-NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/pl/firefox/addon/vega-wallet
-
 NX_TENDERMINT_URL=https://tm.be.testnet.vega.xyz
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.testnet.vega.xyz/websocket

 # Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=true
+NX_SUCCESSOR_MARKETS=true
@@ -12,11 +12,8 @@ NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/annou
 NX_VEGA_REST_URL=https://api-validators-testnet.vega.rocks/api/v2/
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996

-NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/pl/firefox/addon/vega-wallet
-
 NX_TENDERMINT_URL=https://tm.be.validators-testnet.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.

 # Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=false
+NX_SUCCESSOR_MARKETS=false
@@ -36,4 +36,4 @@ CYPRESS_VEGA_WALLET_API_TOKEN=

 # Cosmic elevator flags (MUST be doubled with CYPRESS_ prefix)
 NX_SUCCESSOR_MARKETS=true
-CYPRESS_NX_SUCCESSOR_MARKETS=true
+CYPRESS_NX_SUCCESSOR_MARKETS=true
@@ -23,7 +23,7 @@ describe('deal ticket basics', { tags: '@smoke' }, () => {
    // 0003-WTXN-001
    cy.getByTestId('connect-vega-wallet'); // Not connected
    cy.getByTestId(placeOrderBtn).should('exist');
-    cy.getByTestId('order-connect-wallet').should('exist');
+    cy.getByTestId('get-started-button').should('exist');
  });

  it('must be able to select order direction - long/short', function () {
@@ -44,7 +44,7 @@ describe('deal ticket basics', { tags: '@smoke' }, () => {
    mockConnectWallet();
    cy.getByTestId(toggleLimit).click();
    cy.getByTestId(orderPriceField).clear().type('101');
-    cy.getByTestId('order-connect-wallet').click();
+    cy.getByTestId('get-started-button').click();
    cy.getByTestId('dialog-content').should('be.visible');
    cy.getByTestId('connectors-list')
      .find('[data-testid="connector-jsonRpc"]')
@@ -12,7 +12,8 @@ NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/main/announcements.json
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
-
+NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
+NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/pl/firefox/addon/vega-wallet

 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
@@ -12,8 +12,6 @@ NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
-NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/pl/firefox/addon/vega-wallet

 NX_ETH_LOCAL_PROVIDER_URL=http://localhost:8545/
 NX_ETH_WALLET_MNEMONIC="ozone access unlock valid olympic save include omit supply green clown session"
@@ -13,8 +13,6 @@ NX_VEGA_DOCS_URL=#
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega-dev-releases/releases
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
-NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/pl/firefox/addon/vega-wallet

 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
@@ -13,8 +13,6 @@ NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
 NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
 NX_VEGA_CONSOLE_URL=https://console.vega.xyz
-NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-mainnet/codfcglpplgmmlokgilfkpcjnmkbfiel
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/pl/firefox/addon/vega-wallet-mainnet
 # TAG name of the current app version - TODO: bump to the latest upon release
 NX_APP_VERSION=v0.20.21-core-0.71.6

@@ -13,8 +13,6 @@ NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
 NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
 NX_VEGA_CONSOLE_URL=https://console.mainnet-mirror.vega.rocks
-NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-mainnet/codfcglpplgmmlokgilfkpcjnmkbfiel
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/pl/firefox/addon/vega-wallet-mainnet
 # TAG name of the current app version - TODO: bump to the latest upon release
 NX_APP_VERSION=v0.20.19-core-0.71.6

@@ -13,11 +13,9 @@ NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
-NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/pl/firefox/addon/vega-wallet

 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
 NX_STOP_ORDERS=true
 # NX_ICEBERG_ORDERS
-# NX_PRODUCT_PERPETUALS
+# NX_PRODUCT_PERPETUALS
@@ -14,8 +14,6 @@ NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
 NX_VEGA_CONSOLE_URL=https://console.fairground.wtf
-NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/pl/firefox/addon/vega-wallet

 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
@@ -24,4 +22,4 @@ NX_ICEBERG_ORDERS=true
 # NX_PRODUCT_PERPETUALS

 NX_TENDERMINT_URL=https://tm.be.testnet.vega.xyz
-NX_TENDERMINT_WEBSOCKET_URL=wss://be.testnet.vega.xyz/websocket
+NX_TENDERMINT_WEBSOCKET_URL=wss://be.testnet.vega.xyz/websocket
@@ -15,9 +15,6 @@ NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/annou
 NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
 NX_VEGA_CONSOLE_URL=https://trading.validators-testnet.vega.rocks

-NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
-NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/pl/firefox/addon/vega-wallet
-
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=false
 NX_STOP_ORDERS=false
@@ -1,2 +1,10 @@
+import { t } from '@vegaprotocol/i18n';
+
 export const THROTTLE_UPDATE_TIME = 500;
 export const ONBOARDING_VIEWED_KEY = 'vega_onboarding_viewed';
+export const MAINNET_WELCOME_HEADER = t(
+  'Trade cash settled futures on the fully decentralised Vega network.'
+);
+export const TESTNET_WELCOME_HEADER = t(
+  'Try out trading cash settled futures on the fully decentralised Vega network (Testnet).'
+);
@@ -1,4 +1,4 @@
-import { Fragment, useState } from 'react';
+import { useState } from 'react';
 import type {
  SuccessorProposalListFieldsFragment,
  NewMarketSuccessorFieldsFragment,
@@ -52,7 +52,7 @@ export const MarketSuccessorProposalBanner = ({
              TOKEN_PROPOSAL.replace(':id', item.id || '')
            );
            return (
-              <Fragment key={i}>
+              <>
                <ExternalLink href={externalLink} key={i}>
                  {
                    (item.terms?.change as NewMarketSuccessorFieldsFragment)
@@ -60,7 +60,7 @@ export const MarketSuccessorProposalBanner = ({
                  }
                </ExternalLink>
                {i < successors.length - 1 && ', '}
-              </Fragment>
+              </>
            );
          })}
        </div>
@@ -3,7 +3,7 @@ import { Header, HeaderTitle } from '../header';
 import { useParams } from 'react-router-dom';
 import { MarketSelector } from '../../components/market-selector/market-selector';
 import { MarketHeaderStats } from '../../client-pages/market/market-header-stats';
-import { useMarket, useMarketList } from '@vegaprotocol/markets';
+import { useMarket } from '@vegaprotocol/markets';
 import { useState } from 'react';

 export const MarketHeader = () => {
@@ -11,10 +11,6 @@ export const MarketHeader = () => {
  const { data } = useMarket(marketId);
  const [open, setOpen] = useState(false);

-  // Ensure that markets are kept cached so opening the list
-  // shows all markets instantly
-  useMarketList();
-
  if (!data) return null;

  return (
@@ -132,7 +132,6 @@ describe('MarketSelector', () => {
    data: markets,
    loading: false,
    error: undefined,
-    reload: jest.fn(),
  });

  it('Button "All" should be selected by default', () => {
@@ -1,6 +1,6 @@
 import { t } from '@vegaprotocol/i18n';
 import uniqBy from 'lodash/uniqBy';
-import { type MarketMaybeWithDataAndCandles } from '@vegaprotocol/markets';
+import type { MarketMaybeWithDataAndCandles } from '@vegaprotocol/markets';
 import {
  TradingInput,
  TinyScroll,
@@ -8,7 +8,7 @@ import {
  VegaIconNames,
 } from '@vegaprotocol/ui-toolkit';
 import type { CSSProperties } from 'react';
-import { useCallback, useState, useMemo, useRef, useEffect } from 'react';
+import { useCallback, useState, useMemo, useRef } from 'react';
 import { FixedSizeList } from 'react-window';
 import { useMarketSelectorList } from './use-market-selector-list';
 import type { ProductType } from './product-selector';
@@ -44,12 +44,7 @@ export const MarketSelector = ({
    assets: [],
  });
  const allProducts = filter.product === Product.All;
-  const { markets, data, loading, error, reload } =
-    useMarketSelectorList(filter);
-
-  useEffect(() => {
-    reload();
-  }, [reload]);
+  const { markets, data, loading, error } = useMarketSelectorList(filter);

  return (
    <div data-testid="market-selector">
@@ -15,7 +15,6 @@ export const Sort = {
  Gained: 'Gained',
  Lost: 'Lost',
  New: 'New',
-  TopTraded: 'TopTraded',
 } as const;

 export type SortType = keyof typeof Sort;
@@ -27,7 +26,6 @@ export const SortTypeMapping: {
  [Sort.Gained]: 'Top gaining',
  [Sort.Lost]: 'Top losing',
  [Sort.New]: 'New markets',
-  [Sort.TopTraded]: 'Top traded',
 };

 const SortIconMapping: {
@@ -37,7 +35,6 @@ const SortIconMapping: {
  [Sort.Gained]: VegaIconNames.TREND_UP,
  [Sort.Lost]: VegaIconNames.TREND_DOWN,
  [Sort.New]: VegaIconNames.STAR,
-  [Sort.TopTraded]: VegaIconNames.ARROW_UP,
 };

 export const SortDropdown = ({
@@ -1,11 +1,7 @@
 import { useMemo } from 'react';
 import orderBy from 'lodash/orderBy';
 import { MarketState } from '@vegaprotocol/types';
-import {
-  calcCandleVolume,
-  calcTradedFactor,
-  useMarketList,
-} from '@vegaprotocol/markets';
+import { calcCandleVolume, useMarketList } from '@vegaprotocol/markets';
 import { priceChangePercentage } from '@vegaprotocol/utils';
 import type { Filter } from '../../components/market-selector/market-selector';
 import { Sort } from './sort-dropdown';
@@ -24,7 +20,7 @@ export const useMarketSelectorList = ({
  sort,
  searchTerm,
 }: Filter) => {
-  const { data, loading, error, reload } = useMarketList();
+  const { data, loading, error } = useMarketList();

  const markets = useMemo(() => {
    if (!data?.length) return [];
@@ -98,14 +94,10 @@ export const useMarketSelectorList = ({
      );
    }

-    if (sort === Sort.TopTraded) {
-      return orderBy(markets, [(m) => calcTradedFactor(m)], ['desc']);
-    }
-
    return markets;
  }, [data, product, searchTerm, assets, sort]);

-  return { markets, data, loading, error, reload };
+  return { markets, data, loading, error };
 };

 export const isMarketActive = (state: MarketState) => {
@@ -1,6 +1,6 @@
 import { VegaIcon, VegaIconNames } from '@vegaprotocol/ui-toolkit';
 import { MarketSelector } from '../market-selector';
-import { useMarket, useMarketList } from '@vegaprotocol/markets';
+import { useMarket } from '@vegaprotocol/markets';
 import { t } from '@vegaprotocol/i18n';
 import { useParams } from 'react-router-dom';
 import * as PopoverPrimitive from '@radix-ui/react-popover';
@@ -14,10 +14,6 @@ export const NavHeader = () => {
  const { data } = useMarket(marketId);
  const [open, setOpen] = useState(false);

-  // Ensure that markets are kept cached so opening the list
-  // shows all markets instantly
-  useMarketList();
-
  if (!marketId) return null;

  return (
@@ -1,36 +1,16 @@
-import { MemoryRouter } from 'react-router-dom';
 import type { VegaWalletContextShape } from '@vegaprotocol/wallet';
 import { VegaWalletContext } from '@vegaprotocol/wallet';
 import { GetStarted } from './get-started';
 import { render, screen } from '@testing-library/react';

-let mockStep = 1;
-jest.mock('./use-get-onboarding-step', () => ({
-  ...jest.requireActual('./use-get-onboarding-step'),
-  useGetOnboardingStep: jest.fn(() => mockStep),
-}));
-
 describe('GetStarted', () => {
  const renderComponent = (context: Partial<VegaWalletContextShape> = {}) => {
    return render(
-      <MemoryRouter>
-        <VegaWalletContext.Provider value={context as VegaWalletContextShape}>
-          <GetStarted />
-        </VegaWalletContext.Provider>
-      </MemoryRouter>
+      <VegaWalletContext.Provider value={context as VegaWalletContextShape}>
+        <GetStarted />
+      </VegaWalletContext.Provider>
    );
  };
-  const checkTicks = (elements: Element[]) => {
-    elements.forEach((item, i) => {
-      if (i + 1 < mockStep) {
-        expect(item.querySelector('[data-testid="icon-tick"]')).toBeTruthy();
-      }
-    });
-  };
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });

  it('renders full get started content if not connected and no browser wallet detected', () => {
    renderComponent();
@@ -40,71 +20,12 @@ describe('GetStarted', () => {
  it('renders connect prompt if no pubKey but wallet installed', () => {
    globalThis.window.vega = {} as Vega;
    renderComponent();
-    expect(screen.getByTestId('get-started-banner')).toBeInTheDocument();
+    expect(screen.getByTestId('order-connect-wallet')).toBeInTheDocument();
    globalThis.window.vega = undefined as unknown as Vega;
  });

  it('renders nothing if connected', () => {
-    mockStep = 0;
    const { container } = renderComponent({ pubKey: 'my-pubkey' });
    expect(container).toBeEmptyDOMElement();
  });
-
-  it('steps should be ticked', () => {
-    const navigatorGetter: jest.SpyInstance = jest.spyOn(
-      window.navigator,
-      'userAgent',
-      'get'
-    );
-    navigatorGetter.mockReturnValue('Chrome');
-    mockStep = 1;
-    const { rerender, container } = renderComponent();
-    expect(screen.queryByTestId('icon-tick')).not.toBeInTheDocument();
-    expect(screen.getByTestId('get-wallet-button')).toBeInTheDocument();
-
-    mockStep = 2;
-    rerender(
-      <MemoryRouter>
-        <VegaWalletContext.Provider value={{} as VegaWalletContextShape}>
-          <GetStarted />
-        </VegaWalletContext.Provider>
-      </MemoryRouter>
-    );
-    checkTicks(screen.getAllByRole('listitem'));
-    expect(screen.getByRole('button', { name: 'Connect' })).toBeInTheDocument();
-
-    mockStep = 3;
-    rerender(
-      <MemoryRouter>
-        <VegaWalletContext.Provider value={{} as VegaWalletContextShape}>
-          <GetStarted />
-        </VegaWalletContext.Provider>
-      </MemoryRouter>
-    );
-    checkTicks(screen.getAllByRole('listitem'));
-    expect(screen.getByRole('button', { name: 'Deposit' })).toBeInTheDocument();
-
-    mockStep = 4;
-    rerender(
-      <MemoryRouter>
-        <VegaWalletContext.Provider value={{} as VegaWalletContextShape}>
-          <GetStarted />
-        </VegaWalletContext.Provider>
-      </MemoryRouter>
-    );
-    checkTicks(screen.getAllByRole('listitem'));
-    expect(screen.getByRole('button', { name: 'Dismiss' })).toBeInTheDocument();
-
-    mockStep = 5;
-    rerender(
-      <MemoryRouter>
-        <VegaWalletContext.Provider
-          value={{ pubKey: 'my-pubkey' } as VegaWalletContextShape}
-        >
-          <GetStarted />
-        </VegaWalletContext.Provider>
-      </MemoryRouter>
-    );
-    expect(container).toBeEmptyDOMElement();
-  });
 });
@@ -1,96 +1,36 @@
 import classNames from 'classnames';
 import { t } from '@vegaprotocol/i18n';
+import { ExternalLink, Intent, TradingButton } from '@vegaprotocol/ui-toolkit';
 import {
-  ExternalLink,
-  Intent,
-  TradingButton,
-  VegaIcon,
-  VegaIconNames,
-} from '@vegaprotocol/ui-toolkit';
-import {
-  GetWalletButton,
  useVegaWallet,
  useVegaWalletDialogStore,
+  isBrowserWalletInstalled,
 } from '@vegaprotocol/wallet';
 import { Networks, useEnvironment } from '@vegaprotocol/environment';
 import { useLocalStorage } from '@vegaprotocol/react-helpers';
-import { useNavigate } from 'react-router-dom';
-import {
-  OnboardingStep,
-  useGetOnboardingStep,
-} from './use-get-onboarding-step';
-import { Links, Routes } from '../../pages/client-router';
-import { useGlobalStore } from '../../stores';
-import { useSidebar, ViewType } from '../sidebar';
 import * as constants from '../constants';

 interface Props {
  lead?: string;
 }

-const GetStartedButton = ({ step }: { step: OnboardingStep }) => {
-  const navigate = useNavigate();
-  const [, setOnboardingViewed] = useLocalStorage(
-    constants.ONBOARDING_VIEWED_KEY
-  );
-
-  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(
-    (store) => store.openVegaWalletDialog
-  );
-  const setView = useSidebar((store) => store.setView);
-  let buttonText = t('Get started');
-  let onClickHandle = () => {
-    openVegaWalletDialog();
-  };
-  if (step === OnboardingStep.ONBOARDING_WALLET_STEP) {
-    return <GetWalletButton className="justify-between" />;
-  } else if (step === OnboardingStep.ONBOARDING_CONNECT_STEP) {
-    buttonText = t('Connect');
-  } else if (step === OnboardingStep.ONBOARDING_DEPOSIT_STEP) {
-    buttonText = t('Deposit');
-    onClickHandle = () => {
-      navigate(link);
-      setView({ type: ViewType.Deposit });
-      update({ onBoardingDismissed: true });
-    };
-  } else if (step === OnboardingStep.ONBOARDING_ORDER_STEP) {
-    buttonText = t('Dismiss');
-    onClickHandle = () => {
-      navigate(link);
-      setView({ type: ViewType.Order });
-      setOnboardingViewed('true');
-    };
-  }
-
-  return (
-    <TradingButton
-      onClick={onClickHandle}
-      size="small"
-      data-testid="get-started-button"
-      intent={Intent.Info}
-    >
-      {buttonText}
-    </TradingButton>
-  );
-};
-
 export const GetStarted = ({ lead }: Props) => {
  const { pubKey } = useVegaWallet();
  const { VEGA_ENV, VEGA_NETWORKS } = useEnvironment();
  const CANONICAL_URL = VEGA_NETWORKS[VEGA_ENV] || 'https://console.vega.xyz';
-  const [onBoardingViewed] = useLocalStorage(constants.ONBOARDING_VIEWED_KEY);
-  const currentStep = useGetOnboardingStep();
+
+  const [, setOnboardingViewed] = useLocalStorage(
+    constants.ONBOARDING_VIEWED_KEY
+  );
+
  const openVegaWalletDialog = useVegaWalletDialogStore(
    (store) => store.openVegaWalletDialog
  );

-  const getStartedNeeded =
-    onBoardingViewed !== 'true' &&
-    currentStep &&
-    currentStep < OnboardingStep.ONBOARDING_COMPLETE_STEP;
+  const onButtonClick = () => {
+    openVegaWalletDialog();
+    setOnboardingViewed('true');
+  };

  const wrapperClasses = classNames(
    'flex flex-col py-4 px-6 gap-4 rounded',
@@ -99,39 +39,27 @@ export const GetStarted = ({ lead }: Props) => {
    { 'mt-8': !lead }
  );

-  if (getStartedNeeded) {
+  if (!pubKey && !isBrowserWalletInstalled()) {
    return (
      <div className={wrapperClasses} data-testid="get-started-banner">
        {lead && <h2>{lead}</h2>}
        <h3 className="text-lg">{t('Get started')}</h3>
        <div>
-          <ul className="list-none">
-            <Step
-              step={1}
-              text={t('Get a Vega wallet')}
-              complete={currentStep > OnboardingStep.ONBOARDING_WALLET_STEP}
-            />
-            <Step
-              step={2}
-              text={t('Connect')}
-              complete={Boolean(
-                currentStep > OnboardingStep.ONBOARDING_CONNECT_STEP || pubKey
-              )}
-            />
-            <Step
-              step={3}
-              text={t('Deposit funds')}
-              complete={currentStep > OnboardingStep.ONBOARDING_DEPOSIT_STEP}
-            />
-            <Step
-              step={4}
-              text={t('Open a position')}
-              complete={currentStep > OnboardingStep.ONBOARDING_ORDER_STEP}
-            />
+          <ul className="list-decimal list-inside">
+            <li>{t('Get a Vega wallet')}</li>
+            <li>{t('Connect')}</li>
+            <li>{t('Deposit funds')}</li>
+            <li>{t('Open a position')}</li>
          </ul>
        </div>
        <div>
-          <GetStartedButton step={currentStep} />
+          <TradingButton
+            intent={Intent.Info}
+            onClick={onButtonClick}
+            data-testid="get-started-button"
+          >
+            {t('Get started')}
+          </TradingButton>
        </div>
        {VEGA_ENV === Networks.MAINNET && (
          <p className="text-sm">
@@ -156,7 +84,7 @@ export const GetStarted = ({ lead }: Props) => {
  if (!pubKey) {
    return (
      <div className={wrapperClasses}>
-        <p className="mb-1 text-sm">
+        <p className="text-sm mb-1">
          You need a{' '}
          <ExternalLink href="https://vega.xyz/wallet">
            Vega wallet
@@ -177,34 +105,3 @@ export const GetStarted = ({ lead }: Props) => {

  return null;
 };
-
-const Step = ({
-  step,
-  text,
-  complete,
-}: {
-  step: number;
-  text: string;
-  complete: boolean;
-}) => {
-  return (
-    <li
-      className={classNames('flex', {
-        'text-vega-clight-200 dark:text-vega-cdark-200': complete,
-      })}
-    >
-      <div className="flex justify-center w-5">
-        {complete ? <Tick /> : <span>{step}.</span>}
-      </div>
-      <div className="ml-1">{text}</div>
-    </li>
-  );
-};
-
-const Tick = () => {
-  return (
-    <span className="relative right-[2px]">
-      <VegaIcon name={VegaIconNames.TICK} size={18} />
-    </span>
-  );
-};
@@ -1,97 +0,0 @@
-import type { ReactNode } from 'react';
-import { renderHook } from '@testing-library/react';
-import {
-  useGetOnboardingStep,
-  OnboardingStep,
-} from './use-get-onboarding-step';
-import type { VegaWalletContextShape } from '@vegaprotocol/wallet';
-import { VegaWalletContext } from '@vegaprotocol/wallet';
-import { useDataProvider } from '@vegaprotocol/data-provider';
-import { depositsProvider } from '@vegaprotocol/deposits';
-import { aggregatedAccountsDataProvider } from '@vegaprotocol/accounts';
-import { ordersWithMarketProvider } from '@vegaprotocol/orders';
-import { positionsDataProvider } from '@vegaprotocol/positions';
-
-let mockData: object[] | null = [{ id: 'item-id' }];
-jest.mock('@vegaprotocol/data-provider', () => ({
-  ...jest.requireActual('@vegaprotocol/data-provider'),
-  useDataProvider: jest.fn(() => ({ data: mockData })),
-}));
-
-let mockContext: Partial<VegaWalletContextShape> = { pubKey: 'test-pubkey' };
-
-describe('useGetOnboardingStep', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-    mockData = [{ id: 'item-id' }];
-    mockContext = { pubKey: 'test-pubkey' };
-    globalThis.window.vega = {} as Vega;
-  });
-
-  const wrapper = ({ children }: { children: ReactNode }) => (
-    <VegaWalletContext.Provider
-      value={mockContext as unknown as VegaWalletContextShape}
-    >
-      {children}
-    </VegaWalletContext.Provider>
-  );
-
-  it('should return properly ONBOARDING_UNKNOWN_STEP', () => {
-    mockData = null;
-    const { result } = renderHook(() => useGetOnboardingStep(), { wrapper });
-    expect(result.current).toEqual(OnboardingStep.ONBOARDING_UNKNOWN_STEP);
-  });
-
-  it('should return properly ONBOARDING_WALLET_STEP', () => {
-    // @ts-ignore test only purpose
-    globalThis.window.vega = undefined;
-    const { result } = renderHook(() => useGetOnboardingStep(), { wrapper });
-    expect(result.current).toEqual(OnboardingStep.ONBOARDING_WALLET_STEP);
-  });
-
-  it('should return properly ONBOARDING_CONNECT_STEP', () => {
-    mockContext = { pubKey: null };
-    const { result } = renderHook(() => useGetOnboardingStep(), { wrapper });
-    expect(result.current).toEqual(OnboardingStep.ONBOARDING_CONNECT_STEP);
-  });
-
-  it('should return properly ONBOARDING_DEPOSIT_STEP', async () => {
-    (useDataProvider as jest.Mock).mockImplementation((args) => {
-      if (
-        args.dataProvider === depositsProvider ||
-        args.dataProvider === aggregatedAccountsDataProvider
-      ) {
-        return { data: [] };
-      }
-      return { data: mockData };
-    });
-    const { result } = renderHook(() => useGetOnboardingStep(), { wrapper });
-    await expect(result.current).toEqual(
-      OnboardingStep.ONBOARDING_DEPOSIT_STEP
-    );
-  });
-
-  it('should return properly ONBOARDING_ORDER_STEP', async () => {
-    (useDataProvider as jest.Mock).mockImplementation((args) => {
-      if (
-        args.dataProvider === ordersWithMarketProvider ||
-        args.dataProvider === positionsDataProvider
-      ) {
-        return { data: [] };
-      }
-      return { data: mockData };
-    });
-    const { result } = renderHook(() => useGetOnboardingStep(), { wrapper });
-    await expect(result.current).toEqual(OnboardingStep.ONBOARDING_ORDER_STEP);
-  });
-
-  it('should return properly ONBOARDING_COMPLETE_STEP', async () => {
-    (useDataProvider as jest.Mock).mockImplementation(() => {
-      return { data: mockData };
-    });
-    const { result } = renderHook(() => useGetOnboardingStep(), { wrapper });
-    await expect(result.current).toEqual(
-      OnboardingStep.ONBOARDING_COMPLETE_STEP
-    );
-  });
-});
@@ -1,82 +0,0 @@
-import { isBrowserWalletInstalled, useVegaWallet } from '@vegaprotocol/wallet';
-import { depositsProvider } from '@vegaprotocol/deposits';
-import { useDataProvider } from '@vegaprotocol/data-provider';
-import { ordersWithMarketProvider } from '@vegaprotocol/orders';
-import * as Types from '@vegaprotocol/types';
-import { aggregatedAccountsDataProvider } from '@vegaprotocol/accounts';
-import { positionsDataProvider } from '@vegaprotocol/positions';
-import { useGlobalStore } from '../../stores';
-
-export enum OnboardingStep {
-  ONBOARDING_UNKNOWN_STEP,
-  ONBOARDING_WALLET_STEP,
-  ONBOARDING_CONNECT_STEP,
-  ONBOARDING_DEPOSIT_STEP,
-  ONBOARDING_ORDER_STEP,
-  ONBOARDING_COMPLETE_STEP,
-}
-
-export const useGetOnboardingStep = () => {
-  const connecting = useGlobalStore((store) => store.eagerConnecting);
-  const { pubKey = '', pubKeys } = useVegaWallet();
-  const { data: depositsData } = useDataProvider({
-    dataProvider: depositsProvider,
-    variables: { partyId: pubKey || '' },
-    skip: !pubKey,
-  });
-  const { data: collateralData } = useDataProvider({
-    dataProvider: aggregatedAccountsDataProvider,
-    variables: { partyId: pubKey || '' },
-    skip: !pubKey,
-  });
-  const collaterals = Boolean(collateralData?.length);
-  const deposits =
-    depositsData?.some(
-      (item) => item.status === Types.DepositStatus.STATUS_FINALIZED
-    ) || false;
-  const { data: ordersData } = useDataProvider({
-    dataProvider: ordersWithMarketProvider,
-    variables: {
-      partyId: pubKey || '',
-      pagination: {
-        first: 1,
-      },
-    },
-    skip: !pubKey,
-  });
-  const orders = Boolean(ordersData?.length);
-
-  const partyIds = pubKeys?.map((item) => item.publicKey) || [];
-  const { data: positionsData } = useDataProvider({
-    dataProvider: positionsDataProvider,
-    variables: {
-      partyIds,
-    },
-    skip: !partyIds?.length,
-  });
-  const positions = Boolean(positionsData?.length);
-
-  const isLoading = Boolean(
-    (connecting || pubKey) &&
-      (depositsData === null ||
-        ordersData === null ||
-        collateralData === null ||
-        positionsData === null)
-  );
-  if (isLoading) {
-    return OnboardingStep.ONBOARDING_UNKNOWN_STEP;
-  }
-  if (!isBrowserWalletInstalled()) {
-    return OnboardingStep.ONBOARDING_WALLET_STEP;
-  }
-  if (!pubKey) {
-    return OnboardingStep.ONBOARDING_CONNECT_STEP;
-  }
-  if (!deposits && !collaterals) {
-    return OnboardingStep.ONBOARDING_DEPOSIT_STEP;
-  }
-  if (!orders && !positions) {
-    return OnboardingStep.ONBOARDING_ORDER_STEP;
-  }
-  return OnboardingStep.ONBOARDING_COMPLETE_STEP;
-};
@@ -3,19 +3,21 @@ import { GetStarted } from './get-started';
 import { TradingButton } from '@vegaprotocol/ui-toolkit';
 import { useNavigate } from 'react-router-dom';
 import { Links, Routes } from '../../pages/client-router';
+import { useLocalStorage } from '@vegaprotocol/react-helpers';
+import * as constants from '../constants';
 import { Networks, useEnvironment } from '@vegaprotocol/environment';
 import type { ReactNode } from 'react';
-import { useGlobalStore } from '../../stores';

 export const WelcomeDialogContent = () => {
  const { VEGA_ENV } = useEnvironment();
-
-  const update = useGlobalStore((store) => store.update);
+  const [, setOnboardingViewed] = useLocalStorage(
+    constants.ONBOARDING_VIEWED_KEY
+  );
  const navigate = useNavigate();
  const browseMarkets = () => {
    const link = Links[Routes.MARKETS]();
    navigate(link);
-    update({ onBoardingDismissed: true });
+    setOnboardingViewed('true');
  };
  const lead =
    VEGA_ENV === Networks.MAINNET
@@ -55,7 +57,7 @@ export const WelcomeDialogContent = () => {
          {t('Browse the markets')}
        </TradingButton>
      </div>
-      <div className="sm:w-1/2 flex grow">
+      <div className="sm:w-1/2">
        <GetStarted lead={lead} />
      </div>
    </div>
@@ -2,38 +2,31 @@ import React from 'react';
 import { useNavigate } from 'react-router-dom';
 import { Dialog, Intent } from '@vegaprotocol/ui-toolkit';
 import { t } from '@vegaprotocol/i18n';
-import { useEnvironment } from '@vegaprotocol/environment';
 import { useLocalStorage } from '@vegaprotocol/react-helpers';
+import { useEnvironment } from '@vegaprotocol/environment';
+import { isBrowserWalletInstalled } from '@vegaprotocol/wallet';
+import * as constants from '../constants';
 import { WelcomeDialogContent } from './welcome-dialog-content';
+import { getConfig } from '@vegaprotocol/wallet';
 import { Links, Routes } from '../../pages/client-router';
 import { useGlobalStore } from '../../stores';
-import {
-  useGetOnboardingStep,
-  OnboardingStep,
-} from './use-get-onboarding-step';
-import * as constants from '../constants';

 export const WelcomeDialog = () => {
  const { VEGA_ENV } = useEnvironment();
-  const [onBoardingViewed] = useLocalStorage(constants.ONBOARDING_VIEWED_KEY);
-  const update = useGlobalStore((store) => store.update);
-  const dismissed = useGlobalStore((store) => store.onBoardingDismissed);
-  const currentStep = useGetOnboardingStep();
-
+  const [onBoardingViewed, setOnboardingViewed] = useLocalStorage(
+    constants.ONBOARDING_VIEWED_KEY
+  );
  const navigate = useNavigate();
  const isOnboardingDialogNeeded =
-    onBoardingViewed !== 'true' &&
-    currentStep &&
-    currentStep < OnboardingStep.ONBOARDING_COMPLETE_STEP &&
-    !dismissed;
+    onBoardingViewed !== 'true' && !isBrowserWalletInstalled() && !getConfig();
  const marketId = useGlobalStore((store) => store.marketId);

  const onClose = () => {
+    setOnboardingViewed('true');
    const link = marketId
      ? Links[Routes.MARKET](marketId)
      : Links[Routes.HOME]();
    navigate(link);
-    update({ onBoardingDismissed: true });
  };
  const title = (
    <span className="font-alpha calt" data-testid="welcome-title">
@@ -1,4 +1,4 @@
-import { useEffect, useMemo, useState } from 'react';
+import { useMemo, useState } from 'react';
 import Head from 'next/head';
 import type { AppProps } from 'next/app';
 import { t } from '@vegaprotocol/i18n';
@@ -23,7 +23,7 @@ import {
  useNodeSwitcherStore,
 } from '@vegaprotocol/environment';
 import './styles.css';
-import { useGlobalStore, usePageTitleStore } from '../stores';
+import { usePageTitleStore } from '../stores';
 import DialogsContainer from './dialogs-container';
 import ToastsManager from './toasts-manager';
 import {
@@ -170,8 +170,7 @@ const PartyData = () => {

 const MaybeConnectEagerly = () => {
  const { VEGA_ENV, SENTRY_DSN } = useEnvironment();
-  const update = useGlobalStore((store) => store.update);
-  const eagerConnecting = useVegaEagerConnect(Connectors);
+  useVegaEagerConnect(Connectors);
  const [isTelemetryApproved] = useTelemetryApproval();
  useEthereumEagerConnect(
    isTelemetryApproved ? { dsn: SENTRY_DSN, env: VEGA_ENV } : {}
@@ -183,8 +182,5 @@ const MaybeConnectEagerly = () => {
  if (query && !pubKey) {
    connect(Connectors['view']);
  }
-  useEffect(() => {
-    update({ eagerConnecting });
-  }, [update, eagerConnecting]);
  return null;
 };
@@ -4,8 +4,6 @@ import produce from 'immer';

 interface GlobalStore {
  marketId: string | null;
-  onBoardingDismissed: boolean;
-  eagerConnecting: boolean;
  update: (store: Partial<Omit<GlobalStore, 'update'>>) => void;
 }

@@ -16,8 +14,6 @@ interface PageTitleStore {

 export const useGlobalStore = create<GlobalStore>()((set) => ({
  marketId: LocalStorage.getItem('marketId') || null,
-  onBoardingDismissed: false,
-  eagerConnecting: false,
  update: (newState) => {
    set(
      produce((state: GlobalStore) => {
@@ -1,10 +1,6 @@
 import * as Schema from '@vegaprotocol/types';
-import type { Market, MarketMaybeWithDataAndCandles } from './markets-provider';
-import {
-  calcTradedFactor,
-  filterAndSortMarkets,
-  totalFeesPercentage,
-} from './market-utils';
+import type { Market } from './markets-provider';
+import { filterAndSortMarkets, totalFeesPercentage } from './market-utils';
 const { MarketState, MarketTradingMode } = Schema;

 const MARKET_A: Partial<Market> = {
@@ -81,52 +77,3 @@ describe('totalFees', () => {
    expect(totalFeesPercentage(i)).toEqual(o);
  });
 });
-
-describe('calcTradedFactor', () => {
-  const marketA = {
-    data: {
-      markPrice: '10',
-    },
-    candles: [
-      {
-        volume: '1000',
-      },
-    ],
-    tradableInstrument: {
-      instrument: {
-        product: {
-          settlementAsset: {
-            decimals: 18,
-            quantum: '1000000000000000000', // 1
-          },
-        },
-      },
-    },
-  };
-  const marketB = {
-    data: {
-      markPrice: '10',
-    },
-    candles: [
-      {
-        volume: '1000',
-      },
-    ],
-    tradableInstrument: {
-      instrument: {
-        product: {
-          settlementAsset: {
-            decimals: 18,
-            quantum: '1', // 0.0000000000000000001
-          },
-        },
-      },
-    },
-  };
-  it('a is "traded" more than b', () => {
-    const fa = calcTradedFactor(marketA as MarketMaybeWithDataAndCandles);
-    const fb = calcTradedFactor(marketB as MarketMaybeWithDataAndCandles);
-    // it should be true because market a's asset is "more valuable" than b's
-    expect(fa > fb).toBeTruthy();
-  });
-});
@@ -1,13 +1,8 @@
-import { formatNumberPercentage, toBigNum } from '@vegaprotocol/utils';
+import { formatNumberPercentage } from '@vegaprotocol/utils';
 import * as Schema from '@vegaprotocol/types';
 import BigNumber from 'bignumber.js';
 import orderBy from 'lodash/orderBy';
-import type {
-  Market,
-  Candle,
-  MarketMaybeWithData,
-  MarketMaybeWithDataAndCandles,
-} from '../';
+import type { Market, Candle, MarketMaybeWithData } from '../';
 const { MarketState, MarketTradingMode } = Schema;

 export const totalFees = (fees: Market['fees']['factors']) => {
@@ -91,18 +86,3 @@ export const calcCandleHigh = (candles: Candle[]): string | undefined => {
 export const calcCandleVolume = (candles: Candle[]): string | undefined =>
  candles &&
  candles.reduce((acc, c) => new BigNumber(acc).plus(c.volume).toString(), '0');
-
-export const calcTradedFactor = (m: MarketMaybeWithDataAndCandles) => {
-  const volume = Number(calcCandleVolume(m.candles || []) || 0);
-  const price = m.data?.markPrice ? Number(m.data.markPrice) : 0;
-  const quantum = Number(
-    m.tradableInstrument.instrument.product.settlementAsset.quantum
-  );
-  const decimals = Number(
-    m.tradableInstrument.instrument.product.settlementAsset.decimals
-  );
-  const fp = toBigNum(price, decimals);
-  const fq = toBigNum(quantum, decimals);
-  const factor = fq.multipliedBy(fp).multipliedBy(volume);
-  return factor.toNumber();
-};
@@ -181,7 +181,7 @@ const getSubscriptionVariables = (
 ): PositionsSubscriptionSubscriptionVariables[] =>
  ([] as string[]).concat(variables.partyIds).map((partyId) => ({ partyId }));

-export const positionsDataProvider = makeDataProvider<
+const positionsDataProvider = makeDataProvider<
  PositionsQuery,
  PositionFieldsFragment[],
  PositionsSubscriptionSubscription,
@@ -1,5 +1,9 @@
 import { renderHook, waitFor } from '@testing-library/react';
-import { useTimeToUpgrade } from './use-time-to-upgrade';
+import {
+  ERR_NO_TIME_UNITS,
+  parseDuration,
+  useTimeToUpgrade,
+} from './use-time-to-upgrade';

 jest.mock('./__generated__/BlockStatistics', () => ({
  ...jest.requireActual('./__generated__/BlockStatistics'),
@@ -8,7 +12,7 @@ jest.mock('./__generated__/BlockStatistics', () => ({
      data: {
        statistics: {
          blockHeight: 1,
-          blockDuration: 500,
+          blockDuration: '500ms',
        },
      },
    };
@@ -30,3 +34,25 @@ describe('useTimeToUpgrade', () => {
    });
  });
 });
+
+describe('parseDuration', () => {
+  it.each([
+    ['1000000ns', 1],
+    ['1000µs', 1],
+    ['1ms', 1],
+    ['1s', 1000],
+    ['1m', 60 * 1000],
+    ['1h', 60 * 60 * 1000],
+    // below test cases are from vega
+    ['3.3s', 3300],
+    ['4m5s', 4 * 60 * 1000 + 5 * 1000],
+    ['4m5.001s', 4 * 60 * 1000 + 5001],
+    ['5h6m7.001s', 5 * 60 * 60 * 1000 + 6 * 60 * 1000 + 7001],
+    ['8m0.000000001s', 8 * 60 * 1000 + 1 / 1000000],
+  ])('parses %s to %d milliseconds', (input, output) => {
+    expect(parseDuration(input)).toEqual(output);
+  });
+  it('throws an error when given corrupted data', () => {
+    expect(() => parseDuration('blah')).toThrow(ERR_NO_TIME_UNITS);
+  });
+});
@@ -7,6 +7,52 @@ const DEFAULT_POLLS = 10;
 const INTERVAL = 1000;
 const durations = [] as number[];

+export const ERR_NO_TIME_UNITS = new Error(
+  'could not parse block duration value - no time units detected'
+);
+
+/**
+ * Parses block duration value and output a number of milliseconds.
+ * @param input The block duration input from the API, e.g. 4m5.001s
+ * @returns A number of milliseconds
+ */
+export const parseDuration = (input: string) => {
+  // h  -> 60*60*1000
+  // m  -> 60*1000
+  // s  -> 1000
+  // ms -> 1
+  // µs -> 1/1000
+  // ns -> 1/1000000
+  let H = 0;
+  let M = 0;
+  let S = 0;
+  const lessThanSecond = /^[0-9.]+[nµm]*s$/gu.test(input);
+  const exp = /(?<hours>[0-9.]+h)?(?<minutes>[0-9.]+m)?(?<seconds>[0-9.]+s)?/gu;
+  const m = exp.exec(input);
+
+  const hours = m?.groups?.['hours'];
+  const minutes = m?.groups?.['minutes'];
+  const seconds = lessThanSecond ? input : m?.groups?.['seconds'];
+  if (!lessThanSecond && !hours && !minutes && !seconds) {
+    throw ERR_NO_TIME_UNITS;
+  }
+
+  if (seconds) {
+    S = parseFloat(seconds);
+    if (seconds.includes('ns')) S /= 1000 * 1000;
+    else if (seconds.includes('µs')) S /= 1000;
+    else if (seconds.includes('ms')) S *= 1;
+    else if (seconds.includes('s')) S *= 1000;
+  }
+  if (minutes && !lessThanSecond) {
+    M = parseFloat(minutes) * 60 * 1000;
+  }
+  if (hours && !lessThanSecond) {
+    H = parseFloat(hours) * 60 * 60 * 1000;
+  }
+  return H + M + S;
+};
+
 const useAverageBlockDuration = (polls = DEFAULT_POLLS) => {
  const [avg, setAvg] = useState<number | undefined>(undefined);
  const { data, startPolling, stopPolling, error } = useBlockStatisticsQuery({
@@ -28,7 +74,11 @@ const useAverageBlockDuration = (polls = DEFAULT_POLLS) => {

  useEffect(() => {
    if (durations.length < polls && data) {
-      durations.push(parseFloat(data.statistics.blockDuration));
+      try {
+        durations.push(parseDuration(data.statistics.blockDuration)); // ms
+      } catch (err) {
+        // NOOP - do not add unparsed value to AVG
+      }
    }
    if (durations.length === polls) {
      const averageBlockDuration = sum(durations) / durations.length; // ms
@@ -5,7 +5,7 @@ import { VegaIconNameMap } from './vega-icon-record';

 export interface VegaIconProps {
  name: VegaIconNames;
-  size?: 8 | 10 | 12 | 13 | 14 | 16 | 18 | 20 | 24 | 32;
+  size?: 8 | 10 | 12 | 13 | 14 | 16 | 20 | 24 | 32;
 }

 export const VegaIcon = ({ size = 16, name }: VegaIconProps) => {
@@ -204,7 +204,6 @@ const ConnectorList = ({
  setWalletUrl: (value: string) => void;
  isDesktopWalletRunning: boolean | null;
 }) => {
-  const { pubKey } = useVegaWallet();
  const title = isBrowserWalletInstalled()
    ? t('Connect Vega wallet')
    : t('Get a Vega wallet');
@@ -235,7 +234,7 @@ const ConnectorList = ({
              onClick={() => onSelect('injected')}
            />
          ) : (
-            <GetWalletButton />
+            <GetWallet />
          )}
        </div>
        <div>
@@ -243,7 +242,6 @@ const ConnectorList = ({
            type="view"
            text={t('View as party')}
            onClick={() => onSelect('view')}
-            disabled={Boolean(pubKey)}
          />
        </div>
        <div className="last:mb-0">
@@ -320,7 +318,7 @@ const SelectedForm = ({
  throw new Error('No connector selected');
 };

-export const GetWalletButton = ({ className }: { className?: string }) => {
+const GetWallet = () => {
  const { MOZILLA_EXTENSION_URL, CHROME_EXTENSION_URL } = useEnvironment();
  const isItChrome = window.navigator.userAgent.includes('Chrome');
  const isItMozilla =
@@ -349,13 +347,10 @@ export const GetWalletButton = ({ className }: { className?: string }) => {

  return !isItChrome && !isItMozilla ? (
    <div
-      className={classNames(
-        [
-          'bg-vega-blue-350 hover:bg-vega-blue-400 dark:bg-vega-blue-650 dark:hover:bg-vega-blue-600',
-          'flex gap-2 items-center justify-center rounded h-8 px-3 relative',
-        ],
-        className
-      )}
+      className={classNames([
+        'bg-vega-blue-350 hover:bg-vega-blue-400 dark:bg-vega-blue-650 dark:hover:bg-vega-blue-600',
+        'flex gap-2 items-center justify-center rounded h-8 px-3 relative',
+      ])}
      data-testid="get-wallet-button"
    >
      {buttonContent}
@@ -365,7 +360,7 @@ export const GetWalletButton = ({ className }: { className?: string }) => {
      onClick={onClick}
      intent={Intent.Info}
      data-testid="get-wallet-button"
-      className={classNames('relative', className)}
+      className="relative"
      size="small"
      fill
    >
@@ -414,7 +409,6 @@ const CustomUrlInput = ({
  isDesktopWalletRunning: boolean | null;
  onSelect: (type: WalletType) => void;
 }) => {
-  const { pubKey } = useVegaWallet();
  const [urlInputExpanded, setUrlInputExpanded] = useState(false);
  return urlInputExpanded ? (
    <>
@@ -439,7 +433,7 @@ const CustomUrlInput = ({
        />
      </TradingFormGroup>
      <ConnectionOption
-        disabled={!isDesktopWalletRunning || Boolean(pubKey)}
+        disabled={!isDesktopWalletRunning}
        type="jsonRpc"
        text={t('Connect the App/CLI')}
        onClick={() => onSelect('jsonRpc')}
@@ -448,7 +442,7 @@ const CustomUrlInput = ({
  ) : (
    <>
      <ConnectionOption
-        disabled={!isDesktopWalletRunning || Boolean(pubKey)}
+        disabled={!isDesktopWalletRunning}
        type="jsonRpc"
        text={t('Use the Desktop App/CLI')}
        onClick={() => onSelect('jsonRpc')}
@@ -459,7 +453,6 @@ const CustomUrlInput = ({
            <button
              className="underline text-default"
              onClick={() => setUrlInputExpanded(true)}
-              disabled={Boolean(pubKey)}
            >
              {t('Enter a custom wallet location')}{' '}
              <VegaIcon name={VegaIconNames.ARROW_RIGHT} />
@@ -474,7 +467,6 @@ const CustomUrlInput = ({
              <button
                className="underline"
                onClick={() => setUrlInputExpanded(true)}
-                disabled={Boolean(pubKey)}
              >
                {t('custom wallet location')}
              </button>
@@ -12,9 +12,7 @@ export const useIsWalletServiceRunning = (

  const checkState = useCallback(async () => {
    const connector = connectors['jsonRpc'] as JsonRpcConnector;
-    if (url && url !== connector.url) {
-      connector.url = url;
-    }
+    connector.url = url;
    try {
      await connector.checkCompat();
      const chainIdResult = await connector.getChainId();
@@ -21,7 +21,8 @@
          "echo $NX_TENDERMINT_URL",
          "echo $NX_TENDERMINT_WEBSOCKET_URL",
          "echo $NX_ETHEREUM_PROVIDER_URL"
-        ]
+        ],
+        "url": "https://cloud.nx.app"
      }
    }
  },
@@ -1,34 +1,22 @@
 # First use & get started steps

-## "Onboarding" state is gradable and has following steps: (<a name="0007-FUGS-002" href="#0007-FUGS-002">0007-FUGS-003</a>)
-
- New visitor - has no wallet nor any dapps running.
-  - I **must** see CTA button "Get started", which clicking launches the get wallet flow (wallet connection window with links to the Chrome and FF stores)
- Has wallet - Once wallet detected set to this.
-  - I **must** see CTA button "Connect", which clicking launches the wallet connection
- Has connected - Once user has connected set to this.
-  - I **must** see CTA button "Deposit", which clicking launches the deposit ticket.
- Has deposited - Once user has made AT LEAST one deposit of ANY settlement asset set to this.
-  - I **must** see CTA button "Dismiss", which clicking updates the state to Ready to trade - Get started box should now disappear forever.
- Ready to trade - Once user has made at least one deposit AND has dismissed the "Get Started" box in the ticket.
-  - Onboarding window nor contextual "Get started" banner should be not displayed anymore.
-
-## When first enter the app or next times, but I didn't accomplish all onboarding steps.
+## When first enter the app

 - **Must** When I open Console for the first time I can see what it is i.e. a short description and key features in auto opened dialog window (first use popup) (<a name="0007-FUGS-001" href="#0007-FUGS-001">0007-FUGS-001</a>)
- If full "onboarding" hasn't been accomplished yet, I **must** see the popup with my progress marked. (<a name="0007-FUGS-002" href="#0007-FUGS-002">0007-FUGS-002</a>)
+- **Must** If my wallet is already connected I don't see the first use popup (<a name="0007-FUGS-002" href="#0007-FUGS-002">0007-FUGS-002</a>)
+- - **Must** If window.vega is detected (browser wallet is installed), don't open first use popup (<a name="0007-FUGS-003" href="#0007-FUGS-003">0007-FUGS-003</a>)
+- - **Must** If we detect previous connection using localStorage for desktop/cli wallet, don't open first use popup (<a name="0007-FUGS-004" href="#0007-FUGS-004">0007-FUGS-004</a>)
 - **Must** There is a call to action to browse markets, linking to the market view market/all (<a name="0007-FUGS-005" href="#0007-FUGS-005">0007-FUGS-005</a>)
 - **Must** I can see the steps I need to take to get started trading (<a name="0007-FUGS-007" href="#0007-FUGS-006">0007-FUGS-006</a>)
 - **Must** There is a call to action to get started, triggering the connect modal (<a name="0007-FUGS-007" href="#0007-FUGS-007">0007-FUGS-007</a>)
 - **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 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:
+## When first use popup has been seen, but no browser wallet is installed

- **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** I can see the steps to get started with a visible call to action to "get started" 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** 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>)
Author	SHA1	Message	Date
asiaznik	6f005d123f	chore: error suggestion	2023-08-28 14:25:47 +02:00
asiaznik	f93c595560	fix(proposals): parsing block duration value	2023-08-24 09:32:13 +02:00