@dynamic-labs/sdk-react-core 1.1.0-alpha.8 → 1.1.0-phantom.0

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

@@ -1,11 +1,11 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useCallback } from 'react';
-import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
-import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
+import '../../../context/DynamicContext/DynamicContext.js';
 import { decodeJwt } from '../../../shared/utils/functions/decodeJwt/decodeJwt.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
+import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
 import '../../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
 import '../../constants/colors.js';
@@ -13,16 +13,63 @@ import '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
+import { dynamicEvents } from '../../../events/dynamicEvents.js';
+import '../../../context/CaptchaContext/CaptchaContext.js';
+import '../../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
 import { getAuthToken } from '../../functions/getAuthToken/getAuthToken.js';
 import '@dynamic-labs/sdk-api';
 import { isTurnkeyEnabled } from '../../functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
+import 'viem/chains';
+import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
+import '../../../context/AccountExistsContext/AccountExistsContext.js';
+import '../../../config/ApiEndpoint.js';
+import '../../../context/EmailVerificationContext/EmailVerificationContext.js';
+import 'react-dom';
 import { useEmbeddedWallet } from '../useEmbeddedWallet/useEmbeddedWallet.js';
-import { dynamicEvents } from '../../../events/dynamicEvents.js';
+import '../../../context/ThemeContext/ThemeContext.js';
+import '@dynamic-labs/types';
+import 'yup';
+import 'react-i18next';
+import '../../../context/MockContext/MockContext.js';
+import '../useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
+import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
+import '@dynamic-labs/rpc-providers';
+import '../../../context/UserWalletsContext/UserWalletsContext.js';
+import '../../../components/Alert/Alert.js';
+import '../../../components/ShadowDOM/ShadowDOM.js';
+import '../../../components/IconButton/IconButton.js';
+import '../../../components/InlineWidget/InlineWidget.js';
+import '../../../components/MenuList/Dropdown/Dropdown.js';
+import '../../../components/Transition/ZoomTransition/ZoomTransition.js';
+import '../../../components/Transition/SlideInUpTransition/SlideInUpTransition.js';
+import '../../../components/Transition/OpacityTransition/OpacityTransition.js';
+import '../../../components/Popper/Popper/Popper.js';
+import '../../../components/Popper/PopperContext/PopperContext.js';
+import 'react-focus-lock';
+import 'formik';
+import 'i18next';
+import '../../../components/OverlayCard/OverlayCard.context.js';
+import '../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
+import '../../../views/WalletList/WalletList.js';
+import 'qrcode';
+import '@hcaptcha/react-hcaptcha';
+import '../../../context/LoadingContext/LoadingContext.js';
+import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
+import '../../../context/WalletGroupContext/WalletGroupContext.js';
+import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
+import '../../../context/FooterAnimationContext/index.js';
+import '../../../context/PasskeyContext/PasskeyContext.js';
+import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
+import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
+import '../../../components/UserProfile/parts/UserProfileField/components/VerifiedEmailIcon/VerifiedEmailIcon.js';
+import '@dynamic-labs/viem-utils';
+import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
+import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 // Hook exposed to customers and used internally to trigger embedded reveal
 const useEmbeddedReveal = () => {
-    const { projectSettings, internalSetShowAuthFlow } = useInternalDynamicContext();
+    const { projectSettings, setShowAuthFlow } = useInternalDynamicContext();
     const { userHasEmbeddedWallet } = useEmbeddedWallet();
     const { setView } = useViewContext();
     const initExportProcess = useCallback((recoveryPhrase = false) => __awaiter(void 0, void 0, void 0, function* () {
@@ -43,7 +90,10 @@ const useEmbeddedReveal = () => {
         if (recoveryPhrase && !turnkeyHDWalletId) {
             throw new Error('Wallet is non-HD and does not have a recovery phrase');
         }
-        internalSetShowAuthFlow(true);
+        setShowAuthFlow(true, {
+            ignoreIfIsEmbeddedWidget: false,
+            performMultiWalletChecks: false,
+        });
         if (recoveryPhrase) {
             setView('embedded-reveal-view');
         }
@@ -54,7 +104,7 @@ const useEmbeddedReveal = () => {
             dynamicEvents.once('embeddedWalletRevealCompleted', (wallet) => resolve(wallet));
             dynamicEvents.once('embeddedWalletRevealFailed', (error) => reject(error));
         });
-    }), [internalSetShowAuthFlow, projectSettings, setView, userHasEmbeddedWallet]);
+    }), [setShowAuthFlow, projectSettings, setView, userHasEmbeddedWallet]);
     return {
         initExportProcess,
     };

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

