diff --git a/apps/trading/components/sidebar/sidebar.tsx b/apps/trading/components/sidebar/sidebar.tsx
index b580aa615..861e499cb 100644
--- a/apps/trading/components/sidebar/sidebar.tsx
+++ b/apps/trading/components/sidebar/sidebar.tsx
@@ -185,6 +185,7 @@ export const SidebarContent = () => {
setView({ type: ViewType.Deposit, assetId })
}
/>
+
);
} else {
@@ -208,6 +209,7 @@ export const SidebarContent = () => {
return (
+
);
}
@@ -216,6 +218,7 @@ export const SidebarContent = () => {
return (
+
);
}
@@ -224,6 +227,7 @@ export const SidebarContent = () => {
return (
+
);
}
@@ -254,7 +258,6 @@ const ContentWrapper = ({
>
{title &&
{title}
}
{children}
-
);
};
diff --git a/apps/trading/components/welcome-dialog/get-started.tsx b/apps/trading/components/welcome-dialog/get-started.tsx
index 2ba6dd8e4..5de049107 100644
--- a/apps/trading/components/welcome-dialog/get-started.tsx
+++ b/apps/trading/components/welcome-dialog/get-started.tsx
@@ -8,10 +8,10 @@ import * as constants from '../constants';
import { isBrowserWalletInstalled } from '@vegaprotocol/utils';
interface Props {
- showLead?: boolean;
+ lead?: string;
}
-export const GetStarted = ({ showLead }: Props) => {
+export const GetStarted = ({ lead }: Props) => {
const { pubKey } = useVegaWallet();
const { VEGA_ENV, VEGA_NETWORKS } = useEnvironment();
@@ -35,16 +35,10 @@ export const GetStarted = ({ showLead }: Props) => {
- {showLead && (
-
- {t(
- 'Start trading on the worlds most advanced decentralised exchange.'
- )}
-
- )}
+ {lead &&
{lead}
}
{t('Get started')}
@@ -64,7 +58,7 @@ export const GetStarted = ({ showLead }: Props) => {
{VEGA_ENV === 'MAINNET' && (
-
+
{t('Experiment for free with virtual assets on')}{' '}
{t('Fairground Testnet')}
@@ -72,7 +66,7 @@ export const GetStarted = ({ showLead }: Props) => {
)}
{VEGA_ENV === 'TESTNET' && (
-
+
{t('Ready to trade with real funds?')}{' '}
{t('Switch to Mainnet')}
diff --git a/apps/trading/components/welcome-dialog/onboarding-dialog.tsx b/apps/trading/components/welcome-dialog/onboarding-dialog.tsx
index 09fc01cad..01dd7a2e6 100644
--- a/apps/trading/components/welcome-dialog/onboarding-dialog.tsx
+++ b/apps/trading/components/welcome-dialog/onboarding-dialog.tsx
@@ -5,8 +5,10 @@ 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 { useEnvironment } from '@vegaprotocol/environment';
export const OnboardingDialog = () => {
+ const { VEGA_ENV } = useEnvironment();
const [, setOnboardingViewed] = useLocalStorage(
constants.ONBOARDING_VIEWED_KEY
);
@@ -16,6 +18,12 @@ export const OnboardingDialog = () => {
navigate(link);
setOnboardingViewed('true');
};
+ const lead =
+ VEGA_ENV === 'MAINNET'
+ ? t('Start trading on the worlds most advanced decentralised exchange.')
+ : t(
+ 'Free from the risks of real trading, Fairground is a safe and fun place to try out Vega yourself with virtual assets.'
+ );
return (
@@ -64,7 +72,7 @@ export const OnboardingDialog = () => {
-
+
diff --git a/apps/trading/components/welcome-dialog/welcome-dialog.tsx b/apps/trading/components/welcome-dialog/welcome-dialog.tsx
index 9453cecde..7a03fcc0a 100644
--- a/apps/trading/components/welcome-dialog/welcome-dialog.tsx
+++ b/apps/trading/components/welcome-dialog/welcome-dialog.tsx
@@ -3,10 +3,11 @@ import { useNavigate } from 'react-router-dom';
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, isTestEnv } from '@vegaprotocol/utils';
import * as constants from '../constants';
import { OnboardingDialog } from './onboarding-dialog';
-import { useEnvironment } from '@vegaprotocol/environment';
-import { isTestEnv } from '@vegaprotocol/utils';
+import { getConfig } from '@vegaprotocol/wallet';
import { Links, Routes } from '../../pages/client-router';
import { useGlobalStore } from '../../stores';
@@ -20,7 +21,11 @@ export const WelcomeDialog = () => {
constants.ONBOARDING_VIEWED_KEY
);
const navigate = useNavigate();
- const isOnboardingDialogNeeded = onBoardingViewed !== 'true' && !isTestEnv();
+ const isOnboardingDialogNeeded =
+ onBoardingViewed !== 'true' &&
+ !isTestEnv() &&
+ !isBrowserWalletInstalled() &&
+ !getConfig();
const marketId = useGlobalStore((store) => store.marketId);
if (isOnboardingDialogNeeded) {
diff --git a/libs/wallet/src/index.ts b/libs/wallet/src/index.ts
index 67d5f712d..3d43a0b18 100644
--- a/libs/wallet/src/index.ts
+++ b/libs/wallet/src/index.ts
@@ -12,5 +12,6 @@ export * from './vega-transaction-dialog';
export * from './provider';
export * from './connect-dialog';
export * from './utils';
+export * from './storage';
export * from './__generated__/TransactionResult';
export * from './__generated__/WithdrawalApproval';