@dynamic-labs/sdk-react-core 1.1.0-alpha.10 → 1.1.0-alpha.11

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, { emitCancelAuth: true });
-                    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, { emitCancelAuth: true });
+                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, { emitCancelAuth: true });
-                    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, { emitCancelAuth: true });
+                onSettled === null || onSettled === void 0 ? void 0 : onSettled();
+            }
         }
         catch (error) {
             if (error instanceof NoAccessError) {

package/src/lib/utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs

@@ -25,8 +25,6 @@ require('../../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');
 require('@dynamic-labs/sdk-api');
-var isTurnkeyEnabled = require('../../../functions/isTurnkeyEnabled/isTurnkeyEnabled.cjs');
-var index = require('../../../functions/storeAuthToken/index.cjs');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 var useEmailVerificationRequest = require('../../authenticationHooks/useEmailVerificationRequest/useEmailVerificationRequest.cjs');
@@ -56,14 +54,13 @@ const userFieldsSchema = yup.object().shape({
     username: yup.string(),
 });
 const useUpdateUser = (validationSchemaStripUnknown) => {
-    const { authToken, onboardingOnlyJwt, environmentId, projectSettings, primaryWallet, } = useInternalDynamicContext.useInternalDynamicContext();
-    const isTurnkeyProviderEnabled = isTurnkeyEnabled.isTurnkeyEnabled(projectSettings);
+    const { authToken, onboardingOnlyJwt, environmentId } = useInternalDynamicContext.useInternalDynamicContext();
     const jwtToken = onboardingOnlyJwt || authToken;
     const { setVerificationUUID, setEmail } = EmailVerificationContext.useEmailVerificationContext();
     const { verifyEmail } = useEmailVerificationRequest.useEmailVerificationRequest();
     const { updateUserProfileByJWT } = useUpdateUserProfileByJWTCallback.useUpdateUserProfileByJWTCallback();
     return React.useCallback((userFields, userEnvironmentId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         // `stripUnknown: true` will automatically strip out any values in the metadata object
         // so we need to pull out the metadata object here and then re-add it after stripping unknown fields
         const { metadata } = userFields;
@@ -75,25 +72,6 @@ const useUpdateUser = (validationSchemaStripUnknown) => {
         const decodedJwt = decodeJwt.decodeJwt(updateUserProfileResponse.jwt);
         const missingFields = (_a = decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.missingFields) !== null && _a !== void 0 ? _a : [];
         const _isEmailVerificationRequired = isEmailVerificationRequired.isEmailVerificationRequired(updateUserProfileResponse);
-        // This is to handle properly the embedded wallet creation.
-        // In that case we shouldn't create a user. Only store the JWT in the localstorage
-        // The user will be created after generating the wallet.
-        // This should be called only when:
-        // Turnkey is enabled
-        // automaticEmbeddedWalletCreation is set to true
-        // there is no emailVerificationRequired -> it's already verified
-        // there is no primaryWallet -> it means that the user is already logged in
-        if (isTurnkeyProviderEnabled &&
-            ((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _b === void 0 ? void 0 : _b.automaticEmbeddedWalletCreation) &&
-            !_isEmailVerificationRequired &&
-            !primaryWallet) {
-            index.storeAuthToken(updateUserProfileResponse.jwt);
-            return {
-                isEmailVerificationRequired: false,
-                missingFields,
-                updateUserProfileResponse,
-            };
-        }
         if (!_isEmailVerificationRequired) {
             // If email verification is not needed then we can update the user profile immediately.
             yield updateUserProfileByJWT(updateUserProfileResponse.jwt);
@@ -104,8 +82,8 @@ const useUpdateUser = (validationSchemaStripUnknown) => {
             };
         }
         // We update EmailContext to use this information in the Email Verification view
-        setEmail((_c = updateUserProfileResponse.emailVerification) === null || _c === void 0 ? void 0 : _c.email);
-        setVerificationUUID((_d = updateUserProfileResponse.emailVerification) === null || _d === void 0 ? void 0 : _d.verificationUUID);
+        setEmail((_b = updateUserProfileResponse.emailVerification) === null || _b === void 0 ? void 0 : _b.email);
+        setVerificationUUID((_c = updateUserProfileResponse.emailVerification) === null || _c === void 0 ? void 0 : _c.verificationUUID);
         // DYN-2046 - Customers have the opportunity to programmatically use our email verification and profile editing.
         // VerifyEmailFN was scoped to bypass the problem with memoization of the state at the beginning of Promise.
         // setEmail and setVerificationUUID in the above lines will are not visible in this promise.

package/src/lib/utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.js

@@ -21,8 +21,6 @@ import '../../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
 import '@dynamic-labs/sdk-api';
-import { isTurnkeyEnabled } from '../../../functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
-import { storeAuthToken } from '../../../functions/storeAuthToken/index.js';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
 import { useEmailVerificationRequest } from '../../authenticationHooks/useEmailVerificationRequest/useEmailVerificationRequest.js';
@@ -52,14 +50,13 @@ const userFieldsSchema = object().shape({
     username: string(),
 });
 const useUpdateUser = (validationSchemaStripUnknown) => {
-    const { authToken, onboardingOnlyJwt, environmentId, projectSettings, primaryWallet, } = useInternalDynamicContext();
-    const isTurnkeyProviderEnabled = isTurnkeyEnabled(projectSettings);
+    const { authToken, onboardingOnlyJwt, environmentId } = useInternalDynamicContext();
     const jwtToken = onboardingOnlyJwt || authToken;
     const { setVerificationUUID, setEmail } = useEmailVerificationContext();
     const { verifyEmail } = useEmailVerificationRequest();
     const { updateUserProfileByJWT } = useUpdateUserProfileByJWTCallback();
     return useCallback((userFields, userEnvironmentId) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         // `stripUnknown: true` will automatically strip out any values in the metadata object
         // so we need to pull out the metadata object here and then re-add it after stripping unknown fields
         const { metadata } = userFields;
@@ -71,25 +68,6 @@ const useUpdateUser = (validationSchemaStripUnknown) => {
         const decodedJwt = decodeJwt(updateUserProfileResponse.jwt);
         const missingFields = (_a = decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.missingFields) !== null && _a !== void 0 ? _a : [];
         const _isEmailVerificationRequired = isEmailVerificationRequired(updateUserProfileResponse);
-        // This is to handle properly the embedded wallet creation.
-        // In that case we shouldn't create a user. Only store the JWT in the localstorage
-        // The user will be created after generating the wallet.
-        // This should be called only when:
-        // Turnkey is enabled
-        // automaticEmbeddedWalletCreation is set to true
-        // there is no emailVerificationRequired -> it's already verified
-        // there is no primaryWallet -> it means that the user is already logged in
-        if (isTurnkeyProviderEnabled &&
-            ((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _b === void 0 ? void 0 : _b.automaticEmbeddedWalletCreation) &&
-            !_isEmailVerificationRequired &&
-            !primaryWallet) {
-            storeAuthToken(updateUserProfileResponse.jwt);
-            return {
-                isEmailVerificationRequired: false,
-                missingFields,
-                updateUserProfileResponse,
-            };
-        }
         if (!_isEmailVerificationRequired) {
             // If email verification is not needed then we can update the user profile immediately.
             yield updateUserProfileByJWT(updateUserProfileResponse.jwt);
@@ -100,8 +78,8 @@ const useUpdateUser = (validationSchemaStripUnknown) => {
             };
         }
         // We update EmailContext to use this information in the Email Verification view
-        setEmail((_c = updateUserProfileResponse.emailVerification) === null || _c === void 0 ? void 0 : _c.email);
-        setVerificationUUID((_d = updateUserProfileResponse.emailVerification) === null || _d === void 0 ? void 0 : _d.verificationUUID);
+        setEmail((_b = updateUserProfileResponse.emailVerification) === null || _b === void 0 ? void 0 : _b.email);
+        setVerificationUUID((_c = updateUserProfileResponse.emailVerification) === null || _c === void 0 ? void 0 : _c.verificationUUID);
         // DYN-2046 - Customers have the opportunity to programmatically use our email verification and profile editing.
         // VerifyEmailFN was scoped to bypass the problem with memoization of the state at the beginning of Promise.
         // setEmail and setVerificationUUID in the above lines will are not visible in this promise.

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

@@ -38,11 +38,12 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
     const { setExistentAccountData } = AccountExistsContext.useAccountExistsContext();
     const { setView, goToInitialView } = ViewContext.useViewContext();
     const { setErrorMessage, setError } = ErrorContext.useErrorContext();
-    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallets, authMode, setOnboardingOnlyJwt, authToken, setAuthMode, removeConnectedWalletsInfo, setIsVerificationInProgress, eventsCallbacks, primaryWallet, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallets, authMode, setOnboardingOnlyJwt, authToken, setAuthMode, removeConnectedWalletsInfo, setIsVerificationInProgress, eventsCallbacks, primaryWallet, enableConnectOnlyFallback, setMultiWalletWidgetState, setLogInWithEmail, } = useInternalDynamicContext.useInternalDynamicContext();
     // If the user is not already logged it means that we only need to verify
     // We need this boolean for the part of the logic where we already persisted a new authToken,
     // and need to distinguish between logic for verify or linking.
     const verifyOnly = !authToken;
+    const shouldFallbackToConnectOnly = enableConnectOnlyFallback && (verifyOnly || !multiWalletEnabled);
     const generateJWT = (walletConnector, walletProvider, fetchPublicAddressOpts, publicWalletAddress, captchaToken, oauth) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         let Jwt;
         const nonce = consumeNonce();
@@ -104,25 +105,33 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
             setIsSingleWalletAccount(true);
         }
     };
-    const handleError = (e, walletConnector, address, oauth) => {
+    const handleDisconnectWallet = ({ walletConnector, endSession = true, }) => {
         removeConnectedWalletsInfo();
         // Ensure auth verification flag is taken down
         setIsVerificationInProgress(false);
+        if (endSession)
+            walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.endSession();
+    };
+    const handleError = (e, walletConnector, address, oauth) => {
+        var _a;
         if (e instanceof utils.WalletUsedError) {
+            handleDisconnectWallet({ endSession: false, walletConnector });
             return handleWalletUsedError(e);
         }
-        walletConnector.endSession();
         if (e instanceof utils.ChainalysisError) {
+            handleDisconnectWallet({ walletConnector });
             setDeniedAddress(address);
             setView('chainalysis-blocked-wallet');
             return;
         }
         if (e instanceof utils.GateBlockedError) {
+            handleDisconnectWallet({ walletConnector });
             setDeniedAddress(address);
             setView('gate-blocked-wallet');
             return;
         }
         if (e instanceof utils.NoAccessError) {
+            handleDisconnectWallet({ walletConnector });
             setDeniedAddress(address);
             // we need to set this value if it's magic in order to set proper icon
             if (walletConnectorCore.isSocialWalletConnector(walletConnector)) {
@@ -132,6 +141,7 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
             return;
         }
         if (e instanceof utils.AccountExistsError) {
+            handleDisconnectWallet({ walletConnector });
             setExistentAccountData(e.errorPayload);
             setView('account-exists');
             return;
@@ -139,7 +149,19 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
         if (connectedWallets.length && authMode === 'connect-only') {
             throw new utils.DynamicError(e.message);
         }
-        goToInitialView();
+        const userRejectedRequestError = (_a = e === null || e === void 0 ? void 0 : e.message) === null || _a === void 0 ? void 0 : _a.includes('User rejected the request');
+        const fallbackToConnectOnly = shouldFallbackToConnectOnly && !userRejectedRequestError;
+        if (fallbackToConnectOnly) {
+            logger.logger.warn('Verification failed, changing to connect-only');
+            // verification failed for unknown reason, set authmode to connect-only and show wallet list
+            setAuthMode('connect-only');
+            setView('wallet-list');
+            setIsVerificationInProgress(false);
+        }
+        else {
+            handleDisconnectWallet({ walletConnector });
+            goToInitialView();
+        }
         logger.logger.error(e);
         if (debugError) {
             setError(`${e.message}\n ${e.stack}`);
@@ -179,7 +201,9 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
             }
             index.storeAuthToken(Jwt);
             setOnboardingOnlyJwt(undefined);
+            setMultiWalletWidgetState('idle');
             setUser(user); // The user should only be set if no KYC is needed.
+            setLogInWithEmail(false);
             setShowAuthFlow(false);
             /* istanbul ignore else */
             if (verifyOnly) {

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

@@ -34,11 +34,12 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
     const { setExistentAccountData } = useAccountExistsContext();
     const { setView, goToInitialView } = useViewContext();
     const { setErrorMessage, setError } = useErrorContext();
-    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallets, authMode, setOnboardingOnlyJwt, authToken, setAuthMode, removeConnectedWalletsInfo, setIsVerificationInProgress, eventsCallbacks, primaryWallet, } = useInternalDynamicContext();
+    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallets, authMode, setOnboardingOnlyJwt, authToken, setAuthMode, removeConnectedWalletsInfo, setIsVerificationInProgress, eventsCallbacks, primaryWallet, enableConnectOnlyFallback, setMultiWalletWidgetState, setLogInWithEmail, } = useInternalDynamicContext();
     // If the user is not already logged it means that we only need to verify
     // We need this boolean for the part of the logic where we already persisted a new authToken,
     // and need to distinguish between logic for verify or linking.
     const verifyOnly = !authToken;
+    const shouldFallbackToConnectOnly = enableConnectOnlyFallback && (verifyOnly || !multiWalletEnabled);
     const generateJWT = (walletConnector, walletProvider, fetchPublicAddressOpts, publicWalletAddress, captchaToken, oauth) => __awaiter(void 0, void 0, void 0, function* () {
         let Jwt;
         const nonce = consumeNonce();
@@ -100,25 +101,33 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
             setIsSingleWalletAccount(true);
         }
     };
-    const handleError = (e, walletConnector, address, oauth) => {
+    const handleDisconnectWallet = ({ walletConnector, endSession = true, }) => {
         removeConnectedWalletsInfo();
         // Ensure auth verification flag is taken down
         setIsVerificationInProgress(false);
+        if (endSession)
+            walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.endSession();
+    };
+    const handleError = (e, walletConnector, address, oauth) => {
+        var _a;
         if (e instanceof WalletUsedError) {
+            handleDisconnectWallet({ endSession: false, walletConnector });
             return handleWalletUsedError(e);
         }
-        walletConnector.endSession();
         if (e instanceof ChainalysisError) {
+            handleDisconnectWallet({ walletConnector });
             setDeniedAddress(address);
             setView('chainalysis-blocked-wallet');
             return;
         }
         if (e instanceof GateBlockedError) {
+            handleDisconnectWallet({ walletConnector });
             setDeniedAddress(address);
             setView('gate-blocked-wallet');
             return;
         }
         if (e instanceof NoAccessError) {
+            handleDisconnectWallet({ walletConnector });
             setDeniedAddress(address);
             // we need to set this value if it's magic in order to set proper icon
             if (isSocialWalletConnector(walletConnector)) {
@@ -128,6 +137,7 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
             return;
         }
         if (e instanceof AccountExistsError) {
+            handleDisconnectWallet({ walletConnector });
             setExistentAccountData(e.errorPayload);
             setView('account-exists');
             return;
@@ -135,7 +145,19 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
         if (connectedWallets.length && authMode === 'connect-only') {
             throw new DynamicError(e.message);
         }
-        goToInitialView();
+        const userRejectedRequestError = (_a = e === null || e === void 0 ? void 0 : e.message) === null || _a === void 0 ? void 0 : _a.includes('User rejected the request');
+        const fallbackToConnectOnly = shouldFallbackToConnectOnly && !userRejectedRequestError;
+        if (fallbackToConnectOnly) {
+            logger.warn('Verification failed, changing to connect-only');
+            // verification failed for unknown reason, set authmode to connect-only and show wallet list
+            setAuthMode('connect-only');
+            setView('wallet-list');
+            setIsVerificationInProgress(false);
+        }
+        else {
+            handleDisconnectWallet({ walletConnector });
+            goToInitialView();
+        }
         logger.error(e);
         if (debugError) {
             setError(`${e.message}\n ${e.stack}`);
@@ -175,7 +197,9 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
             }
             storeAuthToken(Jwt);
             setOnboardingOnlyJwt(undefined);
+            setMultiWalletWidgetState('idle');
             setUser(user); // The user should only be set if no KYC is needed.
+            setLogInWithEmail(false);
             setShowAuthFlow(false);
             /* istanbul ignore else */
             if (verifyOnly) {

package/src/lib/utils/hooks/useWalletConnectorOptions/utils/verifyMagicIsSetup/verifyMagicIsSetup.cjs

@@ -3,9 +3,9 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var sdkApi = require('@dynamic-labs/sdk-api');
+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('../../../../../context/ViewContext/ViewContext.cjs');
 require('react');

package/src/lib/utils/hooks/useWalletConnectorOptions/utils/verifyMagicIsSetup/verifyMagicIsSetup.js

@@ -1,7 +1,7 @@
 import { ProviderEnum } from '@dynamic-labs/sdk-api';
+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 '../../../../../context/ViewContext/ViewContext.js';
 import 'react';

package/src/lib/utils/hooks/useWalletConnectorOptions/utils/verifyZeroDevIsSetup/verifyZeroDevIsSetup.cjs

@@ -3,9 +3,9 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var sdkApi = require('@dynamic-labs/sdk-api');
+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('../../../../../context/ViewContext/ViewContext.cjs');
 require('react');

package/src/lib/utils/hooks/useWalletConnectorOptions/utils/verifyZeroDevIsSetup/verifyZeroDevIsSetup.js

@@ -1,7 +1,7 @@
 import { ProviderEnum } from '@dynamic-labs/sdk-api';
+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 '../../../../../context/ViewContext/ViewContext.js';
 import 'react';

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

@@ -18,6 +18,8 @@ require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 require('../../../shared/consts/index.cjs');
 var useWalletsConnectionState = require('../useWalletsConnectionState/useWalletsConnectionState.cjs');
+require('@dynamic-labs/multi-wallet');
+var getWalletIdentifier = require('../../functions/getWalletIdentifier/getWalletIdentifier.cjs');
 var reconnectSocialWallet = require('./reconnectSocialWallet.cjs');
 var createLinkedWalletsFromWalletOptions = require('./utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.cjs');
 var updateUserWalletsFromLinkedWallets = require('./utils/updateUserWalletsFromLinkedWallets/updateUserWalletsFromLinkedWallets.cjs');
@@ -64,12 +66,14 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, walletConn
         wallet.connector.initEventListener();
     }), [walletsBasedOnAuthMode]);
     const { connectedWalletMap, didConnectedStateLoad } = useWalletsConnectionState.useWalletsConnectionState(walletsBasedOnAuthMode);
-    const wallets = React.useMemo(() => walletsBasedOnAuthMode.map((wallet) => (Object.assign(Object.assign({}, wallet), { connected: Boolean(connectedWalletMap[wallet.id]) }))), [connectedWalletMap, walletsBasedOnAuthMode]);
+    const wallets = React.useMemo(() => walletsBasedOnAuthMode.map((wallet) => (Object.assign(Object.assign({}, wallet), { connected: Boolean(connectedWalletMap[getWalletIdentifier.getWalletIdentifier(wallet)]) }))), [connectedWalletMap, walletsBasedOnAuthMode]);
     const { setUserWallets } = UserWalletsContext.useInternalUserWallets();
     // Keep userWallets in sync whenever linkedWallets changes
     React.useEffect(() => {
-        setUserWallets((userWallets) => updateUserWalletsFromLinkedWallets.updateUserWalletsFromLinkedWallets(userWallets, wallets));
-    }, [setUserWallets, wallets]);
+        setUserWallets((userWallets) => didConnectedStateLoad
+            ? updateUserWalletsFromLinkedWallets.updateUserWalletsFromLinkedWallets(userWallets, wallets)
+            : userWallets);
+    }, [didConnectedStateLoad, setUserWallets, wallets]);
     const primaryWallet = React.useMemo(() => { var _a; return (_a = wallets.find((wallet) => wallet.id === primaryWalletId)) !== null && _a !== void 0 ? _a : null; }, [primaryWalletId, wallets]);
     const secondaryWallets = React.useMemo(() => canHaveMultipleWalletsConnected
         ? wallets.filter((wallet) => wallet.id !== primaryWalletId)

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

@@ -14,6 +14,8 @@ import '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import '../../../shared/consts/index.js';
 import { useWalletsConnectionState } from '../useWalletsConnectionState/useWalletsConnectionState.js';
+import '@dynamic-labs/multi-wallet';
+import { getWalletIdentifier } from '../../functions/getWalletIdentifier/getWalletIdentifier.js';
 import { reconnectSocialWallet } from './reconnectSocialWallet.js';
 import { createLinkedWalletsFromWalletOptions } from './utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.js';
 import { updateUserWalletsFromLinkedWallets } from './utils/updateUserWalletsFromLinkedWallets/updateUserWalletsFromLinkedWallets.js';
@@ -60,12 +62,14 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, walletConn
         wallet.connector.initEventListener();
     }), [walletsBasedOnAuthMode]);
     const { connectedWalletMap, didConnectedStateLoad } = useWalletsConnectionState(walletsBasedOnAuthMode);
-    const wallets = useMemo(() => walletsBasedOnAuthMode.map((wallet) => (Object.assign(Object.assign({}, wallet), { connected: Boolean(connectedWalletMap[wallet.id]) }))), [connectedWalletMap, walletsBasedOnAuthMode]);
+    const wallets = useMemo(() => walletsBasedOnAuthMode.map((wallet) => (Object.assign(Object.assign({}, wallet), { connected: Boolean(connectedWalletMap[getWalletIdentifier(wallet)]) }))), [connectedWalletMap, walletsBasedOnAuthMode]);
     const { setUserWallets } = useInternalUserWallets();
     // Keep userWallets in sync whenever linkedWallets changes
     useEffect(() => {
-        setUserWallets((userWallets) => updateUserWalletsFromLinkedWallets(userWallets, wallets));
-    }, [setUserWallets, wallets]);
+        setUserWallets((userWallets) => didConnectedStateLoad
+            ? updateUserWalletsFromLinkedWallets(userWallets, wallets)
+            : userWallets);
+    }, [didConnectedStateLoad, setUserWallets, wallets]);
     const primaryWallet = useMemo(() => { var _a; return (_a = wallets.find((wallet) => wallet.id === primaryWalletId)) !== null && _a !== void 0 ? _a : null; }, [primaryWalletId, wallets]);
     const secondaryWallets = useMemo(() => canHaveMultipleWalletsConnected
         ? wallets.filter((wallet) => wallet.id !== primaryWalletId)

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

@@ -8,10 +8,10 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useInte
 var ErrorContext = require('../../../context/ErrorContext/ErrorContext.cjs');
 var MockContext = require('../../../context/MockContext/MockContext.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('react');
 require('@dynamic-labs/wallet-book');
@@ -127,7 +127,7 @@ const useWalletItemActions = () => {
         }
         else if (utils.isMobile()) {
             // mobile wallets
-            if (walletConnector.name === 'WalletConnect') {
+            if (walletConnector.key === 'walletconnect') {
                 setView('wallet-connect-mobile-wallets-list');
             }
             else {

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

@@ -4,10 +4,10 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useIn
 import { useErrorContext } from '../../../context/ErrorContext/ErrorContext.js';
 import { useMockContext } from '../../../context/MockContext/MockContext.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 'react';
 import '@dynamic-labs/wallet-book';
@@ -123,7 +123,7 @@ const useWalletItemActions = () => {
         }
         else if (isMobile()) {
             // mobile wallets
-            if (walletConnector.name === 'WalletConnect') {
+            if (walletConnector.key === 'walletconnect') {
                 setView('wallet-connect-mobile-wallets-list');
             }
             else {

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

@@ -50,12 +50,17 @@ require('react-focus-lock');
 require('formik');
 require('i18next');
 require('../../../components/OverlayCard/OverlayCard.context.cjs');
-require('../../../context/FooterAnimationContext/index.cjs');
-require('../../../context/QrCodeContext/QrCodeContext.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('../../../context/LoadingContext/LoadingContext.cjs');
-require('qrcode');
 require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../components/UserProfile/parts/UserProfileField/components/VerifiedEmailIcon/VerifiedEmailIcon.cjs');
 require('@dynamic-labs/viem-utils');