@dynamic-labs/sdk-react-core 2.1.2-alpha.1 → 2.1.3

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

@@ -37,6 +37,7 @@ const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, pr
     return user.verifiedCredentials
         .map(convertLegacyPhantomLedger)
         .map((account) => {
+        var _a;
         const wallet = findWallet.findWallet(account, walletConnectorOptions);
         // this probably shouldn't happen. this would mean that the user has an account linked
         // with wallet W, but the customer has toggled off wallet W or the chain that
@@ -68,6 +69,7 @@ const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, pr
                 connected: false,
                 connector: wallet.walletConnector,
                 id: account.id,
+                key: (_a = account.walletName) !== null && _a !== void 0 ? _a : wallet.walletConnector.key,
             };
         }
         return null;

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

@@ -33,6 +33,7 @@ const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, pr
     return user.verifiedCredentials
         .map(convertLegacyPhantomLedger)
         .map((account) => {
+        var _a;
         const wallet = findWallet(account, walletConnectorOptions);
         // this probably shouldn't happen. this would mean that the user has an account linked
         // with wallet W, but the customer has toggled off wallet W or the chain that
@@ -64,6 +65,7 @@ const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, pr
                 connected: false,
                 connector: wallet.walletConnector,
                 id: account.id,
+                key: (_a = account.walletName) !== null && _a !== void 0 ? _a : wallet.walletConnector.key,
             };
         }
         return null;

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var values = require('../../../../constants/values.cjs');
 
 const findWallet = (account, walletOptions) => {
+    var _a;
     const walletKey = account.walletName;
     if (walletKey === 'turnkeyhd') {
         const chain = account.chain
@@ -14,7 +15,9 @@ const findWallet = (account, walletOptions) => {
         return walletOptions.find((wallet) => walletKey === wallet.key &&
             wallet.walletConnector.connectedChain === chain);
     }
-    return walletOptions.find((wallet) => walletKey === wallet.key);
+    // if we cannot find the correct connector for the wallet, we default to the unknown
+    // this way the wallet will appear in user wallets, but will not be able to be interacted with
+    return ((_a = walletOptions.find((wallet) => walletKey === wallet.key)) !== null && _a !== void 0 ? _a : walletOptions.find((wallet) => wallet.key === 'unknown'));
 };
 
 exports.findWallet = findWallet;

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

@@ -2,6 +2,7 @@
 import { VerifiedCredentialNameToChainEnum } from '../../../../constants/values.js';
 
 const findWallet = (account, walletOptions) => {
+    var _a;
     const walletKey = account.walletName;
     if (walletKey === 'turnkeyhd') {
         const chain = account.chain
@@ -10,7 +11,9 @@ const findWallet = (account, walletOptions) => {
         return walletOptions.find((wallet) => walletKey === wallet.key &&
             wallet.walletConnector.connectedChain === chain);
     }
-    return walletOptions.find((wallet) => walletKey === wallet.key);
+    // if we cannot find the correct connector for the wallet, we default to the unknown
+    // this way the wallet will appear in user wallets, but will not be able to be interacted with
+    return ((_a = walletOptions.find((wallet) => walletKey === wallet.key)) !== null && _a !== void 0 ? _a : walletOptions.find((wallet) => wallet.key === 'unknown'));
 };
 
 export { findWallet };

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

@@ -105,7 +105,7 @@ const useWalletUiUtils = ({ appLogoUrl, appName, getAppOrigin, hideEmbeddedWalle
             return false;
         }
         return true;
-    }, [confirmationStateRef]);
+    }, [confirmationStateRef, hideEmbeddedWalletTransactionUIs]);
     const signMessage = React.useCallback(({ message, handler }) => {
         if (!shouldConfirmAction()) {
             return handler();

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

@@ -101,7 +101,7 @@ const useWalletUiUtils = ({ appLogoUrl, appName, getAppOrigin, hideEmbeddedWalle
             return false;
         }
         return true;
-    }, [confirmationStateRef]);
+    }, [confirmationStateRef, hideEmbeddedWalletTransactionUIs]);
     const signMessage = useCallback(({ message, handler }) => {
         if (!shouldConfirmAction()) {
             return handler();

package/src/lib/views/EmailVerification/EmailVerification.cjs

@@ -103,7 +103,7 @@ const SECONDS_TO_RETRY = 15;
 const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _showRetryButton = true, showTransferMessage: _showTransferMessage = false, }) => {
     var _a, _b, _c, _d;
     const { environmentId, handleLogOut, setPrimaryWalletId, setShowAuthFlow, projectSettings, user, unauthenticatedUser, } = useInternalDynamicContext.useInternalDynamicContext();
-    const { view, setView, goToInitialView } = ViewContext.useViewContext();
+    const { setView, goToInitialView } = ViewContext.useViewContext();
     const { error, setError, setErrorMessage } = ErrorContext.useErrorContext();
     const { loading, setLoading } = LoadingContext.useLoadingContext();
     const [showRetryButton, setShowRetryButton] = React.useState(_showRetryButton);
@@ -135,10 +135,9 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
         if (!email$1)
             logger.logger.warn("WARNING: emitted emailVerificationResult with incomplete params because useVerification's displayedDestination was undefined");
     });
