@dynamic-labs/sdk-react-core 3.0.0-alpha.52 → 3.0.0-alpha.53

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

@@ -87,11 +87,7 @@ import '../../../context/ConnectWithOtpContext/constants.js';
 import '../../../context/ReinitializeContext/ReinitializeContextProvider.js';
 import { logVerboseTroubleshootingMessage } from '../../functions/logVerboseTroubleshootingMessage/logVerboseTroubleshootingMessage.js';
 
-const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnectorKey, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, }) => {
-    useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'disconnect', () => {
-        logger.debug('primary wallet disconnect');
-        handleLogOut();
-    });
+const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnectorKey, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, detectNewWalletsForLinking, }) => {
     useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'chainChange', ({ chain }) => {
         logger.debug('primary wallet chain change', { chain });
         if (!primaryWallet) {
@@ -145,41 +141,37 @@ const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet,
             return;
         const [newAddress] = accounts;
         const changedAddress = !isSameAddress(newAddress, primaryWallet.address, primaryWallet.chain);
-        if (changedAddress && authMode === 'connect-only') {
-            refreshConnectedWallet(primaryWallet.id, primaryWallet.connector);
-            return;
-        }
-        const newWallet = secondaryWallets.find((wallet) => isSameAddress(wallet.address, newAddress, wallet.chain));
         if (!changedAddress) {
             setMultiWalletWidgetState('idle');
-        }
-        else if (!multiWallet) {
-            setSelectedWalletWithAction({
-                action: 'select',
-                wallet: primaryWallet,
-            });
-            setMultiWalletWidgetState('awaiting_account_switch', 'primary_not_connected');
             return;
         }
-        else if (multiWalletWidgetState === 'awaiting_account_switch') {
-            handleAccountChangeWhenAwaitingAccountSwitch(true, newAddress);
+        if (authMode === 'connect-only') {
+            refreshConnectedWallet(primaryWallet.id, primaryWallet.connector);
+            return;
         }
-        else if (multiWalletWidgetState === 'idle' && newWallet) {
-            setPrimaryWalletId(newWallet.id);
+        if (!multiWallet) {
+            return;
         }
-        else if (multiWalletWidgetState === 'idle' && !newWallet) {
-            if (user) {
-                setMultiWalletWidgetState('detected_new_wallet');
-                setSelectedWalletConnectorKey(primaryWallet.connector.key);
-                return;
-            }
+        if (multiWalletWidgetState === 'awaiting_account_switch') {
+            handleAccountChangeWhenAwaitingAccountSwitch(true, newAddress);
+            return;
         }
-        else {
+        if (multiWalletWidgetState !== 'idle') {
             logger.error(`Unexpected multiWalletWidgetState (${multiWalletWidgetState}) and onAccountChange combination. Resetting state to idle.`);
             setMultiWalletWidgetState('idle');
         }
+        const newWallet = secondaryWallets.find((wallet) => isSameAddress(wallet.address, newAddress, wallet.chain));
+        if (newWallet) {
+            setPrimaryWalletId(newWallet.id);
+            return;
+        }
+        if (user && detectNewWalletsForLinking) {
+            setMultiWalletWidgetState('detected_new_wallet');
+            setSelectedWalletConnectorKey(primaryWallet.connector.key);
+        }
     }, [
         authMode,
+        detectNewWalletsForLinking,
         handleAccountChangeWhenAwaitingAccountSwitch,
         multiWallet,
         multiWalletWidgetState,
@@ -189,7 +181,6 @@ const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet,
         setMultiWalletWidgetState,
         setPrimaryWalletId,
         setSelectedWalletConnectorKey,
-        setSelectedWalletWithAction,
         user,
     ]);
     useInternalDynamicEvents('triggerComputePrimaryWalletMultiWalletStateFromAccounts', calculatePrimaryWalletMultiWalletStateFromAccounts);
@@ -231,6 +222,12 @@ const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet,
         for (const wallet of affectedWallets)
             refreshConnectedWallet(wallet.id, wallet.connector);
     }));
+    useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'disconnect', () => {
+        logger.debug('primary wallet disconnect');
+        if (authMode === 'connect-only') {
+            handleLogOut();
+        }
+    });
     useWalletConnectorEvent(uniqueNonPrimaryWallets, 'disconnect', (affectedConnector) => {
         logger.debug('secondary wallet disconnect');
         if (authMode === 'connect-only') {

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

@@ -170,7 +170,7 @@ const useWalletItemActions = () => {
     });
     const handleAlreadyConnectedWallet = (walletConnector) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         logger.logger.debug('handleAlreadyConnectedWallet', walletConnector);
-        const connectedAccounts = yield walletConnector.getConnectedAccounts();
+        const connectedAccounts = yield walletConnector.getConnectedAccounts(true);
         const activeAccountAlreadyLinked = linkedWallets.find((wallet) => { var _a; return wallet.address.toLowerCase() === ((_a = connectedAccounts[0]) === null || _a === void 0 ? void 0 : _a.toLowerCase()); });
         logVerboseTroubleshootingMessage.logVerboseTroubleshootingMessage('[handleAlreadyConnectedWallet]', {
             activeAccountAlreadyLinked,

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

@@ -1,12 +1,12 @@
-import { WalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { InternalWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { WalletOption } from '../../../shared/types/wallets';
 import { OpenWalletHandler } from './useWalletItemActions.types';
 export declare const useWalletItemActions: () => {
-    handleAlreadyConnectedWallet: (walletConnector: WalletConnector) => Promise<void>;
-    handleCustodialWalletClick: (walletConnector: WalletConnector) => Promise<void>;
-    handleInstalledExtensionClick: (walletConnector: WalletConnector) => Promise<void>;
-    handleMobileWalletClick: (walletConnector: WalletConnector) => Promise<void>;
-    handleUninstalledClick: (walletConnector: WalletConnector) => Promise<void>;
+    handleAlreadyConnectedWallet: (walletConnector: InternalWalletConnector) => Promise<void>;
+    handleCustodialWalletClick: (walletConnector: InternalWalletConnector) => Promise<void>;
+    handleInstalledExtensionClick: (walletConnector: InternalWalletConnector) => Promise<void>;
+    handleMobileWalletClick: (walletConnector: InternalWalletConnector) => Promise<void>;
+    handleUninstalledClick: (walletConnector: InternalWalletConnector) => Promise<void>;
     handleWalletItemClick: (wallet: WalletOption) => Promise<void>;
     openWallet: OpenWalletHandler;
 };

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

@@ -166,7 +166,7 @@ const useWalletItemActions = () => {
     });
     const handleAlreadyConnectedWallet = (walletConnector) => __awaiter(void 0, void 0, void 0, function* () {
         logger.debug('handleAlreadyConnectedWallet', walletConnector);
-        const connectedAccounts = yield walletConnector.getConnectedAccounts();
+        const connectedAccounts = yield walletConnector.getConnectedAccounts(true);
         const activeAccountAlreadyLinked = linkedWallets.find((wallet) => { var _a; return wallet.address.toLowerCase() === ((_a = connectedAccounts[0]) === null || _a === void 0 ? void 0 : _a.toLowerCase()); });
         logVerboseTroubleshootingMessage('[handleAlreadyConnectedWallet]', {
             activeAccountAlreadyLinked,

package/src/lib/utils/hooks/useWalletItemActions/useWalletItemActions.types.d.ts

@@ -1,6 +1,6 @@
-import type { WalletConnector } from '@dynamic-labs/wallet-connector-core';
+import type { InternalWalletConnector } from '@dynamic-labs/wallet-connector-core';
 export type OpenWalletHandler = (walletKey: string, handlers?: {
-    openCustodialWallet: (walletConnector: WalletConnector) => void;
-    openExtensionWallet: (walletConnector: WalletConnector) => void;
-    openMobileWallet: (walletConnector: WalletConnector) => void;
+    openCustodialWallet: (walletConnector: InternalWalletConnector) => void;
+    openExtensionWallet: (walletConnector: InternalWalletConnector) => void;
+    openMobileWallet: (walletConnector: InternalWalletConnector) => void;
 }) => void;

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

@@ -107,7 +107,7 @@ const useWalletUiUtils = ({ appLogoUrl, appName, getAppOrigin, hideEmbeddedWalle
             return false;
         }
         return true;
-    }, [confirmationStateRef, hideEmbeddedWalletTransactionUIs]);
+    }, [confirmationStateRef]);
     const signMessage = React.useCallback((_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ walletConnector, message, handler }) {
         // prevent the modal from opening itself again
         if (!shouldConfirmAction())
@@ -119,7 +119,14 @@ const useWalletUiUtils = ({ appLogoUrl, appName, getAppOrigin, hideEmbeddedWalle
             else
                 return signedMessage;
         }));
-    }), [appLogoUrl, appName, getAppOrigin, openSignMessage, shouldConfirmAction]);
+    }), [
+        appLogoUrl,
+        appName,
+        getAppOrigin,
+        hideEmbeddedWalletTransactionUIs,
+        openSignMessage,
+        shouldConfirmAction,
+    ]);
     const sendTransaction = React.useCallback((walletConnector, transaction) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         // prevent the modal from opening itself again
         if (!shouldConfirmAction())
@@ -131,7 +138,12 @@ const useWalletUiUtils = ({ appLogoUrl, appName, getAppOrigin, hideEmbeddedWalle
             else
                 return signedTransaction;
         }));
-    }), [openSendTransaction, shouldConfirmAction, t]);
+    }), [
+        hideEmbeddedWalletTransactionUIs,
+        openSendTransaction,
+        shouldConfirmAction,
+        t,
+    ]);
     const enterPassword = React.useCallback((_b) => _tslib.__awaiter(void 0, [_b], void 0, function* ({ handler, closeView = true }) {
         return openEnterPassword((resolve, reject) => (jsxRuntime.jsx(EnterPasswordModal.EnterPasswordModal, { handler: handler, onResolve: resolve, onReject: reject, closeView: closeView })));
     }), [openEnterPassword]);