@@ -4,12 +4,12 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
-var useInternalDynamicContext = require('../../../context/DynamicContext/useInternalDynamicContext.cjs');
-var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
+require('../../../context/DynamicContext/DynamicContext.cjs');
 var decodeJwt = require('../../../shared/utils/functions/decodeJwt/decodeJwt.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
+var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
 var logger = require('../../../shared/logger.cjs');
 require('@dynamic-labs/wallet-book');
 require('../../constants/colors.cjs');
@@ -17,6 +17,9 @@ require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
+var dynamicEvents = require('../../../events/dynamicEvents.cjs');
+require('../../../context/CaptchaContext/CaptchaContext.cjs');
+require('../../../context/ErrorContext/ErrorContext.cjs');
 var findEmbeddedWalletFromVerifiedCredentials = require('../../functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.cjs');
 var findTurnkeyWallet = require('../../functions/findTurnkeyWallet/findTurnkeyWallet.cjs');
 require('@dynamic-labs/multi-wallet');
@@ -25,17 +28,59 @@ require('@dynamic-labs/sdk-api');
 var getUserWalletsFromVerifiedCredentials = require('../../functions/getUserWalletsFromVerifiedCredentials/getUserWalletsFromVerifiedCredentials.cjs');
 var isEmbeddedWalletPresent = require('../../functions/isEmbeddedWalletPresent/isEmbeddedWalletPresent.cjs');
 var isTurnkeyEnabled = require('../../functions/isTurnkeyEnabled/isTurnkeyEnabled.cjs');
-var smartWallet = require('../useWalletConnectors/utils/smartWallet/smartWallet.cjs');
+require('viem/chains');
+require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
+require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
+require('../../../config/ApiEndpoint.cjs');
+require('../../../context/EmailVerificationContext/EmailVerificationContext.cjs');
+require('react-dom');
 var useCreateDynamicEmbeddedWalletMutation = require('../useCreateDynamicEmbeddedWalletMutation/useCreateDynamicEmbeddedWalletMutation.cjs');
-var dynamicEvents = require('../../../events/dynamicEvents.cjs');
-var useCreateUserProfileByJWTCallback = require('../useCreateUserProfileByJWTCallback/useCreateUserProfileByJWTCallback.cjs');
+var smartWallet = require('../useWalletConnectors/utils/smartWallet/smartWallet.cjs');
+require('../../../context/ThemeContext/ThemeContext.cjs');
+require('@dynamic-labs/types');
+require('yup');
+require('react-i18next');
+require('../../../context/MockContext/MockContext.cjs');
+require('../useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
+require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
+require('@dynamic-labs/rpc-providers');
+require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
+require('../../../components/Alert/Alert.cjs');
+require('../../../components/ShadowDOM/ShadowDOM.cjs');
+require('../../../components/IconButton/IconButton.cjs');
+require('../../../components/InlineWidget/InlineWidget.cjs');
+require('../../../components/MenuList/Dropdown/Dropdown.cjs');
+require('../../../components/Transition/ZoomTransition/ZoomTransition.cjs');
+require('../../../components/Transition/SlideInUpTransition/SlideInUpTransition.cjs');
+require('../../../components/Transition/OpacityTransition/OpacityTransition.cjs');
+require('../../../components/Popper/Popper/Popper.cjs');
+require('../../../components/Popper/PopperContext/PopperContext.cjs');
+require('react-focus-lock');
+require('formik');
+require('i18next');
+require('../../../components/OverlayCard/OverlayCard.context.cjs');
+require('../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
+require('../../../views/WalletList/WalletList.cjs');
+require('qrcode');
+require('@hcaptcha/react-hcaptcha');
+require('../../../context/LoadingContext/LoadingContext.cjs');
+require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
+require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
+require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
+require('../../../context/FooterAnimationContext/index.cjs');
+require('../../../context/PasskeyContext/PasskeyContext.cjs');
+require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
+require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
+require('../../../components/UserProfile/parts/UserProfileField/components/VerifiedEmailIcon/VerifiedEmailIcon.cjs');
+require('@dynamic-labs/viem-utils');
+require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
+var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 // Hook exposed to customers and used internally to trigger embedded wallet creation
 const useEmbeddedWallet = () => {
-    const { projectSettings, onboardingOnlyJwt, setPrimaryWalletId, walletConnectorOptions, internalSetShowAuthFlow, primaryWallet, environmentId, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { projectSettings, onboardingOnlyJwt, setPrimaryWalletId, walletConnectorOptions, setShowAuthFlow, primaryWallet, environmentId, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setView } = ViewContext.useViewContext();
     const { createDynamicEmbeddedWalletMutation } = useCreateDynamicEmbeddedWalletMutation.useCreateDynamicEmbeddedWalletMutation();
-    const { createUserProfileByJWT } = useCreateUserProfileByJWTCallback.useCreateUserProfileByJWTCallback();
     const userHasEmbeddedWallet = () => {
         var _a;
         const jwt = (_a = getAuthToken.getAuthToken()) !== null && _a !== void 0 ? _a : onboardingOnlyJwt;
@@ -52,7 +97,7 @@ const useEmbeddedWallet = () => {
             walletConnectorOptions,
             withAuthenticator: false,
         });
-        internalSetShowAuthFlow(false); // close email otp pin modal
+        setShowAuthFlow(false, { performMultiWalletChecks: false }); // close email otp pin modal
         return new Promise((resolve, reject) => {
             dynamicEvents.dynamicEvents.once('embeddedWalletCreated', (wallet) => resolve(wallet));
             dynamicEvents.dynamicEvents.once('embeddedWalletFailed', (error) => reject(error));
@@ -61,10 +106,13 @@ const useEmbeddedWallet = () => {
         createDynamicEmbeddedWalletMutation,
         environmentId,
         walletConnectorOptions,
-        internalSetShowAuthFlow,
+        setShowAuthFlow,
     ]);
-    const startEmbeddedWalletCreationFlow = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        internalSetShowAuthFlow(true);
+    const startEmbeddedWalletCreationFlow = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        setShowAuthFlow(true, {
+            ignoreIfIsEmbeddedWidget: false,
+            performMultiWalletChecks: false,
+        });
         setView('passkey-intro');
         return new Promise((resolve, reject) => {
             dynamicEvents.dynamicEvents.once('embeddedWalletCreated', (wallet) => resolve(wallet));
@@ -72,22 +120,22 @@ const useEmbeddedWallet = () => {
                 // when creating a passkey, if user cancels the passkey modal more than once
                 // it will throw this DOMException, but we don't want to let user to have access
                 // to the app before they've a passkey correctly setup
-                if (error instanceof DOMException && error.name === 'NotAllowedError') {
+                if (error instanceof DOMException &&
+                    error.name === 'NotAllowedError') {
                     logger.logger.error('User cancelled the passkey creation.', error);
                     return;
                 }
                 reject(error);
             });
         });
-    });
-    const returnEmbeddedWallet = (jwt, embeddedWalletVerifiedCredential) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    }), [setShowAuthFlow, setView]);
+    const returnEmbeddedWallet = React.useCallback((jwt, embeddedWalletVerifiedCredential) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         var _a, _b, _c, _d;
         const decodedJwt = decodeJwt.decodeJwt(jwt);
         const turnkeyWallet = findTurnkeyWallet.findTurnkeyWallet(walletConnectorOptions);
         // if user already has embedded wallet, set it as primary wallet
         if (decodedJwt) {
             (_a = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _a === void 0 ? void 0 : _a.setVerifiedCredentials(decodedJwt.verifiedCredentials);
-            yield createUserProfileByJWT(jwt);
             const smartWallet$1 = smartWallet.findSmartWallet(embeddedWalletVerifiedCredential, decodedJwt.verifiedCredentials);
             if (smartWallet$1) {
                 yield smartWallet.initializeSmartWallet({
@@ -112,7 +160,7 @@ const useEmbeddedWallet = () => {
             id: embeddedWalletVerifiedCredential.id,
         };
         return Promise.resolve(passkeyWallet);
-    });
+    }), [setPrimaryWalletId, walletConnectorOptions]);
     const createEmbeddedWallet = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         var _e, _f, _g;
         const jwt = (_e = getAuthToken.getAuthToken()) !== null && _e !== void 0 ? _e : onboardingOnlyJwt;
@@ -131,20 +179,28 @@ const useEmbeddedWallet = () => {
             }
             return startEmbeddedWalletCreationFlow();
         }
-        internalSetShowAuthFlow(false);
+        setShowAuthFlow(false, { performMultiWalletChecks: false });
         const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(jwt);
         // if user logged in with MM for example, just continue the flow
         if (!embeddedWalletVerifiedCredential) {
+            // user logged in through an email linked to a third party wallet
+            // at this point primary wallet is still undefined and we need to set it
+            if (!primaryWallet) {
+                setPrimaryWalletId(userWaletsCredentials[0].id);
+            }
             return Promise.resolve(primaryWallet);
         }
         // if user already has embedded wallet, returns it
         return returnEmbeddedWallet(jwt, embeddedWalletVerifiedCredential);
     }), [
-        internalSetShowAuthFlow,
         onboardingOnlyJwt,
         projectSettings,
+        setShowAuthFlow,
+        returnEmbeddedWallet,
+        startEmbeddedWalletCreationFlow,
         startPregeneratedWalletCreationFlow,
         primaryWallet,
+        setPrimaryWalletId,
     ]);
     return {
         createEmbeddedWallet,

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

@@ -1,11 +1,11 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useCallback } from 'react';
-import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
-import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
+import '../../../context/DynamicContext/DynamicContext.js';
 import { decodeJwt } from '../../../shared/utils/functions/decodeJwt/decodeJwt.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
