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

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

@@ -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;
             }
         }

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

@@ -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;
             }
         }

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/useEmbeddedReveal/useEmbeddedReveal.cjs

@@ -26,7 +26,7 @@ var dynamicEvents = require('../../../events/dynamicEvents.cjs');
 
 // Hook exposed to customers and used internally to trigger embedded reveal
 const useEmbeddedReveal = () => {
-    const { projectSettings, internalSetShowAuthFlow } = useInternalDynamicContext.useInternalDynamicContext();
+    const { projectSettings, setShowAuthFlow } = useInternalDynamicContext.useInternalDynamicContext();
     const { userHasEmbeddedWallet } = useEmbeddedWallet.useEmbeddedWallet();
     const { setView } = ViewContext.useViewContext();
     const initExportProcess = React.useCallback((recoveryPhrase = false) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
@@ -47,7 +47,10 @@ const useEmbeddedReveal = () => {
         if (recoveryPhrase && !turnkeyHDWalletId) {
             throw new Error('Wallet is non-HD and does not have a recovery phrase');
         }
-        internalSetShowAuthFlow(true);
+        setShowAuthFlow(true, {
+            ignoreIfIsEmbeddedWidget: false,
+            performMultiWalletChecks: false,
+        });
         if (recoveryPhrase) {
             setView('embedded-reveal-view');
         }
@@ -58,7 +61,7 @@ const useEmbeddedReveal = () => {
             dynamicEvents.dynamicEvents.once('embeddedWalletRevealCompleted', (wallet) => resolve(wallet));
             dynamicEvents.dynamicEvents.once('embeddedWalletRevealFailed', (error) => reject(error));
         });
-    }), [internalSetShowAuthFlow, projectSettings, setView, userHasEmbeddedWallet]);
+    }), [setShowAuthFlow, projectSettings, setView, userHasEmbeddedWallet]);
     return {
         initExportProcess,
     };

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

@@ -22,7 +22,7 @@ import { dynamicEvents } from '../../../events/dynamicEvents.js';
 
 // Hook exposed to customers and used internally to trigger embedded reveal
 const useEmbeddedReveal = () => {
-    const { projectSettings, internalSetShowAuthFlow } = useInternalDynamicContext();
+    const { projectSettings, setShowAuthFlow } = useInternalDynamicContext();
     const { userHasEmbeddedWallet } = useEmbeddedWallet();
     const { setView } = useViewContext();
     const initExportProcess = useCallback((recoveryPhrase = false) => __awaiter(void 0, void 0, void 0, function* () {
@@ -43,7 +43,10 @@ const useEmbeddedReveal = () => {
         if (recoveryPhrase && !turnkeyHDWalletId) {
             throw new Error('Wallet is non-HD and does not have a recovery phrase');
         }
-        internalSetShowAuthFlow(true);
+        setShowAuthFlow(true, {
+            ignoreIfIsEmbeddedWidget: false,
+            performMultiWalletChecks: false,
+        });
         if (recoveryPhrase) {
             setView('embedded-reveal-view');
         }
@@ -54,7 +57,7 @@ const useEmbeddedReveal = () => {
             dynamicEvents.once('embeddedWalletRevealCompleted', (wallet) => resolve(wallet));
             dynamicEvents.once('embeddedWalletRevealFailed', (error) => reject(error));
         });
-    }), [internalSetShowAuthFlow, projectSettings, setView, userHasEmbeddedWallet]);
+    }), [setShowAuthFlow, projectSettings, setView, userHasEmbeddedWallet]);
     return {
         initExportProcess,
     };

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

