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

package/src/lib/utils/functions/walletListBuilder/utils/filterConnectedWallets/filterConnectedWallets.js

@@ -4,8 +4,19 @@
  * not additional accounts from the same wallet
  */
 const filterConnectedWallets = ({ walletOptions, connectedWallets, }) => {
-    const connectedWalletKeys = connectedWallets.map((connectedWallet) => connectedWallet.connector.key);
-    return walletOptions.filter((wallet) => !connectedWalletKeys.includes(wallet.walletConnector.key));
+    const connectedWalletKeys = new Set(connectedWallets.map((connectedWallet) => connectedWallet.connector.key));
+    /**
+     * Phantom and Phantom Ledger are the same wallet, so we have to filter both of them
+     * if one is present, because the next connection will not work, it will just connect the
+     * same wallet again with a different walletName.
+     * This will be fixed by combining both Phantom and PhantomLedger to the same connector here QNTM-885
+     */
+    if (connectedWalletKeys.has('phantom') ||
+        connectedWalletKeys.has('phantomledger')) {
+        connectedWalletKeys.add('phantom');
+        connectedWalletKeys.add('phantomledger');
+    }
+    return walletOptions.filter((wallet) => !connectedWalletKeys.has(wallet.walletConnector.key));
 };
 
 export { filterConnectedWallets };

package/src/lib/utils/functions/walletListBuilder/walletListBuilder.cjs

