@dynamic-labs/sdk-react-core 4.14.0 → 4.16.0

package/CHANGELOG.md

@@ -1,4 +1,35 @@
 
+## [4.16.0](https://github.com/dynamic-labs/dynamic-auth/compare/v4.15.0...v4.16.0) (2025-05-03)
+
+
+### Features
+
+* (GVTY-3020) add send balance to waas sui connector ([#8638](https://github.com/dynamic-labs/dynamic-auth/issues/8638)) ([97f0af0](https://github.com/dynamic-labs/dynamic-auth/commit/97f0af0504a0079ebf0958fde1f8edc34c035927))
+* add isAtomicSupported and isPaymasterServiceSupported methods to EthereumWallet ([#8627](https://github.com/dynamic-labs/dynamic-auth/issues/8627)) ([df82b9e](https://github.com/dynamic-labs/dynamic-auth/commit/df82b9e86eafea9dd6c505227722450bc56d7c57))
+* add solana mpc to global wallets ([#8605](https://github.com/dynamic-labs/dynamic-auth/issues/8605)) ([6261bf9](https://github.com/dynamic-labs/dynamic-auth/commit/6261bf9bec45b1d1afa13869cf5d10cda215783e))
+
+## [4.15.0](https://github.com/dynamic-labs/dynamic-auth/compare/v4.14.0...v4.15.0) (2025-04-30)
+
+
+### Features
+
+* add end session override for waas sui connector ([#8602](https://github.com/dynamic-labs/dynamic-auth/issues/8602)) ([6c9e6fd](https://github.com/dynamic-labs/dynamic-auth/commit/6c9e6fda4581a4e3b9e1544f22d6e5f03723d928))
+* add presets and demo fixes ([#8609](https://github.com/dynamic-labs/dynamic-auth/issues/8609)) ([2201914](https://github.com/dynamic-labs/dynamic-auth/commit/2201914d2029ff0b67dfc2c6e696f728f32f57b3))
+* add ShareConfig component with modal and styling ([74aff97](https://github.com/dynamic-labs/dynamic-auth/commit/74aff97689c9e7c9abc892c1deac4d748b498909))
+* add wallet actions section and update UI components ([#8598](https://github.com/dynamic-labs/dynamic-auth/issues/8598)) ([d6170b7](https://github.com/dynamic-labs/dynamic-auth/commit/d6170b7f6abd963e6a081541e2c674b7141f1c15))
+* dynamic waas to sign 7702 authorization ([#8603](https://github.com/dynamic-labs/dynamic-auth/issues/8603)) ([74e1722](https://github.com/dynamic-labs/dynamic-auth/commit/74e1722f417aab621f4062093e109dc45cf542ea))
+* add signMessage feature to global wallet client ([#8563](https://github.com/dynamic-labs/dynamic-auth/issues/8563)) ([c3f9734](https://github.com/dynamic-labs/dynamic-auth/commit/c3f9734c097f5c9b88c35e0f642632f261e40fe7))
+* allow displaying custom links in the global wallet profile dropdown menu ([#8617](https://github.com/dynamic-labs/dynamic-auth/issues/8617)) ([5fb956c](https://github.com/dynamic-labs/dynamic-auth/commit/5fb956c0c2b681fece56104b330a0e90fc8fb936))
+
+
+### Bug Fixes
+
+* add default base api url for dynamic waas config on connector initialization ([#8604](https://github.com/dynamic-labs/dynamic-auth/issues/8604)) ([6218a7e](https://github.com/dynamic-labs/dynamic-auth/commit/6218a7edda4feb9028be548acfe8eff64578f0a0))
+* enables caching for sprite.svg ([#8610](https://github.com/dynamic-labs/dynamic-auth/issues/8610)) ([decdb69](https://github.com/dynamic-labs/dynamic-auth/commit/decdb69b4df8bc2d97ee579fa423e9682ab1720b))
+* change mobile experience to redirect ([#8003](https://github.com/dynamic-labs/dynamic-auth/issues/8003)) ([2e8a1d8](https://github.com/dynamic-labs/dynamic-auth/commit/2e8a1d8b54f54386e1abc9f4e6e5e9acf859e5fa))
+* optimize wallet finder when performing eth and sol operations in global wallet popup ([#8564](https://github.com/dynamic-labs/dynamic-auth/issues/8564)) ([2eaf424](https://github.com/dynamic-labs/dynamic-auth/commit/2eaf4244d4aa1b1cc5c6e32574db10ab34f8ed80))
+* loading state for v3 connect-only embedded wallet generation ([#8600](https://github.com/dynamic-labs/dynamic-auth/issues/8600)) ([af34d16](https://github.com/dynamic-labs/dynamic-auth/commit/af34d168a765aa82867116541e73c59672ab2341))
+
 ## [4.14.0](https://github.com/dynamic-labs/dynamic-auth/compare/v4.13.0...v4.14.0) (2025-04-25)
 
 

package/package.cjs

@@ -3,9 +3,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "4.14.0";
+var version = "4.16.0";
 var dependencies = {
-	"@dynamic-labs/sdk-api-core": "0.0.658",
+	"@dynamic-labs/sdk-api-core": "0.0.660",
 	"@hcaptcha/react-hcaptcha": "1.4.4",
 	"@thumbmarkjs/thumbmarkjs": "0.16.0",
 	"country-list": "2.3.0",

package/package.js

@@ -1,7 +1,7 @@
 'use client'
-var version = "4.14.0";
+var version = "4.16.0";
 var dependencies = {
-	"@dynamic-labs/sdk-api-core": "0.0.658",
+	"@dynamic-labs/sdk-api-core": "0.0.660",
 	"@hcaptcha/react-hcaptcha": "1.4.4",
 	"@thumbmarkjs/thumbmarkjs": "0.16.0",
 	"country-list": "2.3.0",

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@dynamic-labs/sdk-react-core",
-  "version": "4.14.0",
+  "version": "4.16.0",
   "dependencies": {
-    "@dynamic-labs/sdk-api-core": "0.0.658",
+    "@dynamic-labs/sdk-api-core": "0.0.660",
     "@hcaptcha/react-hcaptcha": "1.4.4",
     "@thumbmarkjs/thumbmarkjs": "0.16.0",
     "country-list": "2.3.0",
@@ -14,16 +14,16 @@
     "yup": "0.32.11",
     "react-international-phone": "4.2.5",
     "bs58": "5.0.0",
-    "@dynamic-labs/assert-package-version": "4.14.0",
-    "@dynamic-labs/iconic": "4.14.0",
-    "@dynamic-labs/logger": "4.14.0",
-    "@dynamic-labs/multi-wallet": "4.14.0",
-    "@dynamic-labs/rpc-providers": "4.14.0",
-    "@dynamic-labs/store": "4.14.0",
-    "@dynamic-labs/types": "4.14.0",
-    "@dynamic-labs/utils": "4.14.0",
-    "@dynamic-labs/wallet-book": "4.14.0",
-    "@dynamic-labs/wallet-connector-core": "4.14.0",
+    "@dynamic-labs/assert-package-version": "4.16.0",
+    "@dynamic-labs/iconic": "4.16.0",
+    "@dynamic-labs/logger": "4.16.0",
+    "@dynamic-labs/multi-wallet": "4.16.0",
+    "@dynamic-labs/rpc-providers": "4.16.0",
+    "@dynamic-labs/store": "4.16.0",
+    "@dynamic-labs/types": "4.16.0",
+    "@dynamic-labs/utils": "4.16.0",
+    "@dynamic-labs/wallet-book": "4.16.0",
+    "@dynamic-labs/wallet-connector-core": "4.16.0",
     "eventemitter3": "5.0.1"
   },
   "devDependencies": {

package/src/lib/components/TransactionStatusLayout/TransactionStatusLayout.cjs

@@ -125,6 +125,7 @@ const TransactionStatusLayout = ({ destinationAddress, transactionValue, network
     const totalFiatCost = fiatUtils.getTotalFiatCost(currentToken, transaction, nativePrice, transactionValue);
     return (jsxRuntime.jsxs("div", { className: 'transaction-status-layout', children: [jsxRuntime.jsx(ModalHeader.ModalHeader, { trailing: closeButton, alignContent: 'bottom', children: jsxRuntime.jsx(Icon.Icon, { size: 'large', className: 'transaction-status-layout__status-icon', children: jsxRuntime.jsx(checkBlue.ReactComponent, {}) }) }), jsxRuntime.jsxs("div", { className: 'transaction-status-layout__body', children: [jsxRuntime.jsxs("div", { className: 'transaction-status-layout__sent_to', children: [jsxRuntime.jsxs(Typography.Typography, { variant: 'body_small', color: 'secondary', className: 'transaction-status-layout__title', copykey: 'dyn_send_transaction.succeeded.title', children: [t('dyn_send_transaction.succeeded.title'), ' '] }), jsxRuntime.jsx(Typography.Typography, { variant: 'body_small', color: 'primary', className: 'transaction-status-layout__title', copykey: 'dyn_send_transaction.succeeded.title', children: shortenWalletAddress.shortenWalletAddress(destinationAddress, 3, 3) })] }), jsxRuntime.jsx("div", { className: 'transaction-status-layout__content', children: jsxRuntime.jsx("div", { className: 'transaction-status-layout__rows', children: jsxRuntime.jsxs(Typography.Typography, { variant: 'title', color: 'primary', className: 'transaction-status-layout__title', copykey: 'dyn_send_transaction.succeeded.title', children: [`${utils.getValueRounded(isNativeToken, transaction)} ${networkCurrency} `, showFiat &&
                                         (currentToken === null || currentToken === void 0 ? void 0 : currentToken.price) &&
+                                        totalFiatCost !== undefined &&
                                         `($${Number(totalFiatCost) <= 0.01 ? '<0.01' : totalFiatCost})`] }) }) }), jsxRuntime.jsx(AnimatePresence.AnimatePresence, { animationComponent: jsxRuntime.jsx(VerticalDrawerTransition.VerticalDrawerTransition, {}), children: jsxRuntime.jsx("div", { className: 'transaction-confirmation__warning', children: jsxRuntime.jsx(Alert.Alert, { variant: 'info', copykey: 'dyn_send_transaction.info_message.refresh_balance_time', children: t('dyn_send_transaction.info_message.refresh_balance_time') }) }) }), jsxRuntime.jsx("div", { className: 'transaction-status-layout__transaction-link-container', children: txLink && (jsxRuntime.jsx(Typography.Typography, { as: 'a', href: txLink, target: '_blank', rel: 'noreferrer', className: 'transaction-status-layout__transaction-link-container__transaction-link', variant: 'body_small', children: t('dyn_wallet_funding.success_txn_link') })) }), jsxRuntime.jsx("div", { className: 'transaction-status-layout__actions', children: jsxRuntime.jsx(TypographyButton.TypographyButton, { buttonVariant: 'brand-primary', buttonPadding: 'small', expanded: true, onClick: onDone, loading: false, copykey: 'dyn_send_transaction.succeeded.continue_button', dataTestId: 'transaction-done-continue', children: t('dyn_send_transaction.succeeded.continue_button') }) }), displayPoweredByDynamicFooter && (jsxRuntime.jsx(PoweredByDynamic.PoweredByDynamic, { classNameRoot: 'transaction-status-layout__footer' }))] })] }));
 };
 

package/src/lib/components/TransactionStatusLayout/TransactionStatusLayout.js

@@ -121,6 +121,7 @@ const TransactionStatusLayout = ({ destinationAddress, transactionValue, network
     const totalFiatCost = getTotalFiatCost(currentToken, transaction, nativePrice, transactionValue);
     return (jsxs("div", { className: 'transaction-status-layout', children: [jsx(ModalHeader, { trailing: closeButton, alignContent: 'bottom', children: jsx(Icon, { size: 'large', className: 'transaction-status-layout__status-icon', children: jsx(SvgCheckBlue, {}) }) }), jsxs("div", { className: 'transaction-status-layout__body', children: [jsxs("div", { className: 'transaction-status-layout__sent_to', children: [jsxs(Typography, { variant: 'body_small', color: 'secondary', className: 'transaction-status-layout__title', copykey: 'dyn_send_transaction.succeeded.title', children: [t('dyn_send_transaction.succeeded.title'), ' '] }), jsx(Typography, { variant: 'body_small', color: 'primary', className: 'transaction-status-layout__title', copykey: 'dyn_send_transaction.succeeded.title', children: shortenWalletAddress(destinationAddress, 3, 3) })] }), jsx("div", { className: 'transaction-status-layout__content', children: jsx("div", { className: 'transaction-status-layout__rows', children: jsxs(Typography, { variant: 'title', color: 'primary', className: 'transaction-status-layout__title', copykey: 'dyn_send_transaction.succeeded.title', children: [`${getValueRounded(isNativeToken, transaction)} ${networkCurrency} `, showFiat &&
                                         (currentToken === null || currentToken === void 0 ? void 0 : currentToken.price) &&
+                                        totalFiatCost !== undefined &&
                                         `($${Number(totalFiatCost) <= 0.01 ? '<0.01' : totalFiatCost})`] }) }) }), jsx(AnimatePresence, { animationComponent: jsx(VerticalDrawerTransition, {}), children: jsx("div", { className: 'transaction-confirmation__warning', children: jsx(Alert, { variant: 'info', copykey: 'dyn_send_transaction.info_message.refresh_balance_time', children: t('dyn_send_transaction.info_message.refresh_balance_time') }) }) }), jsx("div", { className: 'transaction-status-layout__transaction-link-container', children: txLink && (jsx(Typography, { as: 'a', href: txLink, target: '_blank', rel: 'noreferrer', className: 'transaction-status-layout__transaction-link-container__transaction-link', variant: 'body_small', children: t('dyn_wallet_funding.success_txn_link') })) }), jsx("div", { className: 'transaction-status-layout__actions', children: jsx(TypographyButton, { buttonVariant: 'brand-primary', buttonPadding: 'small', expanded: true, onClick: onDone, loading: false, copykey: 'dyn_send_transaction.succeeded.continue_button', dataTestId: 'transaction-done-continue', children: t('dyn_send_transaction.succeeded.continue_button') }) }), displayPoweredByDynamicFooter && (jsx(PoweredByDynamic, { classNameRoot: 'transaction-status-layout__footer' }))] })] }));
 };
 

package/src/lib/utils/constants/waas/apiUrl.cjs

@@ -0,0 +1,8 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const DEFAULT_WAAS_API_URL = 'https://app.dynamicauth.com/api/v0';
+
+exports.DEFAULT_WAAS_API_URL = DEFAULT_WAAS_API_URL;

package/src/lib/utils/constants/waas/apiUrl.d.ts

@@ -0,0 +1 @@
+export declare const DEFAULT_WAAS_API_URL = "https://app.dynamicauth.com/api/v0";

package/src/lib/utils/constants/waas/apiUrl.js

@@ -0,0 +1,4 @@
+'use client'
+const DEFAULT_WAAS_API_URL = 'https://app.dynamicauth.com/api/v0';
+
+export { DEFAULT_WAAS_API_URL };

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

@@ -17,7 +17,7 @@ require('../../constants/values.cjs');
 require('../../../shared/consts/index.cjs');
 
 const getNetworkInfoEntry = ({ chain, networkId, networkInfo, }) => {
-    var _a;
+    var _a, _b;
     logger.logger.logVerboseTroubleshootingMessage('[getNetworkInfoEntry]', {
         chain,
         networkId,
@@ -36,11 +36,8 @@ const getNetworkInfoEntry = ({ chain, networkId, networkInfo, }) => {
         networkData,
         normalizedChain,
     });
-    if (['evm', 'solana'].includes(normalizedChain)) {
-        return networkData.find((e) => e.chainId.toString() === networkId.toString());
-    }
-    // Other networks
-    return networkData[0];
+    // Not all networks have a valid chainId, so default to the first network if the chainId is not found
+    return ((_b = networkData.find((e) => e.chainId.toString() === networkId.toString())) !== null && _b !== void 0 ? _b : networkData[0]);
 };
 const getEvmChainName = (chainId) => {
     const map = {

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

@@ -13,7 +13,7 @@ import '../../constants/values.js';
 import '../../../shared/consts/index.js';
 
 const getNetworkInfoEntry = ({ chain, networkId, networkInfo, }) => {
-    var _a;
+    var _a, _b;
     logger.logVerboseTroubleshootingMessage('[getNetworkInfoEntry]', {
         chain,
         networkId,
@@ -32,11 +32,8 @@ const getNetworkInfoEntry = ({ chain, networkId, networkInfo, }) => {
         networkData,
         normalizedChain,
     });
-    if (['evm', 'solana'].includes(normalizedChain)) {
-        return networkData.find((e) => e.chainId.toString() === networkId.toString());
-    }
-    // Other networks
-    return networkData[0];
+    // Not all networks have a valid chainId, so default to the first network if the chainId is not found
+    return ((_b = networkData.find((e) => e.chainId.toString() === networkId.toString())) !== null && _b !== void 0 ? _b : networkData[0]);
 };
 const getEvmChainName = (chainId) => {
     const map = {

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

@@ -96,6 +96,7 @@ require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCa
 require('../../../context/OnrampContext/OnrampContext.cjs');
 require('../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.cjs');
 require('../../../../index.cjs');
+var apiUrl = require('../../constants/waas/apiUrl.cjs');
 var constants = require('./constants.cjs');
 require('../../../store/state/tokenBalances.cjs');
 require('../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
@@ -103,8 +104,9 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useDyna
 
 const dynamicWaasKey = 'dynamicwaas';
 const configWaasWalletConnector = ({ walletConnector, environmentId, apiBaseUrl, authToken, relayUrl, }) => {
+    var _a;
     walletConnector.setEnvironmentId(environmentId);
-    walletConnector.setBaseApiUrl(apiBaseUrl === null || apiBaseUrl === void 0 ? void 0 : apiBaseUrl.replace('/api/v0', ''));
+    walletConnector.setBaseApiUrl((_a = (apiBaseUrl || apiUrl.DEFAULT_WAAS_API_URL)) === null || _a === void 0 ? void 0 : _a.replace('/api/v0', ''));
     walletConnector.setGetAuthTokenFunction(() => authToken !== null && authToken !== void 0 ? authToken : '');
     walletConnector.setRelayUrl(relayUrl);
     return walletConnector;
@@ -134,7 +136,7 @@ const useDynamicWaas = () => {
         if (!isCookieAuthEnabled && !authToken) {
             return undefined;
         }
-        if (!walletConnectorOptions.length || !environmentId || !apiBaseUrl)
+        if (!walletConnectorOptions.length || !environmentId)
             return undefined;
         const walletConnector = (_a = walletConnectorOptions.find((option) => option.key.includes(dynamicWaasKey) &&
             option.walletConnector.connectedChain === chainName)) === null || _a === void 0 ? void 0 : _a.walletConnector;
@@ -142,7 +144,7 @@ const useDynamicWaas = () => {
             throw new utils.DynamicError(constants.DYNAMIC_WAAS_CONNECTOR_NOT_FOUND_ERROR);
         }
         const configuredWalletConnector = configWaasWalletConnector({
-            apiBaseUrl,
+            apiBaseUrl: apiBaseUrl || apiUrl.DEFAULT_WAAS_API_URL,
             authToken,
             environmentId,
             relayUrl: relayUrl !== null && relayUrl !== void 0 ? relayUrl : '',

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

@@ -92,6 +92,7 @@ import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCar
 import '../../../context/OnrampContext/OnrampContext.js';
 import '../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.js';
 import '../../../../index.js';
+import { DEFAULT_WAAS_API_URL } from '../../constants/waas/apiUrl.js';
 import { DYNAMIC_WAAS_CONNECTOR_NOT_FOUND_ERROR, NO_ENABLED_CHAINS_ERROR } from './constants.js';
 import '../../../store/state/tokenBalances.js';
 import '../../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
@@ -99,8 +100,9 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useDy
 
 const dynamicWaasKey = 'dynamicwaas';
 const configWaasWalletConnector = ({ walletConnector, environmentId, apiBaseUrl, authToken, relayUrl, }) => {
+    var _a;
     walletConnector.setEnvironmentId(environmentId);
-    walletConnector.setBaseApiUrl(apiBaseUrl === null || apiBaseUrl === void 0 ? void 0 : apiBaseUrl.replace('/api/v0', ''));
+    walletConnector.setBaseApiUrl((_a = (apiBaseUrl || DEFAULT_WAAS_API_URL)) === null || _a === void 0 ? void 0 : _a.replace('/api/v0', ''));
     walletConnector.setGetAuthTokenFunction(() => authToken !== null && authToken !== void 0 ? authToken : '');
     walletConnector.setRelayUrl(relayUrl);
     return walletConnector;
@@ -130,7 +132,7 @@ const useDynamicWaas = () => {
         if (!isCookieAuthEnabled && !authToken) {
             return undefined;
         }
-        if (!walletConnectorOptions.length || !environmentId || !apiBaseUrl)
+        if (!walletConnectorOptions.length || !environmentId)
             return undefined;
         const walletConnector = (_a = walletConnectorOptions.find((option) => option.key.includes(dynamicWaasKey) &&
             option.walletConnector.connectedChain === chainName)) === null || _a === void 0 ? void 0 : _a.walletConnector;
@@ -138,7 +140,7 @@ const useDynamicWaas = () => {
             throw new DynamicError(DYNAMIC_WAAS_CONNECTOR_NOT_FOUND_ERROR);
         }
         const configuredWalletConnector = configWaasWalletConnector({
-            apiBaseUrl,
+            apiBaseUrl: apiBaseUrl || DEFAULT_WAAS_API_URL,
             authToken,
             environmentId,
             relayUrl: relayUrl !== null && relayUrl !== void 0 ? relayUrl : '',

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

@@ -25,6 +25,7 @@ require('../../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 require('../../../store/state/nonce/nonce.cjs');
+var isTurnkeyEnabled = require('../../functions/isTurnkeyEnabled/isTurnkeyEnabled.cjs');
 var projectSettings = require('../../../store/state/projectSettings/projectSettings.cjs');
 require('../../../config/ApiEndpoint.cjs');
 require('../../../store/state/user/user.cjs');
@@ -102,16 +103,27 @@ const useIsLoadingEmbeddedWallet = () => {
     // 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
     // always return false for connect-only mode, because verified credentials are not used in this mode
+    // except when user is logging in with email and will get an embedded wallet
     const isLoadingEmbeddedWallet = React.useMemo(() => {
-        var _a;
-        if (!usingV3Wallets.usingV3Wallets(projectSettings$1)) {
+        var _a, _b;
+        if (!usingV3Wallets.usingV3Wallets(projectSettings$1) ||
+            !isTurnkeyEnabled.isTurnkeyEnabled(projectSettings$1)) {
             return false;
         }
+        const isEmailLogin = (_a = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.some((credential) => credential.format === 'email');
+        const hasWallet = (_b = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _b === void 0 ? void 0 : _b.some((credential) => credential.format === 'blockchain');
         if (authMode === 'connect-only') {
+            if (isEmailLogin) {
+                if (hasWallet) {
+                    return false;
+                }
+                return true;
+            }
+            // login with injected wallet will already have a primary wallet set so we dont need to show loading state
             return false;
         }
         // If user has NO blockchain credential, then we show loading state
-        return !((_a = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.some((credential) => credential.format === 'blockchain'));
+        return !hasWallet;
     }, [projectSettings$1, user, authMode]);
     return { isLoadingEmbeddedWallet };
 };

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

@@ -21,6 +21,7 @@ import '../../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import '../../../store/state/nonce/nonce.js';
+import { isTurnkeyEnabled } from '../../functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
 import { getProjectSettings } from '../../../store/state/projectSettings/projectSettings.js';
 import '../../../config/ApiEndpoint.js';
 import '../../../store/state/user/user.js';
@@ -98,16 +99,27 @@ const useIsLoadingEmbeddedWallet = () => {
     // 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
     // always return false for connect-only mode, because verified credentials are not used in this mode
+    // except when user is logging in with email and will get an embedded wallet
     const isLoadingEmbeddedWallet = useMemo(() => {
-        var _a;
-        if (!usingV3Wallets(projectSettings)) {
+        var _a, _b;
+        if (!usingV3Wallets(projectSettings) ||
+            !isTurnkeyEnabled(projectSettings)) {
             return false;
         }
+        const isEmailLogin = (_a = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.some((credential) => credential.format === 'email');
+        const hasWallet = (_b = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _b === void 0 ? void 0 : _b.some((credential) => credential.format === 'blockchain');
         if (authMode === 'connect-only') {
+            if (isEmailLogin) {
+                if (hasWallet) {
+                    return false;
+                }
+                return true;
+            }
+            // login with injected wallet will already have a primary wallet set so we dont need to show loading state
             return false;
         }
         // If user has NO blockchain credential, then we show loading state
-        return !((_a = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.some((credential) => credential.format === 'blockchain'));
+        return !hasWallet;
     }, [projectSettings, user, authMode]);
     return { isLoadingEmbeddedWallet };
 };

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

@@ -94,10 +94,10 @@ require('../../../context/OnrampContext/OnrampContext.cjs');
 require('../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.cjs');
 require('../../../../index.cjs');
 var useDynamicWaas = require('../useDynamicWaas/useDynamicWaas.cjs');
+var apiUrl = require('../../constants/waas/apiUrl.cjs');
 require('../../../store/state/tokenBalances.cjs');
 require('../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
 
-const DEFAULT_API_BASE_URL = 'https://app.dynamicauth.com/api/v0';
 const useSetWalletConnectorFetchers = (walletOptions, environmentId, projectSettings) => {
     const apiBaseUrl = dynamicContextProps.useApiBaseUrl();
     const authToken = getAuthToken.getAuthToken();
@@ -112,7 +112,7 @@ const useSetWalletConnectorFetchers = (walletOptions, environmentId, projectSett
         }
         else if (walletConnectorCore.isDynamicWaasConnector(walletOption.walletConnector)) {
             useDynamicWaas.configWaasWalletConnector({
-                apiBaseUrl: apiBaseUrl !== null && apiBaseUrl !== void 0 ? apiBaseUrl : DEFAULT_API_BASE_URL,
+                apiBaseUrl: apiBaseUrl !== null && apiBaseUrl !== void 0 ? apiBaseUrl : apiUrl.DEFAULT_WAAS_API_URL,
                 authToken,
                 environmentId,
                 relayUrl: (_e = (_d = (_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _c === void 0 ? void 0 : _c.waas) === null || _d === void 0 ? void 0 : _d.relayUrl) !== null && _e !== void 0 ? _e : '',

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

@@ -90,10 +90,10 @@ import '../../../context/OnrampContext/OnrampContext.js';
 import '../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.js';
 import '../../../../index.js';
 import { configWaasWalletConnector } from '../useDynamicWaas/useDynamicWaas.js';
+import { DEFAULT_WAAS_API_URL } from '../../constants/waas/apiUrl.js';
 import '../../../store/state/tokenBalances.js';
 import '../../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
 
-const DEFAULT_API_BASE_URL = 'https://app.dynamicauth.com/api/v0';
 const useSetWalletConnectorFetchers = (walletOptions, environmentId, projectSettings) => {
     const apiBaseUrl = useApiBaseUrl();
     const authToken = getAuthToken();
@@ -108,7 +108,7 @@ const useSetWalletConnectorFetchers = (walletOptions, environmentId, projectSett
         }
         else if (isDynamicWaasConnector(walletOption.walletConnector)) {
             configWaasWalletConnector({
-                apiBaseUrl: apiBaseUrl !== null && apiBaseUrl !== void 0 ? apiBaseUrl : DEFAULT_API_BASE_URL,
+                apiBaseUrl: apiBaseUrl !== null && apiBaseUrl !== void 0 ? apiBaseUrl : DEFAULT_WAAS_API_URL,
                 authToken,
                 environmentId,
                 relayUrl: (_e = (_d = (_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _c === void 0 ? void 0 : _c.waas) === null || _d === void 0 ? void 0 : _d.relayUrl) !== null && _e !== void 0 ? _e : '',