@dynamic-labs/sdk-react-core 4.9.2-preview.0 → 4.9.3

package/src/lib/utils/hooks/useAuthLayoutChecks/useAuthLayoutChecks.js

@@ -19,9 +19,9 @@ import '../../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import '../../../store/state/nonce/nonce.js';
-import '../../../store/state/projectSettings/projectSettings.js';
+import { useProjectSettings } from '../../../store/state/projectSettings/projectSettings.js';
 import '../../../config/ApiEndpoint.js';
-import '../../../store/state/user/user.js';
+import { useUserCoalesced } from '../../../store/state/user/user.js';
 import '../../../locale/locale.js';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';
@@ -65,6 +65,7 @@ import '../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBan
 import '../../../components/Popper/Popper/Popper.js';
 import '../../../components/Popper/PopperContext/PopperContext.js';
 import 'react-focus-lock';
+import { useAllowClose } from './useAllowClose/useAllowClose.js';
 import 'qrcode';
 import 'formik';
 import '../useSubdomainCheck/useSubdomainCheck.js';
@@ -75,9 +76,10 @@ import '../../../context/ConnectWithOtpContext/constants.js';
 import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
 import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
+import { useFooterAnimationContext } from '../../../context/FooterAnimationContext/index.js';
 import { isUserLinkingWallet } from '../../../shared/utils/functions/isUserLinkingWallet/isUserLinkingWallet.js';
+import { viewsThatPreventBorderBelowHeader, viewsWithWalletListType, viewsThatHideHelpContent, viewsThatHideHeader, viewsThatShowConnectedWalletProgress, viewsThatShowDynamicFooter } from '../../constants/authViewLayoutChecks.js';
 import { useDynamicLayoutData } from '../useDynamicLayoutData/useDynamicLayoutData.js';
-import { useFooterAnimationContext } from '../../../context/FooterAnimationContext/index.js';
 import '../../../context/ErrorContext/hooks/useErrorText/useErrorText.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../store/state/sendBalances.js';
