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

package/CHANGELOG.md

@@ -1,4 +1,28 @@
 
+### [2.1.2](https://github.com/dynamic-labs/DynamicAuth/compare/v2.1.2-alpha.1...v2.1.2) (2024-06-10)
+
+
+### Features
+
+* hide wallets from wallet list that can't have multiple accounts linked ([#5935](https://github.com/dynamic-labs/DynamicAuth/issues/5935)) ([20f9b15](https://github.com/dynamic-labs/DynamicAuth/commit/20f9b15b145cbc57519155691b3640149eec3689))
+
+
+### Bug Fixes
+
+* ensure sign message will not show 2 times ([#5938](https://github.com/dynamic-labs/DynamicAuth/issues/5938)) ([#5941](https://github.com/dynamic-labs/DynamicAuth/issues/5941)) ([2c5a156](https://github.com/dynamic-labs/DynamicAuth/commit/2c5a156ead565bd25067b3bc2b23cbc704f9b314))
+* improve logic related to embedded wallets and emailVerifcation ([#5947](https://github.com/dynamic-labs/DynamicAuth/issues/5947)) ([b885a14](https://github.com/dynamic-labs/DynamicAuth/commit/b885a14dcf200f05233e4ab42b8b518d877d291a))
+* init coinbase provider adhoc ([#5907](https://github.com/dynamic-labs/DynamicAuth/issues/5907)) ([#5933](https://github.com/dynamic-labs/DynamicAuth/issues/5933)) ([2fa1f52](https://github.com/dynamic-labs/DynamicAuth/commit/2fa1f528b27113ee108252ee874ee7f5ead88329))
+* remove force consent and account selection even for returning google users ([#5912](https://github.com/dynamic-labs/DynamicAuth/issues/5912)) ([26a07f2](https://github.com/dynamic-labs/DynamicAuth/commit/26a07f29bdb8bf32a080396906a21d8b084c202f))
+* resolve the default phone country based on enabled countries ([#5](https://github.com/dynamic-labs/DynamicAuth/issues/5)… ([#5916](https://github.com/dynamic-labs/DynamicAuth/issues/5916)) ([8f27c00](https://github.com/dynamic-labs/DynamicAuth/commit/8f27c0082edb77b964b8402cfa75c6a896b061d3)), closes [#5910](https://github.com/dynamic-labs/DynamicAuth/issues/5910)
+* versioned tx needs address lookup table  ([#5909](https://github.com/dynamic-labs/DynamicAuth/issues/5909)) ([#5919](https://github.com/dynamic-labs/DynamicAuth/issues/5919)) ([22e3ca2](https://github.com/dynamic-labs/DynamicAuth/commit/22e3ca2d0b27d15efb50e3092a7bc3a0c0d255a5))
+
+### [2.1.2-alpha.1](https://github.com/dynamic-labs/DynamicAuth/compare/v2.1.2-alpha.0...v2.1.2-alpha.1) (2024-06-07)
+
+
+### Bug Fixes
+
+* find phantom solana provider when opening dapp on new tab ([#5902](https://github.com/dynamic-labs/DynamicAuth/issues/5902)) ([99daf87](https://github.com/dynamic-labs/DynamicAuth/commit/99daf87f17caed870a76e4f89a257a14da37c7ab)), closes [#5895](https://github.com/dynamic-labs/DynamicAuth/issues/5895) [#5896](https://github.com/dynamic-labs/DynamicAuth/issues/5896) [#5897](https://github.com/dynamic-labs/DynamicAuth/issues/5897)
+
 ### [2.1.2-alpha.0](https://github.com/dynamic-labs/DynamicAuth/compare/v2.1.1...v2.1.2-alpha.0) (2024-06-07)
 
 

package/package.cjs

@@ -3,7 +3,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "2.1.2-alpha.0";
+var version = "2.1.2";
 var dependencies = {
 	"@dynamic-labs/sdk-api-core": "0.0.460",
 	"@hcaptcha/react-hcaptcha": "1.4.4",

package/package.js

@@ -1,5 +1,5 @@
 'use client'
-var version = "2.1.2-alpha.0";
+var version = "2.1.2";
 var dependencies = {
 	"@dynamic-labs/sdk-api-core": "0.0.460",
 	"@hcaptcha/react-hcaptcha": "1.4.4",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/sdk-react-core",
-  "version": "2.1.2-alpha.0",
+  "version": "2.1.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/dynamic-labs/dynamic-auth.git",
@@ -17,18 +17,18 @@
     "react-i18next": "13.5.0",
     "yup": "0.32.11",
     "react-international-phone": "4.2.5",
-    "@dynamic-labs/iconic": "2.1.2-alpha.0",
-    "@dynamic-labs/logger": "2.1.2-alpha.0",
-    "@dynamic-labs/multi-wallet": "2.1.2-alpha.0",
-    "@dynamic-labs/rpc-provider-ethereum": "2.1.2-alpha.0",
-    "@dynamic-labs/rpc-provider-solana": "2.1.2-alpha.0",
-    "@dynamic-labs/rpc-providers": "2.1.2-alpha.0",
-    "@dynamic-labs/store": "2.1.2-alpha.0",
-    "@dynamic-labs/types": "2.1.2-alpha.0",
-    "@dynamic-labs/utils": "2.1.2-alpha.0",
-    "@dynamic-labs/viem-utils": "2.1.2-alpha.0",
-    "@dynamic-labs/wallet-book": "2.1.2-alpha.0",
-    "@dynamic-labs/wallet-connector-core": "2.1.2-alpha.0",
+    "@dynamic-labs/iconic": "2.1.2",
+    "@dynamic-labs/logger": "2.1.2",
+    "@dynamic-labs/multi-wallet": "2.1.2",
+    "@dynamic-labs/rpc-provider-ethereum": "2.1.2",
+    "@dynamic-labs/rpc-provider-solana": "2.1.2",
+    "@dynamic-labs/rpc-providers": "2.1.2",
+    "@dynamic-labs/store": "2.1.2",
+    "@dynamic-labs/types": "2.1.2",
+    "@dynamic-labs/utils": "2.1.2",
+    "@dynamic-labs/viem-utils": "2.1.2",
+    "@dynamic-labs/wallet-book": "2.1.2",
+    "@dynamic-labs/wallet-connector-core": "2.1.2",
     "eventemitter3": "5.0.1"
   },
   "devDependencies": {

package/src/lib/components/PhoneNumberField/PhoneNumberField.cjs

@@ -23,6 +23,7 @@ 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');
@@ -87,10 +88,12 @@ const PhoneNumberField = ({ isLoading, disabled, error, label, onUpdate, appendR
     const countryInputRef = React.useRef(null);
     const [countryDropdownOpen, setCountryDropdownOpen] = React.useState(false);
     const anchorRef = React.useRef(null);
+    const { defaultPhoneInputIso2 } = useInternalDynamicContext.useInternalDynamicContext();
     const [invalidNumberMessage, setInvalidNumberMessage] = React.useState(undefined);
     const { formattedPhone, currentCountry, handleCountryInput, handlePhoneInput, hasInput, inputRef, countryInput, onBlurCountry, filteredCountries, openDropdown, handleCountryKeyDown, closeDropdown, setCountry, onMenuDisplayToggle, onFocusCountry, countryFontSize, } = usePhoneInputLogic.usePhoneInputLogic({
         countries,
         countryInputRef,
+        defaultIso2: defaultPhoneInputIso2,
         initialPhone,
         onUpdate,
         setCountryDropdownOpen,

package/src/lib/components/PhoneNumberField/PhoneNumberField.js

@@ -19,6 +19,7 @@ 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';
@@ -83,10 +84,12 @@ const PhoneNumberField = ({ isLoading, disabled, error, label, onUpdate, appendR
     const countryInputRef = useRef(null);
     const [countryDropdownOpen, setCountryDropdownOpen] = useState(false);
     const anchorRef = useRef(null);
+    const { defaultPhoneInputIso2 } = useInternalDynamicContext();
     const [invalidNumberMessage, setInvalidNumberMessage] = useState(undefined);
     const { formattedPhone, currentCountry, handleCountryInput, handlePhoneInput, hasInput, inputRef, countryInput, onBlurCountry, filteredCountries, openDropdown, handleCountryKeyDown, closeDropdown, setCountry, onMenuDisplayToggle, onFocusCountry, countryFontSize, } = usePhoneInputLogic({
         countries,
         countryInputRef,
+        defaultIso2: defaultPhoneInputIso2,
         initialPhone,
         onUpdate,
         setCountryDropdownOpen,

package/src/lib/components/PhoneNumberField/usePhoneInputLogic/usePhoneInputLogic.cjs

@@ -9,33 +9,24 @@ var localStorage = require('../../../shared/utils/classes/storage/localStorage.c
 var useThrottle = require('../../../shared/utils/hooks/useThrottle/useThrottle.cjs');
 var localStorage$1 = require('../../../utils/constants/localStorage.cjs');
 var modulo = require('../../../utils/functions/modulo/modulo.cjs');
+var parseDefaultCountry = require('../utils/parseDefaultCountry/parseDefaultCountry.cjs');
 
 const MENU_DISPLAY_THROTTLE = 50;
 const COUNTRY_INPUT_SCROLL_DELAY = 20;
-const usePhoneInputLogic = ({ countryInputRef, setCountryDropdownOpen, setInvalidNumberMessage, onUpdate, initialPhone, countries, }) => {
-    var _a, _b, _c, _d, _e, _f;
-    /** The default country we want to use */
-    const getDefaultCountry = () => {
-        var _a;
-        const defaultCountryIso2 = (_a = localStorage.LocalStorage.getFromLS(localStorage$1.PHONE_INPUT_DEFAULT_COUNTRY)) !== null && _a !== void 0 ? _a : 'us';
-        return countries
-            .map(reactInternationalPhone.parseCountry)
-            .find(({ iso2 }) => iso2 === defaultCountryIso2);
-    };
-    const { country: initialCountry } = initialPhone
-        ? reactInternationalPhone.guessCountryByPartialPhoneNumber({
-            countries,
-            phone: initialPhone,
-        })
-        : { country: undefined };
+const usePhoneInputLogic = ({ countryInputRef, setCountryDropdownOpen, setInvalidNumberMessage, onUpdate, initialPhone, countries, defaultIso2, }) => {
+    const defaultCountry = React.useMemo(() => parseDefaultCountry.parseDefaultCountry({
+        countries,
+        defaultIso2,
+        initialPhone,
+    }), [countries, defaultIso2, initialPhone]);
     const { inputValue: formattedPhone, phone, country: currentCountry, setCountry: setSelectedCountry, handlePhoneValueChange: handlePhoneInput, inputRef, } = reactInternationalPhone.usePhoneInput({
         countries,
-        defaultCountry: (_c = (_a = initialCountry === null || initialCountry === void 0 ? void 0 : initialCountry.iso2) !== null && _a !== void 0 ? _a : (_b = getDefaultCountry()) === null || _b === void 0 ? void 0 : _b.iso2) !== null && _c !== void 0 ? _c : 'us',
+        defaultCountry: defaultCountry.iso2,
         disableDialCodeAndPrefix: true,
         value: initialPhone,
     });
     /** What is currently displayed on the country input */
-    const [countryInput, setCountryInput] = React.useState((_f = (_d = initialCountry === null || initialCountry === void 0 ? void 0 : initialCountry.dialCode) !== null && _d !== void 0 ? _d : (_e = getDefaultCountry()) === null || _e === void 0 ? void 0 : _e.dialCode) !== null && _f !== void 0 ? _f : '1');
+    const [countryInput, setCountryInput] = React.useState(defaultCountry.dialCode);
     /**
      * This is the same value as phone, except for the following scenario:
      * Since the phone number field hides the "+" char and the country code, when the field
@@ -93,7 +84,7 @@ const usePhoneInputLogic = ({ countryInputRef, setCountryDropdownOpen, setInvali
     // COUNTRY INPUT
     // =================================================================
     /** The last inputted value for country that was valid */
-    const lastValidCountry = React.useRef(initialCountry !== null && initialCountry !== void 0 ? initialCountry : getDefaultCountry());
+    const lastValidCountry = React.useRef(defaultCountry);
     const handleCountryInput = ({ target, }) => {
         const value = target.value.slice(0, 4);
         setCountryInput(value);

package/src/lib/components/PhoneNumberField/usePhoneInputLogic/usePhoneInputLogic.d.ts

@@ -1,5 +1,5 @@
 import { ChangeEventHandler, Dispatch, KeyboardEventHandler, RefObject, SetStateAction } from 'react';
-import { CountryData, ParsedCountry } from 'react-international-phone';
+import { CountryData, CountryIso2, ParsedCountry } from 'react-international-phone';
 export type OnUpdatePhoneData = (values: {
     phone: string;
     formattedPhone: string;
@@ -12,8 +12,9 @@ type UsePhoneLogicProps = {
     countries: CountryData[];
     onUpdate?: OnUpdatePhoneData;
     initialPhone?: string;
+    defaultIso2?: CountryIso2;
 };
-export declare const usePhoneInputLogic: ({ countryInputRef, setCountryDropdownOpen, setInvalidNumberMessage, onUpdate, initialPhone, countries, }: UsePhoneLogicProps) => {
+export declare const usePhoneInputLogic: ({ countryInputRef, setCountryDropdownOpen, setInvalidNumberMessage, onUpdate, initialPhone, countries, defaultIso2, }: UsePhoneLogicProps) => {
     closeDropdown: () => void;
     countryFontSize: string;
     countryInput: string;

package/src/lib/components/PhoneNumberField/usePhoneInputLogic/usePhoneInputLogic.js

@@ -1,37 +1,28 @@
 'use client'
-import { useState, useMemo, useEffect, useCallback, useRef } from 'react';
-import { guessCountryByPartialPhoneNumber, usePhoneInput, parseCountry, removeDialCode } from 'react-international-phone';
+import { useMemo, useState, useEffect, useCallback, useRef } from 'react';
+import { usePhoneInput, parseCountry, removeDialCode, guessCountryByPartialPhoneNumber } from 'react-international-phone';
 import { LocalStorage } from '../../../shared/utils/classes/storage/localStorage.js';
 import { useThrottle } from '../../../shared/utils/hooks/useThrottle/useThrottle.js';
 import { PHONE_INPUT_DEFAULT_COUNTRY } from '../../../utils/constants/localStorage.js';
 import { modulo } from '../../../utils/functions/modulo/modulo.js';
+import { parseDefaultCountry } from '../utils/parseDefaultCountry/parseDefaultCountry.js';
 
 const MENU_DISPLAY_THROTTLE = 50;
 const COUNTRY_INPUT_SCROLL_DELAY = 20;
-const usePhoneInputLogic = ({ countryInputRef, setCountryDropdownOpen, setInvalidNumberMessage, onUpdate, initialPhone, countries, }) => {
-    var _a, _b, _c, _d, _e, _f;
-    /** The default country we want to use */
-    const getDefaultCountry = () => {
-        var _a;
-        const defaultCountryIso2 = (_a = LocalStorage.getFromLS(PHONE_INPUT_DEFAULT_COUNTRY)) !== null && _a !== void 0 ? _a : 'us';
-        return countries
-            .map(parseCountry)
-            .find(({ iso2 }) => iso2 === defaultCountryIso2);
-    };
-    const { country: initialCountry } = initialPhone
-        ? guessCountryByPartialPhoneNumber({
-            countries,
-            phone: initialPhone,
-        })
-        : { country: undefined };
+const usePhoneInputLogic = ({ countryInputRef, setCountryDropdownOpen, setInvalidNumberMessage, onUpdate, initialPhone, countries, defaultIso2, }) => {
+    const defaultCountry = useMemo(() => parseDefaultCountry({
+        countries,
+        defaultIso2,
+        initialPhone,
+    }), [countries, defaultIso2, initialPhone]);
     const { inputValue: formattedPhone, phone, country: currentCountry, setCountry: setSelectedCountry, handlePhoneValueChange: handlePhoneInput, inputRef, } = usePhoneInput({
         countries,
-        defaultCountry: (_c = (_a = initialCountry === null || initialCountry === void 0 ? void 0 : initialCountry.iso2) !== null && _a !== void 0 ? _a : (_b = getDefaultCountry()) === null || _b === void 0 ? void 0 : _b.iso2) !== null && _c !== void 0 ? _c : 'us',
+        defaultCountry: defaultCountry.iso2,
         disableDialCodeAndPrefix: true,
         value: initialPhone,
     });
     /** What is currently displayed on the country input */
-    const [countryInput, setCountryInput] = useState((_f = (_d = initialCountry === null || initialCountry === void 0 ? void 0 : initialCountry.dialCode) !== null && _d !== void 0 ? _d : (_e = getDefaultCountry()) === null || _e === void 0 ? void 0 : _e.dialCode) !== null && _f !== void 0 ? _f : '1');
+    const [countryInput, setCountryInput] = useState(defaultCountry.dialCode);
     /**
      * This is the same value as phone, except for the following scenario:
      * Since the phone number field hides the "+" char and the country code, when the field
@@ -89,7 +80,7 @@ const usePhoneInputLogic = ({ countryInputRef, setCountryDropdownOpen, setInvali
     // COUNTRY INPUT
     // =================================================================
     /** The last inputted value for country that was valid */
-    const lastValidCountry = useRef(initialCountry !== null && initialCountry !== void 0 ? initialCountry : getDefaultCountry());
+    const lastValidCountry = useRef(defaultCountry);
     const handleCountryInput = ({ target, }) => {
         const value = target.value.slice(0, 4);
         setCountryInput(value);

package/src/lib/components/PhoneNumberField/utils/parseDefaultCountry/index.d.ts

@@ -0,0 +1 @@
+export { parseDefaultCountry } from './parseDefaultCountry';

package/src/lib/components/PhoneNumberField/utils/parseDefaultCountry/parseDefaultCountry.cjs

@@ -0,0 +1,57 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var reactInternationalPhone = require('react-international-phone');
+require('@dynamic-labs/sdk-api-core');
+require('../../../../shared/logger.cjs');
+require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
+require('react/jsx-runtime');
+require('../../../../context/ViewContext/ViewContext.cjs');
+require('react');
+require('@dynamic-labs/wallet-book');
+var localStorage$1 = require('../../../../utils/constants/localStorage.cjs');
+require('../../../../utils/constants/colors.cjs');
+require('../../../../utils/constants/values.cjs');
+var localStorage = require('../../../../shared/utils/classes/storage/localStorage.cjs');
+require('@dynamic-labs/utils');
+require('../../../../shared/consts/index.cjs');
+
+const parseDefaultCountry = ({ defaultIso2, countries, initialPhone, }) => {
+    // Return the country inferred from the phone number if possible
+    if (initialPhone) {
+        const { country } = reactInternationalPhone.guessCountryByPartialPhoneNumber({
+            countries,
+            phone: initialPhone,
+        });
+        if (country) {
+            return country;
+        }
+    }
+    const parsedCountries = countries.map(reactInternationalPhone.parseCountry);
+    // If the user has previously selected a country, use that as the default
+    const lastUsedCountryIso2 = localStorage.LocalStorage.getFromLS(localStorage$1.PHONE_INPUT_DEFAULT_COUNTRY);
+    const lastUsedCountry = parsedCountries.find(({ iso2 }) => iso2 === lastUsedCountryIso2);
+    if (lastUsedCountry) {
+        return lastUsedCountry;
+    }
+    // Use default country setting if found in enabled countries
+    const defaultCountry = parsedCountries.find(({ iso2 }) => iso2 === defaultIso2);
+    if (defaultCountry) {
+        return defaultCountry;
+    }
+    // Return US if it is enabled
+    const countryUS = parsedCountries.find(({ iso2 }) => iso2 === 'us');
+    if (countryUS) {
+        return countryUS;
+    }
+    // Return the first country in the list as a last resort
+    if (parsedCountries[0]) {
+        return parsedCountries[0];
+    }
+    throw new Error('No country list was provided');
+};
+
+exports.parseDefaultCountry = parseDefaultCountry;

package/src/lib/components/PhoneNumberField/utils/parseDefaultCountry/parseDefaultCountry.d.ts

@@ -0,0 +1,8 @@
+import { CountryData, CountryIso2, ParsedCountry } from 'react-international-phone';
+type ParseDefaultCountryProps = {
+    initialPhone: string | undefined;
+    defaultIso2: CountryIso2 | undefined;
+    countries: CountryData[];
+};
+export declare const parseDefaultCountry: ({ defaultIso2, countries, initialPhone, }: ParseDefaultCountryProps) => ParsedCountry;
+export {};

package/src/lib/components/PhoneNumberField/utils/parseDefaultCountry/parseDefaultCountry.js

@@ -0,0 +1,53 @@
+'use client'
+import { guessCountryByPartialPhoneNumber, parseCountry } from 'react-international-phone';
+import '@dynamic-labs/sdk-api-core';
+import '../../../../shared/logger.js';
+import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
+import 'react/jsx-runtime';
+import '../../../../context/ViewContext/ViewContext.js';
+import 'react';
+import '@dynamic-labs/wallet-book';
+import { PHONE_INPUT_DEFAULT_COUNTRY } from '../../../../utils/constants/localStorage.js';
+import '../../../../utils/constants/colors.js';
+import '../../../../utils/constants/values.js';
+import { LocalStorage } from '../../../../shared/utils/classes/storage/localStorage.js';
+import '@dynamic-labs/utils';
+import '../../../../shared/consts/index.js';
+
+const parseDefaultCountry = ({ defaultIso2, countries, initialPhone, }) => {
+    // Return the country inferred from the phone number if possible
+    if (initialPhone) {
+        const { country } = guessCountryByPartialPhoneNumber({
+            countries,
+            phone: initialPhone,
+        });
+        if (country) {
+            return country;
+        }
+    }
+    const parsedCountries = countries.map(parseCountry);
+    // If the user has previously selected a country, use that as the default
+    const lastUsedCountryIso2 = LocalStorage.getFromLS(PHONE_INPUT_DEFAULT_COUNTRY);
+    const lastUsedCountry = parsedCountries.find(({ iso2 }) => iso2 === lastUsedCountryIso2);
+    if (lastUsedCountry) {
+        return lastUsedCountry;
+    }
+    // Use default country setting if found in enabled countries
+    const defaultCountry = parsedCountries.find(({ iso2 }) => iso2 === defaultIso2);
+    if (defaultCountry) {
+        return defaultCountry;
+    }
+    // Return US if it is enabled
+    const countryUS = parsedCountries.find(({ iso2 }) => iso2 === 'us');
+    if (countryUS) {
+        return countryUS;
+    }
+    // Return the first country in the list as a last resort
+    if (parsedCountries[0]) {
+        return parsedCountries[0];
+    }
+    throw new Error('No country list was provided');
+};
+
+export { parseDefaultCountry };

package/src/lib/components/Step/index.d.ts

@@ -0,0 +1 @@
+export { Step } from './Step';

package/src/lib/context/DynamicContext/DynamicContext.cjs

@@ -137,7 +137,7 @@ const DynamicContext = React.createContext(undefined);
 /** The context provider itself we only use internally */
 const InnerDynamicContextProvider = ({ children, theme, settings: settings$1, locale: locale$1, }) => {
     var _a, _b, _c, _d, _e, _f;
-    const { accessDeniedMessagePrimary, accessDeniedMessageSecondary, accessDeniedButton, apiBaseUrl, coinbaseWalletPreference, enableConnectOnlyFallback = false, deepLinkPreference: deepLinkPreferenceProp = 'native', bridgeChains, cssOverrides, defaultNumberOfWalletsToShow = values.DEFAULT_NUMBER_OF_WALLETS_TO_SHOW, flowNetwork, initialAuthenticationMode = 'connect-and-sign', debugError = false, displaySiweStatement = true, newToWeb3WalletChainMap, enableVisitTrackingOnConnectOnly = true, environmentId, walletsFilter, logLevel = 'WARN', mobileExperience = 'in-app-browser', notInTheListImageUrl, onboardingImageUrl, policiesConsentInnerComponent, customPrivacyPolicy, privacyPolicyUrl, signWithEmailWalletName, socialMediaLinkText, socialMediaIconUrl, socialMediaUrl, customTermsOfServices, termsOfServiceUrl, toolkitEnabled, siweStatement, shadowDOMEnabled = true, walletConnectors: walletConnectorsProp, socialProvidersFilter, showLockedWalletView = false, walletConnectPreferredChains, walletConnectorExtensions, recommendedWallets, hideEmbeddedWalletTransactionUIs, handlers, headless = false, } = settings$1;
+    const { accessDeniedMessagePrimary, accessDeniedMessageSecondary, accessDeniedButton, defaultPhoneInputIso2, apiBaseUrl, coinbaseWalletPreference, enableConnectOnlyFallback = false, deepLinkPreference: deepLinkPreferenceProp = 'native', bridgeChains, cssOverrides, defaultNumberOfWalletsToShow = values.DEFAULT_NUMBER_OF_WALLETS_TO_SHOW, flowNetwork, initialAuthenticationMode = 'connect-and-sign', debugError = false, displaySiweStatement = true, newToWeb3WalletChainMap, enableVisitTrackingOnConnectOnly = true, environmentId, walletsFilter, logLevel = 'WARN', mobileExperience = 'in-app-browser', notInTheListImageUrl, onboardingImageUrl, policiesConsentInnerComponent, customPrivacyPolicy, privacyPolicyUrl, signWithEmailWalletName, socialMediaLinkText, socialMediaIconUrl, socialMediaUrl, customTermsOfServices, termsOfServiceUrl, toolkitEnabled, siweStatement, shadowDOMEnabled = true, walletConnectors: walletConnectorsProp, socialProvidersFilter, showLockedWalletView = false, walletConnectPreferredChains, walletConnectorExtensions, recommendedWallets, hideEmbeddedWalletTransactionUIs, handlers, headless = false, } = settings$1;
     localStorage.LocalStorage.setSuffix(settings$1.localStorageSuffix);
     /**
      * initialize global store
@@ -441,6 +441,7 @@ const InnerDynamicContextProvider = ({ children, theme, settings: settings$1, lo
             customTermsOfServices,
             debugError,
             defaultNumberOfWalletsToShow,
+            defaultPhoneInputIso2,
             defaultTabIndex,
             desktopUri,
             disconnectWallet,
@@ -545,6 +546,7 @@ const InnerDynamicContextProvider = ({ children, theme, settings: settings$1, lo
         accessDeniedMessageSecondary,
         accountSwitchState,
         handlers,
+        defaultPhoneInputIso2,
         appLogoUrl,
         appName,
         defaultTabIndex,

package/src/lib/context/DynamicContext/DynamicContext.d.ts

@@ -1,4 +1,5 @@
 import { FC, ReactNode } from 'react';
+import { CountryIso2 } from 'react-international-phone';
 import { LogLevel } from '@dynamic-labs/logger';
 import { type CoinbaseWalletPreference, type SocialProviderFilter } from '@dynamic-labs/types';
 import { DeepLinkVariant, WalletConnectorExtension, WalletConnectorsMethod } from '@dynamic-labs/wallet-connector-core';
@@ -23,6 +24,7 @@ export interface DynamicContextProps {
         coinbaseWalletPreference?: CoinbaseWalletPreference;
         cssOverrides?: string | JSX.Element;
         customPrivacyPolicy?: ReactNode;
+        defaultPhoneInputIso2?: CountryIso2;
         customTermsOfServices?: ReactNode;
         debugError?: boolean;
         /**

package/src/lib/context/DynamicContext/DynamicContext.js

@@ -133,7 +133,7 @@ const DynamicContext = createContext(undefined);
 /** The context provider itself we only use internally */
 const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) => {
     var _a, _b, _c, _d, _e, _f;
-    const { accessDeniedMessagePrimary, accessDeniedMessageSecondary, accessDeniedButton, apiBaseUrl, coinbaseWalletPreference, enableConnectOnlyFallback = false, deepLinkPreference: deepLinkPreferenceProp = 'native', bridgeChains, cssOverrides, defaultNumberOfWalletsToShow = DEFAULT_NUMBER_OF_WALLETS_TO_SHOW, flowNetwork, initialAuthenticationMode = 'connect-and-sign', debugError = false, displaySiweStatement = true, newToWeb3WalletChainMap, enableVisitTrackingOnConnectOnly = true, environmentId, walletsFilter, logLevel = 'WARN', mobileExperience = 'in-app-browser', notInTheListImageUrl, onboardingImageUrl, policiesConsentInnerComponent, customPrivacyPolicy, privacyPolicyUrl, signWithEmailWalletName, socialMediaLinkText, socialMediaIconUrl, socialMediaUrl, customTermsOfServices, termsOfServiceUrl, toolkitEnabled, siweStatement, shadowDOMEnabled = true, walletConnectors: walletConnectorsProp, socialProvidersFilter, showLockedWalletView = false, walletConnectPreferredChains, walletConnectorExtensions, recommendedWallets, hideEmbeddedWalletTransactionUIs, handlers, headless = false, } = settings;
+    const { accessDeniedMessagePrimary, accessDeniedMessageSecondary, accessDeniedButton, defaultPhoneInputIso2, apiBaseUrl, coinbaseWalletPreference, enableConnectOnlyFallback = false, deepLinkPreference: deepLinkPreferenceProp = 'native', bridgeChains, cssOverrides, defaultNumberOfWalletsToShow = DEFAULT_NUMBER_OF_WALLETS_TO_SHOW, flowNetwork, initialAuthenticationMode = 'connect-and-sign', debugError = false, displaySiweStatement = true, newToWeb3WalletChainMap, enableVisitTrackingOnConnectOnly = true, environmentId, walletsFilter, logLevel = 'WARN', mobileExperience = 'in-app-browser', notInTheListImageUrl, onboardingImageUrl, policiesConsentInnerComponent, customPrivacyPolicy, privacyPolicyUrl, signWithEmailWalletName, socialMediaLinkText, socialMediaIconUrl, socialMediaUrl, customTermsOfServices, termsOfServiceUrl, toolkitEnabled, siweStatement, shadowDOMEnabled = true, walletConnectors: walletConnectorsProp, socialProvidersFilter, showLockedWalletView = false, walletConnectPreferredChains, walletConnectorExtensions, recommendedWallets, hideEmbeddedWalletTransactionUIs, handlers, headless = false, } = settings;
     LocalStorage.setSuffix(settings.localStorageSuffix);
     /**
      * initialize global store
@@ -437,6 +437,7 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
             customTermsOfServices,
             debugError,
             defaultNumberOfWalletsToShow,
+            defaultPhoneInputIso2,
             defaultTabIndex,
             desktopUri,
             disconnectWallet,
@@ -541,6 +542,7 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
         accessDeniedMessageSecondary,
         accountSwitchState,
         handlers,
+        defaultPhoneInputIso2,
         appLogoUrl,
         appName,
         defaultTabIndex,

package/src/lib/context/DynamicContext/types/index.d.ts

@@ -1,5 +1,6 @@
 import { Dispatch, MutableRefObject, ReactElement, ReactNode, SetStateAction } from 'react';
 import { changeLanguage } from 'i18next';
+import { CountryIso2 } from 'react-international-phone';
 import { NameServiceData, ProjectSettings, SdkView } from '@dynamic-labs/sdk-api-core';
 import { GenericNetwork, NetworkConfigurationMap, SocialProviderFilter, UserProfile, WalletUiUtils } from '@dynamic-labs/types';
 import { Chain, GetAddressOpts, WalletConnector } from '@dynamic-labs/wallet-connector-core';
@@ -64,6 +65,7 @@ export interface IDynamicContext {
     accountSwitchState: AccountSwitchState;
     appLogoUrl?: string;
     appName?: string;
+    defaultPhoneInputIso2?: CountryIso2;
     authMode: AuthModeType;
     authToken: string | undefined;
     authorizationViewDisplayOrder: DisplayOrder;

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

@@ -32,7 +32,6 @@ const OAUTH_LOGIN_DATA = {
         url: 'https://github.com/login/oauth/authorize',
     },
     google: {
-        prompt: ['select_account', 'consent'],
         scope: ['profile', 'email'],
         url: 'https://accounts.google.com/o/oauth2/v2/auth',
     },

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

@@ -28,7 +28,6 @@ const OAUTH_LOGIN_DATA = {
         url: 'https://github.com/login/oauth/authorize',
     },
     google: {
-        prompt: ['select_account', 'consent'],
         scope: ['profile', 'email'],
         url: 'https://accounts.google.com/o/oauth2/v2/auth',
     },

package/src/lib/utils/functions/walletListBuilder/utils/staticLinkedWalletFilter/index.d.ts

@@ -0,0 +1 @@
+export * from './staticLinkedWalletFilter';

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

@@ -0,0 +1,30 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+/**
+ * These wallets do not fire events when switching accounts, so we should filter
+ * them out of the wallet list if they are already linked to the user profile.
+ */
+const staticListToFilter = [
+    'xverse',
+    'magiceden',
+    'magicedenbtc',
+    'magicedensol',
+];
+/**
+ * This function is a helper to filter out wallets that should not appear in the wallet list
+ * if they are already linked to the user profile.
+ */
+const staticWalletFilter = (linkedWallets, walletOptions) => walletOptions.filter((walletOption) => {
+    if (!staticListToFilter.includes(walletOption.key)) {
+        return true;
+    }
+    if (linkedWallets.some((wallet) => wallet.connector.key === walletOption.key)) {
+        return false;
+    }
+    return true;
+});
+
+exports.staticWalletFilter = staticWalletFilter;

package/src/lib/utils/functions/walletListBuilder/utils/staticLinkedWalletFilter/staticLinkedWalletFilter.d.ts

@@ -0,0 +1,6 @@
+import { Wallet, WalletOption } from '../../../../../shared';
+/**
+ * This function is a helper to filter out wallets that should not appear in the wallet list
+ * if they are already linked to the user profile.
+ */
+export declare const staticWalletFilter: (linkedWallets: Wallet[], walletOptions: WalletOption[]) => WalletOption[];

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

@@ -0,0 +1,26 @@
+'use client'
+/**
+ * These wallets do not fire events when switching accounts, so we should filter
+ * them out of the wallet list if they are already linked to the user profile.
+ */
+const staticListToFilter = [
+    'xverse',
+    'magiceden',
+    'magicedenbtc',
+    'magicedensol',
+];
+/**
+ * This function is a helper to filter out wallets that should not appear in the wallet list
+ * if they are already linked to the user profile.
+ */
+const staticWalletFilter = (linkedWallets, walletOptions) => walletOptions.filter((walletOption) => {
+    if (!staticListToFilter.includes(walletOption.key)) {
+        return true;
+    }
+    if (linkedWallets.some((wallet) => wallet.connector.key === walletOption.key)) {
+        return false;
+    }
+    return true;
+});
+
+export { staticWalletFilter };

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

@@ -7,6 +7,7 @@ var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var getCalculatedOffset = require('./utils/getCalculatedOffset/getCalculatedOffset.cjs');
 var groupWalletOptions = require('./utils/groupWalletOptions/groupWalletOptions.cjs');
 var filterConnectedWallets = require('./utils/filterConnectedWallets/filterConnectedWallets.cjs');
+var staticLinkedWalletFilter = require('./utils/staticLinkedWalletFilter/staticLinkedWalletFilter.cjs');
 
 const PRIORITY_WALLET_LIST = [
     'metamask',
@@ -56,7 +57,7 @@ const sortedInputList = (inputList, recommendedWalletKeys) => {
         ...unsortedOtherWallets,
     ];
 };
-const walletListBuilder = ({ authMode, connectedWallets, multiWallet, numberOfWalletsToShow, inputList, isWalletConnectList, lastUsedWalletKey, signWithEmailWalletName, searchFilter, walletsFilter, loginWithEmail, groupWallets, walletBook, showMoreWalletsWithFilter, recommendedWallets, }) => {
+const walletListBuilder = ({ authMode, connectedWallets, linkedWallets, multiWallet, numberOfWalletsToShow, inputList, isWalletConnectList, lastUsedWalletKey, signWithEmailWalletName, searchFilter, walletsFilter, loginWithEmail, groupWallets, walletBook, showMoreWalletsWithFilter, recommendedWallets, }) => {
     let walletList = inputList;
     if (isWalletConnectList) {
         walletList = inputList.filter((wallet) => wallet.walletConnector.isWalletConnect &&
@@ -68,6 +69,9 @@ const walletListBuilder = ({ authMode, connectedWallets, multiWallet, numberOfWa
             walletOptions: walletList,
         });
     }
+    if (authMode === 'connect-and-sign' && multiWallet) {
+        walletList = staticLinkedWalletFilter.staticWalletFilter(linkedWallets, walletList);
+    }
     let lastUsedWallet;
     const hasWalletFilter = Boolean(walletsFilter);
     const signWithEmailWallet = getSignWithEmailWallet(signWithEmailWalletName, walletList);

package/src/lib/utils/functions/walletListBuilder/walletListBuilder.d.ts

@@ -3,6 +3,7 @@ import { AuthModeType, RecommendedWallet, Wallet, WalletOption } from '../../../
 type BuilderParams = {
     authMode: AuthModeType;
     connectedWallets: Wallet[];
+    linkedWallets: Wallet[];
     multiWallet: boolean;
     inputList: WalletOption[];
     isWalletConnectList: boolean;
@@ -23,7 +24,7 @@ type BuilderResult = {
 };
 export declare const PRIORITY_WALLET_LIST: string[];
 export declare const SIGN_IN_WITH_EMAIL_WALLET_NAME = "Sign In With Email";
-export declare const walletListBuilder: ({ authMode, connectedWallets, multiWallet, numberOfWalletsToShow, inputList, isWalletConnectList, lastUsedWalletKey, signWithEmailWalletName, searchFilter, walletsFilter, loginWithEmail, groupWallets, walletBook, showMoreWalletsWithFilter, recommendedWallets, }: BuilderParams) => BuilderResult;
+export declare const walletListBuilder: ({ authMode, connectedWallets, linkedWallets, multiWallet, numberOfWalletsToShow, inputList, isWalletConnectList, lastUsedWalletKey, signWithEmailWalletName, searchFilter, walletsFilter, loginWithEmail, groupWallets, walletBook, showMoreWalletsWithFilter, recommendedWallets, }: BuilderParams) => BuilderResult;
 /**
  * This calculation adds an offset to numberOfWalletsToShow so we will show the
  * intended wallets + installed and last used.

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

@@ -3,6 +3,7 @@ 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';
+import { staticWalletFilter } from './utils/staticLinkedWalletFilter/staticLinkedWalletFilter.js';
 
 const PRIORITY_WALLET_LIST = [
     'metamask',
@@ -52,7 +53,7 @@ const sortedInputList = (inputList, recommendedWalletKeys) => {
         ...unsortedOtherWallets,
     ];
 };
-const walletListBuilder = ({ authMode, connectedWallets, multiWallet, numberOfWalletsToShow, inputList, isWalletConnectList, lastUsedWalletKey, signWithEmailWalletName, searchFilter, walletsFilter, loginWithEmail, groupWallets, walletBook, showMoreWalletsWithFilter, recommendedWallets, }) => {
+const walletListBuilder = ({ authMode, connectedWallets, linkedWallets, multiWallet, numberOfWalletsToShow, inputList, isWalletConnectList, lastUsedWalletKey, signWithEmailWalletName, searchFilter, walletsFilter, loginWithEmail, groupWallets, walletBook, showMoreWalletsWithFilter, recommendedWallets, }) => {
     let walletList = inputList;
     if (isWalletConnectList) {
         walletList = inputList.filter((wallet) => wallet.walletConnector.isWalletConnect &&
@@ -64,6 +65,9 @@ const walletListBuilder = ({ authMode, connectedWallets, multiWallet, numberOfWa
             walletOptions: walletList,
         });
     }
+    if (authMode === 'connect-and-sign' && multiWallet) {
+        walletList = staticWalletFilter(linkedWallets, walletList);
+    }
     let lastUsedWallet;
     const hasWalletFilter = Boolean(walletsFilter);
     const signWithEmailWallet = getSignWithEmailWallet(signWithEmailWalletName, walletList);

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,7 +135,6 @@ 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;
@@ -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
@@ -185,7 +190,7 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
                 setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
                 dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', wallet, embeddedWalletVerifiedCredential, updateUserProfileResponse.jwt, user);
             }
-            if (isUsingPregeneratedWallets || isManualMode) {
+            if (isUsingPregeneratedWallets || !isAutomaticWalletCreation) {
                 setShowAuthFlow(false);
                 return true;
             }
@@ -205,14 +210,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 +242,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 +287,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,7 +131,6 @@ 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;
@@ -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
@@ -181,7 +186,7 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
                 setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
                 dynamicEvents.emit('embeddedWalletCreated', wallet, embeddedWalletVerifiedCredential, updateUserProfileResponse.jwt, user);
             }
-            if (isUsingPregeneratedWallets || isManualMode) {
+            if (isUsingPregeneratedWallets || !isAutomaticWalletCreation) {
                 setShowAuthFlow(false);
                 return true;
             }
@@ -201,14 +206,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 +238,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 +283,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

@@ -84,7 +84,7 @@ 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, connectedWallets, linkedWallets, recommendedWallets, } = useInternalDynamicContext.useInternalDynamicContext();
     const { walletBook: walletBook$1 } = walletBook.useWalletBookContext();
     const { numberOfWallets, walletsList } = walletListBuilder.walletListBuilder({
         authMode,
@@ -93,6 +93,7 @@ const WalletSimpleSignIn = ({ previewWalletsNumber, disabled = false, onshowAllW
         inputList: walletConnectorOptions,
         isWalletConnectList: false,
         lastUsedWalletKey: localStorage.LocalStorage.getFromLS(localStorage$1.LAST_USED_WALLET),
+        linkedWallets,
         loginWithEmail: true,
         multiWallet,
         numberOfWalletsToShow: previewWalletsNumber,

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

@@ -80,7 +80,7 @@ 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, connectedWallets, linkedWallets, recommendedWallets, } = useInternalDynamicContext();
     const { walletBook } = useWalletBookContext();
     const { numberOfWallets, walletsList } = walletListBuilder({
         authMode,
@@ -89,6 +89,7 @@ const WalletSimpleSignIn = ({ previewWalletsNumber, disabled = false, onshowAllW
         inputList: walletConnectorOptions,
         isWalletConnectList: false,
         lastUsedWalletKey: LocalStorage.getFromLS(LAST_USED_WALLET),
+        linkedWallets,
         loginWithEmail: true,
         multiWallet,
         numberOfWalletsToShow: previewWalletsNumber,

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

@@ -95,7 +95,7 @@ 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, connectedWallets, linkedWallets, authMode, multiWallet, recommendedWallets, } = useInternalDynamicContext.useInternalDynamicContext();
     const { selectedTabIndex, setSelectedTabIndex, selectedTabSettings, tabsItems, } = useTabState.useTabState();
     const { walletBook: walletBook$1 } = walletBook.useWalletBookContext();
     const { error } = ErrorContext.useErrorContext();
@@ -114,6 +114,7 @@ const WalletList = ({ isWalletConnectList = false, }) => {
         inputList: filteredBridgeChains || walletConnectorOptions,
         isWalletConnectList,
         lastUsedWalletKey: localStorage.LocalStorage.getFromLS(localStorage$1.LAST_USED_WALLET),
+        linkedWallets,
         multiWallet,
         numberOfWalletsToShow: defaultNumberOfWalletsToShow,
         recommendedWallets: effectiveRecommendedWallets,

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

@@ -91,7 +91,7 @@ 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, connectedWallets, linkedWallets, authMode, multiWallet, recommendedWallets, } = useInternalDynamicContext();
     const { selectedTabIndex, setSelectedTabIndex, selectedTabSettings, tabsItems, } = useTabState();
     const { walletBook } = useWalletBookContext();
     const { error } = useErrorContext();
@@ -110,6 +110,7 @@ const WalletList = ({ isWalletConnectList = false, }) => {
         inputList: filteredBridgeChains || walletConnectorOptions,
         isWalletConnectList,
         lastUsedWalletKey: LocalStorage.getFromLS(LAST_USED_WALLET),
+        linkedWallets,
         multiWallet,
         numberOfWalletsToShow: defaultNumberOfWalletsToShow,
         recommendedWallets: effectiveRecommendedWallets,

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, {}) }));