diff --git a/apps/trading/components/vega-wallet-connect-button/vega-wallet-connect-button.tsx b/apps/trading/components/vega-wallet-connect-button/vega-wallet-connect-button.tsx
index 15e3e03cb..0a1bb8f80 100644
--- a/apps/trading/components/vega-wallet-connect-button/vega-wallet-connect-button.tsx
+++ b/apps/trading/components/vega-wallet-connect-button/vega-wallet-connect-button.tsx
@@ -1,6 +1,7 @@
import { useMemo, useState } from 'react';
import CopyToClipboard from 'react-copy-to-clipboard';
-import { isBrowserWalletInstalled, truncateByChars } from '@vegaprotocol/utils';
+import { isBrowserWalletInstalled } from '@vegaprotocol/wallet';
+import { truncateByChars } from '@vegaprotocol/utils';
import { t } from '@vegaprotocol/i18n';
import {
VegaIcon,
diff --git a/apps/trading/components/welcome-dialog/get-started.tsx b/apps/trading/components/welcome-dialog/get-started.tsx
index 7a71ece26..25c764eef 100644
--- a/apps/trading/components/welcome-dialog/get-started.tsx
+++ b/apps/trading/components/welcome-dialog/get-started.tsx
@@ -1,11 +1,14 @@
import classNames from 'classnames';
import { t } from '@vegaprotocol/i18n';
import { ExternalLink, Intent, TradingButton } from '@vegaprotocol/ui-toolkit';
-import { useVegaWallet, useVegaWalletDialogStore } from '@vegaprotocol/wallet';
+import {
+ useVegaWallet,
+ useVegaWalletDialogStore,
+ isBrowserWalletInstalled,
+} from '@vegaprotocol/wallet';
import { Networks, useEnvironment } from '@vegaprotocol/environment';
import { useLocalStorage } from '@vegaprotocol/react-helpers';
import * as constants from '../constants';
-import { isBrowserWalletInstalled } from '@vegaprotocol/utils';
interface Props {
lead?: string;
diff --git a/apps/trading/components/welcome-dialog/onboarding-dialog.tsx b/apps/trading/components/welcome-dialog/welcome-dialog-content.tsx
similarity index 99%
rename from apps/trading/components/welcome-dialog/onboarding-dialog.tsx
rename to apps/trading/components/welcome-dialog/welcome-dialog-content.tsx
index 147d0fe4c..59485bfe7 100644
--- a/apps/trading/components/welcome-dialog/onboarding-dialog.tsx
+++ b/apps/trading/components/welcome-dialog/welcome-dialog-content.tsx
@@ -7,7 +7,7 @@ import { useLocalStorage } from '@vegaprotocol/react-helpers';
import * as constants from '../constants';
import { Networks, useEnvironment } from '@vegaprotocol/environment';
-export const OnboardingDialog = () => {
+export const WelcomeDialogContent = () => {
const { VEGA_ENV } = useEnvironment();
const [, setOnboardingViewed] = useLocalStorage(
constants.ONBOARDING_VIEWED_KEY
diff --git a/apps/trading/components/welcome-dialog/welcome-dialog.tsx b/apps/trading/components/welcome-dialog/welcome-dialog.tsx
index 0dc37f7d3..c1b6670bc 100644
--- a/apps/trading/components/welcome-dialog/welcome-dialog.tsx
+++ b/apps/trading/components/welcome-dialog/welcome-dialog.tsx
@@ -4,60 +4,49 @@ import { Dialog, Intent } from '@vegaprotocol/ui-toolkit';
import { t } from '@vegaprotocol/i18n';
import { useLocalStorage } from '@vegaprotocol/react-helpers';
import { useEnvironment } from '@vegaprotocol/environment';
-import { isBrowserWalletInstalled } from '@vegaprotocol/utils';
+import { isBrowserWalletInstalled } from '@vegaprotocol/wallet';
import * as constants from '../constants';
-import { OnboardingDialog } from './onboarding-dialog';
+import { WelcomeDialogContent } from './welcome-dialog-content';
import { getConfig } from '@vegaprotocol/wallet';
import { Links, Routes } from '../../pages/client-router';
import { useGlobalStore } from '../../stores';
export const WelcomeDialog = () => {
const { VEGA_ENV } = useEnvironment();
- let dialogContent: React.ReactNode;
- let title: string | React.ReactNode = '';
- let size: 'small' | 'medium' = 'small';
- let onClose: ((open: boolean) => void) | undefined = undefined;
const [onBoardingViewed, setOnboardingViewed] = useLocalStorage(
constants.ONBOARDING_VIEWED_KEY
);
const navigate = useNavigate();
const isOnboardingDialogNeeded =
onBoardingViewed !== 'true' && !isBrowserWalletInstalled() && !getConfig();
-
const marketId = useGlobalStore((store) => store.marketId);
- if (isOnboardingDialogNeeded) {
- dialogContent = ;
- onClose = () => {
- setOnboardingViewed('true');
- const link = marketId
- ? Links[Routes.MARKET](marketId)
- : Links[Routes.HOME]();
- navigate(link);
- };
- title = (
-
- {t('Console')}{' '}
-
- {VEGA_ENV}
-
+ const onClose = () => {
+ setOnboardingViewed('true');
+ const link = marketId
+ ? Links[Routes.MARKET](marketId)
+ : Links[Routes.HOME]();
+ navigate(link);
+ };
+ const title = (
+
+ {t('Console')}{' '}
+
+ {VEGA_ENV}
- );
- size = 'medium';
- } else {
- dialogContent = null as React.ReactNode;
- }
+
+ );
- return (
+ return isOnboardingDialogNeeded ? (
- );
+ ) : null;
};
diff --git a/libs/utils/src/index.ts b/libs/utils/src/index.ts
index 0252b55a1..d1e76477f 100644
--- a/libs/utils/src/index.ts
+++ b/libs/utils/src/index.ts
@@ -15,4 +15,3 @@ export * from './lib/time';
export * from './lib/validate';
export * from './lib/resolve-network-name';
export * from './lib/is-test-env';
-export * from './lib/is-browser-wallet-installed';
diff --git a/libs/wallet/src/index.ts b/libs/wallet/src/index.ts
index 3d43a0b18..dd309bcf9 100644
--- a/libs/wallet/src/index.ts
+++ b/libs/wallet/src/index.ts
@@ -13,5 +13,6 @@ export * from './provider';
export * from './connect-dialog';
export * from './utils';
export * from './storage';
+export * from './is-browser-wallet-installed';
export * from './__generated__/TransactionResult';
export * from './__generated__/WithdrawalApproval';
diff --git a/libs/utils/src/lib/is-browser-wallet-installed.ts b/libs/wallet/src/is-browser-wallet-installed.ts
similarity index 58%
rename from libs/utils/src/lib/is-browser-wallet-installed.ts
rename to libs/wallet/src/is-browser-wallet-installed.ts
index 89ecb7d94..b16e05d99 100644
--- a/libs/utils/src/lib/is-browser-wallet-installed.ts
+++ b/libs/wallet/src/is-browser-wallet-installed.ts
@@ -1,2 +1 @@
-// @ts-ignore vega globals defined in wallet lib
export const isBrowserWalletInstalled = () => Boolean(window.vega);