@@ -96,67 +98,24 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useDy
 const useAuthLayoutChecks = () => {
     var _a;
     const { view } = useViewContext();
-    const { user, customPrivacyPolicy, customTermsOfServices, privacyPolicyUrl, termsOfServiceUrl, isBridgeFlow, authMode, projectSettings, } = useInternalDynamicContext();
+    const { customPrivacyPolicy, customTermsOfServices, privacyPolicyUrl, termsOfServiceUrl, isBridgeFlow, authMode, } = useInternalDynamicContext();
     const { isFooterExpanded } = useFooterAnimationContext();
     const { mockedSDK } = useMockContext();
     const { helpHeaderData } = useDynamicLayoutData({
         authMode,
         view: view.type,
     });
-    const displayBorderBelowHeader = (view.type !== 'wallet-list' &&
-        view.type !== 'login-with-email-or-wallet-full-wallet-list' &&
-        view.type !== 'multi-wallet-wallet-list' &&
-        view.type !== 'login-with-wallet-only') ||
-        isFooterExpanded;
-    const isWalletListTypeView = view.type === 'wallet-connect-mobile-wallets-list' ||
-        view.type === 'wallet-list' ||
-        view.type === 'login-with-email-or-wallet-full-wallet-list' ||
-        view.type === 'login-with-wallet-only';
+    const user = useUserCoalesced();
+    const projectSettings = useProjectSettings();
+    const isLinkingWallet = isUserLinkingWallet(user, view.type, mockedSDK);
+    const displayBorderBelowHeader = !viewsThatPreventBorderBelowHeader.includes(view.type) || isFooterExpanded;
+    const isWalletListTypeView = viewsWithWalletListType.includes(view.type);
     const showHelpContent = Boolean(helpHeaderData &&
-        // Notice the negation here
-        !(view.type === 'qr-code' ||
-            view.type === 'no-qr-not-installed' ||
-            view.type === 'wallet-used' ||
-            view.type === 'chainalysis-blocked-wallet' ||
-            view.type === 'wallet-sign' ||
-            view.type === 'collect-user-data' ||
-            view.type === 'passkey-new-domain-detected' ||
-            isUserLinkingWallet(user, view.type, mockedSDK)));
-    const showHeader = view.type !== 'collect-user-data' &&
-        view.type !== 'no-access' &&
-        view.type !== 'chainalysis-blocked-wallet' &&
-        view.type !== 'wallet-locked-view' &&
-        view.type !== 'gate-blocked-wallet' &&
-        view.type !== 'email-wallet-otp-verification-view' &&
-        view.type !== 'bridge-welcome' &&
-        view.type !== 'bridge-summary' &&
-        view.type !== 'bridge-next-wallet-connection' &&
-        view.type !== 'passkey-intro' &&
-        view.type !== 'passkey-new-domain-detected' &&
-        view.type !== 'social-redirect-view' &&
-        view.type !== 'collect-user-data-login-no-wallet' &&
-        view.type !== 'passkey-recovery-bundle' &&
-        view.type !== 'passkey-recovery-start' &&
-        view.type !== 'embedded-reveal-view' &&
-        view.type !== 'embedded-reveal-account-view' &&
-        view.type !== 'rename-passkey' &&
-        view.type !== 'embedded-wallet-auth-choice' &&
-        view.type !== 'passkey-recovery-add-email' &&
-        view.type !== 'global-wallet-confirm' &&
-        view.type !== 'global-wallet-malicious' &&
-        view.type !== 'global-wallet-info' &&
-        view.type !== 'mfa-choose-device' &&
-        view.type !== 'mfa-verification';
-    const showConnectedWalletProgress = isBridgeFlow &&
-        (view.type === 'wallet-list' ||
-            view.type === 'qr-code' ||
-            view.type === 'wallet-connect-mobile-wallets-list' ||
-            view.type === 'pending-connect' ||
-            view.type === 'pending-signature' ||
-            view.type === 'pending-signature-without-back-button' ||
-            view.type === 'bridge-next-wallet-connection' ||
-            view.type === 'bridge-summary');
-    const showToSFooter = Boolean(!isUserLinkingWallet(user, view.type, mockedSDK) &&
+        !viewsThatHideHelpContent.includes(view.type) &&
+        !isLinkingWallet);
+    const showHeader = !viewsThatHideHeader.includes(view.type);
+    const showConnectedWalletProgress = isBridgeFlow && viewsThatShowConnectedWalletProgress.includes(view.type);
+    const showToSFooter = Boolean(!isLinkingWallet &&
         (view.type === 'wallet-list' ||
             view.type === 'wallet-connect-mobile-wallets-list' ||
             // Don't show empty footer during the login
@@ -169,44 +128,12 @@ const useAuthLayoutChecks = () => {
                     customPrivacyPolicy ||
                     customTermsOfServices))));
     const showDynamicFooter = Boolean((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.displayDynamicMessaging) &&
-        (view.type === 'login-with-email-or-wallet' ||
-            view.type === 'login-with-email-or-wallet-full-wallet-list' ||
-            view.type === 'login-with-wallet-only' ||
-            view.type === 'login-with-email-verification' ||
-            view.type === 'login-with-sms-verification' ||
-            view.type === 'verify-email' ||
-            view.type === 'verify-sms' ||
-            view.type === 'pending-connect' ||
-            view.type === 'wallet-group' ||
-            view.type === 'select-wallet-in-wallet-group' ||
-            view.type === 'select-hardware-wallet' ||
-            view.type === 'pending-signature' ||
-            view.type === 'qr-code' ||
-            view.type === 'wallet-used' ||
-            view.type === 'email-wallet-otp-verification-view' ||
-            view.type === 'farcaster-connect-view' ||
-            view.type === 'merge-user-accounts' ||
-            view.type === 'merge-user-accounts-conflicts' ||
-            view.type === 'mfa-verification' ||
-            view.type === 'mfa-display-backup-codes' ||
-            view.type === 'mfa-recovery');
-    const showCloseButton = view.type !== 'login-with-email-or-wallet-full-wallet-list' &&
-        view.type !== 'login-with-email-verification' &&
-        view.type !== 'login-with-sms-verification' &&
-        view.type !== 'network-not-supported' &&
-        view.type !== 'passkey-recovery-complete' &&
-        view.type !== 'passkey-recovery-start' &&
-        view.type !== 'passkey-recovery-bundle' &&
-        view.type !== 'rename-passkey' &&
-        view.type !== 'mobile-wallet-redirect-view' &&
-        view.type !== 'qr-code' &&
-        view.type !== 'mfa-verification' &&
-        view.type !== 'mfa-display-backup-codes' &&
-        view.type !== 'mfa-recovery' &&
-        view.type !== 'user-delete-account';
+        viewsThatShowDynamicFooter.includes(view.type);
     const showDefaultFooter = !showConnectedWalletProgress && !showDynamicFooter && !showToSFooter;
     const shouldHideDynamicFooterSeparator = showDynamicFooter && showToSFooter;
+    const { allowsClosing, showCloseButton } = useAllowClose();
     return {
+        allowsClosing,
         displayBorderBelowHeader,
         isWalletListTypeView,
         shouldHideDynamicFooterSeparator,

package/src/lib/utils/hooks/useDynamicWaas/useDynamicWaas.cjs

@@ -101,14 +101,15 @@ require('../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 const dynamicWaasKey = 'dynamicwaas';
-const configWaasWalletConnector = ({ walletConnector, environmentId, apiBaseUrl, authToken, }) => {
+const configWaasWalletConnector = ({ walletConnector, environmentId, apiBaseUrl, authToken, relayUrl, }) => {
     walletConnector.setEnvironmentId(environmentId);
     walletConnector.setBaseApiUrl(apiBaseUrl === null || apiBaseUrl === void 0 ? void 0 : apiBaseUrl.replace('/api/v0', ''));
     walletConnector.setGetAuthTokenFunction(() => authToken !== null && authToken !== void 0 ? authToken : '');
+    walletConnector.setRelayUrl(relayUrl);
     return walletConnector;
 };
 const useDynamicWaas = () => {
-    var _a;
+    var _a, _b, _c;
     const { setShowAuthFlow } = useInternalDynamicContext.useInternalDynamicContext();
     const { user: user$1 } = user.useUser();
     const apiBaseUrl = dynamicContextProps.useApiBaseUrl();
@@ -116,8 +117,9 @@ const useDynamicWaas = () => {
     const environmentId = dynamicContextProps.useEnvironmentId();
     const walletConnectorOptions = walletOptions.useWalletConnectorOptions();
     const refresh = useRefreshUser.useRefreshUser();
+    const relayUrl = (_b = (_a = projectSettings$1 === null || projectSettings$1 === void 0 ? void 0 : projectSettings$1.sdk) === null || _a === void 0 ? void 0 : _a.waas) === null || _b === void 0 ? void 0 : _b.relayUrl;
     const embeddedWalletSettings = projectSettings$1 === null || projectSettings$1 === void 0 ? void 0 : projectSettings$1.sdk.embeddedWallets;
-    const enabledChains = (_a = embeddedWalletSettings === null || embeddedWalletSettings === void 0 ? void 0 : embeddedWalletSettings.chainConfigurations) === null || _a === void 0 ? void 0 : _a.filter((c) => c.enabled);
+    const enabledChains = (_c = embeddedWalletSettings === null || embeddedWalletSettings === void 0 ? void 0 : embeddedWalletSettings.chainConfigurations) === null || _c === void 0 ? void 0 : _c.filter((c) => c.enabled);
     const primaryChain = enabledChains === null || enabledChains === void 0 ? void 0 : enabledChains.find((chain) => chain.primary);
     const enabledChainNames = enabledChains === null || enabledChains === void 0 ? void 0 : enabledChains.map((chain) => chain.name);
     const automaticEmbeddedWalletCreationEnabled = embeddedWalletSettings === null || embeddedWalletSettings === void 0 ? void 0 : embeddedWalletSettings.automaticEmbeddedWalletCreation;
@@ -142,6 +144,7 @@ const useDynamicWaas = () => {
             apiBaseUrl,
             authToken,
             environmentId,
+            relayUrl: relayUrl !== null && relayUrl !== void 0 ? relayUrl : '',
             walletConnector,
         });
         return configuredWalletConnector;
@@ -198,7 +201,7 @@ const useDynamicWaas = () => {
         automaticEmbeddedWalletCreationForExternalEnabled,
         walletConnectorOptions,
     ]);
-    const importPrivateKey = (_b) => _tslib.__awaiter(void 0, [_b], void 0, function* ({ chainName, privateKey, }) {
+    const importPrivateKey = (_d) => _tslib.__awaiter(void 0, [_d], void 0, function* ({ chainName, privateKey, }) {
         const walletConnector = getWalletConnector(chainName);
         if (!walletConnector)
             return;

package/src/lib/utils/hooks/useDynamicWaas/useDynamicWaas.d.ts

@@ -1,15 +1,18 @@
 import { IDynamicWaasConnector } from '@dynamic-labs/wallet-connector-core';
-export declare const configWaasWalletConnector: ({ walletConnector, environmentId, apiBaseUrl, authToken, }: {
+export declare const configWaasWalletConnector: ({ walletConnector, environmentId, apiBaseUrl, authToken, relayUrl, }: {
     walletConnector: IDynamicWaasConnector;
     environmentId: string;
     apiBaseUrl: string;
     authToken: string | undefined;
+    relayUrl: string;
 }) => IDynamicWaasConnector;
 export declare const useDynamicWaas: () => {
     createWalletAccount: () => Promise<({
         chainName: string;
         accountAddress: string;
-        publicKeyHex: string;
+        rawPublicKey: Uint8Array;
+        clientKeyShares: string[];
+        publicKeyHex?: string | undefined;
     } | undefined)[]>;
     dynamicWaasIsEnabled: boolean;
     getWalletConnector: (chainName: string) => IDynamicWaasConnector | undefined;

package/src/lib/utils/hooks/useDynamicWaas/useDynamicWaas.js

@@ -97,14 +97,15 @@ import '../../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 const dynamicWaasKey = 'dynamicwaas';
-const configWaasWalletConnector = ({ walletConnector, environmentId, apiBaseUrl, authToken, }) => {
+const configWaasWalletConnector = ({ walletConnector, environmentId, apiBaseUrl, authToken, relayUrl, }) => {
     walletConnector.setEnvironmentId(environmentId);
     walletConnector.setBaseApiUrl(apiBaseUrl === null || apiBaseUrl === void 0 ? void 0 : apiBaseUrl.replace('/api/v0', ''));
     walletConnector.setGetAuthTokenFunction(() => authToken !== null && authToken !== void 0 ? authToken : '');
+    walletConnector.setRelayUrl(relayUrl);
     return walletConnector;
 };
 const useDynamicWaas = () => {
-    var _a;
+    var _a, _b, _c;
     const { setShowAuthFlow } = useInternalDynamicContext();
     const { user } = useUser();
     const apiBaseUrl = useApiBaseUrl();
@@ -112,8 +113,9 @@ const useDynamicWaas = () => {
     const environmentId = useEnvironmentId();
     const walletConnectorOptions = useWalletConnectorOptions();
     const refresh = useRefreshUser();
+    const relayUrl = (_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.waas) === null || _b === void 0 ? void 0 : _b.relayUrl;
     const embeddedWalletSettings = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets;
-    const enabledChains = (_a = embeddedWalletSettings === null || embeddedWalletSettings === void 0 ? void 0 : embeddedWalletSettings.chainConfigurations) === null || _a === void 0 ? void 0 : _a.filter((c) => c.enabled);
+    const enabledChains = (_c = embeddedWalletSettings === null || embeddedWalletSettings === void 0 ? void 0 : embeddedWalletSettings.chainConfigurations) === null || _c === void 0 ? void 0 : _c.filter((c) => c.enabled);
     const primaryChain = enabledChains === null || enabledChains === void 0 ? void 0 : enabledChains.find((chain) => chain.primary);
     const enabledChainNames = enabledChains === null || enabledChains === void 0 ? void 0 : enabledChains.map((chain) => chain.name);
     const automaticEmbeddedWalletCreationEnabled = embeddedWalletSettings === null || embeddedWalletSettings === void 0 ? void 0 : embeddedWalletSettings.automaticEmbeddedWalletCreation;
@@ -138,6 +140,7 @@ const useDynamicWaas = () => {
             apiBaseUrl,
             authToken,
             environmentId,
+            relayUrl: relayUrl !== null && relayUrl !== void 0 ? relayUrl : '',
             walletConnector,
         });
         return configuredWalletConnector;
@@ -194,7 +197,7 @@ const useDynamicWaas = () => {
         automaticEmbeddedWalletCreationForExternalEnabled,
         walletConnectorOptions,
     ]);
-    const importPrivateKey = (_b) => __awaiter(void 0, [_b], void 0, function* ({ chainName, privateKey, }) {
+    const importPrivateKey = (_d) => __awaiter(void 0, [_d], void 0, function* ({ chainName, privateKey, }) {
         const walletConnector = getWalletConnector(chainName);
         if (!walletConnector)
             return;

package/src/lib/utils/hooks/useEmbeddedWallet/useEmbeddedWallet.cjs

@@ -162,23 +162,23 @@ const useEmbeddedWallet = () => {
     const shouldPromptForKeyExport = React.useCallback(() => { var _a; return Boolean((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _a === void 0 ? void 0 : _a.promptForKeyExport); }, [projectSettings]);
     const embeddedWalletSettingVersion = React.useCallback(() => { var _a; return (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _a === void 0 ? void 0 : _a.defaultWalletVersion; }, [projectSettings]);
     const shouldAutoCreateEmbeddedWallet = React.useCallback((verifiedUser) => {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e;
         const hasEmbeddedWalletProviderEnabled = isTurnkeyEnabled.isTurnkeyEnabled(projectSettings);
-        const defaultWalletVersion = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _a === void 0 ? void 0 : _a.defaultWalletVersion;
         const hasPrimaryWallet = primaryWalletId.getPrimaryWalletId();
-        if (defaultWalletVersion === sdkApiCore.EmbeddedWalletVersionEnum.V3) {
+        if (embeddedWalletSettingVersion() === sdkApiCore.EmbeddedWalletVersionEnum.V3 &&
+            !verifiedUser) {
             return false;
         }
         if (!hasEmbeddedWalletProviderEnabled || hasPrimaryWallet) {
             return false;
         }
-        // Turnkey specific rules
+        // Turnkey and WAAS specific rules
         if (verifiedUser) {
             const primaryEmbeddedChain = findPrimaryEmbeddedChain.findPrimaryEmbeddedChain(projectSettings);
-            const embeddedWalletVerifiedCredentialId = (_b = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(verifiedUser, [
+            const embeddedWalletVerifiedCredentialId = (_a = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(verifiedUser, [
                 primaryEmbeddedChain,
-            ])) === null || _b === void 0 ? void 0 : _b.id;
-            const AAWalletCredentialId = (_d = (_c = verifiedUser.verifiedCredentials) === null || _c === void 0 ? void 0 : _c.find((vc) => vc.walletProvider === sdkApiCore.WalletProviderEnum.SmartContractWallet)) === null || _d === void 0 ? void 0 : _d.id;
+            ])) === null || _a === void 0 ? void 0 : _a.id;
+            const AAWalletCredentialId = (_c = (_b = verifiedUser.verifiedCredentials) === null || _b === void 0 ? void 0 : _b.find((vc) => vc.walletProvider === sdkApiCore.WalletProviderEnum.SmartContractWallet)) === null || _c === void 0 ? void 0 : _c.id;
             const targetPrimaryWalletId = AAWalletCredentialId
                 ? AAWalletCredentialId
                 : embeddedWalletVerifiedCredentialId;
@@ -188,7 +188,7 @@ const useEmbeddedWallet = () => {
             }
         }
         if (isTurnkeyEnabled.isTurnkeyEnabled(projectSettings) &&
-            !((_f = (_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _e === void 0 ? void 0 : _e.embeddedWallets) === null || _f === void 0 ? void 0 : _f.automaticEmbeddedWalletCreation)) {
+            !((_e = (_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _d === void 0 ? void 0 : _d.embeddedWallets) === null || _e === void 0 ? void 0 : _e.automaticEmbeddedWalletCreation)) {
             return false;
         }
         return true;

package/src/lib/utils/hooks/useEmbeddedWallet/useEmbeddedWallet.js

@@ -158,23 +158,23 @@ const useEmbeddedWallet = () => {
     const shouldPromptForKeyExport = useCallback(() => { var _a; return Boolean((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _a === void 0 ? void 0 : _a.promptForKeyExport); }, [projectSettings]);
     const embeddedWalletSettingVersion = useCallback(() => { var _a; return (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _a === void 0 ? void 0 : _a.defaultWalletVersion; }, [projectSettings]);
     const shouldAutoCreateEmbeddedWallet = useCallback((verifiedUser) => {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e;
         const hasEmbeddedWalletProviderEnabled = isTurnkeyEnabled(projectSettings);
-        const defaultWalletVersion = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _a === void 0 ? void 0 : _a.defaultWalletVersion;
         const hasPrimaryWallet = getPrimaryWalletId();
-        if (defaultWalletVersion === EmbeddedWalletVersionEnum.V3) {
+        if (embeddedWalletSettingVersion() === EmbeddedWalletVersionEnum.V3 &&
+            !verifiedUser) {
             return false;
         }
         if (!hasEmbeddedWalletProviderEnabled || hasPrimaryWallet) {
             return false;
         }
-        // Turnkey specific rules
+        // Turnkey and WAAS specific rules
         if (verifiedUser) {
             const primaryEmbeddedChain = findPrimaryEmbeddedChain(projectSettings);
-            const embeddedWalletVerifiedCredentialId = (_b = findEmbeddedWalletFromVerifiedCredentials(verifiedUser, [
+            const embeddedWalletVerifiedCredentialId = (_a = findEmbeddedWalletFromVerifiedCredentials(verifiedUser, [
                 primaryEmbeddedChain,
-            ])) === null || _b === void 0 ? void 0 : _b.id;
-            const AAWalletCredentialId = (_d = (_c = verifiedUser.verifiedCredentials) === null || _c === void 0 ? void 0 : _c.find((vc) => vc.walletProvider === WalletProviderEnum.SmartContractWallet)) === null || _d === void 0 ? void 0 : _d.id;
+            ])) === null || _a === void 0 ? void 0 : _a.id;
+            const AAWalletCredentialId = (_c = (_b = verifiedUser.verifiedCredentials) === null || _b === void 0 ? void 0 : _b.find((vc) => vc.walletProvider === WalletProviderEnum.SmartContractWallet)) === null || _c === void 0 ? void 0 : _c.id;
             const targetPrimaryWalletId = AAWalletCredentialId
                 ? AAWalletCredentialId
                 : embeddedWalletVerifiedCredentialId;
@@ -184,7 +184,7 @@ const useEmbeddedWallet = () => {
             }
         }
         if (isTurnkeyEnabled(projectSettings) &&
-            !((_f = (_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _e === void 0 ? void 0 : _e.embeddedWallets) === null || _f === void 0 ? void 0 : _f.automaticEmbeddedWalletCreation)) {
+            !((_e = (_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _d === void 0 ? void 0 : _d.embeddedWallets) === null || _e === void 0 ? void 0 : _e.automaticEmbeddedWalletCreation)) {
             return false;
         }
         return true;

package/src/lib/utils/hooks/useSetWalletConnectorFetchers/useSetWalletConnectorFetchers.cjs

@@ -105,7 +105,7 @@ const useSetWalletConnectorFetchers = (walletOptions, environmentId, projectSett
     if (!(walletOptions === null || walletOptions === void 0 ? void 0 : walletOptions.length))
         return;
     walletOptions.forEach((walletOption) => {
-        var _a, _b;
+        var _a, _b, _c, _d, _e;
         if (walletConnectorCore.isSessionKeyCompatibleWalletConnector(walletOption.walletConnector)) {
             (_a = walletOption.walletConnector) === null || _a === void 0 ? void 0 : _a.setSessionKeyFetcher(registerEmbeddedWalletSessionKey);
             (_b = walletOption.walletConnector) === null || _b === void 0 ? void 0 : _b.setSessionKeyRemoveFunction(() => removeSessionKey());
@@ -115,6 +115,7 @@ const useSetWalletConnectorFetchers = (walletOptions, environmentId, projectSett
                 apiBaseUrl: apiBaseUrl !== null && apiBaseUrl !== void 0 ? apiBaseUrl : DEFAULT_API_BASE_URL,
                 authToken,
                 environmentId,
+                relayUrl: (_e = (_d = (_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _c === void 0 ? void 0 : _c.waas) === null || _d === void 0 ? void 0 : _d.relayUrl) !== null && _e !== void 0 ? _e : '',
                 walletConnector: walletOption.walletConnector,
             });
         }

package/src/lib/utils/hooks/useSetWalletConnectorFetchers/useSetWalletConnectorFetchers.js

@@ -101,7 +101,7 @@ const useSetWalletConnectorFetchers = (walletOptions, environmentId, projectSett
     if (!(walletOptions === null || walletOptions === void 0 ? void 0 : walletOptions.length))
         return;
     walletOptions.forEach((walletOption) => {
-        var _a, _b;
+        var _a, _b, _c, _d, _e;
         if (isSessionKeyCompatibleWalletConnector(walletOption.walletConnector)) {
             (_a = walletOption.walletConnector) === null || _a === void 0 ? void 0 : _a.setSessionKeyFetcher(registerEmbeddedWalletSessionKey);
             (_b = walletOption.walletConnector) === null || _b === void 0 ? void 0 : _b.setSessionKeyRemoveFunction(() => removeSessionKey());
@@ -111,6 +111,7 @@ const useSetWalletConnectorFetchers = (walletOptions, environmentId, projectSett
                 apiBaseUrl: apiBaseUrl !== null && apiBaseUrl !== void 0 ? apiBaseUrl : DEFAULT_API_BASE_URL,
                 authToken,
                 environmentId,
+                relayUrl: (_e = (_d = (_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _c === void 0 ? void 0 : _c.waas) === null || _d === void 0 ? void 0 : _d.relayUrl) !== null && _e !== void 0 ? _e : '',
                 walletConnector: walletOption.walletConnector,
             });
         }

package/src/lib/utils/hooks/useSyncMfaFlow/useSyncMfaFlow.cjs

@@ -103,7 +103,7 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useDyna
  */
 const useSyncMfaFlow = ({ handler: headlessHandler, } = {}) => {
     const { setShowAuthFlow, userWithMissingInfo, sdkHasLoaded } = useInternalDynamicContext.useInternalDynamicContext();
-    const { pushView } = ViewContext.useViewContext();
+    const { pushView, clearStackAndPush } = ViewContext.useViewContext();
     const { getUserDevices } = useMfa.useMfa();
     // this is used to make sure we only trigger the effect once
     const triggered = React.useRef(false);
@@ -153,7 +153,7 @@ const useSyncMfaFlow = ({ handler: headlessHandler, } = {}) => {
             });
         }
         else {
-            pushView('mfa-display-backup-codes');
+            clearStackAndPush('mfa-display-backup-codes');
         }
     }, [
         getUserDevices,
@@ -162,6 +162,7 @@ const useSyncMfaFlow = ({ handler: headlessHandler, } = {}) => {
         pushView,
         userWithMissingInfo,
         headlessHandler,
+        clearStackAndPush,
     ]);
 };
 

package/src/lib/utils/hooks/useSyncMfaFlow/useSyncMfaFlow.js

@@ -99,7 +99,7 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useDy
  */
 const useSyncMfaFlow = ({ handler: headlessHandler, } = {}) => {
     const { setShowAuthFlow, userWithMissingInfo, sdkHasLoaded } = useInternalDynamicContext();
-    const { pushView } = useViewContext();
+    const { pushView, clearStackAndPush } = useViewContext();
     const { getUserDevices } = useMfa();
     // this is used to make sure we only trigger the effect once
     const triggered = useRef(false);
@@ -149,7 +149,7 @@ const useSyncMfaFlow = ({ handler: headlessHandler, } = {}) => {
             });
         }
         else {
-            pushView('mfa-display-backup-codes');
+            clearStackAndPush('mfa-display-backup-codes');
         }
     }, [
         getUserDevices,
@@ -158,6 +158,7 @@ const useSyncMfaFlow = ({ handler: headlessHandler, } = {}) => {
         pushView,
         userWithMissingInfo,
         headlessHandler,
+        clearStackAndPush,
     ]);
 };
 

package/src/lib/utils/hooks/useValidateSession/handleStoreAndEnvironmentMismatch/handleStoreAndEnvironmentMismatch.cjs

@@ -8,19 +8,17 @@ var dynamicContextProps = require('../../../../store/state/dynamicContextProps/d
 
 /**
  * Detects envId mismtach with store.
- * @returns true if there is no mismatch.
  */
 const handleStoreAndEnvironmentMismatch = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ environmentId, logout, }) {
     const storeEnvId = dynamicContextProps.getEnvironmentId();
     if (!storeEnvId || environmentId === storeEnvId) {
-        return true;
+        return;
     }
     yield logout('store and environment are out of sync', {
         currentEnvId: environmentId,
         storedEnvId: storeEnvId,
     });
     dynamicContextProps.setEnvironmentId(environmentId);
-    return false;
 });
 
 exports.handleStoreAndEnvironmentMismatch = handleStoreAndEnvironmentMismatch;

package/src/lib/utils/hooks/useValidateSession/handleStoreAndEnvironmentMismatch/handleStoreAndEnvironmentMismatch.d.ts

@@ -4,6 +4,5 @@ export type HandleStoreAndEnvironmentMismatchParams = {
 };
 /**
  * Detects envId mismtach with store.
- * @returns true if there is no mismatch.
  */
-export declare const handleStoreAndEnvironmentMismatch: ({ environmentId, logout, }: HandleStoreAndEnvironmentMismatchParams) => Promise<boolean>;
+export declare const handleStoreAndEnvironmentMismatch: ({ environmentId, logout, }: HandleStoreAndEnvironmentMismatchParams) => Promise<void>;

package/src/lib/utils/hooks/useValidateSession/handleStoreAndEnvironmentMismatch/handleStoreAndEnvironmentMismatch.js

@@ -4,19 +4,17 @@ import { getEnvironmentId, setEnvironmentId } from '../../../../store/state/dyna
 
 /**
  * Detects envId mismtach with store.
- * @returns true if there is no mismatch.
  */
 const handleStoreAndEnvironmentMismatch = (_a) => __awaiter(void 0, [_a], void 0, function* ({ environmentId, logout, }) {
     const storeEnvId = getEnvironmentId();
     if (!storeEnvId || environmentId === storeEnvId) {
-        return true;
+        return;
     }
     yield logout('store and environment are out of sync', {
         currentEnvId: environmentId,
         storedEnvId: storeEnvId,
     });
     setEnvironmentId(environmentId);
-    return false;
 });
 
 export { handleStoreAndEnvironmentMismatch };

package/src/lib/utils/hooks/useValidateSession/handleUserDataOutOfSync/handleUserDataOutOfSync.cjs

@@ -14,14 +14,13 @@ var getAuthToken = require('../../../functions/getAuthToken/getAuthToken.cjs');
 
 /**
  * Detects mismatch between user and auth token.
- * @returns true if there is no mismatch.
  */
 const handleUserDataOutOfSync = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ environmentId, logout, projectSettings, }) {
     const cookieEnabled = isCookieEnabled.isCookieEnabled(projectSettings);
     const authToken = getAuthToken.getAuthToken();
     const user$2 = user.getUser();
     if (authToken || !user$2) {
-        return true;
+        return;
     }
     if (user$2 && !authToken && cookieEnabled) {
         try {
@@ -33,16 +32,15 @@ const handleUserDataOutOfSync = (_a) => _tslib.__awaiter(void 0, [_a], void 0, f
                     authToken,
                     user: user$2,
                 });
-                return false;
+                return;
             }
         }
-        return true;
+        return;
     }
     yield logout('user data out of sync', {
         authToken,
         user: user$2,
     });
-    return false;
 });
 
 exports.handleUserDataOutOfSync = handleUserDataOutOfSync;

package/src/lib/utils/hooks/useValidateSession/handleUserDataOutOfSync/handleUserDataOutOfSync.d.ts

@@ -6,6 +6,5 @@ export type HandleUserDataOutOfSyncParams = {
 };
 /**
  * Detects mismatch between user and auth token.
- * @returns true if there is no mismatch.
  */
-export declare const handleUserDataOutOfSync: ({ environmentId, logout, projectSettings, }: HandleUserDataOutOfSyncParams) => Promise<boolean>;
+export declare const handleUserDataOutOfSync: ({ environmentId, logout, projectSettings, }: HandleUserDataOutOfSyncParams) => Promise<void>;

package/src/lib/utils/hooks/useValidateSession/handleUserDataOutOfSync/handleUserDataOutOfSync.js

@@ -10,14 +10,13 @@ import { getAuthToken } from '../../../functions/getAuthToken/getAuthToken.js';
 
 /**
  * Detects mismatch between user and auth token.
- * @returns true if there is no mismatch.
  */
 const handleUserDataOutOfSync = (_a) => __awaiter(void 0, [_a], void 0, function* ({ environmentId, logout, projectSettings, }) {
     const cookieEnabled = isCookieEnabled(projectSettings);
     const authToken = getAuthToken();
     const user = getUser();
     if (authToken || !user) {
-        return true;
+        return;
     }
     if (user && !authToken && cookieEnabled) {
         try {
@@ -29,16 +28,15 @@ const handleUserDataOutOfSync = (_a) => __awaiter(void 0, [_a], void 0, function
                     authToken,
                     user,
                 });
-                return false;
+                return;
             }
         }
-        return true;
+        return;
     }
     yield logout('user data out of sync', {
         authToken,
         user,
     });
-    return false;
 });
 
 export { handleUserDataOutOfSync };

package/src/lib/utils/hooks/useValidateSession/handleWalletInfoOutOfSync/handleWalletInfoOutOfSync.cjs

@@ -0,0 +1,37 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../../../../../_virtual/_tslib.cjs');
+var user = require('../../../../store/state/user/user.cjs');
+require('@dynamic-labs/utils');
+require('../../../constants/values.cjs');
+require('@dynamic-labs/sdk-api-core');
+require('../../../../store/state/projectSettings/projectSettings.cjs');
+var primaryWalletId = require('../../../../store/state/primaryWalletId/primaryWalletId.cjs');
+var connectedWalletsInfo = require('../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
+
+/**
+ * Detects mismatch between wallet info.
+ * If there is primary wallet id, but no user or connected wallets info,
+ * it means it's in a bad state and we should log out.
+ */
+const handleWalletInfoOutOfSync = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ logout, }) {
+    const primaryWalletId$1 = primaryWalletId.getPrimaryWalletId();
+    if (!primaryWalletId$1) {
+        return;
+    }
+    const user$1 = user.getUser();
+    const connectedWallets = connectedWalletsInfo.getConnectedWalletsInfo();
+    if (user$1 || connectedWallets.length > 0) {
+        return;
+    }
+    yield logout('wallet info is out of sync', {
+        connectedWallets,
+        primaryWalletId: primaryWalletId$1,
+        user: user$1,
+    });
+});
+
+exports.handleWalletInfoOutOfSync = handleWalletInfoOutOfSync;

package/src/lib/utils/hooks/useValidateSession/handleWalletInfoOutOfSync/handleWalletInfoOutOfSync.d.ts

@@ -0,0 +1,9 @@
+export type HandleWalletInfoOutOfSyncParams = {
+    logout: (reason: string, params: any) => Promise<void>;
+};
+/**
+ * Detects mismatch between wallet info.
+ * If there is primary wallet id, but no user or connected wallets info,
+ * it means it's in a bad state and we should log out.
+ */
+export declare const handleWalletInfoOutOfSync: ({ logout, }: HandleWalletInfoOutOfSyncParams) => Promise<void>;