@@ -139,10 +151,7 @@ const useWalletUiUtils = ({ appLogoUrl, appName, getAppOrigin, hideEmbeddedWalle
         return openCreatePassword((resolve, reject) => (jsxRuntime.jsx(CreatePasswordModal.CreatePasswordModal, { onResolve: resolve, onReject: reject, closeView: closeView })));
     }), [openCreatePassword]);
     const syncWallet = React.useCallback((_d) => _tslib.__awaiter(void 0, [_d], void 0, function* ({ walletConnector, activeAddress, expectedAddress }) {
-        if (!activeAddress) {
-            return;
-        }
-        yield openSyncWalletPrompt((resolve) => (jsxRuntime.jsx(SyncWalletPromptModal.SyncWalletPromptModal, { onResolve: resolve, connector: walletConnector, expectedAddress: expectedAddress })));
+        yield openSyncWalletPrompt((resolve, reject) => (jsxRuntime.jsx(SyncWalletPromptModal.SyncWalletPromptModal, { onResolve: resolve, onReject: reject, connector: walletConnector, expectedAddress: expectedAddress, activeAddress: activeAddress })));
     }), [openSyncWalletPrompt]);
     const disabledConfirmationOnce = React.useCallback(() => {
         confirmationStateRef.current = 'disabled';

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

@@ -1,8 +1,8 @@
 import { ReactNode } from 'react';
 import { WalletUiUtils } from '@dynamic-labs/types';
-import { WalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { InternalWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { WalletUiUtilsHookProps } from './useWalletUiUtils.types';
 export declare const useWalletUiUtils: ({ appLogoUrl, appName, getAppOrigin, hideEmbeddedWalletTransactionUIs, }: WalletUiUtilsHookProps) => [
     ReactNode | undefined,
-    WalletUiUtils<WalletConnector>
+    WalletUiUtils<InternalWalletConnector>
 ];

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

@@ -103,7 +103,7 @@ const useWalletUiUtils = ({ appLogoUrl, appName, getAppOrigin, hideEmbeddedWalle
             return false;
         }
         return true;
-    }, [confirmationStateRef, hideEmbeddedWalletTransactionUIs]);
+    }, [confirmationStateRef]);
     const signMessage = useCallback((_a) => __awaiter(void 0, [_a], void 0, function* ({ walletConnector, message, handler }) {
         // prevent the modal from opening itself again
         if (!shouldConfirmAction())
@@ -115,7 +115,14 @@ const useWalletUiUtils = ({ appLogoUrl, appName, getAppOrigin, hideEmbeddedWalle
             else
                 return signedMessage;
         }));
-    }), [appLogoUrl, appName, getAppOrigin, openSignMessage, shouldConfirmAction]);
+    }), [
+        appLogoUrl,
+        appName,
+        getAppOrigin,
+        hideEmbeddedWalletTransactionUIs,
+        openSignMessage,
+        shouldConfirmAction,
+    ]);
     const sendTransaction = useCallback((walletConnector, transaction) => __awaiter(void 0, void 0, void 0, function* () {
         // prevent the modal from opening itself again
         if (!shouldConfirmAction())
@@ -127,7 +134,12 @@ const useWalletUiUtils = ({ appLogoUrl, appName, getAppOrigin, hideEmbeddedWalle
             else
                 return signedTransaction;
         }));
-    }), [openSendTransaction, shouldConfirmAction, t]);
+    }), [
+        hideEmbeddedWalletTransactionUIs,
+        openSendTransaction,
+        shouldConfirmAction,
+        t,
+    ]);
     const enterPassword = useCallback((_b) => __awaiter(void 0, [_b], void 0, function* ({ handler, closeView = true }) {
         return openEnterPassword((resolve, reject) => (jsx(EnterPasswordModal, { handler: handler, onResolve: resolve, onReject: reject, closeView: closeView })));
     }), [openEnterPassword]);