@@ -29,7 +29,7 @@ const sortedInputList = (inputList) => {
     const unsortedPriorityWallets = [];
     const unsortedOtherWallets = [];
     inputList.forEach((wallet) => {
-        if (PRIORITY_WALLET_LIST.includes(walletConnectorCore.normalizeWalletName(wallet.name))) {
+        if (PRIORITY_WALLET_LIST.includes(wallet.key)) {
             unsortedPriorityWallets.push(wallet);
         }
         else {
@@ -38,8 +38,8 @@ const sortedInputList = (inputList) => {
     });
     const sortedPriorityWallets = unsortedPriorityWallets
         .slice()
-        .sort((a, b) => PRIORITY_WALLET_LIST.indexOf(walletConnectorCore.normalizeWalletName(a.name)) -
-        PRIORITY_WALLET_LIST.indexOf(walletConnectorCore.normalizeWalletName(b.name)));
+        .sort((a, b) => PRIORITY_WALLET_LIST.indexOf(a.key) -
+        PRIORITY_WALLET_LIST.indexOf(b.key));
     return [...sortedPriorityWallets, ...unsortedOtherWallets];
 };
 const walletListBuilder = ({ authMode, connectedWallets, multiWallet, numberOfWalletsToShow, inputList, isWalletConnectList, lastUsedWalletName, signWithEmailWalletName, searchFilter, walletsFilter, loginWithEmail, groupWallets, walletBook, showMoreWalletsWithFilter, }) => {

package/src/lib/utils/functions/walletListBuilder/walletListBuilder.js

@@ -1,4 +1,4 @@
-import { isEmbeddedConnector, normalizeWalletName } from '@dynamic-labs/wallet-connector-core';
+import { isEmbeddedConnector } from '@dynamic-labs/wallet-connector-core';
 import { getCalculatedOffset } from './utils/getCalculatedOffset/getCalculatedOffset.js';
 import { groupWalletOptions } from './utils/groupWalletOptions/groupWalletOptions.js';
 import { filterConnectedWallets } from './utils/filterConnectedWallets/filterConnectedWallets.js';
@@ -25,7 +25,7 @@ const sortedInputList = (inputList) => {
     const unsortedPriorityWallets = [];
     const unsortedOtherWallets = [];
     inputList.forEach((wallet) => {
-        if (PRIORITY_WALLET_LIST.includes(normalizeWalletName(wallet.name))) {
+        if (PRIORITY_WALLET_LIST.includes(wallet.key)) {
             unsortedPriorityWallets.push(wallet);
         }
         else {
@@ -34,8 +34,8 @@ const sortedInputList = (inputList) => {
     });
     const sortedPriorityWallets = unsortedPriorityWallets
         .slice()
-        .sort((a, b) => PRIORITY_WALLET_LIST.indexOf(normalizeWalletName(a.name)) -
-        PRIORITY_WALLET_LIST.indexOf(normalizeWalletName(b.name)));
+        .sort((a, b) => PRIORITY_WALLET_LIST.indexOf(a.key) -
+        PRIORITY_WALLET_LIST.indexOf(b.key));
     return [...sortedPriorityWallets, ...unsortedOtherWallets];
 };
 const walletListBuilder = ({ authMode, connectedWallets, multiWallet, numberOfWalletsToShow, inputList, isWalletConnectList, lastUsedWalletName, signWithEmailWalletName, searchFilter, walletsFilter, loginWithEmail, groupWallets, walletBook, showMoreWalletsWithFilter, }) => {

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSignSplitSteps/useConnectAndSignSplitSteps.cjs

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../../_virtual/_tslib.cjs');
+var utils = require('@dynamic-labs/utils');
 var useInternalDynamicContext = require('../../../../context/DynamicContext/useInternalDynamicContext.cjs');
 var ErrorContext = require('../../../../context/ErrorContext/ErrorContext.cjs');
 var ViewContext = require('../../../../context/ViewContext/ViewContext.cjs');
@@ -20,7 +21,6 @@ var localStorage$1 = require('../../../constants/localStorage.cjs');
 require('../../../constants/colors.cjs');
 var localStorage = require('../../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
-require('@dynamic-labs/utils');
 require('../../../../shared/consts/index.cjs');
 var CaptchaContext = require('../../../../context/CaptchaContext/CaptchaContext.cjs');
 var useHandleWalletsToConnect = require('../../useHandleWalletsToConnect/useHandleWalletsToConnect.cjs');
@@ -38,6 +38,19 @@ const useConnectAndSignSplitSteps = () => {
         projectSettings,
         setIsSingleWalletAccount,
     });
+    const onErrorHandler = (err) => {
+        logger.logger.debug(err);
+        goToInitialView();
+        setIsVerificationInProgress(false);
+        /**
+         * On mobile we don't want to show error message because the user
+         * is redirected to the wallet mobile app
+         */
+        const isMissingPublicAddressErrorExpected = err instanceof utils.MissingPublicAddressError && utils.isMobile();
+        if (!isMissingPublicAddressErrorExpected) {
+            setErrorMessage(err.toString());
+        }
+    };
     // This method is similar to useConnectAndSign, but it skips signing for now
     // It's used when we want to connect and sign in two separate steps
     // For example on mobile when we want to sign on button click
@@ -71,10 +84,7 @@ const useConnectAndSignSplitSteps = () => {
             setView('pending-signature');
         }
         catch (err) {
-            logger.logger.debug(err);
-            setErrorMessage(err.toString());
-            goToInitialView();
-            setIsVerificationInProgress(false);
+            onErrorHandler(err);
             return;
         }
     });
@@ -95,10 +105,7 @@ const useConnectAndSignSplitSteps = () => {
             });
         }
         catch (err) {
-            logger.logger.debug(err);
-            setErrorMessage(err.toString());
-            goToInitialView();
-            setIsVerificationInProgress(false);
+            onErrorHandler(err);
             return;
         }
     });

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

@@ -1,4 +1,5 @@
 import { __awaiter } from '../../../../../../_virtual/_tslib.js';
+import { MissingPublicAddressError, isMobile } from '@dynamic-labs/utils';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useInternalDynamicContext.js';
 import { useErrorContext } from '../../../../context/ErrorContext/ErrorContext.js';
 import { useViewContext } from '../../../../context/ViewContext/ViewContext.js';
@@ -16,7 +17,6 @@ import { LAST_USED_WALLET } from '../../../constants/localStorage.js';
 import '../../../constants/colors.js';
 import { LocalStorage } from '../../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
-import '@dynamic-labs/utils';
 import '../../../../shared/consts/index.js';
 import { useCaptchaContext } from '../../../../context/CaptchaContext/CaptchaContext.js';
 import { useHandleWalletsToConnect } from '../../useHandleWalletsToConnect/useHandleWalletsToConnect.js';
@@ -34,6 +34,19 @@ const useConnectAndSignSplitSteps = () => {
         projectSettings,
         setIsSingleWalletAccount,
     });
+    const onErrorHandler = (err) => {
+        logger.debug(err);
+        goToInitialView();
+        setIsVerificationInProgress(false);
+        /**
+         * On mobile we don't want to show error message because the user
+         * is redirected to the wallet mobile app
+         */
+        const isMissingPublicAddressErrorExpected = err instanceof MissingPublicAddressError && isMobile();
+        if (!isMissingPublicAddressErrorExpected) {
+            setErrorMessage(err.toString());
+        }
+    };
     // This method is similar to useConnectAndSign, but it skips signing for now
     // It's used when we want to connect and sign in two separate steps
     // For example on mobile when we want to sign on button click
@@ -67,10 +80,7 @@ const useConnectAndSignSplitSteps = () => {
             setView('pending-signature');
         }
         catch (err) {
-            logger.debug(err);
-            setErrorMessage(err.toString());
-            goToInitialView();
-            setIsVerificationInProgress(false);
+            onErrorHandler(err);
             return;
         }
     });
