@dynamic-labs/sdk-react-core 4.12.2 → 4.12.3

package/CHANGELOG.md

@@ -1,4 +1,12 @@
 
+### [4.12.3](https://github.com/dynamic-labs/dynamic-auth/compare/v4.12.2...v4.12.3) (2025-04-17)
+
+
+### Features
+
+* default waas sui connector network based on enabled chains ([#8570](https://github.com/dynamic-labs/dynamic-auth/issues/8570)) ([9a11b01](https://github.com/dynamic-labs/dynamic-auth/commit/9a11b019bc8ed51873de9d24c93bcc3c1ed6406b))
+* dynamic waas can sign smart account transactiosn ([#8551](https://github.com/dynamic-labs/dynamic-auth/issues/8551)) ([f4882eb](https://github.com/dynamic-labs/dynamic-auth/commit/f4882ebc869b5af72c3beb187bd1a98b83c06e04))
+
 ### [4.12.2](https://github.com/dynamic-labs/dynamic-auth/compare/v4.12.1...v4.12.2) (2025-04-16)
 
 

package/package.cjs

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

package/package.js

@@ -1,5 +1,5 @@
 'use client'
-var version = "4.12.2";
+var version = "4.12.3";
 var dependencies = {
 	"@dynamic-labs/sdk-api-core": "0.0.658",
 	"@hcaptcha/react-hcaptcha": "1.4.4",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/sdk-react-core",
-  "version": "4.12.2",
+  "version": "4.12.3",
   "dependencies": {
     "@dynamic-labs/sdk-api-core": "0.0.658",
     "@hcaptcha/react-hcaptcha": "1.4.4",
@@ -14,16 +14,16 @@
     "yup": "0.32.11",
     "react-international-phone": "4.2.5",
     "bs58": "5.0.0",
-    "@dynamic-labs/assert-package-version": "4.12.2",
-    "@dynamic-labs/iconic": "4.12.2",
-    "@dynamic-labs/logger": "4.12.2",
-    "@dynamic-labs/multi-wallet": "4.12.2",
-    "@dynamic-labs/rpc-providers": "4.12.2",
-    "@dynamic-labs/store": "4.12.2",
-    "@dynamic-labs/types": "4.12.2",
-    "@dynamic-labs/utils": "4.12.2",
-    "@dynamic-labs/wallet-book": "4.12.2",
-    "@dynamic-labs/wallet-connector-core": "4.12.2",
+    "@dynamic-labs/assert-package-version": "4.12.3",
+    "@dynamic-labs/iconic": "4.12.3",
+    "@dynamic-labs/logger": "4.12.3",
+    "@dynamic-labs/multi-wallet": "4.12.3",
+    "@dynamic-labs/rpc-providers": "4.12.3",
+    "@dynamic-labs/store": "4.12.3",
+    "@dynamic-labs/types": "4.12.3",
+    "@dynamic-labs/utils": "4.12.3",
+    "@dynamic-labs/wallet-book": "4.12.3",
+    "@dynamic-labs/wallet-connector-core": "4.12.3",
     "eventemitter3": "5.0.1"
   },
   "devDependencies": {

package/src/lib/components/WalletConnectorEvents/WalletConnectorEvents.cjs

@@ -99,8 +99,19 @@ require('../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
 var useInternalDynamicContext = require('../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.cjs');
 
 const WalletConnectorEvents = ({ connectorProps, }) => {
-    const { walletConnectorOptions, primaryWallet } = useInternalDynamicContext.useInternalDynamicContext();
+    const { primaryWallet } = useInternalDynamicContext.useInternalDynamicContext();
     const { handleWalletItemClick } = useWalletItemActions.useWalletItemActions();
+    const pendingConstructorRef = React.useRef([]);
+    const injectedDebounceTimeoutRef = React.useRef();
+    const pendingReadyConnectorsRef = React.useRef([]);
+    const readyDebounceTimeoutRef = React.useRef();
+    // need to add the timeout to ensure the setConnectorInitializing call is
+    // not made in the same tick to avoid a bad setState call error from React
+    const waitAndSetState = (func) => {
+        setTimeout(() => {
+            func();
+        }, 0);
+    };
     const walletConnectorConstructorOptions = React.useMemo(() => {
         var _a, _b;
         if (!connectorProps.projectSettings ||
@@ -112,44 +123,84 @@ const WalletConnectorEvents = ({ connectorProps, }) => {
     }, [connectorProps]);
     // add listener for providerInjected event
     React.useEffect(() => {
-        const handleProviderInjected = ({ injectedConnectorConstructor, }) => {
-            if (!walletConnectorConstructorOptions)
+        const processPendingConstructors = () => {
+            if (pendingConstructorRef.current.length === 0) {
                 return;
-            const injectedConnector = new injectedConnectorConstructor(walletConnectorConstructorOptions);
-            logger.logger.debug('[WalletConnectorEvents] handleProviderInjected', {
-                injectedConnector,
+            }
+            logger.logger.debug('[WalletConnectorEvents] processPendingConstructors', {
+                pendingConstructors: pendingConstructorRef.current,
             });
-            walletConnectorCore.walletConnectorEvents.emit('providerReady', {
-                connector: injectedConnector,
+            pendingConstructorRef.current.forEach((injectedConnectorConstructor) => {
+                if (!walletConnectorConstructorOptions)
+                    return;
+                const injectedConnector = new injectedConnectorConstructor(walletConnectorConstructorOptions);
+                logger.logger.debug('[WalletConnectorEvents] handleProviderInjected', {
+                    injectedConnector,
+                });
+                walletConnectorCore.walletConnectorEvents.emit('providerReady', {
+                    connector: injectedConnector,
+                });
             });
+            pendingConstructorRef.current = [];
+        };
+        const handleProviderInjected = ({ injectedConnectorConstructor, }) => {
+            pendingConstructorRef.current.push(injectedConnectorConstructor);
+            if (injectedDebounceTimeoutRef.current) {
+                clearTimeout(injectedDebounceTimeoutRef.current);
+            }
+            injectedDebounceTimeoutRef.current = setTimeout(() => {
+                processPendingConstructors();
+            }, 100); // 100ms debounce window
         };
         walletConnectorCore.walletConnectorEvents.on('providerInjected', handleProviderInjected);
         return () => {
             walletConnectorCore.walletConnectorEvents.off('providerInjected', handleProviderInjected);
+            if (injectedDebounceTimeoutRef.current) {
+                clearTimeout(injectedDebounceTimeoutRef.current);
+            }
+            // Process any remaining constructors on cleanup
+            processPendingConstructors();
         };
     }, [walletConnectorConstructorOptions]);
     // add listener for providerReady event
     React.useEffect(() => {
-        const handleProviderReady = ({ connector, }) => {
-            logger.logger.debug('[WalletConnectorEvents] handleProviderReady', {
-                connector,
+        const processReadyConnectors = () => {
+            if (pendingReadyConnectorsRef.current.length === 0) {
+                return;
+            }
+            logger.logger.logVerboseTroubleshootingMessage('[WalletConnectorEvents] processReadyConnectors', {
+                connectors: pendingReadyConnectorsRef.current,
             });
-            let foundWallet = false;
-            const updatedConnectors = walletConnectorOptions.map((walletOption) => {
-                if (walletOption.key === connector.key) {
-                    foundWallet = true;
-                    return Object.assign(Object.assign({}, walletOption), { isInstalledOnBrowser: connector.isInstalledOnBrowser(), walletConnector: connector });
+            const walletConnectorOptions = walletOptions.getWalletConnectorOptions();
+            const updatedConnectors = [...walletConnectorOptions];
+            pendingReadyConnectorsRef.current.forEach((connector) => {
+                let foundWallet = false;
+                for (let i = 0; i < updatedConnectors.length; i++) {
+                    if (updatedConnectors[i].key === connector.key) {
+                        foundWallet = true;
+                        updatedConnectors[i] = Object.assign(Object.assign({}, updatedConnectors[i]), { isInstalledOnBrowser: connector.isInstalledOnBrowser(), walletConnector: connector });
+                        break;
+                    }
+                }
+                if (!foundWallet) {
+                    const newWalletOption = createWallet.createWallet(connectorProps.walletBook, connector);
+                    updatedConnectors.push(newWalletOption);
                 }
-                return walletOption;
             });
-            logger.logger.debug('[WalletConnectorEvents] handleProviderReady', {
-                foundWallet,
+            walletOptions.mergeWalletConnectorOptions(updatedConnectors);
+            pendingReadyConnectorsRef.current = [];
+        };
+        const handleProviderReady = ({ connector, }) => {
+            logger.logger.logVerboseTroubleshootingMessage('[WalletConnectorEvents] handleProviderReady', {
+                connector,
             });
-            if (!foundWallet) {
-                const newWalletOption = createWallet.createWallet(connectorProps.walletBook, connector);
-                updatedConnectors.push(newWalletOption);
+            pendingReadyConnectorsRef.current.push(connector);
+            if (readyDebounceTimeoutRef.current) {
+                clearTimeout(readyDebounceTimeoutRef.current);
             }
-            walletOptions.mergeWalletConnectorOptions(updatedConnectors);
+            readyDebounceTimeoutRef.current = setTimeout(() => {
+                processReadyConnectors();
+            }, 100); // 100ms debounce window
         };
         if (!walletBook.isWalletBookPopulated(connectorProps.walletBook)) {
             return;
@@ -157,12 +208,18 @@ const WalletConnectorEvents = ({ connectorProps, }) => {
         walletConnectorCore.walletConnectorEvents.on('providerReady', handleProviderReady);
         return () => {
             walletConnectorCore.walletConnectorEvents.off('providerReady', handleProviderReady);
+            if (readyDebounceTimeoutRef.current) {
+                clearTimeout(readyDebounceTimeoutRef.current);
+            }
+            // Process any remaining connectors on cleanup
+            processReadyConnectors();
         };
-    }, [connectorProps.walletBook, walletConnectorOptions]);
+    }, [connectorProps.walletBook]);
     // add listener for autoConnect event
     React.useEffect(() => {
         const handleAutoConnect = ({ connector, }) => {
             logger.logger.debug('[WalletConnectorEvents] handleAutoConnect', { connector });
+            const walletConnectorOptions = walletOptions.getWalletConnectorOptions();
             const walletOption = walletConnectorOptions.find((wallet) => wallet.walletConnector.key === connector.key);
             logger.logger.debug('[WalletConnectorEvents] handleAutoConnect - found walletOption', Boolean(walletOption));
             if (!walletOption)
@@ -177,24 +234,20 @@ const WalletConnectorEvents = ({ connectorProps, }) => {
         return () => {
             walletConnectorCore.walletConnectorEvents.off('autoConnect', handleAutoConnect);
         };
-    }, [handleWalletItemClick, walletConnectorOptions, primaryWallet]);
+    }, [handleWalletItemClick, primaryWallet]);
     // add listener for connectorInitStarted and connectorInitCompleted events
     React.useEffect(() => {
         const handleConnectorInitStarted = (key) => {
             logger.logger.logVerboseTroubleshootingMessage('[WalletConnectorEvents] handleConnectorInitStarted', { key });
-            // need to add the timeout to ensure the setConnectorInitializing call is not
-            // made in the same tick to avoid a bad setState call error from React
-            setTimeout(() => {
+            waitAndSetState(() => {
                 connectorsInitializing.setConnectorInitializing(key, true);
-            }, 0);
+            });
         };
         const handleConnectorInitCompleted = (key) => {
             logger.logger.logVerboseTroubleshootingMessage('[WalletConnectorEvents] handleConnectorInitCompleted', { key });
-            // need to add the timeout to ensure the setConnectorInitializing call is not
-            // made in the same tick to avoid a bad setState call error from React
-            setTimeout(() => {
+            waitAndSetState(() => {
                 connectorsInitializing.setConnectorInitializing(key, false);
-            }, 0);
+            });
         };
         walletConnectorCore.walletConnectorEvents.on('connectorInitStarted', handleConnectorInitStarted);
         walletConnectorCore.walletConnectorEvents.on('connectorInitCompleted', handleConnectorInitCompleted);

package/src/lib/components/WalletConnectorEvents/WalletConnectorEvents.js

@@ -1,5 +1,5 @@
 'use client'
-import { useMemo, useEffect } from 'react';
+import { useRef, useMemo, useEffect } from 'react';
 import { walletConnectorEvents } from '@dynamic-labs/wallet-connector-core';
 import { getWalletConnectorConstructorOptions } from '@dynamic-labs/multi-wallet';
 import { ChainRpcProviders } from '@dynamic-labs/rpc-providers';
@@ -50,7 +50,7 @@ import '../../context/MockContext/MockContext.js';
 import '../../views/CollectUserDataView/useFields.js';
 import '../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../context/UserFieldEditorContext/UserFieldEditorContext.js';
-import { mergeWalletConnectorOptions } from '../../store/state/walletOptions/walletOptions.js';
+import { getWalletConnectorOptions, mergeWalletConnectorOptions } from '../../store/state/walletOptions/walletOptions.js';
 import 'react-i18next';
 import '../Accordion/components/AccordionItem/AccordionItem.js';
 import '../Alert/Alert.js';
@@ -95,8 +95,19 @@ import '../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
 import { useInternalDynamicContext } from '../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.js';
 
 const WalletConnectorEvents = ({ connectorProps, }) => {
-    const { walletConnectorOptions, primaryWallet } = useInternalDynamicContext();
+    const { primaryWallet } = useInternalDynamicContext();
     const { handleWalletItemClick } = useWalletItemActions();
+    const pendingConstructorRef = useRef([]);
+    const injectedDebounceTimeoutRef = useRef();
+    const pendingReadyConnectorsRef = useRef([]);
+    const readyDebounceTimeoutRef = useRef();
+    // need to add the timeout to ensure the setConnectorInitializing call is
+    // not made in the same tick to avoid a bad setState call error from React
+    const waitAndSetState = (func) => {
+        setTimeout(() => {
+            func();
+        }, 0);
+    };
     const walletConnectorConstructorOptions = useMemo(() => {
         var _a, _b;
         if (!connectorProps.projectSettings ||
@@ -108,44 +119,84 @@ const WalletConnectorEvents = ({ connectorProps, }) => {
     }, [connectorProps]);
     // add listener for providerInjected event
     useEffect(() => {
-        const handleProviderInjected = ({ injectedConnectorConstructor, }) => {
-            if (!walletConnectorConstructorOptions)
+        const processPendingConstructors = () => {
+            if (pendingConstructorRef.current.length === 0) {
                 return;
-            const injectedConnector = new injectedConnectorConstructor(walletConnectorConstructorOptions);
-            logger.debug('[WalletConnectorEvents] handleProviderInjected', {
-                injectedConnector,
+            }
+            logger.debug('[WalletConnectorEvents] processPendingConstructors', {
+                pendingConstructors: pendingConstructorRef.current,
             });
-            walletConnectorEvents.emit('providerReady', {
-                connector: injectedConnector,
+            pendingConstructorRef.current.forEach((injectedConnectorConstructor) => {
+                if (!walletConnectorConstructorOptions)
+                    return;
+                const injectedConnector = new injectedConnectorConstructor(walletConnectorConstructorOptions);
+                logger.debug('[WalletConnectorEvents] handleProviderInjected', {
+                    injectedConnector,
+                });
+                walletConnectorEvents.emit('providerReady', {
+                    connector: injectedConnector,
+                });
             });
+            pendingConstructorRef.current = [];
+        };
+        const handleProviderInjected = ({ injectedConnectorConstructor, }) => {
+            pendingConstructorRef.current.push(injectedConnectorConstructor);
+            if (injectedDebounceTimeoutRef.current) {
+                clearTimeout(injectedDebounceTimeoutRef.current);
+            }
+            injectedDebounceTimeoutRef.current = setTimeout(() => {
+                processPendingConstructors();
+            }, 100); // 100ms debounce window
         };
         walletConnectorEvents.on('providerInjected', handleProviderInjected);
         return () => {
             walletConnectorEvents.off('providerInjected', handleProviderInjected);
+            if (injectedDebounceTimeoutRef.current) {
+                clearTimeout(injectedDebounceTimeoutRef.current);
+            }
+            // Process any remaining constructors on cleanup
+            processPendingConstructors();
         };
     }, [walletConnectorConstructorOptions]);
     // add listener for providerReady event
     useEffect(() => {
-        const handleProviderReady = ({ connector, }) => {
-            logger.debug('[WalletConnectorEvents] handleProviderReady', {
-                connector,
+        const processReadyConnectors = () => {
+            if (pendingReadyConnectorsRef.current.length === 0) {
+                return;
+            }
+            logger.logVerboseTroubleshootingMessage('[WalletConnectorEvents] processReadyConnectors', {
+                connectors: pendingReadyConnectorsRef.current,
             });
-            let foundWallet = false;
-            const updatedConnectors = walletConnectorOptions.map((walletOption) => {
-                if (walletOption.key === connector.key) {
-                    foundWallet = true;
-                    return Object.assign(Object.assign({}, walletOption), { isInstalledOnBrowser: connector.isInstalledOnBrowser(), walletConnector: connector });
+            const walletConnectorOptions = getWalletConnectorOptions();
+            const updatedConnectors = [...walletConnectorOptions];
+            pendingReadyConnectorsRef.current.forEach((connector) => {
+                let foundWallet = false;
+                for (let i = 0; i < updatedConnectors.length; i++) {
+                    if (updatedConnectors[i].key === connector.key) {
+                        foundWallet = true;
+                        updatedConnectors[i] = Object.assign(Object.assign({}, updatedConnectors[i]), { isInstalledOnBrowser: connector.isInstalledOnBrowser(), walletConnector: connector });
+                        break;
+                    }
+                }
+                if (!foundWallet) {
+                    const newWalletOption = createWallet(connectorProps.walletBook, connector);
+                    updatedConnectors.push(newWalletOption);
                 }
-                return walletOption;
             });
-            logger.debug('[WalletConnectorEvents] handleProviderReady', {
-                foundWallet,
+            mergeWalletConnectorOptions(updatedConnectors);
+            pendingReadyConnectorsRef.current = [];
+        };
+        const handleProviderReady = ({ connector, }) => {
+            logger.logVerboseTroubleshootingMessage('[WalletConnectorEvents] handleProviderReady', {
+                connector,
             });
-            if (!foundWallet) {
-                const newWalletOption = createWallet(connectorProps.walletBook, connector);
-                updatedConnectors.push(newWalletOption);
+            pendingReadyConnectorsRef.current.push(connector);
+            if (readyDebounceTimeoutRef.current) {
+                clearTimeout(readyDebounceTimeoutRef.current);
             }
-            mergeWalletConnectorOptions(updatedConnectors);
+            readyDebounceTimeoutRef.current = setTimeout(() => {
+                processReadyConnectors();
+            }, 100); // 100ms debounce window
         };
         if (!isWalletBookPopulated(connectorProps.walletBook)) {
             return;
@@ -153,12 +204,18 @@ const WalletConnectorEvents = ({ connectorProps, }) => {
         walletConnectorEvents.on('providerReady', handleProviderReady);
         return () => {
             walletConnectorEvents.off('providerReady', handleProviderReady);
+            if (readyDebounceTimeoutRef.current) {
+                clearTimeout(readyDebounceTimeoutRef.current);
+            }
+            // Process any remaining connectors on cleanup
+            processReadyConnectors();
         };
-    }, [connectorProps.walletBook, walletConnectorOptions]);
+    }, [connectorProps.walletBook]);
     // add listener for autoConnect event
     useEffect(() => {
         const handleAutoConnect = ({ connector, }) => {
             logger.debug('[WalletConnectorEvents] handleAutoConnect', { connector });
+            const walletConnectorOptions = getWalletConnectorOptions();
             const walletOption = walletConnectorOptions.find((wallet) => wallet.walletConnector.key === connector.key);
             logger.debug('[WalletConnectorEvents] handleAutoConnect - found walletOption', Boolean(walletOption));
             if (!walletOption)
@@ -173,24 +230,20 @@ const WalletConnectorEvents = ({ connectorProps, }) => {
         return () => {
             walletConnectorEvents.off('autoConnect', handleAutoConnect);
         };
-    }, [handleWalletItemClick, walletConnectorOptions, primaryWallet]);
+    }, [handleWalletItemClick, primaryWallet]);
     // add listener for connectorInitStarted and connectorInitCompleted events
     useEffect(() => {
         const handleConnectorInitStarted = (key) => {
             logger.logVerboseTroubleshootingMessage('[WalletConnectorEvents] handleConnectorInitStarted', { key });
-            // need to add the timeout to ensure the setConnectorInitializing call is not
-            // made in the same tick to avoid a bad setState call error from React
-            setTimeout(() => {
+            waitAndSetState(() => {
                 setConnectorInitializing(key, true);
-            }, 0);
+            });
         };
         const handleConnectorInitCompleted = (key) => {
             logger.logVerboseTroubleshootingMessage('[WalletConnectorEvents] handleConnectorInitCompleted', { key });
-            // need to add the timeout to ensure the setConnectorInitializing call is not
-            // made in the same tick to avoid a bad setState call error from React
-            setTimeout(() => {
+            waitAndSetState(() => {
                 setConnectorInitializing(key, false);
-            }, 0);
+            });
         };
         walletConnectorEvents.on('connectorInitStarted', handleConnectorInitStarted);
         walletConnectorEvents.on('connectorInitCompleted', handleConnectorInitCompleted);

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

@@ -40,9 +40,10 @@ require('../../../locale/locale.cjs');
 require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
-require('../../functions/compareChains/compareChains.cjs');
+var smartWallet = require('../useWalletConnectors/utils/smartWallet/smartWallet.cjs');
 require('../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
+require('../../functions/compareChains/compareChains.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('bs58');
 require('@dynamic-labs/types');
@@ -169,14 +170,18 @@ const useDynamicWaas = () => {
         })));
         const primaryWalletAccount = createdWalletAccounts === null || createdWalletAccounts === void 0 ? void 0 : createdWalletAccounts.find((wallet) => (wallet === null || wallet === void 0 ? void 0 : wallet.chainName) === (primaryChain === null || primaryChain === void 0 ? void 0 : primaryChain.name));
         const refreshedUser = yield refresh();
-        const createdPrimaryWallet = refreshedUser === null || refreshedUser === void 0 ? void 0 : refreshedUser.verifiedCredentials.find((wallet) => {
-            var _a, _b, _c;
-            return ((_a = wallet.walletName) === null || _a === void 0 ? void 0 : _a.includes(dynamicWaasKey)) &&
-                ((_b = wallet.address) === null || _b === void 0 ? void 0 : _b.toLowerCase()) ===
-                    ((_c = primaryWalletAccount === null || primaryWalletAccount === void 0 ? void 0 : primaryWalletAccount.accountAddress) === null || _c === void 0 ? void 0 : _c.toLowerCase());
-        });
-        if (createdPrimaryWallet) {
-            updatePrimaryWalletId.updatePrimaryWalletId(createdPrimaryWallet.id);
+        if (refreshedUser && primaryWalletAccount) {
+            const createdPrimaryWallet = refreshedUser.verifiedCredentials.find((wallet) => {
+                var _a, _b, _c;
+                return ((_a = wallet.walletName) === null || _a === void 0 ? void 0 : _a.includes(dynamicWaasKey)) &&
+                    ((_b = wallet.address) === null || _b === void 0 ? void 0 : _b.toLowerCase()) ===
+                        ((_c = primaryWalletAccount.accountAddress) === null || _c === void 0 ? void 0 : _c.toLowerCase());
+            });
+            if (createdPrimaryWallet) {
+                const smartWalletAccount = smartWallet.findSmartWallet(createdPrimaryWallet, refreshedUser.verifiedCredentials);
+                const walletIdToUse = (smartWalletAccount === null || smartWalletAccount === void 0 ? void 0 : smartWalletAccount.id) || createdPrimaryWallet.id;
+                updatePrimaryWalletId.updatePrimaryWalletId(walletIdToUse);
+            }
         }
         setShowAuthFlow(false, { performMultiWalletChecks: false }); // close email otp pin modal
         return createdWalletAccounts;

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

@@ -36,9 +36,10 @@ import '../../../locale/locale.js';
 import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
-import '../../functions/compareChains/compareChains.js';
+import { findSmartWallet } from '../useWalletConnectors/utils/smartWallet/smartWallet.js';
 import '../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
 import '../../../context/ThemeContext/ThemeContext.js';
+import '../../functions/compareChains/compareChains.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import 'bs58';
 import '@dynamic-labs/types';
@@ -165,14 +166,18 @@ const useDynamicWaas = () => {
         })));
         const primaryWalletAccount = createdWalletAccounts === null || createdWalletAccounts === void 0 ? void 0 : createdWalletAccounts.find((wallet) => (wallet === null || wallet === void 0 ? void 0 : wallet.chainName) === (primaryChain === null || primaryChain === void 0 ? void 0 : primaryChain.name));
         const refreshedUser = yield refresh();
-        const createdPrimaryWallet = refreshedUser === null || refreshedUser === void 0 ? void 0 : refreshedUser.verifiedCredentials.find((wallet) => {
-            var _a, _b, _c;
-            return ((_a = wallet.walletName) === null || _a === void 0 ? void 0 : _a.includes(dynamicWaasKey)) &&
-                ((_b = wallet.address) === null || _b === void 0 ? void 0 : _b.toLowerCase()) ===
-                    ((_c = primaryWalletAccount === null || primaryWalletAccount === void 0 ? void 0 : primaryWalletAccount.accountAddress) === null || _c === void 0 ? void 0 : _c.toLowerCase());
-        });
-        if (createdPrimaryWallet) {
-            updatePrimaryWalletId(createdPrimaryWallet.id);
+        if (refreshedUser && primaryWalletAccount) {
+            const createdPrimaryWallet = refreshedUser.verifiedCredentials.find((wallet) => {
+                var _a, _b, _c;
+                return ((_a = wallet.walletName) === null || _a === void 0 ? void 0 : _a.includes(dynamicWaasKey)) &&
+                    ((_b = wallet.address) === null || _b === void 0 ? void 0 : _b.toLowerCase()) ===
+                        ((_c = primaryWalletAccount.accountAddress) === null || _c === void 0 ? void 0 : _c.toLowerCase());
+            });
+            if (createdPrimaryWallet) {
+                const smartWalletAccount = findSmartWallet(createdPrimaryWallet, refreshedUser.verifiedCredentials);
+                const walletIdToUse = (smartWalletAccount === null || smartWalletAccount === void 0 ? void 0 : smartWalletAccount.id) || createdPrimaryWallet.id;
+                updatePrimaryWalletId(walletIdToUse);
+            }
         }
         setShowAuthFlow(false, { performMultiWalletChecks: false }); // close email otp pin modal
         return createdWalletAccounts;

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

@@ -100,10 +100,12 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useDyna
 const useIsLoadingEmbeddedWallet = () => {
     const { user } = useInternalDynamicContext.useInternalDynamicContext();
     const projectSettings$1 = projectSettings.getProjectSettings();
+    // we only want to show the loading state if the user has no wallets at all, and is creating a waas wallet
+    // for example if they sign up with phantom wallet, we don't want to show the loading state
     const isLoadingEmbeddedWallet = React.useMemo(() => {
         var _a;
         return usingV3Wallets.usingV3Wallets(projectSettings$1) &&
-            !((_a = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find(({ walletProvider }) => walletProvider === 'embeddedWallet'));
+            !((_a = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find(({ format }) => format === 'blockchain'));
     }, [projectSettings$1, user]);
     return { isLoadingEmbeddedWallet };
 };

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

@@ -96,10 +96,12 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useDy
 const useIsLoadingEmbeddedWallet = () => {
     const { user } = useInternalDynamicContext();
     const projectSettings = getProjectSettings();
+    // we only want to show the loading state if the user has no wallets at all, and is creating a waas wallet
+    // for example if they sign up with phantom wallet, we don't want to show the loading state
     const isLoadingEmbeddedWallet = useMemo(() => {
         var _a;
         return usingV3Wallets(projectSettings) &&
-            !((_a = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find(({ walletProvider }) => walletProvider === 'embeddedWallet'));
+            !((_a = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find(({ format }) => format === 'blockchain'));
     }, [projectSettings, user]);
     return { isLoadingEmbeddedWallet };
 };

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

@@ -41,6 +41,7 @@ require('../../functions/compareChains/compareChains.cjs');
 require('../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 var useSmartWallets = require('../useSmartWallets/useSmartWallets.cjs');
+var usingV3Wallets = require('../../functions/usingV3Wallets/usingV3Wallets.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('bs58');
 require('@dynamic-labs/types');
@@ -111,7 +112,8 @@ const useIsLoggedIn = () => {
     const isLoggedIn = Boolean(user) || (authMode === 'connect-only' && Boolean(primaryWallet));
     const userWalletsCredentials = (_a = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.filter(({ walletProvider }) => walletProvider);
     const hasEmbeddedWalletVerifiedCredential = Boolean(userWalletsCredentials === null || userWalletsCredentials === void 0 ? void 0 : userWalletsCredentials.find(({ walletProvider }) => walletProvider === 'embeddedWallet'));
-    const isTurnkeyPregen = isTurnkeyProviderEnabled &&
+    const isTurnkeyPregen = !usingV3Wallets.usingV3Wallets(projectSettings) &&
+        isTurnkeyProviderEnabled &&
         ((_c = (_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _b === void 0 ? void 0 : _b.embeddedWallets) === null || _c === void 0 ? void 0 : _c.automaticEmbeddedWalletCreation) &&
         (!(projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets.forceAuthenticatorAtSignup) ||
             isSessionKeyCompatible);

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

@@ -37,6 +37,7 @@ import '../../functions/compareChains/compareChains.js';
 import '../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import { useSmartWallets } from '../useSmartWallets/useSmartWallets.js';
+import { usingV3Wallets } from '../../functions/usingV3Wallets/usingV3Wallets.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import 'bs58';
 import '@dynamic-labs/types';
@@ -107,7 +108,8 @@ const useIsLoggedIn = () => {
     const isLoggedIn = Boolean(user) || (authMode === 'connect-only' && Boolean(primaryWallet));
     const userWalletsCredentials = (_a = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.filter(({ walletProvider }) => walletProvider);
     const hasEmbeddedWalletVerifiedCredential = Boolean(userWalletsCredentials === null || userWalletsCredentials === void 0 ? void 0 : userWalletsCredentials.find(({ walletProvider }) => walletProvider === 'embeddedWallet'));
-    const isTurnkeyPregen = isTurnkeyProviderEnabled &&
+    const isTurnkeyPregen = !usingV3Wallets(projectSettings) &&
+        isTurnkeyProviderEnabled &&
         ((_c = (_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _b === void 0 ? void 0 : _b.embeddedWallets) === null || _c === void 0 ? void 0 : _c.automaticEmbeddedWalletCreation) &&
         (!(projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets.forceAuthenticatorAtSignup) ||
             isSessionKeyCompatible);