+import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
 import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
 import '../../constants/colors.js';
@@ -13,6 +13,9 @@ import '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
+import { dynamicEvents } from '../../../events/dynamicEvents.js';
+import '../../../context/CaptchaContext/CaptchaContext.js';
+import '../../../context/ErrorContext/ErrorContext.js';
 import { findEmbeddedWalletFromVerifiedCredentials } from '../../functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.js';
 import { findTurnkeyWallet } from '../../functions/findTurnkeyWallet/findTurnkeyWallet.js';
 import '@dynamic-labs/multi-wallet';
@@ -21,17 +24,59 @@ import '@dynamic-labs/sdk-api';
 import { getUserWalletsFromVerifiedCredentials } from '../../functions/getUserWalletsFromVerifiedCredentials/getUserWalletsFromVerifiedCredentials.js';
 import { isEmbeddedWalletPresent } from '../../functions/isEmbeddedWalletPresent/isEmbeddedWalletPresent.js';
 import { isTurnkeyEnabled } from '../../functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
-import { findSmartWallet, initializeSmartWallet } from '../useWalletConnectors/utils/smartWallet/smartWallet.js';
+import 'viem/chains';
+import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
+import '../../../context/AccountExistsContext/AccountExistsContext.js';
+import '../../../config/ApiEndpoint.js';
+import '../../../context/EmailVerificationContext/EmailVerificationContext.js';
+import 'react-dom';
 import { useCreateDynamicEmbeddedWalletMutation } from '../useCreateDynamicEmbeddedWalletMutation/useCreateDynamicEmbeddedWalletMutation.js';