@@ -91,10 +101,7 @@ const useConnectAndSignSplitSteps = () => {
             });
         }
         catch (err) {
-            logger.debug(err);
-            setErrorMessage(err.toString());
-            goToInitialView();
-            setIsVerificationInProgress(false);
+            onErrorHandler(err);
             return;
         }
     });

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

@@ -8,14 +8,31 @@ var useInternalDynamicContext = require('../../../../context/DynamicContext/useI
 var api = require('../../../../data/api.cjs');
 var useUpdateUserProfileByJWTCallback = require('../../useUpdateUserProfileByJWTCallback/useUpdateUserProfileByJWTCallback.cjs');
 var EmailVerificationContext = require('../../../../context/EmailVerificationContext/EmailVerificationContext.cjs');
+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');
+require('../../../constants/colors.cjs');
+require('../../../../shared/utils/classes/storage/localStorage.cjs');
+require('viem');
+require('@dynamic-labs/utils');
+require('../../../../shared/consts/index.cjs');
+require('@dynamic-labs/multi-wallet');
+var isTurnkeyEnabled = require('../../../functions/isTurnkeyEnabled/isTurnkeyEnabled.cjs');
 
 // Hook exposed to the public as a scoped function in useUserUpdateRequest result
 const useEmailVerificationRequest = () => {
-    const { onboardingOnlyJwt, authToken, environmentId } = useInternalDynamicContext.useInternalDynamicContext();
+    var _a;
+    const { onboardingOnlyJwt, authToken, environmentId, projectSettings, primaryWallet, } = useInternalDynamicContext.useInternalDynamicContext();
     const jwtToken = onboardingOnlyJwt || authToken;
+    const isTurnkeyProviderEnabled = isTurnkeyEnabled.isTurnkeyEnabled(projectSettings);
     const { updateUserProfileByJWT } = useUpdateUserProfileByJWTCallback.useUpdateUserProfileByJWTCallback();
     const { verificationUUID: emailVerificationContextVerificationUUID } = EmailVerificationContext.useEmailVerificationContext();
     const verifyEmail = React.useCallback((verificationToken, verificationUUID) => _tslib.__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
@@ -27,12 +44,22 @@ 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 };

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

@@ -4,14 +4,31 @@ 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 = () => {
-    const { onboardingOnlyJwt, authToken, environmentId } = useInternalDynamicContext();
+    var _a;
+    const { onboardingOnlyJwt, authToken, environmentId, projectSettings, primaryWallet, } = 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
@@ -23,12 +40,22 @@ 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/authenticationHooks/useSignConnectOnlyUser/useSignConnectOnlyUser.cjs

@@ -61,7 +61,7 @@ const useSignConnectOnlyUser = () => {
         catch (err) {
             logger.logger.debug(err);
             setErrorMessage(err.toString());
-            setShowAuthFlow(false);
+            setShowAuthFlow(false, { emitCancelAuth: true });
             return;
         }
     });

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

@@ -57,7 +57,7 @@ const useSignConnectOnlyUser = () => {
         catch (err) {
             logger.debug(err);
             setErrorMessage(err.toString());
-            setShowAuthFlow(false);
+            setShowAuthFlow(false, { emitCancelAuth: true });
             return;
         }
     });

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

@@ -41,3 +41,5 @@ export { useWalletConnectorOptions } from './useWalletConnectorOptions';
 export { useWalletConnectors } from './useWalletConnectors';
 export { useWalletItemActions } from './useWalletItemActions';
 export { useWalletUiUtils } from './useWalletUiUtils';
+export { useEmbeddedReveal } from './useEmbeddedReveal';
+export { useWalletConnectorNetwork } from './useWalletConnectorNetwork';

package/src/lib/utils/hooks/multiWallet/useMultiWallet/useMultiWallet.cjs

@@ -18,8 +18,9 @@ var useLocalStorage = require('../../../../shared/utils/hooks/useLocalStorage/us
 require('@dynamic-labs/utils');
 require('../../../../shared/consts/index.cjs');
 
-const useMultiWallet = (toolkitEnabled, multiWalletSettings) => {
-    const isMultiWalletEnabled = multiWalletSettings !== null && multiWalletSettings !== void 0 ? multiWalletSettings : false;
+const useMultiWallet = ({ toolkitEnabled, isBridgeFlow, multiWalletSettings, }) => {
+    var _a;
+    const isMultiWalletEnabled = (_a = (multiWalletSettings || isBridgeFlow)) !== null && _a !== void 0 ? _a : false;
     const [multiWallet, setMultiWallet] = useLocalStorage.useLocalStorage(localStorage.IS_MULTI_WALLET_ENABLED, isMultiWalletEnabled);
     React.useEffect(() => {
         // don't overwrite toolkit stored value after the refresh

package/src/lib/utils/hooks/multiWallet/useMultiWallet/useMultiWallet.d.ts

@@ -1,4 +1,9 @@
-export declare const useMultiWallet: (toolkitEnabled: boolean, multiWalletSettings?: boolean) => {
+export type UseMultiWalletProps = {
+    toolkitEnabled: boolean;
+    isBridgeFlow?: boolean;
+    multiWalletSettings?: boolean;
+};
+export declare const useMultiWallet: ({ toolkitEnabled, isBridgeFlow, multiWalletSettings, }: UseMultiWalletProps) => {
     multiWallet: boolean;
     setMultiWallet: (value: boolean | ((val: boolean) => boolean)) => void;
 };

package/src/lib/utils/hooks/multiWallet/useMultiWallet/useMultiWallet.js

@@ -14,8 +14,9 @@ import { useLocalStorage } from '../../../../shared/utils/hooks/useLocalStorage/
 import '@dynamic-labs/utils';
 import '../../../../shared/consts/index.js';
 
-const useMultiWallet = (toolkitEnabled, multiWalletSettings) => {
-    const isMultiWalletEnabled = multiWalletSettings !== null && multiWalletSettings !== void 0 ? multiWalletSettings : false;
+const useMultiWallet = ({ toolkitEnabled, isBridgeFlow, multiWalletSettings, }) => {
+    var _a;
+    const isMultiWalletEnabled = (_a = (multiWalletSettings || isBridgeFlow)) !== null && _a !== void 0 ? _a : false;
     const [multiWallet, setMultiWallet] = useLocalStorage(IS_MULTI_WALLET_ENABLED, isMultiWalletEnabled);
     useEffect(() => {
         // don't overwrite toolkit stored value after the refresh

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

@@ -48,7 +48,9 @@ const useAuthLayoutChecks = (walletConnector) => {
         view !== 'social-redirect-view' &&
         view !== 'update-email' &&
         view !== 'collect-user-data-login-with-email' &&
-        view !== 'passkey-recovery-start';
+        view !== 'passkey-recovery-start' &&
+        view !== 'embedded-reveal-view' &&
+        view !== 'embedded-reveal-account-view';
     const showConnectedWalletProgress = isBridgeFlow &&
         (view === 'wallet-list' ||
             view === 'qr-code' ||
@@ -94,12 +96,14 @@ const useAuthLayoutChecks = (walletConnector) => {
         view === 'passkey-intro' ||
         (view === 'merge-user-accounts' && !user);
     const showQrCodePreHeader = view === 'qr-code' && showQrCodeMessage && !showQrCodeImage;
+    const showDefaultFooter = !showDynamicFooter && !showToSFooter;
     return {
         displayBorderBelowHeader,
         isWalletListTypeView,
         showBackButton,
         showCloseButton,
         showConnectedWalletProgress,
+        showDefaultFooter,
         showDynamicFooter,
         showHeader,
         showHelpContent,

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

@@ -5,6 +5,7 @@ export declare const useAuthLayoutChecks: (walletConnector?: WalletConnector | n
     showBackButton: boolean;
     showCloseButton: boolean;
     showConnectedWalletProgress: boolean;
+    showDefaultFooter: boolean;
     showDynamicFooter: boolean;
     showHeader: boolean;
     showHelpContent: boolean;

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

@@ -44,7 +44,9 @@ const useAuthLayoutChecks = (walletConnector) => {
         view !== 'social-redirect-view' &&
         view !== 'update-email' &&
         view !== 'collect-user-data-login-with-email' &&
-        view !== 'passkey-recovery-start';
+        view !== 'passkey-recovery-start' &&
+        view !== 'embedded-reveal-view' &&
+        view !== 'embedded-reveal-account-view';
     const showConnectedWalletProgress = isBridgeFlow &&
         (view === 'wallet-list' ||
             view === 'qr-code' ||
@@ -90,12 +92,14 @@ const useAuthLayoutChecks = (walletConnector) => {
         view === 'passkey-intro' ||
         (view === 'merge-user-accounts' && !user);
     const showQrCodePreHeader = view === 'qr-code' && showQrCodeMessage && !showQrCodeImage;
+    const showDefaultFooter = !showDynamicFooter && !showToSFooter;
     return {
         displayBorderBelowHeader,
         isWalletListTypeView,
         showBackButton,
         showCloseButton,
         showConnectedWalletProgress,
+        showDefaultFooter,
         showDynamicFooter,
         showHeader,
         showHelpContent,

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

@@ -3,10 +3,10 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 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');
@@ -22,10 +22,10 @@ const useClearWalletConnectSessions = ({ connectors }) => {
             return;
         if (connectors.length === 0)
             return;
-        const names = new Set(connectors.map((connector) => walletConnectorCore.normalizeWalletName(connector.name)));
+        const keys = new Set(connectors.map((connector) => connector.key));
         for (const key of localStorage$1.LocalStorage.getKeys()) {
             if (key.startsWith('walletconnect') &&
-                !names.has(key.replace('walletconnect-', ''))) {
+                !keys.has(key.replace('walletconnect-', ''))) {
                 localStorage.removeItem(key);
             }
         }

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

@@ -1,8 +1,8 @@
 import { useCallback } from 'react';
-import { normalizeWalletName } from '@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';
@@ -18,10 +18,10 @@ const useClearWalletConnectSessions = ({ connectors }) => {
             return;
         if (connectors.length === 0)
             return;
-        const names = new Set(connectors.map((connector) => normalizeWalletName(connector.name)));
+        const keys = new Set(connectors.map((connector) => connector.key));
         for (const key of LocalStorage.getKeys()) {
             if (key.startsWith('walletconnect') &&
-                !names.has(key.replace('walletconnect-', ''))) {
+                !keys.has(key.replace('walletconnect-', ''))) {
                 localStorage.removeItem(key);
             }
         }

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+var utils = require('@dynamic-labs/utils');
 var UserWalletsContext = require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 var api = require('../../../data/api.cjs');
 require('@dynamic-labs/sdk-api');
@@ -18,7 +19,6 @@ require('../../constants/colors.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 var useLocalStorage = require('../../../shared/utils/hooks/useLocalStorage/useLocalStorage.cjs');
-require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
 var shouldManuallyReconnectOnRefresh = require('../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.cjs');
@@ -152,7 +152,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             if (!shouldProceedWithConnection) {
                 walletConnectorCore.logger.info('Connection was not established because onBeforeConnectSuccessConfirmation returned false');
                 disconnectWallet(walletId);
-                setShowAuthFlow(false);
+                setShowAuthFlow(false, { emitCancelAuth: true });
                 return;
             }
         }
@@ -166,9 +166,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
     const connectWallet = (walletConnector, fetchPublicAddressOpts, shouldCallCallback = true) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const walletAddress = yield walletConnector.fetchPublicAddress(fetchPublicAddressOpts);
         if (!walletAddress) {
-            const error = new Error();
-            error.code = 'missing-public-address';
-            throw error;
+            throw new utils.MissingPublicAddressError();
         }
         if (onBeforeConnectSuccessConfirmation && shouldCallCallback) {
             const shouldProceedWithConnection = yield onBeforeConnectSuccessConfirmation({

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

@@ -1,7 +1,7 @@
-import { Dispatch, SetStateAction } from 'react';
 import { Chain, FetchPublicAddressOpts, WalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { ConnectWalletResult } from '../../../context/DynamicContext/types';
 import { AuthModeType, OnBeforeConnectSuccessConfirmation, Wallet, WalletOption } from '../../../shared';
+import { SetShowAuthFlow } from '../../../context/DynamicContext/hooks';
 export type ConnectedWalletConnectorType = {
     id: string;
     walletChain?: Chain;
@@ -18,7 +18,7 @@ type Props = {
     walletConnectorOptions: WalletOption[];
     onDisconnect: (connectedWalletsInfo: ConnectedWalletConnectorType[], wallet?: Wallet) => void;
     onBeforeConnectSuccessConfirmation: OnBeforeConnectSuccessConfirmation | undefined;
-    setShowAuthFlow: Dispatch<SetStateAction<boolean>>;
+    setShowAuthFlow: SetShowAuthFlow;
     isBridgeFlow: boolean;
 };
 type UseConnectWalletValue = {

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

@@ -1,6 +1,7 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useState, useCallback, useEffect } from 'react';
 import { getWalletConnectorByKey, logger } from '@dynamic-labs/wallet-connector-core';
+import { MissingPublicAddressError } from '@dynamic-labs/utils';
 import { useInternalUserWallets } from '../../../context/UserWalletsContext/UserWalletsContext.js';
 import { createVisit } from '../../../data/api.js';
 import '@dynamic-labs/sdk-api';
@@ -14,7 +15,6 @@ import '../../constants/colors.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import { useLocalStorage } from '../../../shared/utils/hooks/useLocalStorage/useLocalStorage.js';
-import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
 import { shouldManuallyReconnectOnRefresh } from '../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.js';
@@ -148,7 +148,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             if (!shouldProceedWithConnection) {
                 logger.info('Connection was not established because onBeforeConnectSuccessConfirmation returned false');
                 disconnectWallet(walletId);
-                setShowAuthFlow(false);
+                setShowAuthFlow(false, { emitCancelAuth: true });
                 return;
             }
         }
@@ -162,9 +162,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
     const connectWallet = (walletConnector, fetchPublicAddressOpts, shouldCallCallback = true) => __awaiter(void 0, void 0, void 0, function* () {
         const walletAddress = yield walletConnector.fetchPublicAddress(fetchPublicAddressOpts);
         if (!walletAddress) {
-            const error = new Error();
-            error.code = 'missing-public-address';
-            throw error;
+            throw new MissingPublicAddressError();
         }
         if (onBeforeConnectSuccessConfirmation && shouldCallCallback) {
             const shouldProceedWithConnection = yield onBeforeConnectSuccessConfirmation({

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

@@ -28,7 +28,7 @@ var smartWallet = require('../useWalletConnectors/utils/smartWallet/smartWallet.
 
 // This hook needs to be async that's why it's not using useMutation
 const useCreateDynamicEmbeddedWalletMutation = () => {
-    const { setPrimaryWalletId, setCallback, setUser, user, internalSetShowAuthFlow, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setPrimaryWalletId, setCallback, setUser, user, setShowAuthFlow } = useInternalDynamicContext.useInternalDynamicContext();
     const [isLoading, setIsLoading] = React.useState(false);
     const [error, setError] = React.useState();
     const createDynamicEmbeddedWalletMutation = ({ authToken, decodedJwt, environmentId, walletConnectorOptions, withAuthenticator, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
@@ -70,7 +70,7 @@ const useCreateDynamicEmbeddedWalletMutation = () => {
             }
             index.storeAuthToken(jwt);
             setUser(createUserProfile.createUserProfile(updatedDecodedJwt));
-            internalSetShowAuthFlow(false);
+            setShowAuthFlow(false, { performMultiWalletChecks: false });
             setCallback('embeddedWalletCreated', {
                 email: (turnkeyVerifiedCredentials === null || turnkeyVerifiedCredentials === void 0 ? void 0 : turnkeyVerifiedCredentials.email) || '',
                 verifiedCredential: turnkeyVerifiedCredentials,

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

@@ -24,7 +24,7 @@ import { findSmartWallet, initializeSmartWallet } from '../useWalletConnectors/u
 
 // This hook needs to be async that's why it's not using useMutation
 const useCreateDynamicEmbeddedWalletMutation = () => {
-    const { setPrimaryWalletId, setCallback, setUser, user, internalSetShowAuthFlow, } = useInternalDynamicContext();
+    const { setPrimaryWalletId, setCallback, setUser, user, setShowAuthFlow } = useInternalDynamicContext();
     const [isLoading, setIsLoading] = useState(false);
     const [error, setError] = useState();
     const createDynamicEmbeddedWalletMutation = ({ authToken, decodedJwt, environmentId, walletConnectorOptions, withAuthenticator, }) => __awaiter(void 0, void 0, void 0, function* () {
@@ -66,7 +66,7 @@ const useCreateDynamicEmbeddedWalletMutation = () => {
             }
             storeAuthToken(jwt);
             setUser(createUserProfile(updatedDecodedJwt));
-            internalSetShowAuthFlow(false);
+            setShowAuthFlow(false, { performMultiWalletChecks: false });
             setCallback('embeddedWalletCreated', {
                 email: (turnkeyVerifiedCredentials === null || turnkeyVerifiedCredentials === void 0 ? void 0 : turnkeyVerifiedCredentials.email) || '',
                 verifiedCredential: turnkeyVerifiedCredentials,

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

@@ -22,6 +22,7 @@ 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 useEmailProvider = ({ emailWalletConnector }) => {
@@ -39,9 +40,8 @@ const useEmailProvider = ({ emailWalletConnector }) => {
     // 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);
+        (isProviderEnabled.isProviderEnabled(providers || [], sdkApi.ProviderEnum.MagicLink) ||
+            isProviderEnabled.isProviderEnabled(providers || [], sdkApi.ProviderEnum.Blocto));
     const handleEmailOnlyLoginSubmit = (emailInput, captchaToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const { email, verificationUUID } = yield api.createEmailVerification({
             captchaToken,