-    const isLoginView = view.type === 'login-with-email-verification';
     const { verifyOtp } = useOtpVerificationRequest.useOtpVerificationRequest();
     const completeSignInFlow = React.useCallback((updateUserProfileResponse) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _e, _f, _g, _h, _j;
+        var _e, _f, _g, _h, _j, _k;
         if (updateUserProfileResponse.nextView === 'verified-and-transferred') {
             setShowTransferMessage === null || setShowTransferMessage === void 0 ? void 0 : setShowTransferMessage(true);
         }
@@ -149,9 +148,13 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
             });
             return true;
         }
+        if (!isTurnkeyWallet) {
+            return false;
+        }
         // If the user has a turnkey embedded wallet and no recovery email, add the email as a recovery email
-        if (isTurnkeyWallet &&
-            hasTurnkeyVerifiedCredentialAuthenticator &&
+        // This logic should run even if the turnkey provider is not enabled anymore
+        // (e.g. user created the wallet and then the settings were disalbed)
+        if (hasTurnkeyVerifiedCredentialAuthenticator &&
             !hasRecoveryEmail &&
             ((_e = updateUserProfileResponse === null || updateUserProfileResponse === void 0 ? void 0 : updateUserProfileResponse.user) === null || _e === void 0 ? void 0 : _e.email)) {
             storeAuthTokenAndUser.storeAuthTokenAndUser(updateUserProfileResponse);
@@ -159,9 +162,11 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
             setShowAuthFlow(false);
             return true;
         }
+        // The logic below is needed when we capture an email after a user
+        // authenticated with Sms/Twitter etc And we need to capture and email.
         if (isTurnkeyProviderEnabled) {
-            const isManualMode = !((_g = (_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _f === void 0 ? void 0 : _f.embeddedWallets) === null || _g === void 0 ? void 0 : _g.automaticEmbeddedWalletCreation);
-            const isUsingPregeneratedWallets = Boolean(!isManualMode &&
+            const isAutomaticWalletCreation = (_g = (_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _f === void 0 ? void 0 : _f.embeddedWallets) === null || _g === void 0 ? void 0 : _g.automaticEmbeddedWalletCreation;
+            const isUsingPregeneratedWallets = Boolean(isAutomaticWalletCreation &&
                 !((_j = (_h = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _h === void 0 ? void 0 : _h.embeddedWallets) === null || _j === void 0 ? void 0 : _j.forceAuthenticatorAtSignup));
             if (isUsingPregeneratedWallets) {
                 // Pregenerated wallet was created during an
@@ -181,11 +186,12 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
                     // @ts-ignore
                     connector: undefined,
                     id: embeddedWalletVerifiedCredential.id,
+                    key: (_k = embeddedWalletVerifiedCredential.walletName) !== null && _k !== void 0 ? _k : '',
                 };
                 setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
                 dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', wallet, embeddedWalletVerifiedCredential, updateUserProfileResponse.jwt, user);
             }
-            if (isUsingPregeneratedWallets || isManualMode) {
+            if (isUsingPregeneratedWallets || !isAutomaticWalletCreation) {
                 setShowAuthFlow(false);
                 return true;
             }
@@ -205,14 +211,25 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
         setView,
         user,
     ]);
-    const handleComplete = React.useCallback((verificationToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    const handleEmailVerification = React.useCallback((verificationToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         setError(undefined);
         setLoading(true);
-        if (!verificationUUID || (!user && !unauthenticatedUser)) {
-            yield cancelAuth();
-            return;
+        if (!verificationUUID) {
+            return cancelAuth();
         }
-        yield completeAuth({
+        if (!user && !unauthenticatedUser) {
+            return initAuth({
+                onVerifySuccess: () => setIsValidated(true),
+                options: { email: email$1 },
+                showSuccessMessage: true,
+                verifyFunction: () => email.signInWithEmailVerification({
+                    environmentId,
+                    verificationToken,
+                    verificationUUID,
+                }),
+            });
+        }
+        return completeAuth({
             completeSignInFlow: (updateUserResponse) => _tslib.__awaiter(void 0, void 0, void 0, function* () { return completeSignInFlow(updateUserResponse); }),
             onValidUpdatedJwt: () => {
                 // This causes emaiLVerificationSuccess to be raised, so it should be set as soon
@@ -226,40 +243,16 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
         setError,
         setLoading,
         verificationUUID,
+        user,
+        unauthenticatedUser,
         completeAuth,
         email$1,
         isEmailRecoveryFlow,
         cancelAuth,
-        completeSignInFlow,
-        verifyOtp,
-        user,
-        unauthenticatedUser,
-    ]);
-    const handleEmailLogin = React.useCallback((verificationToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        setError(undefined);
-        setLoading(true);
-        if (!verificationUUID) {
-            yield cancelAuth();
-            return;
-        }
-        yield initAuth({
-            onVerifySuccess: () => setIsValidated(true),
-            options: { email: email$1 },
-            showSuccessMessage: true,
-            verifyFunction: () => email.signInWithEmailVerification({
-                environmentId,
-                verificationToken,
-                verificationUUID,
-            }),
-        });
-    }), [
-        setError,
-        setLoading,
-        verificationUUID,
         initAuth,
-        email$1,
-        cancelAuth,
         environmentId,
+        completeSignInFlow,
+        verifyOtp,
     ]);
     const handleRetry = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         try {
@@ -295,7 +288,7 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
     }, []);
     return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [error && (jsxRuntime.jsx(ErrorContainer.ErrorContainer, { withIcon: false, className: 'email-verification__error-message', children: error })), jsxRuntime.jsxs("div", { className: classNames.classNames('email-verification__container', {
                     'email-verification__container--error': Boolean(error),
-                }), children: [showTransferMessage && (jsxRuntime.jsx("div", { className: 'email-verification__transfer-message', copykey: 'dyn_otp_verification.email.complete', children: t('dyn_otp_verification.email.complete') })), isValidated ? (jsxRuntime.jsx("div", { className: 'email-verification__icon-container', children: jsxRuntime.jsx(IconWithStatus.IconWithStatus, { containerClassName: 'email-verification__icon--verified', Icon: EmailIcon, iconSize: 64, InnerIcon: check.ReactComponent }) })) : (jsxRuntime.jsx(IconWithSpinner.IconWithSpinner, { Icon: EmailIcon, iconSize: 96, isSpinning: true, className: 'email-verification__icon-with-spinner' })), jsxRuntime.jsxs("div", { className: 'email-verification__copy-text-container', children: [jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', weight: 'regular', color: 'secondary', copykey: 'dyn_otp_verification.description', children: t('dyn_otp_verification.description') }), jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', weight: 'bold', color: 'secondary', children: shortenEmail.shortenEmail(email$1) })] }), jsxRuntime.jsx(PinField.PinField, { initialValue: Array(6).join('.').split('.'), isLoading: loading, handleComplete: isLoginView ? handleEmailLogin : handleComplete, isValidated: isValidated, inputMode: 'numeric', pattern: '[0-9]*', hasError: Boolean(error), onChange: () => setError(undefined) }), showRetryButton && (jsxRuntime.jsx(RetrySendVerificationCodeSection.RetrySendVerificationCodeSection, { className: 'email-verification__retry-container', retryHandler: handleRetry, secondsToRetry: SECONDS_TO_RETRY })), !isLoginView && !isEmailRecoveryFlow && (jsxRuntime.jsx(TextButton.TextButton, { className: 'email-verification__log-out', onClick: handleLogOut, copykey: 'dyn_otp_verification.log_out_button', children: t('dyn_otp_verification.log_out_button') }))] })] }));
+                }), children: [showTransferMessage && (jsxRuntime.jsx("div", { className: 'email-verification__transfer-message', copykey: 'dyn_otp_verification.email.complete', children: t('dyn_otp_verification.email.complete') })), isValidated ? (jsxRuntime.jsx("div", { className: 'email-verification__icon-container', children: jsxRuntime.jsx(IconWithStatus.IconWithStatus, { containerClassName: 'email-verification__icon--verified', Icon: EmailIcon, iconSize: 64, InnerIcon: check.ReactComponent }) })) : (jsxRuntime.jsx(IconWithSpinner.IconWithSpinner, { Icon: EmailIcon, iconSize: 96, isSpinning: true, className: 'email-verification__icon-with-spinner' })), jsxRuntime.jsxs("div", { className: 'email-verification__copy-text-container', children: [jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', weight: 'regular', color: 'secondary', copykey: 'dyn_otp_verification.description', children: t('dyn_otp_verification.description') }), jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', weight: 'bold', color: 'secondary', children: shortenEmail.shortenEmail(email$1) })] }), jsxRuntime.jsx(PinField.PinField, { initialValue: Array(6).join('.').split('.'), isLoading: loading, handleComplete: handleEmailVerification, isValidated: isValidated, inputMode: 'numeric', pattern: '[0-9]*', hasError: Boolean(error), onChange: () => setError(undefined) }), showRetryButton && (jsxRuntime.jsx(RetrySendVerificationCodeSection.RetrySendVerificationCodeSection, { className: 'email-verification__retry-container', retryHandler: handleRetry, secondsToRetry: SECONDS_TO_RETRY })), (user || unauthenticatedUser) && !isEmailRecoveryFlow && (jsxRuntime.jsx(TextButton.TextButton, { className: 'email-verification__log-out', onClick: handleLogOut, copykey: 'dyn_otp_verification.log_out_button', children: t('dyn_otp_verification.log_out_button') }))] })] }));
 };
 
 exports.EmailVerification = EmailVerification;