@@ -135,10 +147,7 @@ const useWalletUiUtils = ({ appLogoUrl, appName, getAppOrigin, hideEmbeddedWalle
         return openCreatePassword((resolve, reject) => (jsx(CreatePasswordModal, { onResolve: resolve, onReject: reject, closeView: closeView })));
     }), [openCreatePassword]);
     const syncWallet = useCallback((_d) => __awaiter(void 0, [_d], void 0, function* ({ walletConnector, activeAddress, expectedAddress }) {
-        if (!activeAddress) {
-            return;
-        }
-        yield openSyncWalletPrompt((resolve) => (jsx(SyncWalletPromptModal, { onResolve: resolve, connector: walletConnector, expectedAddress: expectedAddress })));
+        yield openSyncWalletPrompt((resolve, reject) => (jsx(SyncWalletPromptModal, { onResolve: resolve, onReject: reject, connector: walletConnector, expectedAddress: expectedAddress, activeAddress: activeAddress })));
     }), [openSyncWalletPrompt]);
     const disabledConfirmationOnce = useCallback(() => {
         confirmationStateRef.current = 'disabled';

package/src/lib/views/CollectUserDataView/UserDataFields/UserField/UserField.cjs

@@ -82,13 +82,13 @@ require('../../../../components/Popper/PopperContext/PopperContext.cjs');
 require('../../../WalletList/WalletList.cjs');
 require('../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
+var Checkbox = require('../../../../components/Checkbox/Checkbox.cjs');
 require('../../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
 require('../../../../context/SendBalanceContext/SendBalanceContext.cjs');
 require('../../../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
 require('../../../../context/ConnectWithOtpContext/constants.cjs');
 require('../../../../context/ReinitializeContext/ReinitializeContextProvider.cjs');
-var Checkbox = require('../../../../components/Checkbox/Checkbox.cjs');
 require('../../../../components/InlineWidget/InlineWidget.cjs');
 require('qrcode');
 var Select = require('../../../../components/Select/Select.cjs');

package/src/lib/views/CollectUserDataView/UserDataFields/UserField/UserField.js

@@ -78,13 +78,13 @@ import '../../../../components/Popper/PopperContext/PopperContext.js';
 import '../../../WalletList/WalletList.js';
 import '../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
+import { Checkbox } from '../../../../components/Checkbox/Checkbox.js';
 import '../../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
 import '../../../../context/SendBalanceContext/SendBalanceContext.js';
 import '../../../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
 import '../../../../context/ConnectWithOtpContext/constants.js';
 import '../../../../context/ReinitializeContext/ReinitializeContextProvider.js';
-import { Checkbox } from '../../../../components/Checkbox/Checkbox.js';
 import '../../../../components/InlineWidget/InlineWidget.js';
 import 'qrcode';
 import { Select } from '../../../../components/Select/Select.js';

package/src/lib/views/CreatePasswordView/SavePasswordStep/SavePasswordStep.cjs

@@ -77,6 +77,7 @@ var Input = require('../../../components/Input/Input.cjs');
 require('@dynamic-labs/ethereum-core');
 require('../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
+var Badge = require('../../../components/Badge/Badge.cjs');
 require('../../../../polyfills.cjs');
 require('../../../context/ErrorBoundary/ErrorBoundaryBase.cjs');
 require('../../../context/ErrorBoundary/ErrorBoundaryContext.cjs');
@@ -91,14 +92,13 @@ require('../../WalletList/WalletList.cjs');
 require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
 var TextButton = require('../../../components/TextButton/TextButton.cjs');
-var Badge = require('../../../components/Badge/Badge.cjs');
+var Checkbox = require('../../../components/Checkbox/Checkbox.cjs');
 require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
 require('../../../context/SendBalanceContext/SendBalanceContext.cjs');
 require('../../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
 require('../../../context/ConnectWithOtpContext/constants.cjs');
 require('../../../context/ReinitializeContext/ReinitializeContextProvider.cjs');
-var Checkbox = require('../../../components/Checkbox/Checkbox.cjs');
 require('../../../components/InlineWidget/InlineWidget.cjs');
 require('qrcode');
 var ToggleVisibilityButton = require('../../../components/ToggleVisibilityButton/ToggleVisibilityButton.cjs');

package/src/lib/views/CreatePasswordView/SavePasswordStep/SavePasswordStep.js

@@ -73,6 +73,7 @@ import { Input } from '../../../components/Input/Input.js';
 import '@dynamic-labs/ethereum-core';
 import '../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
+import { Badge } from '../../../components/Badge/Badge.js';
 import '../../../../polyfills.js';
 import '../../../context/ErrorBoundary/ErrorBoundaryBase.js';
 import '../../../context/ErrorBoundary/ErrorBoundaryContext.js';
@@ -87,14 +88,13 @@ import '../../WalletList/WalletList.js';
 import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
 import { TextButton } from '../../../components/TextButton/TextButton.js';
-import { Badge } from '../../../components/Badge/Badge.js';
+import { Checkbox } from '../../../components/Checkbox/Checkbox.js';
 import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
 import '../../../context/SendBalanceContext/SendBalanceContext.js';
 import '../../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
 import '../../../context/ConnectWithOtpContext/constants.js';
 import '../../../context/ReinitializeContext/ReinitializeContextProvider.js';
-import { Checkbox } from '../../../components/Checkbox/Checkbox.js';
 import '../../../components/InlineWidget/InlineWidget.js';
 import 'qrcode';
 import { ToggleVisibilityButton } from '../../../components/ToggleVisibilityButton/ToggleVisibilityButton.js';

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

@@ -48,6 +48,7 @@ require('react-dom');
 require('../../context/WalletContext/WalletContext.cjs');
 var useIsTurnkeyWallet = require('../../utils/hooks/useIsTurnkeyWallet/useIsTurnkeyWallet.cjs');
 var usePasskeyRecovery = require('../../utils/hooks/usePasskeyRecovery/usePasskeyRecovery.cjs');
+var useSmartWallets = require('../../utils/hooks/useSmartWallets/useSmartWallets.cjs');
 require('../../utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
 require('../../context/ThemeContext/ThemeContext.cjs');
 var VerificationContext = require('../../context/VerificationContext/VerificationContext.cjs');
@@ -102,12 +103,12 @@ var IconWithStatus = require('../../components/IconWithStatus/IconWithStatus.cjs
 var PinField = require('../../components/PinField/PinField.cjs');
 var RetrySendVerificationCodeSection = require('../../components/RetrySendVerificationCodeSection/RetrySendVerificationCodeSection.cjs');
 require('../../context/IpConfigurationContext/IpConfigurationContext.cjs');
+var TextButton = require('../../components/TextButton/TextButton.cjs');
 require('../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
 require('../../context/SendBalanceContext/SendBalanceContext.cjs');
 require('../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
 require('../../context/ConnectWithOtpContext/constants.cjs');
 require('../../context/ReinitializeContext/ReinitializeContextProvider.cjs');
-var TextButton = require('../../components/TextButton/TextButton.cjs');
 require('../../components/InlineWidget/InlineWidget.cjs');
 require('qrcode');
 
@@ -118,9 +119,9 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
     const { setView, goToInitialView } = ViewContext.useViewContext();
     const { error, setError, setErrorMessage } = ErrorContext.useErrorContext();
     const { loading, setLoading } = LoadingContext.useLoadingContext();
-    const walletConnector = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector;
     const [showRetryButton, setShowRetryButton] = React.useState(_showRetryButton);
     const [showTransferMessage, setShowTransferMessage] = React.useState(_showTransferMessage);
+    const { getEOAWallet } = useSmartWallets.useSmartWallets();
     // Use a state to ensure UI is updated, but also a ref to access in effect cleanup
     const [isValidated, _setIsValidated] = React.useState(false);
     const isValidatedRef = React.useRef(isValidated);
@@ -179,12 +180,12 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
         // authenticated with Sms/Twitter etc And we need to capture and email.
         if (isTurnkeyProviderEnabled) {
             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 isSessionKeyCompatibleWallet = walletConnectorCore.isSessionKeyCompatibleWalletConnector(walletConnector) ||
-                ((walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.key) === 'zerodev' &&
-                    walletConnectorCore.isSessionKeyCompatibleWalletConnector(walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.getEOAConnector()));
+            const eoaWallet = primaryWallet && getEOAWallet(primaryWallet);
+            const isSessionKeyCompatible = (primaryWallet && walletConnectorCore.isSessionKeyCompatibleWallet(primaryWallet)) ||
+                (eoaWallet && walletConnectorCore.isSessionKeyCompatibleWallet(eoaWallet));
             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) ||
-                    isSessionKeyCompatibleWallet));
+                    isSessionKeyCompatible));
             if (isUsingPregeneratedWallets) {
                 // Pregenerated wallet was created during an
                 // additional email validation step as part of onboarding
@@ -198,13 +199,12 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
                 if (!(walletOption === null || walletOption === void 0 ? void 0 : walletOption.walletConnector)) {
                     throw new Error('Could not find connector for embedded wallet');
                 }
-                const wallet = new walletConnectorCore.Wallet({
-                    address: embeddedWalletVerifiedCredential.address,
-                    chain: embeddedWalletVerifiedCredential.chain,
+                const wallet = walletOption.walletConnector.createWallet({
+                    address: embeddedWalletVerifiedCredential.address || '',
+                    chain: walletOption.walletConnector.connectedChain,
                     connector: walletOption.walletConnector,
                     id: embeddedWalletVerifiedCredential.id,
                     isAuthenticated: false,
-                    isPrimary: true,
                     key: (_k = embeddedWalletVerifiedCredential.walletName) !== null && _k !== void 0 ? _k : '',
                 });
                 setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
@@ -217,20 +217,21 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
         }
         return false;
     }), [
-        addRecoveryEmail,
-        hasRecoveryEmail,
-        hasTurnkeyVerifiedCredentialAuthenticator,
         isEmailRecoveryFlow,
-        isTurnkeyProviderEnabled,
         isTurnkeyWallet,
+        hasTurnkeyVerifiedCredentialAuthenticator,
+        hasRecoveryEmail,
+        isTurnkeyProviderEnabled,
+        setView,
+        addRecoveryEmail,
+        setShowAuthFlow,
         (_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.embeddedWallets) === null || _b === void 0 ? void 0 : _b.automaticEmbeddedWalletCreation,
         (_d = (_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _c === void 0 ? void 0 : _c.embeddedWallets) === null || _d === void 0 ? void 0 : _d.forceAuthenticatorAtSignup,
+        primaryWallet,
+        getEOAWallet,
+        walletConnectorOptions,
         setPrimaryWalletId,
-        setShowAuthFlow,
-        setView,
         user,
-        walletConnectorOptions,
-        walletConnector,
     ]);
     const handleEmailVerification = React.useCallback((verificationToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         setError(undefined);

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

@@ -3,7 +3,7 @@ import { __awaiter } from '../../../../_virtual/_tslib.js';
 import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
 import { useState, useRef, useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
-import { isSessionKeyCompatibleWalletConnector, Wallet } from '@dynamic-labs/wallet-connector-core';
+import { isSessionKeyCompatibleWallet } from '@dynamic-labs/wallet-connector-core';
 import { classNames } from '../../utils/functions/classNames/classNames.js';
 import '../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import '../../components/Alert/Alert.js';
@@ -44,6 +44,7 @@ import 'react-dom';
 import '../../context/WalletContext/WalletContext.js';
 import { useIsTurnkeyWallet } from '../../utils/hooks/useIsTurnkeyWallet/useIsTurnkeyWallet.js';
 import { usePasskeyRecovery } from '../../utils/hooks/usePasskeyRecovery/usePasskeyRecovery.js';
+import { useSmartWallets } from '../../utils/hooks/useSmartWallets/useSmartWallets.js';
 import '../../utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
 import '../../context/ThemeContext/ThemeContext.js';
 import { useVerification } from '../../context/VerificationContext/VerificationContext.js';
@@ -98,12 +99,12 @@ import { IconWithStatus } from '../../components/IconWithStatus/IconWithStatus.j
 import { PinField } from '../../components/PinField/PinField.js';
 import { RetrySendVerificationCodeSection } from '../../components/RetrySendVerificationCodeSection/RetrySendVerificationCodeSection.js';
 import '../../context/IpConfigurationContext/IpConfigurationContext.js';
+import { TextButton } from '../../components/TextButton/TextButton.js';
 import '../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
 import '../../context/SendBalanceContext/SendBalanceContext.js';
 import '../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
 import '../../context/ConnectWithOtpContext/constants.js';
 import '../../context/ReinitializeContext/ReinitializeContextProvider.js';
-import { TextButton } from '../../components/TextButton/TextButton.js';
 import '../../components/InlineWidget/InlineWidget.js';
 import 'qrcode';
 
@@ -114,9 +115,9 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
     const { setView, goToInitialView } = useViewContext();
     const { error, setError, setErrorMessage } = useErrorContext();
     const { loading, setLoading } = useLoadingContext();
-    const walletConnector = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector;
     const [showRetryButton, setShowRetryButton] = useState(_showRetryButton);
     const [showTransferMessage, setShowTransferMessage] = useState(_showTransferMessage);
+    const { getEOAWallet } = useSmartWallets();
     // Use a state to ensure UI is updated, but also a ref to access in effect cleanup
     const [isValidated, _setIsValidated] = useState(false);
     const isValidatedRef = useRef(isValidated);
@@ -175,12 +176,12 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
         // authenticated with Sms/Twitter etc And we need to capture and email.
         if (isTurnkeyProviderEnabled) {
             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 isSessionKeyCompatibleWallet = isSessionKeyCompatibleWalletConnector(walletConnector) ||
-                ((walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.key) === 'zerodev' &&
-                    isSessionKeyCompatibleWalletConnector(walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.getEOAConnector()));
+            const eoaWallet = primaryWallet && getEOAWallet(primaryWallet);
+            const isSessionKeyCompatible = (primaryWallet && isSessionKeyCompatibleWallet(primaryWallet)) ||
+                (eoaWallet && isSessionKeyCompatibleWallet(eoaWallet));
             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) ||
-                    isSessionKeyCompatibleWallet));
+                    isSessionKeyCompatible));
             if (isUsingPregeneratedWallets) {
                 // Pregenerated wallet was created during an
                 // additional email validation step as part of onboarding
@@ -194,13 +195,12 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
                 if (!(walletOption === null || walletOption === void 0 ? void 0 : walletOption.walletConnector)) {
                     throw new Error('Could not find connector for embedded wallet');
                 }
-                const wallet = new Wallet({
-                    address: embeddedWalletVerifiedCredential.address,
-                    chain: embeddedWalletVerifiedCredential.chain,
+                const wallet = walletOption.walletConnector.createWallet({
+                    address: embeddedWalletVerifiedCredential.address || '',
+                    chain: walletOption.walletConnector.connectedChain,
                     connector: walletOption.walletConnector,
                     id: embeddedWalletVerifiedCredential.id,
                     isAuthenticated: false,
-                    isPrimary: true,
                     key: (_k = embeddedWalletVerifiedCredential.walletName) !== null && _k !== void 0 ? _k : '',
                 });
                 setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
@@ -213,20 +213,21 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
         }
         return false;
     }), [
-        addRecoveryEmail,
-        hasRecoveryEmail,
-        hasTurnkeyVerifiedCredentialAuthenticator,
         isEmailRecoveryFlow,
-        isTurnkeyProviderEnabled,
         isTurnkeyWallet,
+        hasTurnkeyVerifiedCredentialAuthenticator,
+        hasRecoveryEmail,
+        isTurnkeyProviderEnabled,
+        setView,
+        addRecoveryEmail,
+        setShowAuthFlow,
         (_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.embeddedWallets) === null || _b === void 0 ? void 0 : _b.automaticEmbeddedWalletCreation,
         (_d = (_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _c === void 0 ? void 0 : _c.embeddedWallets) === null || _d === void 0 ? void 0 : _d.forceAuthenticatorAtSignup,
+        primaryWallet,
+        getEOAWallet,
+        walletConnectorOptions,
         setPrimaryWalletId,
-        setShowAuthFlow,
-        setView,
         user,
-        walletConnectorOptions,
-        walletConnector,
     ]);
     const handleEmailVerification = useCallback((verificationToken) => __awaiter(void 0, void 0, void 0, function* () {
         setError(undefined);