@dynamic-labs/sdk-react-core 4.0.0-alpha.11 → 4.0.0-alpha.13

package/src/lib/data/api/oauth/oauth.js

@@ -26,11 +26,20 @@ const initAuth = (environmentId, providerType, oauthInitAuthRequest) => __awaite
         });
     }
     catch (err) {
-        logger.error(err);
-        throw err;
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        let data;
+        try {
+            data = yield err.json();
+            logger.error(data);
+        }
+        catch (_a) {
+            logger.error(err);
+            throw err;
+        }
+        throw new Error(data.error);
     }
 });
-const verifyOAuth = (environmentId_1, providerType_1, _a) => __awaiter(void 0, [environmentId_1, providerType_1, _a], void 0, function* (environmentId, providerType, { code, codeVerifier, state }) {
+const verifyOAuth = (environmentId_1, providerType_1, _b) => __awaiter(void 0, [environmentId_1, providerType_1, _b], void 0, function* (environmentId, providerType, { code, codeVerifier, state }) {
     const oauthRequest = {
         code,
         codeVerifier,
@@ -49,7 +58,7 @@ const verifyOAuth = (environmentId_1, providerType_1, _a) => __awaiter(void 0, [
         return handleVerifyError(e);
     }
 });
-const unlinkOAuth = (_b) => __awaiter(void 0, [_b], void 0, function* ({ environmentId, primaryWalletId, verifiedCrentialId, }) {
+const unlinkOAuth = (_c) => __awaiter(void 0, [_c], void 0, function* ({ environmentId, primaryWalletId, verifiedCrentialId, }) {
     try {
         const response = yield sdkApi().verifyUnlink({
             environmentId,
@@ -65,7 +74,7 @@ const unlinkOAuth = (_b) => __awaiter(void 0, [_b], void 0, function* ({ environ
         return undefined;
     }
 });
-const signInOAuth = (environmentId_2, providerType_2, _c) => __awaiter(void 0, [environmentId_2, providerType_2, _c], void 0, function* (environmentId, providerType, { code, codeVerifier, state, captchaToken, sessionPublicKey }) {
+const signInOAuth = (environmentId_2, providerType_2, _d) => __awaiter(void 0, [environmentId_2, providerType_2, _d], void 0, function* (environmentId, providerType, { code, codeVerifier, state, captchaToken, sessionPublicKey }) {
     const oauthRequest = {
         captchaToken,
         code,
@@ -86,7 +95,7 @@ const signInOAuth = (environmentId_2, providerType_2, _c) => __awaiter(void 0, [
         return handleSignInError(e);
     }
 });
-const getOAuthResult = (environmentId_3, providerType_3, _d) => __awaiter(void 0, [environmentId_3, providerType_3, _d], void 0, function* (environmentId, providerType, { state }) {
+const getOAuthResult = (environmentId_3, providerType_3, _e) => __awaiter(void 0, [environmentId_3, providerType_3, _e], void 0, function* (environmentId, providerType, { state }) {
     const oauthResultRequest = {
         state,
     };
@@ -179,7 +188,7 @@ const handleVerifyError = (e) => __awaiter(void 0, void 0, void 0, function* ()
     return undefined;
 });
 const handleSignInError = (e) => __awaiter(void 0, void 0, void 0, function* () {
-    var _e, _f, _g;
+    var _f, _g, _h;
     logger.error(e);
     const data = yield e.json();
     if (data.error.code === 'gate_blocked') {
@@ -187,9 +196,9 @@ const handleSignInError = (e) => __awaiter(void 0, void 0, void 0, function* ()
     }
     if (data.error.code === 'missing_from_list') {
         throw new NoAccessError({
-            socialProvider: (_e = data === null || data === void 0 ? void 0 : data.payload) === null || _e === void 0 ? void 0 : _e.socialProvider,
-            socialUsername: (_f = data === null || data === void 0 ? void 0 : data.payload) === null || _f === void 0 ? void 0 : _f.socialUsername,
-            walletPublicKey: (_g = data === null || data === void 0 ? void 0 : data.payload) === null || _g === void 0 ? void 0 : _g.walletPublicKey,
+            socialProvider: (_f = data === null || data === void 0 ? void 0 : data.payload) === null || _f === void 0 ? void 0 : _f.socialProvider,
+            socialUsername: (_g = data === null || data === void 0 ? void 0 : data.payload) === null || _g === void 0 ? void 0 : _g.socialUsername,
+            walletPublicKey: (_h = data === null || data === void 0 ? void 0 : data.payload) === null || _h === void 0 ? void 0 : _h.walletPublicKey,
         });
     }
     if (data.code === 'email_associated_with_different_provider') {

package/src/lib/layout/DynamicAuthLayout/Header/header.cjs

@@ -72,8 +72,8 @@ require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 var IconButton = require('../../../components/IconButton/IconButton.cjs');
 require('../../../components/MenuList/Dropdown/Dropdown.cjs');
 require('formik');
-require('../../../store/state/sendBalances.cjs');
 var ModalHeader = require('../../../components/ModalHeader/ModalHeader.cjs');
+require('../../../store/state/sendBalances.cjs');
 require('../../../components/Input/Input.cjs');
 require('../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../../context/PasskeyContext/PasskeyContext.cjs');

package/src/lib/layout/DynamicAuthLayout/Header/header.js

@@ -68,8 +68,8 @@ import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import { IconButton } from '../../../components/IconButton/IconButton.js';
 import '../../../components/MenuList/Dropdown/Dropdown.js';
 import 'formik';
-import '../../../store/state/sendBalances.js';
 import { ModalHeader } from '../../../components/ModalHeader/ModalHeader.js';
+import '../../../store/state/sendBalances.js';
 import '../../../components/Input/Input.js';
 import '../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';

package/src/lib/layout/DynamicAuthLayout/HelpContent/HelpHeader/HelpHeader.cjs

@@ -68,8 +68,8 @@ require('../../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 var IconButton = require('../../../../components/IconButton/IconButton.cjs');
 require('../../../../components/MenuList/Dropdown/Dropdown.cjs');
 require('formik');
-require('../../../../store/state/sendBalances.cjs');
 var ModalHeader = require('../../../../components/ModalHeader/ModalHeader.cjs');
+require('../../../../store/state/sendBalances.cjs');
 require('../../../../components/Input/Input.cjs');
 require('../../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../../../context/PasskeyContext/PasskeyContext.cjs');

package/src/lib/layout/DynamicAuthLayout/HelpContent/HelpHeader/HelpHeader.js

@@ -64,8 +64,8 @@ import '../../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import { IconButton } from '../../../../components/IconButton/IconButton.js';
 import '../../../../components/MenuList/Dropdown/Dropdown.js';
 import 'formik';
-import '../../../../store/state/sendBalances.js';
 import { ModalHeader } from '../../../../components/ModalHeader/ModalHeader.js';
+import '../../../../store/state/sendBalances.js';
 import '../../../../components/Input/Input.js';
 import '../../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../../../context/PasskeyContext/PasskeyContext.js';

package/src/lib/layouts/BridgeNextWalletToConnectLayout/BridgeNextWalletToConnectLayout.cjs

@@ -66,8 +66,8 @@ var IconButton = require('../../components/IconButton/IconButton.cjs');
 require('../../components/MenuList/Dropdown/Dropdown.cjs');
 var TypographyButton = require('../../components/TypographyButton/TypographyButton.cjs');
 require('formik');
-require('../../store/state/sendBalances.cjs');
 var ModalHeader = require('../../components/ModalHeader/ModalHeader.cjs');
+require('../../store/state/sendBalances.cjs');
 require('../../components/Input/Input.cjs');
 require('../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../context/PasskeyContext/PasskeyContext.cjs');

package/src/lib/layouts/BridgeNextWalletToConnectLayout/BridgeNextWalletToConnectLayout.js

@@ -62,8 +62,8 @@ import { IconButton } from '../../components/IconButton/IconButton.js';
 import '../../components/MenuList/Dropdown/Dropdown.js';
 import { TypographyButton } from '../../components/TypographyButton/TypographyButton.js';
 import 'formik';
-import '../../store/state/sendBalances.js';
 import { ModalHeader } from '../../components/ModalHeader/ModalHeader.js';
+import '../../store/state/sendBalances.js';
 import '../../components/Input/Input.js';
 import '../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../context/PasskeyContext/PasskeyContext.js';

package/src/lib/layouts/BridgeWelcomeLayout/BridgeWelcomeLayout.cjs

@@ -66,8 +66,8 @@ var IconButton = require('../../components/IconButton/IconButton.cjs');
 require('../../components/MenuList/Dropdown/Dropdown.cjs');
 var TypographyButton = require('../../components/TypographyButton/TypographyButton.cjs');
 require('formik');
-require('../../store/state/sendBalances.cjs');
 var ModalHeader = require('../../components/ModalHeader/ModalHeader.cjs');
+require('../../store/state/sendBalances.cjs');
 require('../../components/Input/Input.cjs');
 require('../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../context/PasskeyContext/PasskeyContext.cjs');

package/src/lib/layouts/BridgeWelcomeLayout/BridgeWelcomeLayout.js

@@ -62,8 +62,8 @@ import { IconButton } from '../../components/IconButton/IconButton.js';
 import '../../components/MenuList/Dropdown/Dropdown.js';
 import { TypographyButton } from '../../components/TypographyButton/TypographyButton.js';
 import 'formik';
-import '../../store/state/sendBalances.js';
 import { ModalHeader } from '../../components/ModalHeader/ModalHeader.js';
+import '../../store/state/sendBalances.js';
 import '../../components/Input/Input.js';
 import '../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../context/PasskeyContext/PasskeyContext.js';

package/src/lib/layouts/ConnectedWalletsListLayout/ConnectedWalletsListLayout.cjs

@@ -67,8 +67,8 @@ var IconButton = require('../../components/IconButton/IconButton.cjs');
 require('../../components/MenuList/Dropdown/Dropdown.cjs');
 var TypographyButton = require('../../components/TypographyButton/TypographyButton.cjs');
 require('formik');
-require('../../store/state/sendBalances.cjs');
 var ModalHeader = require('../../components/ModalHeader/ModalHeader.cjs');
+require('../../store/state/sendBalances.cjs');
 require('../../components/Input/Input.cjs');
 require('../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../context/PasskeyContext/PasskeyContext.cjs');

package/src/lib/layouts/ConnectedWalletsListLayout/ConnectedWalletsListLayout.js

@@ -63,8 +63,8 @@ import { IconButton } from '../../components/IconButton/IconButton.js';
 import '../../components/MenuList/Dropdown/Dropdown.js';
 import { TypographyButton } from '../../components/TypographyButton/TypographyButton.js';
 import 'formik';
-import '../../store/state/sendBalances.js';
 import { ModalHeader } from '../../components/ModalHeader/ModalHeader.js';
+import '../../store/state/sendBalances.js';
 import '../../components/Input/Input.js';
 import '../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../context/PasskeyContext/PasskeyContext.js';

package/src/lib/modals/SendBalanceModal/SendBalanceModal.cjs

@@ -71,7 +71,6 @@ var SendBalanceView = require('../../views/SendBalanceView/SendBalanceView.cjs')
 require('../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 require('../../../index.cjs');
-require('../../store/state/sendBalances.cjs');
 require('../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../store/state/tokenBalances.cjs');
 require('../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
@@ -85,6 +84,7 @@ require('qrcode');
 require('../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
 require('../../context/IpConfigurationContext/IpConfigurationContext.cjs');
+require('../../store/state/sendBalances.cjs');
 
 const SendBalanceModal = ({ initialRecipientAddress, initialValue, onReject, onSuccess, }) => {
     usePreventPageScroll.usePreventPageScroll(true);

package/src/lib/modals/SendBalanceModal/SendBalanceModal.js

@@ -67,7 +67,6 @@ import { SendBalanceView } from '../../views/SendBalanceView/SendBalanceView.js'
 import '../../context/PasskeyContext/PasskeyContext.js';
 import '../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
 import '../../../index.js';
-import '../../store/state/sendBalances.js';
 import '../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../store/state/tokenBalances.js';
 import '../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
@@ -81,6 +80,7 @@ import 'qrcode';
 import '../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
 import '../../context/IpConfigurationContext/IpConfigurationContext.js';
+import '../../store/state/sendBalances.js';
 
 const SendBalanceModal = ({ initialRecipientAddress, initialValue, onReject, onSuccess, }) => {
     usePreventPageScroll(true);

package/src/lib/modals/SignMessageConfirmationModal/SignMessageConfirmationModal.cjs

@@ -83,8 +83,8 @@ var IconButton = require('../../components/IconButton/IconButton.cjs');
 require('../../components/MenuList/Dropdown/Dropdown.cjs');
 var ErrorContainer = require('../../components/ErrorContainer/ErrorContainer.cjs');
 require('formik');
-require('../../store/state/sendBalances.cjs');
 var ModalHeader = require('../../components/ModalHeader/ModalHeader.cjs');
+require('../../store/state/sendBalances.cjs');
 require('../../components/Input/Input.cjs');
 require('../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 var PasskeyContext = require('../../context/PasskeyContext/PasskeyContext.cjs');

package/src/lib/modals/SignMessageConfirmationModal/SignMessageConfirmationModal.js

@@ -79,8 +79,8 @@ import { IconButton } from '../../components/IconButton/IconButton.js';
 import '../../components/MenuList/Dropdown/Dropdown.js';
 import { ErrorContainer } from '../../components/ErrorContainer/ErrorContainer.js';
 import 'formik';
-import '../../store/state/sendBalances.js';
 import { ModalHeader } from '../../components/ModalHeader/ModalHeader.js';
+import '../../store/state/sendBalances.js';
 import '../../components/Input/Input.js';
 import '../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import { usePasskeyContext } from '../../context/PasskeyContext/PasskeyContext.js';

package/src/lib/store/internalImplementation/utils/syncLegacyStorage/syncLegacyStorage.cjs

@@ -9,7 +9,7 @@ const AUTH_USER = 'dynamic_authenticated_user';
 const syncLegacyStorage = (store) => {
     const legacyUser = utils.StorageService.getItem(AUTH_USER);
     if (Boolean(legacyUser) && !store.getState().user) {
-        store.setState({ user: legacyUser });
+        store.setState({ user: legacyUser !== null && legacyUser !== void 0 ? legacyUser : undefined });
         utils.StorageService.removeItem(AUTH_USER);
     }
     return store;

package/src/lib/store/internalImplementation/utils/syncLegacyStorage/syncLegacyStorage.js

@@ -5,7 +5,7 @@ const AUTH_USER = 'dynamic_authenticated_user';
 const syncLegacyStorage = (store) => {
     const legacyUser = StorageService.getItem(AUTH_USER);
     if (Boolean(legacyUser) && !store.getState().user) {
-        store.setState({ user: legacyUser });
+        store.setState({ user: legacyUser !== null && legacyUser !== void 0 ? legacyUser : undefined });
         StorageService.removeItem(AUTH_USER);
     }
     return store;

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

@@ -1 +1 @@
-export declare const getExpiresAt: () => number | undefined;
+export declare const getExpiresAt: () => number | null;

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

@@ -3,25 +3,24 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const getNativeTokenInfo = (chain, networkInfo) => {
-    if (!chain || !chain.name) {
+var values = require('../../constants/values.cjs');
+
+const getNetworkInfoEntry = (chain, networkInfo) => {
+    if (!chain || !chain.symbol) {
         return;
     }
-    const networkData = networkInfo[chain.name.toLowerCase()] || networkInfo['evm'];
+    const normalizedChainSymbol = chain.symbol === 'ETH' || chain.symbol === 'EVM'
+        ? 'evm'
+        : chain.symbol.toLowerCase();
+    const networkData = networkInfo[normalizedChainSymbol] ||
+        networkInfo[values.ChainEnumToVerifiedCredentialName[normalizedChainSymbol.toUpperCase()]];
     if (!networkData)
         return;
-    return networkData.find((e) => e.chainId === (chain === null || chain === void 0 ? void 0 : chain.chainId));
-};
-const allowedChains = {
-    'arbitrum one': 'arbitrum',
-    avalanche: 'avalanche',
-    base: 'base',
-    eth: 'eth',
-    'op mainnet': 'optimism',
-    optimism: 'optimism',
-    polygon: 'polygon',
-    sepolia: 'sepolia',
-    solana: 'solana',
+    if (normalizedChainSymbol === 'evm') {
+        return networkData.find((e) => e.chainId === (chain === null || chain === void 0 ? void 0 : chain.chainId));
+    }
+    // Solana, etc
+    return networkData[0];
 };
 const getEvmChainName = (chainId) => {
     const map = {
@@ -35,12 +34,6 @@ const getEvmChainName = (chainId) => {
     };
     return map[chainId] || 'Unknown';
 };
-const getIconUrl = (chainName) => {
-    const chain = allowedChains[chainName === null || chainName === void 0 ? void 0 : chainName.toLowerCase()] || 'eth';
-    return `https://app.dynamic.xyz/assets/networks/${chain}.svg`;
-};
 
-exports.allowedChains = allowedChains;
 exports.getEvmChainName = getEvmChainName;
-exports.getIconUrl = getIconUrl;
-exports.getNativeTokenInfo = getNativeTokenInfo;
+exports.getNetworkInfoEntry = getNetworkInfoEntry;

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

@@ -1,6 +1,7 @@
 import { ChainWithIcon } from '../../../widgets/DynamicWidget/hooks/useFetchChain';
 interface NativeCurrency {
     decimals: number;
+    iconUrl?: string;
     name: string;
     symbol: string;
 }
@@ -10,10 +11,6 @@ export interface NetworkInfoEntry {
     iconUrls: string[];
     name: string;
 }
-export declare const getNativeTokenInfo: (chain: ChainWithIcon | undefined, networkInfo: Record<string, NetworkInfoEntry[]>) => NetworkInfoEntry | undefined;
-export declare const allowedChains: {
-    [key: string]: string;
-};
+export declare const getNetworkInfoEntry: (chain: ChainWithIcon | undefined, networkInfo: Record<string, NetworkInfoEntry[]>) => NetworkInfoEntry | undefined;
 export declare const getEvmChainName: (chainId: number) => string;
-export declare const getIconUrl: (chainName: string) => string;
 export {};

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

@@ -1,23 +1,22 @@
 'use client'
-const getNativeTokenInfo = (chain, networkInfo) => {
-    if (!chain || !chain.name) {
+import { ChainEnumToVerifiedCredentialName } from '../../constants/values.js';
+
+const getNetworkInfoEntry = (chain, networkInfo) => {
+    if (!chain || !chain.symbol) {
         return;
     }
-    const networkData = networkInfo[chain.name.toLowerCase()] || networkInfo['evm'];
+    const normalizedChainSymbol = chain.symbol === 'ETH' || chain.symbol === 'EVM'
+        ? 'evm'
+        : chain.symbol.toLowerCase();
+    const networkData = networkInfo[normalizedChainSymbol] ||
+        networkInfo[ChainEnumToVerifiedCredentialName[normalizedChainSymbol.toUpperCase()]];
     if (!networkData)
         return;
-    return networkData.find((e) => e.chainId === (chain === null || chain === void 0 ? void 0 : chain.chainId));
-};
-const allowedChains = {
-    'arbitrum one': 'arbitrum',
-    avalanche: 'avalanche',
-    base: 'base',
-    eth: 'eth',
-    'op mainnet': 'optimism',
-    optimism: 'optimism',
-    polygon: 'polygon',
-    sepolia: 'sepolia',
-    solana: 'solana',
+    if (normalizedChainSymbol === 'evm') {
+        return networkData.find((e) => e.chainId === (chain === null || chain === void 0 ? void 0 : chain.chainId));
+    }
+    // Solana, etc
+    return networkData[0];
 };
 const getEvmChainName = (chainId) => {
     const map = {
@@ -31,9 +30,5 @@ const getEvmChainName = (chainId) => {
     };
     return map[chainId] || 'Unknown';
 };
-const getIconUrl = (chainName) => {
-    const chain = allowedChains[chainName === null || chainName === void 0 ? void 0 : chainName.toLowerCase()] || 'eth';
-    return `https://app.dynamic.xyz/assets/networks/${chain}.svg`;
-};
 
-export { allowedChains, getEvmChainName, getIconUrl, getNativeTokenInfo };
+export { getEvmChainName, getNetworkInfoEntry };

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

@@ -35,7 +35,7 @@ export * from './useUserUpdateRequest';
 export * from './useRpcProviders';
 export { useValidateSession } from './useValidateSession';
 export { useVerifyWallet } from './useVerifyWallet';
-export { useWalletConnectorOptions } from './useWalletConnectorOptions';
+export { useCreateWalletConnectorOptions } from './useCreateWalletConnectorOptions';
 export { useWalletConnectors } from './useWalletConnectors';
 export { useWalletItemActions } from './useWalletItemActions';
 export { useWalletUiUtils } from './useWalletUiUtils';

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

@@ -118,7 +118,7 @@ const useCreateDynamicEmbeddedWalletMutation = () => {
             const turnkeyVerifiedCredentials = (_d = updatedUser.verifiedCredentials) === null || _d === void 0 ? void 0 : _d.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'));
             /** It's not authenticated if it's a turnkey wallet that still hasn't created a passkey */
             const isAuthenticated = Boolean((_e = turnkeyVerifiedCredentials === null || turnkeyVerifiedCredentials === void 0 ? void 0 : turnkeyVerifiedCredentials.walletProperties) === null || _e === void 0 ? void 0 : _e.isAuthenticatorAttached);
-            const passkeyWallet = walletConnector.createWallet({
+            const embeddedWallet = walletConnector.createWallet({
                 address: (yield walletConnector.getAddress()) || '',
                 chain: walletConnector.connectedChain,
                 connector: walletConnector,
@@ -138,7 +138,7 @@ const useCreateDynamicEmbeddedWalletMutation = () => {
                 });
                 setPrimaryWalletId(smartWallet$1.id);
             }
-            dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', passkeyWallet, turnkeyVerifiedCredentials, updatedUser);
+            dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', embeddedWallet, turnkeyVerifiedCredentials, updatedUser);
             setShowAuthFlow(false, { performMultiWalletChecks: false });
         }
         catch (err) {

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

@@ -114,7 +114,7 @@ const useCreateDynamicEmbeddedWalletMutation = () => {
             const turnkeyVerifiedCredentials = (_d = updatedUser.verifiedCredentials) === null || _d === void 0 ? void 0 : _d.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'));
             /** It's not authenticated if it's a turnkey wallet that still hasn't created a passkey */
             const isAuthenticated = Boolean((_e = turnkeyVerifiedCredentials === null || turnkeyVerifiedCredentials === void 0 ? void 0 : turnkeyVerifiedCredentials.walletProperties) === null || _e === void 0 ? void 0 : _e.isAuthenticatorAttached);
-            const passkeyWallet = walletConnector.createWallet({
+            const embeddedWallet = walletConnector.createWallet({
                 address: (yield walletConnector.getAddress()) || '',
                 chain: walletConnector.connectedChain,
                 connector: walletConnector,
@@ -134,7 +134,7 @@ const useCreateDynamicEmbeddedWalletMutation = () => {
                 });
                 setPrimaryWalletId(smartWallet.id);
             }
-            dynamicEvents.emit('embeddedWalletCreated', passkeyWallet, turnkeyVerifiedCredentials, updatedUser);
+            dynamicEvents.emit('embeddedWalletCreated', embeddedWallet, turnkeyVerifiedCredentials, updatedUser);
             setShowAuthFlow(false, { performMultiWalletChecks: false });
         }
         catch (err) {

package/src/lib/utils/hooks/useCreateWalletConnectorOptions/index.d.ts

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

package/src/lib/utils/hooks/{useWalletConnectorOptions/useWalletConnectorOptions.cjs → useCreateWalletConnectorOptions/useCreateWalletConnectorOptions.cjs}

@@ -28,7 +28,7 @@ require('../../../store/state/projectSettings/projectSettings.cjs');
 var walletConnectorOptions = require('../../../store/state/walletConnectorOptions.cjs');
 var verifyRequiredConnectorsAreSetup = require('./utils/verifyRequiredConnectorsAreSetup/verifyRequiredConnectorsAreSetup.cjs');
 
-const useWalletConnectorOptions = ({ projectSettings, appLogoUrl, appName, coinbaseWalletPreference, deepLinkPreference, flowNetwork, mobileExperience, networkConfigurations, walletBook, walletUiUtils, walletConnectorsProp, walletConnectPreferredChains, walletConnectorExtensions, }) => {
+const useCreateWalletConnectorOptions = ({ projectSettings, appLogoUrl, appName, coinbaseWalletPreference, deepLinkPreference, flowNetwork, mobileExperience, networkConfigurations, walletBook, walletUiUtils, walletConnectorsProp, walletConnectPreferredChains, walletConnectorExtensions, }) => {
     const walletConnectorsKey = React.useMemo(() => { var _a; return (_a = serializeWalletConnectors.serializeWalletConnectors(walletConnectorsProp)) === null || _a === void 0 ? void 0 : _a.join(','); }, [walletConnectorsProp]);
     const walletBookLength = React.useMemo(() => Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length, [walletBook]);
     const walletConnectorOptions$1 = React.useMemo(() => {
@@ -75,4 +75,4 @@ const useWalletConnectorOptions = ({ projectSettings, appLogoUrl, appName, coinb
     return { walletConnectorOptions: walletConnectorOptions$1 };
 };
 
-exports.useWalletConnectorOptions = useWalletConnectorOptions;
+exports.useCreateWalletConnectorOptions = useCreateWalletConnectorOptions;

package/src/lib/utils/hooks/{useWalletConnectorOptions/useWalletConnectorOptions.d.ts → useCreateWalletConnectorOptions/useCreateWalletConnectorOptions.d.ts}

@@ -17,7 +17,7 @@ type Props = {
     walletUiUtils: WalletUiUtils<InternalWalletConnector>;
     walletConnectorExtensions?: WalletConnectorExtension[];
 };
-export declare const useWalletConnectorOptions: ({ projectSettings, appLogoUrl, appName, coinbaseWalletPreference, deepLinkPreference, flowNetwork, mobileExperience, networkConfigurations, walletBook, walletUiUtils, walletConnectorsProp, walletConnectPreferredChains, walletConnectorExtensions, }: Props) => {
+export declare const useCreateWalletConnectorOptions: ({ projectSettings, appLogoUrl, appName, coinbaseWalletPreference, deepLinkPreference, flowNetwork, mobileExperience, networkConfigurations, walletBook, walletUiUtils, walletConnectorsProp, walletConnectPreferredChains, walletConnectorExtensions, }: Props) => {
     walletConnectorOptions: import("../../../shared").WalletOption[];
 };
 export {};

package/src/lib/utils/hooks/{useWalletConnectorOptions/useWalletConnectorOptions.js → useCreateWalletConnectorOptions/useCreateWalletConnectorOptions.js}

@@ -24,7 +24,7 @@ import '../../../store/state/projectSettings/projectSettings.js';
 import { setWalletConnectorOptions } from '../../../store/state/walletConnectorOptions.js';
 import { verifyRequiredConnectorsAreSetup } from './utils/verifyRequiredConnectorsAreSetup/verifyRequiredConnectorsAreSetup.js';
 
-const useWalletConnectorOptions = ({ projectSettings, appLogoUrl, appName, coinbaseWalletPreference, deepLinkPreference, flowNetwork, mobileExperience, networkConfigurations, walletBook, walletUiUtils, walletConnectorsProp, walletConnectPreferredChains, walletConnectorExtensions, }) => {
+const useCreateWalletConnectorOptions = ({ projectSettings, appLogoUrl, appName, coinbaseWalletPreference, deepLinkPreference, flowNetwork, mobileExperience, networkConfigurations, walletBook, walletUiUtils, walletConnectorsProp, walletConnectPreferredChains, walletConnectorExtensions, }) => {
     const walletConnectorsKey = useMemo(() => { var _a; return (_a = serializeWalletConnectors(walletConnectorsProp)) === null || _a === void 0 ? void 0 : _a.join(','); }, [walletConnectorsProp]);
     const walletBookLength = useMemo(() => Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length, [walletBook]);
     const walletConnectorOptions = useMemo(() => {
@@ -71,4 +71,4 @@ const useWalletConnectorOptions = ({ projectSettings, appLogoUrl, appName, coinb
     return { walletConnectorOptions };
 };
 
-export { useWalletConnectorOptions };
+export { useCreateWalletConnectorOptions };

package/src/lib/utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/useSecureEnclaveEmbeddedWallet.cjs

@@ -45,6 +45,7 @@ var errors = require('../../../constants/errors.cjs');
 require('../../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 var useElementById = require('../../useElementById/useElementById.cjs');
+var findPrimaryEmbeddedChain = require('../../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
 var WalletContext = require('../../../../context/WalletContext/WalletContext.cjs');
 var useIsTurnkeyWallet = require('../../useIsTurnkeyWallet/useIsTurnkeyWallet.cjs');
 var turnkeyExport = require('../../../../views/EmbeddedReveal/utils/turnkeyExport/turnkeyExport.cjs');
@@ -154,7 +155,8 @@ const useSecureEnclaveEmbeddedWallet = () => {
             throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
         }
         const userWalletsCredentials = getUserWalletsFromVerifiedCredentials.getUserWalletsFromVerifiedCredentials(user$1);
-        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(user$1, chains);
+        const primaryChain = findPrimaryEmbeddedChain.findPrimaryEmbeddedChain(projectSettings);
+        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(user$1, chains !== null && chains !== void 0 ? chains : [primaryChain]);
         const isManualMode = ((_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _f === void 0 ? void 0 : _f.automaticEmbeddedWalletCreation) === false;
         // if user has a wallet and it's not embedded,
         // throw error to follow another flow and set up the right wallet
@@ -180,7 +182,8 @@ const useSecureEnclaveEmbeddedWallet = () => {
             throw new Error(errors.USER_NOT_LOGGED_IN);
         }
         validateTurnkeyProviderEnabled.validateTurnkeyProviderEnabled(projectSettings);
-        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(user$1);
+        const primaryChain = findPrimaryEmbeddedChain.findPrimaryEmbeddedChain(projectSettings);
+        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(user$1, [primaryChain]);
         const turnkeyWalletId = (_h = embeddedWalletVerifiedCredential === null || embeddedWalletVerifiedCredential === void 0 ? void 0 : embeddedWalletVerifiedCredential.walletProperties) === null || _h === void 0 ? void 0 : _h.turnkeyHDWalletId;
         if (!turnkeyWalletId) {
             throw new utils.DynamicError('No HD wallet was found for this user to derive a wallet account. Use createEmbeddedWallet first', 'NoHdWalletFound');

package/src/lib/utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/useSecureEnclaveEmbeddedWallet.js

@@ -41,6 +41,7 @@ import { USER_NOT_LOGGED_IN, ACTIVE_SESSION, SESSION_RESTORED, INVALID_REQUEST,
 import '../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import { useElementById } from '../../useElementById/useElementById.js';
+import { findPrimaryEmbeddedChain } from '../../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
 import { useWalletContext } from '../../../../context/WalletContext/WalletContext.js';
 import { useIsTurnkeyWallet } from '../../useIsTurnkeyWallet/useIsTurnkeyWallet.js';
 import { cleanupExport, initExport, exportCredential } from '../../../../views/EmbeddedReveal/utils/turnkeyExport/turnkeyExport.js';
@@ -150,7 +151,8 @@ const useSecureEnclaveEmbeddedWallet = () => {
             throw new DynamicError(USER_NOT_LOGGED_IN);
         }
         const userWalletsCredentials = getUserWalletsFromVerifiedCredentials(user);
-        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(user, chains);
+        const primaryChain = findPrimaryEmbeddedChain(projectSettings);
+        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(user, chains !== null && chains !== void 0 ? chains : [primaryChain]);
         const isManualMode = ((_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _f === void 0 ? void 0 : _f.automaticEmbeddedWalletCreation) === false;
         // if user has a wallet and it's not embedded,
         // throw error to follow another flow and set up the right wallet
@@ -176,7 +178,8 @@ const useSecureEnclaveEmbeddedWallet = () => {
             throw new Error(USER_NOT_LOGGED_IN);
         }
         validateTurnkeyProviderEnabled(projectSettings);
-        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(user);
+        const primaryChain = findPrimaryEmbeddedChain(projectSettings);
+        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(user, [primaryChain]);
         const turnkeyWalletId = (_h = embeddedWalletVerifiedCredential === null || embeddedWalletVerifiedCredential === void 0 ? void 0 : embeddedWalletVerifiedCredential.walletProperties) === null || _h === void 0 ? void 0 : _h.turnkeyHDWalletId;
         if (!turnkeyWalletId) {
             throw new DynamicError('No HD wallet was found for this user to derive a wallet account. Use createEmbeddedWallet first', 'NoHdWalletFound');

package/src/lib/utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/useTurnkey/useTurnkey.cjs

@@ -99,17 +99,26 @@ const useTurnkey = () => {
     const { createDynamicEmbeddedWalletMutation } = useCreateDynamicEmbeddedWalletMutation.useCreateDynamicEmbeddedWalletMutation();
     const { getEOAWallet } = useSmartWallets.useSmartWallets();
     const startHeadlessEmbeddedWalletCreationFlow = React.useCallback((chains, options) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        yield createDynamicEmbeddedWalletMutation({
-            chains,
-            environmentId,
-            options,
-            walletConnectorOptions,
-            withAuthenticator: false,
-        });
-        setShowAuthFlow(false, { performMultiWalletChecks: false }); // close email otp pin modal
         return new Promise((resolve, reject) => {
-            dynamicEvents.dynamicEvents.once('embeddedWalletCreated', (wallet) => resolve(wallet));
+            // register the event listeners before calling create embedded wallet
+            // as the event might fire before the listeners are registered.
+            dynamicEvents.dynamicEvents.once('embeddedWalletCreated', (wallet) => {
+                resolve(wallet);
+            });
             dynamicEvents.dynamicEvents.once('embeddedWalletFailed', (error) => reject(error));
+            createDynamicEmbeddedWalletMutation({
+                chains,
+                environmentId,
+                options,
+                walletConnectorOptions,
+                withAuthenticator: false,
+            })
+                .then(() => {
+                setShowAuthFlow(false, { performMultiWalletChecks: false }); // close email otp pin modal
+            })
+                .catch((error) => {
+                reject(error);
+            });
         });
     }), [
         createDynamicEmbeddedWalletMutation,
@@ -185,7 +194,10 @@ const useTurnkey = () => {
         const isManualMode = ((_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _c === void 0 ? void 0 : _c.automaticEmbeddedWalletCreation) === false;
         const shouldCreateV2WalletsByDefault = ((_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _d === void 0 ? void 0 : _d.defaultWalletVersion) ===
             sdkApiCore.EmbeddedWalletVersionEnum.V2;
-        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(user, chains);
+        const primaryChain = findPrimaryEmbeddedChain.findPrimaryEmbeddedChain(projectSettings);
+        // if embedded wallet already exists
+        // get the one with the primary chain if `chains` is undefined
+        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(user, chains !== null && chains !== void 0 ? chains : [primaryChain]);
         const userWalletsCredentials = getUserWalletsFromVerifiedCredentials.getUserWalletsFromVerifiedCredentials(user);
         // If the user doesn't have a wallet, or if the customer is in Manual
         // Mode, we should attempt to create a new wallet. Note that if in manual
@@ -212,7 +224,7 @@ const useTurnkey = () => {
             if (embeddedWalletVerifiedCredential &&
                 user.newUser &&
                 ((_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _f === void 0 ? void 0 : _f.automaticEmbeddedWalletCreation)) {
-                const walletConnector = findPasskeyEmailWalletConnector.findPasskeyEmailWalletConnector(walletConnectorOptions, findPrimaryEmbeddedChain.findPrimaryEmbeddedChain(projectSettings));
+                const walletConnector = findPasskeyEmailWalletConnector.findPasskeyEmailWalletConnector(walletConnectorOptions, primaryChain);
                 if (!walletConnector) {
                     throw new Error('Could not find the embedded wallet connector');
                 }