package/src/lib/views/EmailVerification/EmailVerification.js

@@ -99,7 +99,7 @@ const SECONDS_TO_RETRY = 15;
 const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _showRetryButton = true, showTransferMessage: _showTransferMessage = false, }) => {
     var _a, _b, _c, _d;
     const { environmentId, handleLogOut, setPrimaryWalletId, setShowAuthFlow, projectSettings, user, unauthenticatedUser, } = useInternalDynamicContext();
-    const { view, setView, goToInitialView } = useViewContext();
+    const { setView, goToInitialView } = useViewContext();
     const { error, setError, setErrorMessage } = useErrorContext();
     const { loading, setLoading } = useLoadingContext();
     const [showRetryButton, setShowRetryButton] = useState(_showRetryButton);
@@ -131,10 +131,9 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
         if (!email)
             logger.warn("WARNING: emitted emailVerificationResult with incomplete params because useVerification's displayedDestination was undefined");
     });
-    const isLoginView = view.type === 'login-with-email-verification';
     const { verifyOtp } = useOtpVerificationRequest();
     const completeSignInFlow = useCallback((updateUserProfileResponse) => __awaiter(void 0, void 0, void 0, function* () {
-        var _e, _f, _g, _h, _j;
+        var _e, _f, _g, _h, _j, _k;
         if (updateUserProfileResponse.nextView === 'verified-and-transferred') {
             setShowTransferMessage === null || setShowTransferMessage === void 0 ? void 0 : setShowTransferMessage(true);
         }
@@ -145,9 +144,13 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
             });
             return true;
         }