-import { dynamicEvents } from '../../../events/dynamicEvents.js';
-import { useCreateUserProfileByJWTCallback } from '../useCreateUserProfileByJWTCallback/useCreateUserProfileByJWTCallback.js';
+import { findSmartWallet, initializeSmartWallet } from '../useWalletConnectors/utils/smartWallet/smartWallet.js';
+import '../../../context/ThemeContext/ThemeContext.js';
+import '@dynamic-labs/types';
+import 'yup';
+import 'react-i18next';
+import '../../../context/MockContext/MockContext.js';
+import '../useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
+import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
+import '@dynamic-labs/rpc-providers';
+import '../../../context/UserWalletsContext/UserWalletsContext.js';
+import '../../../components/Alert/Alert.js';
+import '../../../components/ShadowDOM/ShadowDOM.js';
+import '../../../components/IconButton/IconButton.js';
+import '../../../components/InlineWidget/InlineWidget.js';
+import '../../../components/MenuList/Dropdown/Dropdown.js';
+import '../../../components/Transition/ZoomTransition/ZoomTransition.js';
+import '../../../components/Transition/SlideInUpTransition/SlideInUpTransition.js';
+import '../../../components/Transition/OpacityTransition/OpacityTransition.js';
+import '../../../components/Popper/Popper/Popper.js';
+import '../../../components/Popper/PopperContext/PopperContext.js';
+import 'react-focus-lock';
+import 'formik';
+import 'i18next';
+import '../../../components/OverlayCard/OverlayCard.context.js';
+import '../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
+import '../../../views/WalletList/WalletList.js';
+import 'qrcode';
+import '@hcaptcha/react-hcaptcha';
+import '../../../context/LoadingContext/LoadingContext.js';
+import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
+import '../../../context/WalletGroupContext/WalletGroupContext.js';
+import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
+import '../../../context/FooterAnimationContext/index.js';
+import '../../../context/PasskeyContext/PasskeyContext.js';
+import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
+import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
+import '../../../components/UserProfile/parts/UserProfileField/components/VerifiedEmailIcon/VerifiedEmailIcon.js';
+import '@dynamic-labs/viem-utils';
+import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
+import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 // Hook exposed to customers and used internally to trigger embedded wallet creation
 const useEmbeddedWallet = () => {
-    const { projectSettings, onboardingOnlyJwt, setPrimaryWalletId, walletConnectorOptions, internalSetShowAuthFlow, primaryWallet, environmentId, } = useInternalDynamicContext();
+    const { projectSettings, onboardingOnlyJwt, setPrimaryWalletId, walletConnectorOptions, setShowAuthFlow, primaryWallet, environmentId, } = useInternalDynamicContext();
     const { setView } = useViewContext();
     const { createDynamicEmbeddedWalletMutation } = useCreateDynamicEmbeddedWalletMutation();
-    const { createUserProfileByJWT } = useCreateUserProfileByJWTCallback();
     const userHasEmbeddedWallet = () => {
         var _a;
         const jwt = (_a = getAuthToken()) !== null && _a !== void 0 ? _a : onboardingOnlyJwt;
@@ -48,7 +93,7 @@ const useEmbeddedWallet = () => {
             walletConnectorOptions,
             withAuthenticator: false,
         });
-        internalSetShowAuthFlow(false); // close email otp pin modal
+        setShowAuthFlow(false, { performMultiWalletChecks: false }); // close email otp pin modal
         return new Promise((resolve, reject) => {
             dynamicEvents.once('embeddedWalletCreated', (wallet) => resolve(wallet));
             dynamicEvents.once('embeddedWalletFailed', (error) => reject(error));
@@ -57,10 +102,13 @@ const useEmbeddedWallet = () => {
         createDynamicEmbeddedWalletMutation,
         environmentId,
         walletConnectorOptions,
-        internalSetShowAuthFlow,
+        setShowAuthFlow,
     ]);
-    const startEmbeddedWalletCreationFlow = () => __awaiter(void 0, void 0, void 0, function* () {
-        internalSetShowAuthFlow(true);
+    const startEmbeddedWalletCreationFlow = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
+        setShowAuthFlow(true, {
+            ignoreIfIsEmbeddedWidget: false,
+            performMultiWalletChecks: false,
+        });
         setView('passkey-intro');
         return new Promise((resolve, reject) => {
             dynamicEvents.once('embeddedWalletCreated', (wallet) => resolve(wallet));
@@ -68,22 +116,22 @@ const useEmbeddedWallet = () => {
                 // when creating a passkey, if user cancels the passkey modal more than once
                 // it will throw this DOMException, but we don't want to let user to have access
                 // to the app before they've a passkey correctly setup
-                if (error instanceof DOMException && error.name === 'NotAllowedError') {
+                if (error instanceof DOMException &&
+                    error.name === 'NotAllowedError') {
                     logger.error('User cancelled the passkey creation.', error);
                     return;
                 }
                 reject(error);
             });
         });
-    });
-    const returnEmbeddedWallet = (jwt, embeddedWalletVerifiedCredential) => __awaiter(void 0, void 0, void 0, function* () {
+    }), [setShowAuthFlow, setView]);
+    const returnEmbeddedWallet = useCallback((jwt, embeddedWalletVerifiedCredential) => __awaiter(void 0, void 0, void 0, function* () {
         var _a, _b, _c, _d;
         const decodedJwt = decodeJwt(jwt);
         const turnkeyWallet = findTurnkeyWallet(walletConnectorOptions);
         // if user already has embedded wallet, set it as primary wallet
         if (decodedJwt) {
             (_a = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _a === void 0 ? void 0 : _a.setVerifiedCredentials(decodedJwt.verifiedCredentials);
-            yield createUserProfileByJWT(jwt);
             const smartWallet = findSmartWallet(embeddedWalletVerifiedCredential, decodedJwt.verifiedCredentials);
             if (smartWallet) {
                 yield initializeSmartWallet({
@@ -108,7 +156,7 @@ const useEmbeddedWallet = () => {
             id: embeddedWalletVerifiedCredential.id,
         };
         return Promise.resolve(passkeyWallet);
-    });
+    }), [setPrimaryWalletId, walletConnectorOptions]);
     const createEmbeddedWallet = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
         var _e, _f, _g;
         const jwt = (_e = getAuthToken()) !== null && _e !== void 0 ? _e : onboardingOnlyJwt;
@@ -127,20 +175,28 @@ const useEmbeddedWallet = () => {
             }
             return startEmbeddedWalletCreationFlow();
         }
-        internalSetShowAuthFlow(false);
+        setShowAuthFlow(false, { performMultiWalletChecks: false });
         const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(jwt);
         // if user logged in with MM for example, just continue the flow
         if (!embeddedWalletVerifiedCredential) {
+            // user logged in through an email linked to a third party wallet
+            // at this point primary wallet is still undefined and we need to set it
+            if (!primaryWallet) {
+                setPrimaryWalletId(userWaletsCredentials[0].id);
+            }
             return Promise.resolve(primaryWallet);
         }
         // if user already has embedded wallet, returns it
         return returnEmbeddedWallet(jwt, embeddedWalletVerifiedCredential);
     }), [
-        internalSetShowAuthFlow,
         onboardingOnlyJwt,
         projectSettings,
+        setShowAuthFlow,
+        returnEmbeddedWallet,
+        startEmbeddedWalletCreationFlow,
         startPregeneratedWalletCreationFlow,
         primaryWallet,
+        setPrimaryWalletId,
     ]);
     return {
         createEmbeddedWallet,

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

@@ -18,7 +18,7 @@ require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 var useLocalStorage = require('../../../shared/utils/hooks/useLocalStorage/useLocalStorage.cjs');
 require('../../../shared/consts/index.cjs');
-var validators = require('../../../context/DynamicContext/validators.cjs');
+var validators = require('../../../context/DynamicContext/validators/validators.cjs');
 
 const useFetchNonce = (environmentId, maxRetries = 2) => {
     const [lsNonce, setLsNonce, removeLsNonce] = useLocalStorage.useLocalStorage(localStorage.NONCE_STORAGE_KEY, undefined, validators.validateLocalStorageExpiry);

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

@@ -14,7 +14,7 @@ import '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import { useLocalStorage } from '../../../shared/utils/hooks/useLocalStorage/useLocalStorage.js';
 import '../../../shared/consts/index.js';
-import { validateLocalStorageExpiry } from '../../../context/DynamicContext/validators.js';
+import { validateLocalStorageExpiry } from '../../../context/DynamicContext/validators/validators.js';
 
 const useFetchNonce = (environmentId, maxRetries = 2) => {
     const [lsNonce, setLsNonce, removeLsNonce] = useLocalStorage(NONCE_STORAGE_KEY, undefined, validateLocalStorageExpiry);

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

@@ -19,7 +19,7 @@ require('viem');
 var useLocalStorage = require('../../../shared/utils/hooks/useLocalStorage/useLocalStorage.cjs');
 var useEffectOnce = require('../../../shared/utils/hooks/useEffectOnce/useEffectOnce.cjs');
 require('../../../shared/consts/index.cjs');
-var validators = require('../../../context/DynamicContext/validators.cjs');
+var validators = require('../../../context/DynamicContext/validators/validators.cjs');
 
 const useFetchProjectSettings = ({ authToken, environmentId, maxRetries = 2, dynamicContextProps, }) => {
     const [lsSettings, setLsSettings, removeLsSettings] = useLocalStorage.useLocalStorage(localStorage.PROJECT_SETTINGS_STORAGE_KEY, undefined, validators.validateLocalStorageExpiry);
@@ -61,6 +61,7 @@ const useFetchProjectSettings = ({ authToken, environmentId, maxRetries = 2, dyn
             const serializedDynamicContextProps = Object.assign(Object.assign({}, updatedDynamicProps), { settings: Object.assign(Object.assign({}, updatedDynamicProps.settings), { eventsCallbacks: serializedEventsCallbacks, walletConnectors: serializedWalletConnectors }) });
             api.sendDynamicProps(environmentId, {
                 dynamicContextProps: serializedDynamicContextProps,
+                frameworkSettings: getFrameworkSettings(),
             });
             api.fetchProjectSettings(environmentId)
                 .then((response) => {
@@ -123,6 +124,19 @@ const serializeWalletConnectors = (walletConnectors) => {
         return undefined;
     }
 };
+const getFrameworkSettings = () => {
+    var _a;
+    return ({
+        nextJs: {
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore
+            version: (_a = window.next) === null || _a === void 0 ? void 0 : _a.version,
+        },
+        react: {
+            version: React.version,
+        },
+    });
+};
 
 exports.serializeEventsCallbacks = serializeEventsCallbacks;
 exports.serializeWalletConnectors = serializeWalletConnectors;

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

@@ -1,4 +1,4 @@
-import { useState, useEffect, useMemo } from 'react';
+import { useState, useEffect, useMemo, version } from 'react';
 import { DynamicError } from '@dynamic-labs/utils';
 import { sendDynamicProps, fetchProjectSettings } from '../../../data/api.js';
 import '@dynamic-labs/sdk-api';
@@ -15,7 +15,7 @@ import 'viem';
 import { useLocalStorage } from '../../../shared/utils/hooks/useLocalStorage/useLocalStorage.js';
 import { useEffectOnce } from '../../../shared/utils/hooks/useEffectOnce/useEffectOnce.js';
 import '../../../shared/consts/index.js';
-import { validateLocalStorageExpiry } from '../../../context/DynamicContext/validators.js';
+import { validateLocalStorageExpiry } from '../../../context/DynamicContext/validators/validators.js';
 
 const useFetchProjectSettings = ({ authToken, environmentId, maxRetries = 2, dynamicContextProps, }) => {
     const [lsSettings, setLsSettings, removeLsSettings] = useLocalStorage(PROJECT_SETTINGS_STORAGE_KEY, undefined, validateLocalStorageExpiry);
@@ -57,6 +57,7 @@ const useFetchProjectSettings = ({ authToken, environmentId, maxRetries = 2, dyn
             const serializedDynamicContextProps = Object.assign(Object.assign({}, updatedDynamicProps), { settings: Object.assign(Object.assign({}, updatedDynamicProps.settings), { eventsCallbacks: serializedEventsCallbacks, walletConnectors: serializedWalletConnectors }) });
             sendDynamicProps(environmentId, {
                 dynamicContextProps: serializedDynamicContextProps,
+                frameworkSettings: getFrameworkSettings(),
             });
             fetchProjectSettings(environmentId)
                 .then((response) => {
@@ -119,5 +120,18 @@ const serializeWalletConnectors = (walletConnectors) => {
         return undefined;
     }
 };
+const getFrameworkSettings = () => {
+    var _a;
+    return ({
+        nextJs: {
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore
+            version: (_a = window.next) === null || _a === void 0 ? void 0 : _a.version,
+        },
+        react: {
+            version,
+        },
+    });
+};
 
 export { serializeEventsCallbacks, serializeWalletConnectors, useFetchProjectSettings };

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

@@ -4,10 +4,10 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 require('@dynamic-labs/sdk-api');
 require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
-require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
@@ -18,9 +18,8 @@ require('viem');
 require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 var handleUnlinkHelper = require('../../functions/handleUnlinkHelper/handleUnlinkHelper.cjs');
-var isSameWalletName = require('../../functions/isSameWalletName/isSameWalletName.cjs');
 
-const useHandleUnlinkWallet = ({ verifiedCredentials, environmentId, primaryWalletId, secondaryWallets, setUser, }) => {
+const useHandleUnlinkWallet = ({ verifiedCredentials, environmentId, primaryWalletId, secondaryWallets, setUser, user, eventsCallbacks, }) => {
     const callback = React.useCallback((walletId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         var _a;
         // when we call handleUnlinkWallet on the same execution stack as setPrimaryWallet, the value of
@@ -35,6 +34,7 @@ const useHandleUnlinkWallet = ({ verifiedCredentials, environmentId, primaryWall
         const currentPrimaryWalletId = (_a = localStorage.LocalStorage.getFromLS(localStorage$1.PRIMARY_WALLET_ID)) !== null && _a !== void 0 ? _a : primaryWalletId;
         if (walletId === currentPrimaryWalletId)
             return;
+        const vcWalletFromId = user === null || user === void 0 ? void 0 : user.verifiedCredentials.find((wallet) => wallet.id === walletId);
         const newUser = yield handleUnlinkHelper.handleUnlinkHelper({
             environmentId,
             primaryWalletId: currentPrimaryWalletId,
@@ -44,18 +44,26 @@ const useHandleUnlinkWallet = ({ verifiedCredentials, environmentId, primaryWall
             setUser(newUser);
         }
         const wallet = secondaryWallets.find((w) => w.id === walletId);
+        // remaining normalizeWalletName until QNTM-846 is complete due to us still passing the walletname to redcoast:
+        // https://linear.app/dynamic-labs/issue/QNTM-846/remove-usage-of-walletwalletconnectorwname-to-instead-use
         const numberOfLinkedWallets = verifiedCredentials.filter((account) => account.walletName &&
-            isSameWalletName.isSameWalletName(account.walletName, (wallet === null || wallet === void 0 ? void 0 : wallet.connector.name) || '')).length;
+            walletConnectorCore.normalizeWalletName(account.walletName) ===
+                ((wallet === null || wallet === void 0 ? void 0 : wallet.connector.key) || '')).length;
         // If there's only 1, it's the one being removed and we can kill the session
         if (numberOfLinkedWallets === 1) {
             yield (wallet === null || wallet === void 0 ? void 0 : wallet.connector.endSession());
         }
+        if (vcWalletFromId && (eventsCallbacks === null || eventsCallbacks === void 0 ? void 0 : eventsCallbacks.onUnlinkSuccess)) {
+            eventsCallbacks.onUnlinkSuccess(vcWalletFromId);
+        }
     }), [
         primaryWalletId,
         environmentId,
         secondaryWallets,
         setUser,
         verifiedCredentials,
+        eventsCallbacks,
+        user,
     ]);
     return callback;
 };