@@ -32,7 +32,7 @@ var useCreateUserProfileByJWTCallback = require('../useCreateUserProfileByJWTCal
 
 // Hook exposed to customers and used internally to trigger embedded wallet creation
 const useEmbeddedWallet = () => {
-    const { projectSettings, onboardingOnlyJwt, setPrimaryWalletId, walletConnectorOptions, internalSetShowAuthFlow, primaryWallet, environmentId, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { projectSettings, onboardingOnlyJwt, setPrimaryWalletId, walletConnectorOptions, setShowAuthFlow, primaryWallet, environmentId, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setView } = ViewContext.useViewContext();
     const { createDynamicEmbeddedWalletMutation } = useCreateDynamicEmbeddedWalletMutation.useCreateDynamicEmbeddedWalletMutation();
     const { createUserProfileByJWT } = useCreateUserProfileByJWTCallback.useCreateUserProfileByJWTCallback();
@@ -52,7 +52,7 @@ const useEmbeddedWallet = () => {
             walletConnectorOptions,
             withAuthenticator: false,
         });
-        internalSetShowAuthFlow(false); // close email otp pin modal
+        setShowAuthFlow(false, { performMultiWalletChecks: false }); // close email otp pin modal
         return new Promise((resolve, reject) => {
             dynamicEvents.dynamicEvents.once('embeddedWalletCreated', (wallet) => resolve(wallet));
             dynamicEvents.dynamicEvents.once('embeddedWalletFailed', (error) => reject(error));
@@ -61,10 +61,13 @@ const useEmbeddedWallet = () => {
         createDynamicEmbeddedWalletMutation,
         environmentId,
         walletConnectorOptions,
-        internalSetShowAuthFlow,
+        setShowAuthFlow,
     ]);
     const startEmbeddedWalletCreationFlow = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        internalSetShowAuthFlow(true);
+        setShowAuthFlow(true, {
+            ignoreIfIsEmbeddedWidget: false,
+            performMultiWalletChecks: false,
+        });
         setView('passkey-intro');
         return new Promise((resolve, reject) => {
             dynamicEvents.dynamicEvents.once('embeddedWalletCreated', (wallet) => resolve(wallet));
@@ -131,7 +134,7 @@ const useEmbeddedWallet = () => {
             }
             return startEmbeddedWalletCreationFlow();
         }
-        internalSetShowAuthFlow(false);
+        setShowAuthFlow(false, { performMultiWalletChecks: false });
         const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(jwt);
         // if user logged in with MM for example, just continue the flow
         if (!embeddedWalletVerifiedCredential) {
@@ -140,7 +143,7 @@ const useEmbeddedWallet = () => {
         // if user already has embedded wallet, returns it
         return returnEmbeddedWallet(jwt, embeddedWalletVerifiedCredential);
     }), [
-        internalSetShowAuthFlow,
+        setShowAuthFlow,
         onboardingOnlyJwt,
         projectSettings,
         startPregeneratedWalletCreationFlow,

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

@@ -28,7 +28,7 @@ import { useCreateUserProfileByJWTCallback } from '../useCreateUserProfileByJWTC
 
 // Hook exposed to customers and used internally to trigger embedded wallet creation
 const useEmbeddedWallet = () => {
-    const { projectSettings, onboardingOnlyJwt, setPrimaryWalletId, walletConnectorOptions, internalSetShowAuthFlow, primaryWallet, environmentId, } = useInternalDynamicContext();
+    const { projectSettings, onboardingOnlyJwt, setPrimaryWalletId, walletConnectorOptions, setShowAuthFlow, primaryWallet, environmentId, } = useInternalDynamicContext();
     const { setView } = useViewContext();
     const { createDynamicEmbeddedWalletMutation } = useCreateDynamicEmbeddedWalletMutation();
     const { createUserProfileByJWT } = useCreateUserProfileByJWTCallback();
@@ -48,7 +48,7 @@ const useEmbeddedWallet = () => {
             walletConnectorOptions,
             withAuthenticator: false,
         });
-        internalSetShowAuthFlow(false); // close email otp pin modal
+        setShowAuthFlow(false, { performMultiWalletChecks: false }); // close email otp pin modal
         return new Promise((resolve, reject) => {
             dynamicEvents.once('embeddedWalletCreated', (wallet) => resolve(wallet));
             dynamicEvents.once('embeddedWalletFailed', (error) => reject(error));
@@ -57,10 +57,13 @@ const useEmbeddedWallet = () => {
         createDynamicEmbeddedWalletMutation,
         environmentId,
         walletConnectorOptions,
-        internalSetShowAuthFlow,
+        setShowAuthFlow,
     ]);
     const startEmbeddedWalletCreationFlow = () => __awaiter(void 0, void 0, void 0, function* () {
-        internalSetShowAuthFlow(true);
+        setShowAuthFlow(true, {
+            ignoreIfIsEmbeddedWidget: false,
+            performMultiWalletChecks: false,
+        });
         setView('passkey-intro');
         return new Promise((resolve, reject) => {
             dynamicEvents.once('embeddedWalletCreated', (wallet) => resolve(wallet));
@@ -127,7 +130,7 @@ const useEmbeddedWallet = () => {
             }
             return startEmbeddedWalletCreationFlow();
         }
-        internalSetShowAuthFlow(false);
+        setShowAuthFlow(false, { performMultiWalletChecks: false });
         const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(jwt);
         // if user logged in with MM for example, just continue the flow
         if (!embeddedWalletVerifiedCredential) {
@@ -136,7 +139,7 @@ const useEmbeddedWallet = () => {
         // if user already has embedded wallet, returns it
         return returnEmbeddedWallet(jwt, embeddedWalletVerifiedCredential);
     }), [
-        internalSetShowAuthFlow,
+        setShowAuthFlow,
         onboardingOnlyJwt,
         projectSettings,
         startPregeneratedWalletCreationFlow,

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

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

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

@@ -1,9 +1,9 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 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';
@@ -14,7 +14,6 @@ import 'viem';
 import '@dynamic-labs/utils';
 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 callback = useCallback((walletId) => __awaiter(void 0, void 0, void 0, function* () {
@@ -40,8 +39,11 @@ const useHandleUnlinkWallet = ({ verifiedCredentials, environmentId, primaryWall
             setUser(newUser);
         }
         const wallet = secondaryWallets.find((w) => w.id === walletId);
+        // remaining normalizeWalletName until QNTM-846 is complete due to us still passing the walletname to redcoast:
+        // https://linear.app/dynamic-labs/issue/QNTM-846/remove-usage-of-walletwalletconnectorwname-to-instead-use
         const numberOfLinkedWallets = verifiedCredentials.filter((account) => account.walletName &&
-            isSameWalletName(account.walletName, (wallet === null || wallet === void 0 ? void 0 : wallet.connector.name) || '')).length;
+            normalizeWalletName(account.walletName) ===
+                ((wallet === null || wallet === void 0 ? void 0 : wallet.connector.key) || '')).length;
         // If there's only 1, it's the one being removed and we can kill the session
         if (numberOfLinkedWallets === 1) {
             yield (wallet === null || wallet === void 0 ? void 0 : wallet.connector.endSession());

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

@@ -27,7 +27,7 @@ var useEmbeddedWallet = require('../useEmbeddedWallet/useEmbeddedWallet.cjs');
 
 // Hook exposed to customers and used internally to trigger passkey recovery
 const usePasskeyRecovery = () => {
-    const { projectSettings, internalSetShowAuthFlow } = useInternalDynamicContext.useInternalDynamicContext();
+    const { projectSettings, setShowAuthFlow } = useInternalDynamicContext.useInternalDynamicContext();
     const { userHasEmbeddedWallet } = useEmbeddedWallet.useEmbeddedWallet();
     const { setView } = ViewContext.useViewContext();
     const initPasskeyRecoveryProcess = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
@@ -45,18 +45,16 @@ const usePasskeyRecovery = () => {
         // since the iframe can still exist it can't be recreated by Turnkey
         // and throws an error
         removeElementById.removeElementById(constants.iframeContainerId);
-        internalSetShowAuthFlow(true);
+        setShowAuthFlow(true, {
+            ignoreIfIsEmbeddedWidget: false,
+            performMultiWalletChecks: false,
+        });
         setView('passkey-recovery-start');
         return new Promise((resolve, reject) => {
             dynamicEvents.dynamicEvents.once('passkeyRecoveryCompleted', (wallet) => resolve(wallet));
             dynamicEvents.dynamicEvents.once('passkeyRecoveryFailed', (error) => reject(error));
         });
-    }), [
-        internalSetShowAuthFlow,
-        projectSettings,
-        setView,
-        userHasEmbeddedWallet,
-    ]);
+    }), [setShowAuthFlow, projectSettings, setView, userHasEmbeddedWallet]);
     return {
         initPasskeyRecoveryProcess,
     };

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

@@ -23,7 +23,7 @@ import { useEmbeddedWallet } from '../useEmbeddedWallet/useEmbeddedWallet.js';
 
 // Hook exposed to customers and used internally to trigger passkey recovery
 const usePasskeyRecovery = () => {
-    const { projectSettings, internalSetShowAuthFlow } = useInternalDynamicContext();
+    const { projectSettings, setShowAuthFlow } = useInternalDynamicContext();
     const { userHasEmbeddedWallet } = useEmbeddedWallet();
     const { setView } = useViewContext();
     const initPasskeyRecoveryProcess = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
@@ -41,18 +41,16 @@ const usePasskeyRecovery = () => {
         // since the iframe can still exist it can't be recreated by Turnkey
         // and throws an error
         removeElementById(iframeContainerId);
-        internalSetShowAuthFlow(true);
+        setShowAuthFlow(true, {
+            ignoreIfIsEmbeddedWidget: false,
+            performMultiWalletChecks: false,
+        });
         setView('passkey-recovery-start');
         return new Promise((resolve, reject) => {
             dynamicEvents.once('passkeyRecoveryCompleted', (wallet) => resolve(wallet));
             dynamicEvents.once('passkeyRecoveryFailed', (error) => reject(error));
         });
-    }), [
-        internalSetShowAuthFlow,
-        projectSettings,
-        setView,
-        userHasEmbeddedWallet,
-    ]);
+    }), [setShowAuthFlow, projectSettings, setView, userHasEmbeddedWallet]);
     return {
         initPasskeyRecoveryProcess,
     };

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

@@ -161,7 +161,7 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
                 }
                 catch (e) {
                     yield createUserProfileByJWT(jwt);
-                    setShowAuthFlow(false);
+                    setShowAuthFlow(false, { emitCancelAuth: true });
                     onSettled === null || onSettled === void 0 ? void 0 : onSettled();
                 }
                 return;

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

@@ -157,7 +157,7 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
                 }
                 catch (e) {
                     yield createUserProfileByJWT(jwt);
-                    setShowAuthFlow(false);
+                    setShowAuthFlow(false, { emitCancelAuth: true });
                     onSettled === null || onSettled === void 0 ? void 0 : onSettled();
                 }
                 return;

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

@@ -12,14 +12,17 @@ var dynamicEvents = require('../../../../events/dynamicEvents.cjs');
 var validateUpdateRequest = require('./validateUpdateRequest/validateUpdateRequest.cjs');
 
 /** Saves the values updated by the user */
-const saveUserValues = ({ fields: newValues, updateUserResult: { isEmailVerificationRequired }, }, internalSetShowAuthFlow, setView, resolve, reject) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+const saveUserValues = ({ fields: newValues, updateUserResult: { isEmailVerificationRequired }, }, setShowAuthFlow, setView, resolve, reject) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     // If no verification is needed, we are done
     if (!isEmailVerificationRequired) {
         resolve(newValues);
         return;
     }
     // Show email verification view
-    internalSetShowAuthFlow(true);
+    setShowAuthFlow(true, {
+        ignoreIfIsEmbeddedWidget: false,
+        performMultiWalletChecks: false,
+    });
     setView('verify-email');
     // Subscribe to email verification result
     dynamicEvents.dynamicEvents.once('emailVerificationResult', (wasSuccessful, newEmail) => {
@@ -35,7 +38,7 @@ const saveUserValues = ({ fields: newValues, updateUserResult: { isEmailVerifica
  * The fields must have been previously enabled in the dashboard
  */
 const useUpdateUserWithModal = (updateUser) => {
-    const { user, projectSettings, internalSetShowAuthFlow } = useInternalDynamicContext.useInternalDynamicContext();
+    const { user, projectSettings, setShowAuthFlow } = useInternalDynamicContext.useInternalDynamicContext();
     const { setView } = ViewContext.useViewContext();
     const editorContext = React.useContext(UserFieldEditorContext.UserFieldEditorContext);
     if (!editorContext)
@@ -55,7 +58,7 @@ const useUpdateUserWithModal = (updateUser) => {
             subtitle: options === null || options === void 0 ? void 0 : options.subtitle,
             title: options === null || options === void 0 ? void 0 : options.title,
         }, updateUser)
-            .then((updateValues) => saveUserValues(updateValues, internalSetShowAuthFlow, setView, resolve, reject))
+            .then((updateValues) => saveUserValues(updateValues, setShowAuthFlow, setView, resolve, reject))
             .catch((error) => {
             if (/email already exists/gi.test(error))
                 throw error;
@@ -66,7 +69,7 @@ const useUpdateUserWithModal = (updateUser) => {
         projectSettings,
         promptUserForValues,
         updateUser,
-        internalSetShowAuthFlow,
+        setShowAuthFlow,
         setView,
     ]);
     return updateUserWithModal;

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

@@ -8,14 +8,17 @@ import { dynamicEvents } from '../../../../events/dynamicEvents.js';
 import { validateUpdateRequest } from './validateUpdateRequest/validateUpdateRequest.js';
 
 /** Saves the values updated by the user */
-const saveUserValues = ({ fields: newValues, updateUserResult: { isEmailVerificationRequired }, }, internalSetShowAuthFlow, setView, resolve, reject) => __awaiter(void 0, void 0, void 0, function* () {
+const saveUserValues = ({ fields: newValues, updateUserResult: { isEmailVerificationRequired }, }, setShowAuthFlow, setView, resolve, reject) => __awaiter(void 0, void 0, void 0, function* () {
     // If no verification is needed, we are done
     if (!isEmailVerificationRequired) {
         resolve(newValues);
         return;
     }
     // Show email verification view
-    internalSetShowAuthFlow(true);
+    setShowAuthFlow(true, {
+        ignoreIfIsEmbeddedWidget: false,
+        performMultiWalletChecks: false,
+    });
     setView('verify-email');
     // Subscribe to email verification result
     dynamicEvents.once('emailVerificationResult', (wasSuccessful, newEmail) => {
@@ -31,7 +34,7 @@ const saveUserValues = ({ fields: newValues, updateUserResult: { isEmailVerifica
  * The fields must have been previously enabled in the dashboard
  */
 const useUpdateUserWithModal = (updateUser) => {
-    const { user, projectSettings, internalSetShowAuthFlow } = useInternalDynamicContext();
+    const { user, projectSettings, setShowAuthFlow } = useInternalDynamicContext();
     const { setView } = useViewContext();
     const editorContext = useContext(UserFieldEditorContext);
     if (!editorContext)
@@ -51,7 +54,7 @@ const useUpdateUserWithModal = (updateUser) => {
             subtitle: options === null || options === void 0 ? void 0 : options.subtitle,
             title: options === null || options === void 0 ? void 0 : options.title,
         }, updateUser)
-            .then((updateValues) => saveUserValues(updateValues, internalSetShowAuthFlow, setView, resolve, reject))
+            .then((updateValues) => saveUserValues(updateValues, setShowAuthFlow, setView, resolve, reject))
             .catch((error) => {
             if (/email already exists/gi.test(error))
                 throw error;
@@ -62,7 +65,7 @@ const useUpdateUserWithModal = (updateUser) => {
         projectSettings,
         promptUserForValues,
         updateUser,
-        internalSetShowAuthFlow,
+        setShowAuthFlow,
         setView,
     ]);
     return updateUserWithModal;

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

@@ -38,7 +38,7 @@ 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, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallets, authMode, setOnboardingOnlyJwt, authToken, setAuthMode, removeConnectedWalletsInfo, setIsVerificationInProgress, eventsCallbacks, primaryWallet, } = 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.
@@ -80,7 +80,7 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
         if (newSelectedCredentialWallet) {
             const currentPrimaryWallet = user.verifiedCredentials.find((a) => a.id === primaryWalletId);
             if (verifyOnly ||
-                primaryWalletId === undefined ||
+                !primaryWallet ||
                 (multiWalletWidgetState === 'awaiting_signature' &&
                     newSelectedCredentialWallet.walletName ===
                         (currentPrimaryWallet === null || currentPrimaryWallet === void 0 ? void 0 : currentPrimaryWallet.walletName)) ||

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

@@ -34,7 +34,7 @@ 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, } = useInternalDynamicContext();
+    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallets, authMode, setOnboardingOnlyJwt, authToken, setAuthMode, removeConnectedWalletsInfo, setIsVerificationInProgress, eventsCallbacks, primaryWallet, } = 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.
@@ -76,7 +76,7 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
         if (newSelectedCredentialWallet) {
             const currentPrimaryWallet = user.verifiedCredentials.find((a) => a.id === primaryWalletId);
             if (verifyOnly ||
-                primaryWalletId === undefined ||
+                !primaryWallet ||
                 (multiWalletWidgetState === 'awaiting_signature' &&
                     newSelectedCredentialWallet.walletName ===
                         (currentPrimaryWallet === null || currentPrimaryWallet === void 0 ? void 0 : currentPrimaryWallet.walletName)) ||

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

@@ -17,7 +17,6 @@ require('../../constants/colors.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 require('../../../shared/consts/index.cjs');
-var isSameWalletName = require('../../functions/isSameWalletName/isSameWalletName.cjs');
 var useWalletsConnectionState = require('../useWalletsConnectionState/useWalletsConnectionState.cjs');
 var reconnectSocialWallet = require('./reconnectSocialWallet.cjs');
 var createLinkedWalletsFromWalletOptions = require('./utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.cjs');
@@ -96,7 +95,8 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, walletConn
         const accountIsNotConnectedInSecondaryWallet = connectedAccounts &&
             !connectedAccounts.find((connectedAccount) => connectedAccount.toLowerCase() ===
                 newPrimaryWallet.address.toLowerCase());
-        return (isSameWalletName.isSameWalletName(newPrimaryWallet.connector.name, primaryWallet.connector.name) || accountIsNotConnectedInSecondaryWallet);
+        return (newPrimaryWallet.connector.key === primaryWallet.connector.key ||
+            accountIsNotConnectedInSecondaryWallet);
     }, [multiWalletWidgetState]);
     const checkIfShowQrCodeModal = React.useCallback((wallet) => !wallet.connector.isInstalledOnBrowser() &&
         !wallet.connector.canConnectViaCustodialService, []);

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

@@ -13,7 +13,6 @@ import '../../constants/colors.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import '../../../shared/consts/index.js';
-import { isSameWalletName } from '../../functions/isSameWalletName/isSameWalletName.js';
 import { useWalletsConnectionState } from '../useWalletsConnectionState/useWalletsConnectionState.js';
 import { reconnectSocialWallet } from './reconnectSocialWallet.js';
 import { createLinkedWalletsFromWalletOptions } from './utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.js';
@@ -92,7 +91,8 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, walletConn
         const accountIsNotConnectedInSecondaryWallet = connectedAccounts &&
             !connectedAccounts.find((connectedAccount) => connectedAccount.toLowerCase() ===
                 newPrimaryWallet.address.toLowerCase());
-        return (isSameWalletName(newPrimaryWallet.connector.name, primaryWallet.connector.name) || accountIsNotConnectedInSecondaryWallet);
+        return (newPrimaryWallet.connector.key === primaryWallet.connector.key ||
+            accountIsNotConnectedInSecondaryWallet);
     }, [multiWalletWidgetState]);
     const checkIfShowQrCodeModal = useCallback((wallet) => !wallet.connector.isInstalledOnBrowser() &&
         !wallet.connector.canConnectViaCustodialService, []);

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

@@ -2,8 +2,11 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var isSameWalletName = require('../../../../functions/isSameWalletName/isSameWalletName.cjs');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 
-const findWallet = (account, walletOptions) => walletOptions.find((wallet) => account.walletName && isSameWalletName.isSameWalletName(wallet.name, account.walletName));
+// remaining normalizeWalletName until QNTM-846 is complete due to us still passing the walletname to redcoast:
+// https://linear.app/dynamic-labs/issue/QNTM-846/remove-usage-of-walletwalletconnectorwname-to-instead-use
+const findWallet = (account, walletOptions) => walletOptions.find((wallet) => account.walletName &&
+    walletConnectorCore.normalizeWalletName(account.walletName) === wallet.key);
 
 exports.findWallet = findWallet;

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

@@ -1,5 +1,8 @@
-import { isSameWalletName } from '../../../../functions/isSameWalletName/isSameWalletName.js';
+import { normalizeWalletName } from '@dynamic-labs/wallet-connector-core';
 
-const findWallet = (account, walletOptions) => walletOptions.find((wallet) => account.walletName && isSameWalletName(wallet.name, account.walletName));
+// remaining normalizeWalletName until QNTM-846 is complete due to us still passing the walletname to redcoast:
+// https://linear.app/dynamic-labs/issue/QNTM-846/remove-usage-of-walletwalletconnectorwname-to-instead-use
+const findWallet = (account, walletOptions) => walletOptions.find((wallet) => account.walletName &&
+    normalizeWalletName(account.walletName) === wallet.key);
 
 export { findWallet };

package/src/lib/views/BridgeNextWalletConnectionView/BridgeNextWalletConnectionView.cjs

@@ -32,7 +32,7 @@ const BridgeNextWalletConnectionView = () => {
     if (!chainInfo) {
         throw new utils.DynamicError('No chain info found for chain', chain);
     }
-    return (jsxRuntime.jsx(BridgeNextWalletToConnectLayout.BridgeNextWalletToConnectLayout, { chainName: chainInfo.blockchainName, chainIcon: jsxRuntime.jsx(ChainIcon, {}), onClickAction: () => setView('wallet-list'), onClickClose: () => setShowAuthFlow(false) }));
+    return (jsxRuntime.jsx(BridgeNextWalletToConnectLayout.BridgeNextWalletToConnectLayout, { chainName: chainInfo.blockchainName, chainIcon: jsxRuntime.jsx(ChainIcon, {}), onClickAction: () => setView('wallet-list'), onClickClose: () => setShowAuthFlow(false, { emitCancelAuth: true }) }));
 };
 
 exports.BridgeNextWalletConnectionView = BridgeNextWalletConnectionView;