+        if (!isTurnkeyWallet) {
+            return false;
+        }
         // If the user has a turnkey embedded wallet and no recovery email, add the email as a recovery email
-        if (isTurnkeyWallet &&
-            hasTurnkeyVerifiedCredentialAuthenticator &&
+        // This logic should run even if the turnkey provider is not enabled anymore
+        // (e.g. user created the wallet and then the settings were disalbed)
+        if (hasTurnkeyVerifiedCredentialAuthenticator &&
             !hasRecoveryEmail &&
             ((_e = updateUserProfileResponse === null || updateUserProfileResponse === void 0 ? void 0 : updateUserProfileResponse.user) === null || _e === void 0 ? void 0 : _e.email)) {
             storeAuthTokenAndUser(updateUserProfileResponse);
@@ -155,9 +158,11 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
             setShowAuthFlow(false);
             return true;
         }
+        // The logic below is needed when we capture an email after a user
+        // authenticated with Sms/Twitter etc And we need to capture and email.
         if (isTurnkeyProviderEnabled) {
-            const isManualMode = !((_g = (_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _f === void 0 ? void 0 : _f.embeddedWallets) === null || _g === void 0 ? void 0 : _g.automaticEmbeddedWalletCreation);
-            const isUsingPregeneratedWallets = Boolean(!isManualMode &&
+            const isAutomaticWalletCreation = (_g = (_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _f === void 0 ? void 0 : _f.embeddedWallets) === null || _g === void 0 ? void 0 : _g.automaticEmbeddedWalletCreation;
+            const isUsingPregeneratedWallets = Boolean(isAutomaticWalletCreation &&
                 !((_j = (_h = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _h === void 0 ? void 0 : _h.embeddedWallets) === null || _j === void 0 ? void 0 : _j.forceAuthenticatorAtSignup));
             if (isUsingPregeneratedWallets) {
                 // Pregenerated wallet was created during an
@@ -177,11 +182,12 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
                     // @ts-ignore
                     connector: undefined,
                     id: embeddedWalletVerifiedCredential.id,
+                    key: (_k = embeddedWalletVerifiedCredential.walletName) !== null && _k !== void 0 ? _k : '',
                 };
                 setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
                 dynamicEvents.emit('embeddedWalletCreated', wallet, embeddedWalletVerifiedCredential, updateUserProfileResponse.jwt, user);
             }
-            if (isUsingPregeneratedWallets || isManualMode) {
+            if (isUsingPregeneratedWallets || !isAutomaticWalletCreation) {
                 setShowAuthFlow(false);
                 return true;
             }
@@ -201,14 +207,25 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
         setView,
         user,
     ]);
-    const handleComplete = useCallback((verificationToken) => __awaiter(void 0, void 0, void 0, function* () {
+    const handleEmailVerification = useCallback((verificationToken) => __awaiter(void 0, void 0, void 0, function* () {
         setError(undefined);
         setLoading(true);
-        if (!verificationUUID || (!user && !unauthenticatedUser)) {
-            yield cancelAuth();
-            return;
+        if (!verificationUUID) {
+            return cancelAuth();
         }
-        yield completeAuth({
+        if (!user && !unauthenticatedUser) {
+            return initAuth({
+                onVerifySuccess: () => setIsValidated(true),
+                options: { email },
+                showSuccessMessage: true,
+                verifyFunction: () => signInWithEmailVerification({
+                    environmentId,
+                    verificationToken,
+                    verificationUUID,
+                }),
+            });
+        }
+        return completeAuth({
             completeSignInFlow: (updateUserResponse) => __awaiter(void 0, void 0, void 0, function* () { return completeSignInFlow(updateUserResponse); }),
             onValidUpdatedJwt: () => {
                 // This causes emaiLVerificationSuccess to be raised, so it should be set as soon
@@ -222,40 +239,16 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
         setError,
         setLoading,
         verificationUUID,
+        user,
+        unauthenticatedUser,
         completeAuth,
         email,
         isEmailRecoveryFlow,
         cancelAuth,
-        completeSignInFlow,
-        verifyOtp,
-        user,
-        unauthenticatedUser,
-    ]);
-    const handleEmailLogin = useCallback((verificationToken) => __awaiter(void 0, void 0, void 0, function* () {
-        setError(undefined);
-        setLoading(true);
-        if (!verificationUUID) {
-            yield cancelAuth();
-            return;
-        }
-        yield initAuth({
-            onVerifySuccess: () => setIsValidated(true),
-            options: { email },
-            showSuccessMessage: true,
-            verifyFunction: () => signInWithEmailVerification({
-                environmentId,
-                verificationToken,
-                verificationUUID,
-            }),
-        });
-    }), [
-        setError,
-        setLoading,
-        verificationUUID,
         initAuth,
-        email,
-        cancelAuth,
         environmentId,
+        completeSignInFlow,
+        verifyOtp,
     ]);
     const handleRetry = () => __awaiter(void 0, void 0, void 0, function* () {
         try {
@@ -291,7 +284,7 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
     }, []);
     return (jsxs(Fragment, { children: [error && (jsx(ErrorContainer, { withIcon: false, className: 'email-verification__error-message', children: error })), jsxs("div", { className: classNames('email-verification__container', {
                     'email-verification__container--error': Boolean(error),
-                }), children: [showTransferMessage && (jsx("div", { className: 'email-verification__transfer-message', copykey: 'dyn_otp_verification.email.complete', children: t('dyn_otp_verification.email.complete') })), isValidated ? (jsx("div", { className: 'email-verification__icon-container', children: jsx(IconWithStatus, { containerClassName: 'email-verification__icon--verified', Icon: EmailIcon, iconSize: 64, InnerIcon: SvgCheck }) })) : (jsx(IconWithSpinner, { Icon: EmailIcon, iconSize: 96, isSpinning: true, className: 'email-verification__icon-with-spinner' })), jsxs("div", { className: 'email-verification__copy-text-container', children: [jsx(Typography, { variant: 'body_normal', weight: 'regular', color: 'secondary', copykey: 'dyn_otp_verification.description', children: t('dyn_otp_verification.description') }), jsx(Typography, { variant: 'body_normal', weight: 'bold', color: 'secondary', children: shortenEmail(email) })] }), jsx(PinField, { initialValue: Array(6).join('.').split('.'), isLoading: loading, handleComplete: isLoginView ? handleEmailLogin : handleComplete, isValidated: isValidated, inputMode: 'numeric', pattern: '[0-9]*', hasError: Boolean(error), onChange: () => setError(undefined) }), showRetryButton && (jsx(RetrySendVerificationCodeSection, { className: 'email-verification__retry-container', retryHandler: handleRetry, secondsToRetry: SECONDS_TO_RETRY })), !isLoginView && !isEmailRecoveryFlow && (jsx(TextButton, { className: 'email-verification__log-out', onClick: handleLogOut, copykey: 'dyn_otp_verification.log_out_button', children: t('dyn_otp_verification.log_out_button') }))] })] }));
+                }), children: [showTransferMessage && (jsx("div", { className: 'email-verification__transfer-message', copykey: 'dyn_otp_verification.email.complete', children: t('dyn_otp_verification.email.complete') })), isValidated ? (jsx("div", { className: 'email-verification__icon-container', children: jsx(IconWithStatus, { containerClassName: 'email-verification__icon--verified', Icon: EmailIcon, iconSize: 64, InnerIcon: SvgCheck }) })) : (jsx(IconWithSpinner, { Icon: EmailIcon, iconSize: 96, isSpinning: true, className: 'email-verification__icon-with-spinner' })), jsxs("div", { className: 'email-verification__copy-text-container', children: [jsx(Typography, { variant: 'body_normal', weight: 'regular', color: 'secondary', copykey: 'dyn_otp_verification.description', children: t('dyn_otp_verification.description') }), jsx(Typography, { variant: 'body_normal', weight: 'bold', color: 'secondary', children: shortenEmail(email) })] }), jsx(PinField, { initialValue: Array(6).join('.').split('.'), isLoading: loading, handleComplete: handleEmailVerification, isValidated: isValidated, inputMode: 'numeric', pattern: '[0-9]*', hasError: Boolean(error), onChange: () => setError(undefined) }), showRetryButton && (jsx(RetrySendVerificationCodeSection, { className: 'email-verification__retry-container', retryHandler: handleRetry, secondsToRetry: SECONDS_TO_RETRY })), (user || unauthenticatedUser) && !isEmailRecoveryFlow && (jsx(TextButton, { className: 'email-verification__log-out', onClick: handleLogOut, copykey: 'dyn_otp_verification.log_out_button', children: t('dyn_otp_verification.log_out_button') }))] })] }));
 };
 
 export { EmailVerification };

package/src/lib/views/LoginView/sections/WalletSignInSection/WalletSimpleSignIn/WalletSimpleSignIn.cjs

@@ -33,7 +33,7 @@ require('@dynamic-labs/store');
 require('../../../../../locale/locale.cjs');
 require('../../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../../context/AccountExistsContext/AccountExistsContext.cjs');
-require('../../../../../context/UserWalletsContext/UserWalletsContext.cjs');
+var UserWalletsContext = require('../../../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../../../context/WalletContext/WalletContext.cjs');
@@ -84,11 +84,11 @@ var useInternalDynamicContext = require('../../../../../context/DynamicContext/u
 
 const WalletSimpleSignIn = ({ previewWalletsNumber, disabled = false, onshowAllWallets, }) => {
     const { t } = reactI18next.useTranslation();
-    const { walletConnectorOptions, projectSettings, walletsFilter, signWithEmailWalletName, authMode, multiWallet, connectedWallets, recommendedWallets, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { walletConnectorOptions, projectSettings, walletsFilter, signWithEmailWalletName, authMode, multiWallet, recommendedWallets, } = useInternalDynamicContext.useInternalDynamicContext();
+    const userWallets = UserWalletsContext.useUserWallets();
     const { walletBook: walletBook$1 } = walletBook.useWalletBookContext();
     const { numberOfWallets, walletsList } = walletListBuilder.walletListBuilder({
         authMode,
-        connectedWallets,
         groupWallets: true,
         inputList: walletConnectorOptions,
         isWalletConnectList: false,
@@ -99,6 +99,7 @@ const WalletSimpleSignIn = ({ previewWalletsNumber, disabled = false, onshowAllW
         recommendedWallets,
         searchFilter: undefined,
         signWithEmailWalletName,
+        userWallets,
         walletBook: walletBook$1,
         walletsFilter,
     });

package/src/lib/views/LoginView/sections/WalletSignInSection/WalletSimpleSignIn/WalletSimpleSignIn.js

@@ -29,7 +29,7 @@ import '@dynamic-labs/store';
 import '../../../../../locale/locale.js';
 import '../../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../../context/AccountExistsContext/AccountExistsContext.js';
-import '../../../../../context/UserWalletsContext/UserWalletsContext.js';
+import { useUserWallets } from '../../../../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../../../context/WalletContext/WalletContext.js';
@@ -80,11 +80,11 @@ import { useInternalDynamicContext } from '../../../../../context/DynamicContext
 
 const WalletSimpleSignIn = ({ previewWalletsNumber, disabled = false, onshowAllWallets, }) => {
     const { t } = useTranslation();
-    const { walletConnectorOptions, projectSettings, walletsFilter, signWithEmailWalletName, authMode, multiWallet, connectedWallets, recommendedWallets, } = useInternalDynamicContext();
+    const { walletConnectorOptions, projectSettings, walletsFilter, signWithEmailWalletName, authMode, multiWallet, recommendedWallets, } = useInternalDynamicContext();
+    const userWallets = useUserWallets();
     const { walletBook } = useWalletBookContext();
     const { numberOfWallets, walletsList } = walletListBuilder({
         authMode,
-        connectedWallets,
         groupWallets: true,
         inputList: walletConnectorOptions,
         isWalletConnectList: false,
@@ -95,6 +95,7 @@ const WalletSimpleSignIn = ({ previewWalletsNumber, disabled = false, onshowAllW
         recommendedWallets,
         searchFilter: undefined,
         signWithEmailWalletName,
+        userWallets,
         walletBook,
         walletsFilter,
     });

package/src/lib/views/WalletList/WalletList.cjs

@@ -37,7 +37,7 @@ require('@dynamic-labs/store');
 require('../../locale/locale.cjs');
 require('../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../context/AccountExistsContext/AccountExistsContext.cjs');
-require('../../context/UserWalletsContext/UserWalletsContext.cjs');
+var UserWalletsContext = require('../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../context/WalletContext/WalletContext.cjs');
@@ -95,7 +95,8 @@ var getEffectiveRecommendedWallets = require('./utils/getEffectiveRecommendedWal
 localStorage.LocalStorage.setToLS(localStorage$1.WALLET_PICKER_SEARCH_KEY, '');
 const WalletList = ({ isWalletConnectList = false, }) => {
     var _a;
-    const { walletsFilter, signWithEmailWalletName, walletConnectorOptions, projectSettings, defaultNumberOfWalletsToShow, bridgeChainsToConnect, connectedWallets, authMode, multiWallet, recommendedWallets, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { walletsFilter, signWithEmailWalletName, walletConnectorOptions, projectSettings, defaultNumberOfWalletsToShow, bridgeChainsToConnect, authMode, multiWallet, recommendedWallets, } = useInternalDynamicContext.useInternalDynamicContext();
+    const userWallets = UserWalletsContext.useUserWallets();
     const { selectedTabIndex, setSelectedTabIndex, selectedTabSettings, tabsItems, } = useTabState.useTabState();
     const { walletBook: walletBook$1 } = walletBook.useWalletBookContext();
     const { error } = ErrorContext.useErrorContext();
@@ -109,7 +110,6 @@ const WalletList = ({ isWalletConnectList = false, }) => {
     const effectiveRecommendedWallets = getEffectiveRecommendedWallets.getEffectiveRecommendedWallets(selectedTabSettings, recommendedWallets);
     const { numberOfWallets, walletsList } = walletListBuilder.walletListBuilder({
         authMode,
-        connectedWallets,
         groupWallets: true,
         inputList: filteredBridgeChains || walletConnectorOptions,
         isWalletConnectList,
@@ -120,6 +120,7 @@ const WalletList = ({ isWalletConnectList = false, }) => {
         searchFilter: filterValue,
         showMoreWalletsWithFilter: true,
         signWithEmailWalletName,
+        userWallets,
         walletBook: walletBook$1,
         walletsFilter: getEffectiveWalletFilter.getEffectiveWalletFilter(selectedTabSettings, walletsFilter),
     });

package/src/lib/views/WalletList/WalletList.js

@@ -33,7 +33,7 @@ import '@dynamic-labs/store';
 import '../../locale/locale.js';
 import '../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../context/AccountExistsContext/AccountExistsContext.js';
-import '../../context/UserWalletsContext/UserWalletsContext.js';
+import { useUserWallets } from '../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../context/WalletContext/WalletContext.js';
@@ -91,7 +91,8 @@ import { getEffectiveRecommendedWallets } from './utils/getEffectiveRecommendedW
 LocalStorage.setToLS(WALLET_PICKER_SEARCH_KEY, '');
 const WalletList = ({ isWalletConnectList = false, }) => {
     var _a;
-    const { walletsFilter, signWithEmailWalletName, walletConnectorOptions, projectSettings, defaultNumberOfWalletsToShow, bridgeChainsToConnect, connectedWallets, authMode, multiWallet, recommendedWallets, } = useInternalDynamicContext();
+    const { walletsFilter, signWithEmailWalletName, walletConnectorOptions, projectSettings, defaultNumberOfWalletsToShow, bridgeChainsToConnect, authMode, multiWallet, recommendedWallets, } = useInternalDynamicContext();
+    const userWallets = useUserWallets();
     const { selectedTabIndex, setSelectedTabIndex, selectedTabSettings, tabsItems, } = useTabState();
     const { walletBook } = useWalletBookContext();
     const { error } = useErrorContext();
@@ -105,7 +106,6 @@ const WalletList = ({ isWalletConnectList = false, }) => {
     const effectiveRecommendedWallets = getEffectiveRecommendedWallets(selectedTabSettings, recommendedWallets);
     const { numberOfWallets, walletsList } = walletListBuilder({
         authMode,
-        connectedWallets,
         groupWallets: true,
         inputList: filteredBridgeChains || walletConnectorOptions,
         isWalletConnectList,
@@ -116,6 +116,7 @@ const WalletList = ({ isWalletConnectList = false, }) => {
         searchFilter: filterValue,
         showMoreWalletsWithFilter: true,
         signWithEmailWalletName,
+        userWallets,
         walletBook,
         walletsFilter: getEffectiveWalletFilter(selectedTabSettings, walletsFilter),
     });

package/src/lib/widgets/DynamicMultiWalletPromptsWidget/DynamicMultiWalletPromptsWidget.cjs

@@ -22,12 +22,13 @@ require('@dynamic-labs/sdk-api-core');
 require('../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
-require('../../context/ViewContext/ViewContext.cjs');
+var ViewContext = require('../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
 require('../../utils/constants/colors.cjs');
 require('../../utils/constants/values.cjs');
 require('../../shared/utils/classes/storage/localStorage.cjs');
 require('../../shared/consts/index.cjs');
+var useInternalDynamicContext = require('../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 require('../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');
@@ -86,8 +87,12 @@ require('../DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 
+const pendingSignModalView = ['pending-signature', 'wallet-sign'];
 const DynamicMultiWalletPromptsWidget = () => {
     const isLoggedIn = useIsLoggedIn.useIsLoggedIn();
+    const { showAuthFlow } = useInternalDynamicContext.useInternalDynamicContext();
+    const { view } = ViewContext.useViewContext();
+    const isRenderingSignMessageInLinkWalletModal = showAuthFlow && pendingSignModalView.includes(view.type);
     const multiWalletPromptState = useMultiWalletPromptState.useMultiWalletPromptState();
     const mapMultiWalletPromptStateToModalComponent = {
         awaiting_connection: AwaitingConnectionModal.AwaitingConnectionModal,
@@ -98,7 +103,9 @@ const DynamicMultiWalletPromptsWidget = () => {
         primary_not_connected: PrimaryNotConnectedModal.PrimaryNotConnectedModal,
         unlink_wallet: UnlinkWalletPopUp.UnlinkWalletPopUpModal,
     };
-    if (multiWalletPromptState === 'idle' || !isLoggedIn)
+    if (multiWalletPromptState === 'idle' ||
+        isRenderingSignMessageInLinkWalletModal ||
+        !isLoggedIn)
         return null;
     const ModalComponent = mapMultiWalletPromptStateToModalComponent[multiWalletPromptState];
     return (jsxRuntime.jsx(DynamicBaseWidget.DynamicBaseWidget, { children: jsxRuntime.jsx(ModalComponent, {}) }));

package/src/lib/widgets/DynamicMultiWalletPromptsWidget/DynamicMultiWalletPromptsWidget.js

@@ -18,12 +18,13 @@ import '@dynamic-labs/sdk-api-core';
 import '../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
-import '../../context/ViewContext/ViewContext.js';
+import { useViewContext } from '../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
 import '../../utils/constants/colors.js';
 import '../../utils/constants/values.js';
 import '../../shared/utils/classes/storage/localStorage.js';
 import '../../shared/consts/index.js';
+import { useInternalDynamicContext } from '../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 import '../../context/CaptchaContext/CaptchaContext.js';
 import '../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
@@ -82,8 +83,12 @@ import '../DynamicWidget/context/DynamicWidgetContext.js';
 import '../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
 
+const pendingSignModalView = ['pending-signature', 'wallet-sign'];
 const DynamicMultiWalletPromptsWidget = () => {
     const isLoggedIn = useIsLoggedIn();
+    const { showAuthFlow } = useInternalDynamicContext();
+    const { view } = useViewContext();
+    const isRenderingSignMessageInLinkWalletModal = showAuthFlow && pendingSignModalView.includes(view.type);
     const multiWalletPromptState = useMultiWalletPromptState();
     const mapMultiWalletPromptStateToModalComponent = {
         awaiting_connection: AwaitingConnectionModal,
@@ -94,7 +99,9 @@ const DynamicMultiWalletPromptsWidget = () => {
         primary_not_connected: PrimaryNotConnectedModal,
         unlink_wallet: UnlinkWalletPopUpModal,
     };
-    if (multiWalletPromptState === 'idle' || !isLoggedIn)
+    if (multiWalletPromptState === 'idle' ||
+        isRenderingSignMessageInLinkWalletModal ||
+        !isLoggedIn)
         return null;
     const ModalComponent = mapMultiWalletPromptStateToModalComponent[multiWalletPromptState];
     return (jsx(DynamicBaseWidget, { children: jsx(ModalComponent, {}) }));