@dynamic-labs/sdk-react-core 1.0.4 → 1.0.6

package/src/lib/utils/hooks/authenticationHooks/useEmailVerificationRequest/useEmailVerificationRequest.js

@@ -4,31 +4,14 @@ import { useInternalDynamicContext } from '../../../../context/DynamicContext/us
 import { verifyEmail } from '../../../../data/api.js';
 import { useUpdateUserProfileByJWTCallback } from '../../useUpdateUserProfileByJWTCallback/useUpdateUserProfileByJWTCallback.js';
 import { useEmailVerificationContext } from '../../../../context/EmailVerificationContext/EmailVerificationContext.js';
-import '@dynamic-labs/sdk-api';
-import '../../../../shared/logger.js';
-import '@dynamic-labs/iconic';
-import '@dynamic-labs/wallet-connector-core';
-import 'react/jsx-runtime';
-import '../../../../context/ViewContext/ViewContext.js';
-import '@dynamic-labs/wallet-book';
-import '../../../constants/colors.js';
-import '../../../../shared/utils/classes/storage/localStorage.js';
-import 'viem';
-import '@dynamic-labs/utils';
-import '../../../../shared/consts/index.js';
-import '@dynamic-labs/multi-wallet';
-import { isTurnkeyEnabled } from '../../../functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
 
 // Hook exposed to the public as a scoped function in useUserUpdateRequest result
 const useEmailVerificationRequest = () => {
-    var _a;
-    const { onboardingOnlyJwt, authToken, environmentId, projectSettings, primaryWallet, } = useInternalDynamicContext();
+    const { onboardingOnlyJwt, authToken, environmentId } = useInternalDynamicContext();
     const jwtToken = onboardingOnlyJwt || authToken;
-    const isTurnkeyProviderEnabled = isTurnkeyEnabled(projectSettings);
     const { updateUserProfileByJWT } = useUpdateUserProfileByJWTCallback();
     const { verificationUUID: emailVerificationContextVerificationUUID } = useEmailVerificationContext();
     const verifyEmail$1 = useCallback((verificationToken, verificationUUID) => __awaiter(void 0, void 0, void 0, function* () {
-        var _b;
         if (!jwtToken)
             throw new Error('No JWT token provided');
         // VerificationUUID is saved in the context in case the view changes
@@ -40,22 +23,12 @@ const useEmailVerificationRequest = () => {
             verificationToken,
             verificationUUID: String(verificationUUID || emailVerificationContextVerificationUUID),
         }, jwtToken);
-        if (isTurnkeyProviderEnabled &&
-            ((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _b === void 0 ? void 0 : _b.automaticEmbeddedWalletCreation) &&
-            !primaryWallet) {
-            // Don't create the user right now
-            // It will be done after the wallet creation
-            return verifyEmailResponse;
-        }
         yield updateUserProfileByJWT(verifyEmailResponse.jwt);
         return verifyEmailResponse;
     }), [
         emailVerificationContextVerificationUUID,
         environmentId,
-        isTurnkeyProviderEnabled,
         jwtToken,
-        primaryWallet,
-        (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.automaticEmbeddedWalletCreation,
         updateUserProfileByJWT,
     ]);
     return { verifyEmail: verifyEmail$1 };

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

@@ -64,7 +64,8 @@ const useAuthLayoutChecks = (walletConnector) => {
             // Don't show empty footer during the login
             ((view === 'login-with-email-or-wallet' ||
                 view === 'login-with-email-or-wallet-full-wallet-list' ||
-                view === 'login-with-wallet-only') &&
+                view === 'login-with-wallet-only' ||
+                view === 'multi-wallet-wallet-list') &&
                 (termsOfServiceUrl ||
                     privacyPolicyUrl ||
                     customPrivacyPolicy ||
@@ -94,7 +95,7 @@ const useAuthLayoutChecks = (walletConnector) => {
         view === 'passkey-intro' ||
         (view === 'merge-user-accounts' && !user);
     const showQrCodePreHeader = view === 'qr-code' && showQrCodeMessage && !showQrCodeImage;
-    const showDefaultFooter = !showDynamicFooter && !showToSFooter;
+    const showDefaultFooter = !showConnectedWalletProgress && !showDynamicFooter && !showToSFooter;
     return {
         displayBorderBelowHeader,
         isWalletListTypeView,

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

@@ -60,7 +60,8 @@ const useAuthLayoutChecks = (walletConnector) => {
             // Don't show empty footer during the login
             ((view === 'login-with-email-or-wallet' ||
                 view === 'login-with-email-or-wallet-full-wallet-list' ||
-                view === 'login-with-wallet-only') &&
+                view === 'login-with-wallet-only' ||
+                view === 'multi-wallet-wallet-list') &&
                 (termsOfServiceUrl ||
                     privacyPolicyUrl ||
                     customPrivacyPolicy ||
@@ -90,7 +91,7 @@ const useAuthLayoutChecks = (walletConnector) => {
         view === 'passkey-intro' ||
         (view === 'merge-user-accounts' && !user);
     const showQrCodePreHeader = view === 'qr-code' && showQrCodeMessage && !showQrCodeImage;
-    const showDefaultFooter = !showDynamicFooter && !showToSFooter;
+    const showDefaultFooter = !showConnectedWalletProgress && !showDynamicFooter && !showToSFooter;
     return {
         displayBorderBelowHeader,
         isWalletListTypeView,

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

@@ -5,10 +5,10 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var React = require('react');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useInternalDynamicContext.cjs');
 var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
+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('@dynamic-labs/wallet-book');
 require('../../constants/colors.cjs');

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

@@ -1,10 +1,10 @@
 import { useEffect } from 'react';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
 import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
+import '@dynamic-labs/wallet-connector-core';
 import '@dynamic-labs/sdk-api';
 import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
-import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '@dynamic-labs/wallet-book';
 import '../../constants/colors.js';

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

@@ -6,11 +6,11 @@ var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var createEmbeddedWalletWithPasskey = require('../../../views/Passkey/utils/createEmbeddedWalletWithPasskey/createEmbeddedWalletWithPasskey.cjs');
 var findPasskeyEmailWalletConnector = require('../../../views/Passkey/utils/findPasskeyEmailWalletConnector/findPasskeyEmailWalletConnector.cjs');
 var createPregeneratedWallet = require('../../../views/Passkey/utils/createPregeneratedWallet/createPregeneratedWallet.cjs');
+require('@dynamic-labs/wallet-connector-core');
 var createUserProfile = require('../../functions/createUserProfile/createUserProfile.cjs');
 require('@dynamic-labs/sdk-api');
 var logger = require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
-require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('react');

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

@@ -2,11 +2,11 @@ import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { createEmbeddedWalletWithPasskey } from '../../../views/Passkey/utils/createEmbeddedWalletWithPasskey/createEmbeddedWalletWithPasskey.js';
 import { findPasskeyEmailWalletConnector } from '../../../views/Passkey/utils/findPasskeyEmailWalletConnector/findPasskeyEmailWalletConnector.js';
 import { createPregeneratedWallet } from '../../../views/Passkey/utils/createPregeneratedWallet/createPregeneratedWallet.js';
+import '@dynamic-labs/wallet-connector-core';
 import { createUserProfile } from '../../functions/createUserProfile/createUserProfile.js';
 import '@dynamic-labs/sdk-api';
 import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
-import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import 'react';

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

@@ -10,9 +10,9 @@ var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
 var useWalletItemActions = require('../useWalletItemActions/useWalletItemActions.cjs');
 var useConnectWithEmail = require('../useConnectWithEmail/useConnectWithEmail.cjs');
 var api = require('../../../data/api.cjs');
+require('@dynamic-labs/wallet-connector-core');
 require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
-require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('react');
 require('@dynamic-labs/wallet-book');
@@ -22,8 +22,11 @@ require('viem');
 require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
+var isProviderEnabled = require('../../functions/isProviderEnabled/isProviderEnabled.cjs');
 var isTurnkeyEnabled = require('../../functions/isTurnkeyEnabled/isTurnkeyEnabled.cjs');
 
+const checkMagicOrBloctoEnabled = (providers) => isProviderEnabled.isProviderEnabled(providers || [], sdkApi.ProviderEnum.MagicLink) ||
+    isProviderEnabled.isProviderEnabled(providers || [], sdkApi.ProviderEnum.Blocto);
 const useEmailProvider = ({ emailWalletConnector }) => {
     const { projectSettings, environmentId } = useInternalDynamicContext.useInternalDynamicContext();
     const { setEmail: setEmailForVerification, setVerificationUUID } = EmailVerificationContext.useEmailVerificationContext();
@@ -38,10 +41,7 @@ const useEmailProvider = ({ emailWalletConnector }) => {
     // this is enabled in the sense that we could use the given provider in the email form
     // for magic, as long as there are magic credentials available, then could have an email
     // address that is a magic address, even if magic was previously turned off in dashboard
-    const isMagicOrBloctoEnabled = isInjectedWalletProviderEnabled &&
-        Boolean(providers === null || providers === void 0 ? void 0 : providers.filter((provider) => (provider.provider === sdkApi.ProviderEnum.MagicLink &&
-            Boolean(provider.providerProjectId)) ||
-            (provider.enabledAt && provider.provider === sdkApi.ProviderEnum.Blocto)).length);
+    const isMagicOrBloctoEnabled = isInjectedWalletProviderEnabled && checkMagicOrBloctoEnabled(providers);
     const handleEmailOnlyLoginSubmit = (emailInput, captchaToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const { email, verificationUUID } = yield api.createEmailVerification({
             captchaToken,
@@ -89,4 +89,5 @@ const useEmailProvider = ({ emailWalletConnector }) => {
     };
 };
 
+exports.checkMagicOrBloctoEnabled = checkMagicOrBloctoEnabled;
 exports.useEmailProvider = useEmailProvider;

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

@@ -1,7 +1,9 @@
 import { IEmailWalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { Provider } from '@dynamic-labs/sdk-api';
 type Props = {
     emailWalletConnector: IEmailWalletConnector | undefined;
 };
+export declare const checkMagicOrBloctoEnabled: (providers: Provider[] | undefined) => boolean;
 export declare const useEmailProvider: ({ emailWalletConnector }: Props) => {
     handleEmailSubmitWithOptionalCaptcha: (emailInput: string, captchaToken?: string) => Promise<void>;
     isEmailProviderLoading: boolean;

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

@@ -6,9 +6,9 @@ import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
 import { useWalletItemActions } from '../useWalletItemActions/useWalletItemActions.js';
 import { useConnectWithEmail } from '../useConnectWithEmail/useConnectWithEmail.js';
 import { getEmailProvider, createEmailVerification } from '../../../data/api.js';
+import '@dynamic-labs/wallet-connector-core';
 import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
-import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import 'react';
 import '@dynamic-labs/wallet-book';
@@ -18,8 +18,11 @@ import 'viem';
 import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
+import { isProviderEnabled } from '../../functions/isProviderEnabled/isProviderEnabled.js';
 import { isTurnkeyEnabled } from '../../functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
 
+const checkMagicOrBloctoEnabled = (providers) => isProviderEnabled(providers || [], ProviderEnum.MagicLink) ||
+    isProviderEnabled(providers || [], ProviderEnum.Blocto);
 const useEmailProvider = ({ emailWalletConnector }) => {
     const { projectSettings, environmentId } = useInternalDynamicContext();
     const { setEmail: setEmailForVerification, setVerificationUUID } = useEmailVerificationContext();
@@ -34,10 +37,7 @@ const useEmailProvider = ({ emailWalletConnector }) => {
     // this is enabled in the sense that we could use the given provider in the email form
     // for magic, as long as there are magic credentials available, then could have an email
     // address that is a magic address, even if magic was previously turned off in dashboard
-    const isMagicOrBloctoEnabled = isInjectedWalletProviderEnabled &&
-        Boolean(providers === null || providers === void 0 ? void 0 : providers.filter((provider) => (provider.provider === ProviderEnum.MagicLink &&
-            Boolean(provider.providerProjectId)) ||
-            (provider.enabledAt && provider.provider === ProviderEnum.Blocto)).length);
+    const isMagicOrBloctoEnabled = isInjectedWalletProviderEnabled && checkMagicOrBloctoEnabled(providers);
     const handleEmailOnlyLoginSubmit = (emailInput, captchaToken) => __awaiter(void 0, void 0, void 0, function* () {
         const { email, verificationUUID } = yield createEmailVerification({
             captchaToken,
@@ -85,4 +85,4 @@ const useEmailProvider = ({ emailWalletConnector }) => {
     };
 };
 
-export { useEmailProvider };
+export { checkMagicOrBloctoEnabled, useEmailProvider };

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

@@ -27,14 +27,12 @@ var isEmbeddedWalletPresent = require('../../functions/isEmbeddedWalletPresent/i
 var isTurnkeyEnabled = require('../../functions/isTurnkeyEnabled/isTurnkeyEnabled.cjs');
 var smartWallet = require('../useWalletConnectors/utils/smartWallet/smartWallet.cjs');
 var useCreateDynamicEmbeddedWalletMutation = require('../useCreateDynamicEmbeddedWalletMutation/useCreateDynamicEmbeddedWalletMutation.cjs');
-var useCreateUserProfileByJWTCallback = require('../useCreateUserProfileByJWTCallback/useCreateUserProfileByJWTCallback.cjs');
 
 // Hook exposed to customers and used internally to trigger embedded wallet creation
 const useEmbeddedWallet = () => {
     const { projectSettings, onboardingOnlyJwt, setPrimaryWalletId, walletConnectorOptions, internalSetShowAuthFlow, internalEvents, 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;
@@ -87,7 +85,6 @@ const useEmbeddedWallet = () => {
         // 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({

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

@@ -23,14 +23,12 @@ import { isEmbeddedWalletPresent } from '../../functions/isEmbeddedWalletPresent
 import { isTurnkeyEnabled } from '../../functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
 import { findSmartWallet, initializeSmartWallet } from '../useWalletConnectors/utils/smartWallet/smartWallet.js';
 import { useCreateDynamicEmbeddedWalletMutation } from '../useCreateDynamicEmbeddedWalletMutation/useCreateDynamicEmbeddedWalletMutation.js';
-import { useCreateUserProfileByJWTCallback } from '../useCreateUserProfileByJWTCallback/useCreateUserProfileByJWTCallback.js';
 
 // Hook exposed to customers and used internally to trigger embedded wallet creation
 const useEmbeddedWallet = () => {
     const { projectSettings, onboardingOnlyJwt, setPrimaryWalletId, walletConnectorOptions, internalSetShowAuthFlow, internalEvents, 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;
@@ -83,7 +81,6 @@ const useEmbeddedWallet = () => {
         // 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({

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

@@ -20,7 +20,7 @@ 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 +35,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,
@@ -50,12 +51,17 @@ const useHandleUnlinkWallet = ({ verifiedCredentials, environmentId, primaryWall
         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;
 };

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

@@ -1,12 +1,14 @@
 import { Dispatch, SetStateAction } from 'react';
 import { JwtVerifiedCredential } from '@dynamic-labs/sdk-api';
-import { UserProfile, Wallet } from '../../../shared';
+import { DynamicEventsCallbacks, UserProfile, Wallet } from '../../../shared';
 type UseHandleUnlinkProps = {
     environmentId: string;
     primaryWalletId: string | undefined;
     secondaryWallets: Wallet[];
     setUser: Dispatch<SetStateAction<UserProfile | undefined>>;
     verifiedCredentials: JwtVerifiedCredential[];
+    eventsCallbacks: DynamicEventsCallbacks | undefined;
+    user: UserProfile | undefined;
 };
-export declare const useHandleUnlinkWallet: ({ verifiedCredentials, environmentId, primaryWalletId, secondaryWallets, setUser, }: UseHandleUnlinkProps) => (walletId: string) => Promise<void>;
+export declare const useHandleUnlinkWallet: ({ verifiedCredentials, environmentId, primaryWalletId, secondaryWallets, setUser, user, eventsCallbacks, }: UseHandleUnlinkProps) => (walletId: string) => Promise<void>;
 export {};

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

@@ -16,7 +16,7 @@ import '../../../shared/consts/index.js';
 import { handleUnlinkHelper } from '../../functions/handleUnlinkHelper/handleUnlinkHelper.js';
 import { isSameWalletName } from '../../functions/isSameWalletName/isSameWalletName.js';
 
-const useHandleUnlinkWallet = ({ verifiedCredentials, environmentId, primaryWalletId, secondaryWallets, setUser, }) => {
+const useHandleUnlinkWallet = ({ verifiedCredentials, environmentId, primaryWalletId, secondaryWallets, setUser, user, eventsCallbacks, }) => {
     const callback = useCallback((walletId) => __awaiter(void 0, void 0, void 0, function* () {
         var _a;
         // when we call handleUnlinkWallet on the same execution stack as setPrimaryWallet, the value of
@@ -31,6 +31,7 @@ const useHandleUnlinkWallet = ({ verifiedCredentials, environmentId, primaryWall
         const currentPrimaryWalletId = (_a = LocalStorage.getFromLS(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({
             environmentId,
             primaryWalletId: currentPrimaryWalletId,
@@ -46,12 +47,17 @@ const useHandleUnlinkWallet = ({ verifiedCredentials, environmentId, primaryWall
         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;
 };

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

@@ -5,10 +5,10 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var useInternalDynamicContext = require('../../../context/DynamicContext/useInternalDynamicContext.cjs');
 var useOnlyConnectedMode = require('../useOnlyConnectedMode/useOnlyConnectedMode.cjs');
 var getUserProfileFields = require('../../functions/getUserProfileFields/getUserProfileFields.cjs');
+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('react');

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

@@ -1,10 +1,10 @@
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
 import { useOnlyConnectedMode } from '../useOnlyConnectedMode/useOnlyConnectedMode.js';
 import { getUserProfileFields } from '../../functions/getUserProfileFields/getUserProfileFields.js';
+import '@dynamic-labs/wallet-connector-core';
 import '@dynamic-labs/sdk-api';
 import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
-import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import 'react';

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

@@ -7,10 +7,10 @@ var React = require('react');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useInternalDynamicContext.cjs');
 var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
 var constants = require('../../../views/Passkey/PasskeyRecovery/constants.cjs');
+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('@dynamic-labs/wallet-book');
 require('../../constants/colors.cjs');

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

@@ -3,10 +3,10 @@ import { useCallback } from 'react';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
 import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
 import { iframeContainerId } from '../../../views/Passkey/PasskeyRecovery/constants.js';
+import '@dynamic-labs/wallet-connector-core';
 import '@dynamic-labs/sdk-api';
 import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
-import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '@dynamic-labs/wallet-book';
 import '../../constants/colors.js';

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

@@ -8,10 +8,10 @@ var types = require('@dynamic-labs/types');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useInternalDynamicContext.cjs');
 var api = require('../../../data/api.cjs');
 var useUpdateUserProfileByJWTCallback = require('../useUpdateUserProfileByJWTCallback/useUpdateUserProfileByJWTCallback.cjs');
+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');

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

@@ -4,10 +4,10 @@ import { SocialOAuthErrorCode } from '@dynamic-labs/types';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
 import { unlinkOAuth } from '../../../data/api.js';
 import { useUpdateUserProfileByJWTCallback } from '../useUpdateUserProfileByJWTCallback/useUpdateUserProfileByJWTCallback.js';
+import '@dynamic-labs/wallet-connector-core';
 import '@dynamic-labs/sdk-api';
 import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
-import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';

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

@@ -10,11 +10,11 @@ var utils = require('@dynamic-labs/utils');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useInternalDynamicContext.cjs');
 var api = require('../../../data/api.cjs');
 var useUpdateUserProfileByJWTCallback = require('../useUpdateUserProfileByJWTCallback/useUpdateUserProfileByJWTCallback.cjs');
+require('@dynamic-labs/wallet-connector-core');
 var digestSHA256 = require('../../functions/digestSHA256/digestSHA256.cjs');
 var encodeBase64URL = require('../../functions/encodeBase64URL/encodeBase64URL.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');
@@ -27,9 +27,7 @@ require('@dynamic-labs/multi-wallet');
 var getAuthToken = require('../../functions/getAuthToken/getAuthToken.cjs');
 var getOauthLoginUrl = require('../../functions/getOauthLoginUrl/getOauthLoginUrl.cjs');
 var getProviderByType = require('../../functions/getProviderByType/getProviderByType.cjs');
-var isTurnkeyEnabled = require('../../functions/isTurnkeyEnabled/isTurnkeyEnabled.cjs');
 var randomString = require('../../functions/randomString/randomString.cjs');
-var index = require('../../functions/storeAuthToken/index.cjs');
 var stringifyURIQuery = require('../../functions/stringifyURIQuery/stringifyURIQuery.cjs');
 var useCreateUserProfileByJWTCallback = require('../useCreateUserProfileByJWTCallback/useCreateUserProfileByJWTCallback.cjs');
 var ErrorContext = require('../../../context/ErrorContext/ErrorContext.cjs');
@@ -60,7 +58,6 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
     const { createEmbeddedWallet } = useEmbeddedWallet.useEmbeddedWallet();
     const [isProcessing, setIsProcessing] = React.useState(false);
     const [error, setError] = React.useState();
-    const isTurnkeyProviderEnabled = isTurnkeyEnabled.isTurnkeyEnabled(projectSettings);
     const providersWaitingOauthMessage = React.useRef({});
     const authWindowInterval = React.useRef();
     const shouldPool = React.useRef(false);
@@ -150,25 +147,22 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
                 return;
             }
             setCallback('authSuccess');
-            if (isTurnkeyProviderEnabled &&
-                ((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _b === void 0 ? void 0 : _b.automaticEmbeddedWalletCreation)) {
-                try {
-                    index.storeAuthToken(jwt);
-                    // this function will check turnkey wallet enabled and create wallet if needed
-                    // if not enabled, it will throw an error.
-                    yield createEmbeddedWallet();
-                    onSettled === null || onSettled === void 0 ? void 0 : onSettled();
-                }
-                catch (e) {
-                    yield createUserProfileByJWT(jwt);
-                    setShowAuthFlow(false);
-                    onSettled === null || onSettled === void 0 ? void 0 : onSettled();
-                }
+            yield createUserProfileByJWT(jwt);
+            if (!((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _b === void 0 ? void 0 : _b.automaticEmbeddedWalletCreation)) {
+                setShowAuthFlow(false);
+                onSettled === null || onSettled === void 0 ? void 0 : onSettled();
                 return;
             }
-            yield createUserProfileByJWT(jwt);
-            setShowAuthFlow(false);
-            onSettled === null || onSettled === void 0 ? void 0 : onSettled();
+            try {
+                // this function will check turnkey wallet enabled and create wallet if needed
+                // if not enabled, it will throw an error.
+                yield createEmbeddedWallet();
+                onSettled === null || onSettled === void 0 ? void 0 : onSettled();
+            }
+            catch (e) {
+                setShowAuthFlow(false);
+                onSettled === null || onSettled === void 0 ? void 0 : onSettled();
+            }
         }
         catch (error) {
             if (error instanceof utils.NoAccessError) {

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

@@ -6,11 +6,11 @@ import { isMobile, SocialAccountAlreadyExistsError, NoAccessError } from '@dynam
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
 import { getOAuthResult, verifyOAuth, signInOAuth } from '../../../data/api.js';
 import { useUpdateUserProfileByJWTCallback } from '../useUpdateUserProfileByJWTCallback/useUpdateUserProfileByJWTCallback.js';
+import '@dynamic-labs/wallet-connector-core';
 import { digestSHA256 } from '../../functions/digestSHA256/digestSHA256.js';
 import { encodeBase64URL } from '../../functions/encodeBase64URL/encodeBase64URL.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';
@@ -23,9 +23,7 @@ import '@dynamic-labs/multi-wallet';
 import { getAuthToken } from '../../functions/getAuthToken/getAuthToken.js';
 import { getOauthLoginUrl } from '../../functions/getOauthLoginUrl/getOauthLoginUrl.js';
 import { getProviderByType } from '../../functions/getProviderByType/getProviderByType.js';
-import { isTurnkeyEnabled } from '../../functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
 import { randomString } from '../../functions/randomString/randomString.js';
-import { storeAuthToken } from '../../functions/storeAuthToken/index.js';
 import { stringifyURIQuery } from '../../functions/stringifyURIQuery/stringifyURIQuery.js';
 import { useCreateUserProfileByJWTCallback } from '../useCreateUserProfileByJWTCallback/useCreateUserProfileByJWTCallback.js';
 import { useErrorContext } from '../../../context/ErrorContext/ErrorContext.js';
@@ -56,7 +54,6 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
     const { createEmbeddedWallet } = useEmbeddedWallet();
     const [isProcessing, setIsProcessing] = useState(false);
     const [error, setError] = useState();
-    const isTurnkeyProviderEnabled = isTurnkeyEnabled(projectSettings);
     const providersWaitingOauthMessage = useRef({});
     const authWindowInterval = useRef();
     const shouldPool = useRef(false);
@@ -146,25 +143,22 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
                 return;
             }
             setCallback('authSuccess');
-            if (isTurnkeyProviderEnabled &&
-                ((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _b === void 0 ? void 0 : _b.automaticEmbeddedWalletCreation)) {
-                try {
-                    storeAuthToken(jwt);
-                    // this function will check turnkey wallet enabled and create wallet if needed
-                    // if not enabled, it will throw an error.
-                    yield createEmbeddedWallet();
-                    onSettled === null || onSettled === void 0 ? void 0 : onSettled();
-                }
-                catch (e) {
-                    yield createUserProfileByJWT(jwt);
-                    setShowAuthFlow(false);
-                    onSettled === null || onSettled === void 0 ? void 0 : onSettled();
-                }
+            yield createUserProfileByJWT(jwt);
+            if (!((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _b === void 0 ? void 0 : _b.automaticEmbeddedWalletCreation)) {
+                setShowAuthFlow(false);
+                onSettled === null || onSettled === void 0 ? void 0 : onSettled();
                 return;
             }
-            yield createUserProfileByJWT(jwt);
-            setShowAuthFlow(false);
-            onSettled === null || onSettled === void 0 ? void 0 : onSettled();
+            try {
+                // this function will check turnkey wallet enabled and create wallet if needed
+                // if not enabled, it will throw an error.
+                yield createEmbeddedWallet();
+                onSettled === null || onSettled === void 0 ? void 0 : onSettled();
+            }
+            catch (e) {
+                setShowAuthFlow(false);
+                onSettled === null || onSettled === void 0 ? void 0 : onSettled();
+            }
         }
         catch (error) {
             if (error instanceof NoAccessError) {