@dynamic-labs/sdk-react-core 3.4.0 → 3.4.2

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('../../components/InlineWidget/InlineWidget.cjs');
@@ -84,6 +83,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 '../../components/InlineWidget/InlineWidget.js';
@@ -80,6 +79,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/clearExpiredData/clearExpiredData.cjs

@@ -7,7 +7,7 @@ var utils = require('@dynamic-labs/utils');
 var localStorage = require('../../../../utils/constants/localStorage.cjs');
 
 const clearExpiredData = (store) => {
-    const { projectSettings, networkConfigurations, user } = store.getState();
+    const { projectSettings, user } = store.getState();
     // TODO: we can clean this up once we move wallet info to the store
     const [connectedWalletData] = utils.StorageService.getItem(localStorage.CONNECTED_WALLETS_INFO) || [];
     const shouldRemoveSettingsAndConfigs = !user && !connectedWalletData;
@@ -18,11 +18,6 @@ const clearExpiredData = (store) => {
             projectSettings: store.getInitialState().projectSettings,
         });
     }
-    if (isExpired(networkConfigurations)) {
-        store.setState({
-            networkConfigurations: store.getInitialState().networkConfigurations,
-        });
-    }
     return store;
 };
 

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

@@ -3,7 +3,7 @@ import { StorageService } from '@dynamic-labs/utils';
 import { CONNECTED_WALLETS_INFO } from '../../../../utils/constants/localStorage.js';
 
 const clearExpiredData = (store) => {
-    const { projectSettings, networkConfigurations, user } = store.getState();
+    const { projectSettings, user } = store.getState();
     // TODO: we can clean this up once we move wallet info to the store
     const [connectedWalletData] = StorageService.getItem(CONNECTED_WALLETS_INFO) || [];
     const shouldRemoveSettingsAndConfigs = !user && !connectedWalletData;
@@ -14,11 +14,6 @@ const clearExpiredData = (store) => {
             projectSettings: store.getInitialState().projectSettings,
         });
     }
-    if (isExpired(networkConfigurations)) {
-        store.setState({
-            networkConfigurations: store.getInitialState().networkConfigurations,
-        });
-    }
     return store;
 };
 

package/src/lib/store/stateConfig.cjs

@@ -11,10 +11,6 @@ const createInitialStates = ({ environmentId, }) => ({
     loadingAndLifecycle: {
         sessionValidation: false,
     },
-    networkConfigurations: {
-        expiresAt: undefined,
-        networkConfigurations: undefined,
-    },
     projectSettings: { expiresAt: undefined, settings: undefined },
     sendBalanceState: {
         amount: undefined,
@@ -36,7 +32,6 @@ const createInitialStates = ({ environmentId, }) => ({
  */
 const transformStateForLocalStorage = (state) => ({
     environmentId: state.environmentId,
-    networkConfigurations: state.networkConfigurations,
     projectSettings: state.projectSettings,
     user: state.user,
 });

package/src/lib/store/stateConfig.js

@@ -7,10 +7,6 @@ const createInitialStates = ({ environmentId, }) => ({
     loadingAndLifecycle: {
         sessionValidation: false,
     },
-    networkConfigurations: {
-        expiresAt: undefined,
-        networkConfigurations: undefined,
-    },
     projectSettings: { expiresAt: undefined, settings: undefined },
     sendBalanceState: {
         amount: undefined,
@@ -32,7 +28,6 @@ const createInitialStates = ({ environmentId, }) => ({
  */
 const transformStateForLocalStorage = (state) => ({
     environmentId: state.environmentId,
-    networkConfigurations: state.networkConfigurations,
     projectSettings: state.projectSettings,
     user: state.user,
 });

package/src/lib/store/types.d.ts

@@ -1,5 +1,5 @@
 import { ProjectSettings, TokenBalance } from '@dynamic-labs/sdk-api-core';
-import { NetworkConfigurationMap, UserProfile } from '@dynamic-labs/types';
+import { UserProfile } from '@dynamic-labs/types';
 import { WalletOption } from '../shared/types/wallets';
 export type SdkStoreProps = {
     environmentId: string;
@@ -9,7 +9,6 @@ export type SdkStore = {
     environmentId: string;
     user: UserProfile | undefined;
     projectSettings: StoredProjectSettings;
-    networkConfigurations: StoredNetworkConfigurations;
     tokenBalancesState: TokenBalancesState;
     sendBalanceState: SendBalanceState;
     walletConnectorOptions: WalletOption[];
@@ -36,10 +35,6 @@ export type StoredProjectSettings = {
     expiresAt: number | undefined;
     settings: ProjectSettings | undefined;
 };
-export type StoredNetworkConfigurations = {
-    expiresAt: number | undefined;
-    networkConfigurations: NetworkConfigurationMap | undefined;
-};
 export type StateConfig = {
     [K in keyof SdkStore]: {
         initialValue: SdkStore[K];

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

@@ -3,39 +3,24 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const eth = {
-    logoURI: 'https://app.dynamic.xyz/assets/networks/eth.svg',
-    name: 'Ethereum',
-    symbol: 'ETH',
-};
-const networkMap = {
-    avalanche: {
-        logoURI: 'https://app.dynamic.xyz/assets/networks/avax.svg',
-        name: 'Avalanche',
-        symbol: 'AVAX',
-    },
-    polygon: {
-        logoURI: 'https://app.dynamic.xyz/assets/networks/polygon.svg',
-        name: 'Polygon',
-        symbol: 'MATIC',
-    },
-    solana: {
-        logoURI: 'https://app.dynamic.xyz/assets/networks/solana.svg',
-        name: 'Solana',
-        symbol: 'SOL',
-    },
-};
-const getNativeTokenInfo = (blockchain = 'eth') => networkMap[blockchain] || eth;
-const allowedChains = {
-    'arbitrum one': 'arbitrum',
-    avalanche: 'avalanche',
-    base: 'base',
-    eth: 'eth',
-    'op mainnet': 'optimism',
-    optimism: 'optimism',
-    polygon: 'polygon',
-    sepolia: 'sepolia',
-    solana: 'solana',
+var values = require('../../constants/values.cjs');
+
+const getNetworkInfoEntry = (chain, networkInfo) => {
+    if (!chain || !chain.symbol) {
+        return;
+    }
+    const normalizedChainSymbol = chain.symbol === 'ETH' || chain.symbol === 'EVM'
+        ? 'evm'
+        : chain.symbol.toLowerCase();
+    const networkData = networkInfo[normalizedChainSymbol] ||
+        networkInfo[values.ChainEnumToVerifiedCredentialName[normalizedChainSymbol.toUpperCase()]];
+    if (!networkData)
+        return;
+    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 = {
@@ -49,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,12 +1,16 @@
-interface Network {
-    logoURI: string;
+import { ChainWithIcon } from '../../../widgets/DynamicWidget/hooks/useFetchChain';
+interface NativeCurrency {
+    decimals: number;
+    iconUrl?: string;
     name: string;
     symbol: string;
 }
-export declare const getNativeTokenInfo: (blockchain?: string) => Network;
-export declare const allowedChains: {
-    [key: string]: string;
-};
+export interface NetworkInfoEntry {
+    chainId: number;
+    nativeCurrency: NativeCurrency;
+    iconUrls: string[];
+    name: 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,37 +1,22 @@
 'use client'
-const eth = {
-    logoURI: 'https://app.dynamic.xyz/assets/networks/eth.svg',
-    name: 'Ethereum',
-    symbol: 'ETH',
-};
-const networkMap = {
-    avalanche: {
-        logoURI: 'https://app.dynamic.xyz/assets/networks/avax.svg',
-        name: 'Avalanche',
-        symbol: 'AVAX',
-    },
-    polygon: {
-        logoURI: 'https://app.dynamic.xyz/assets/networks/polygon.svg',
-        name: 'Polygon',
-        symbol: 'MATIC',
-    },
-    solana: {
-        logoURI: 'https://app.dynamic.xyz/assets/networks/solana.svg',
-        name: 'Solana',
-        symbol: 'SOL',
-    },
-};
-const getNativeTokenInfo = (blockchain = 'eth') => networkMap[blockchain] || eth;
-const allowedChains = {
-    'arbitrum one': 'arbitrum',
-    avalanche: 'avalanche',
-    base: 'base',
-    eth: 'eth',
-    'op mainnet': 'optimism',
-    optimism: 'optimism',
-    polygon: 'polygon',
-    sepolia: 'sepolia',
-    solana: 'solana',
+import { ChainEnumToVerifiedCredentialName } from '../../constants/values.js';
+
+const getNetworkInfoEntry = (chain, networkInfo) => {
+    if (!chain || !chain.symbol) {
+        return;
+    }
+    const normalizedChainSymbol = chain.symbol === 'ETH' || chain.symbol === 'EVM'
+        ? 'evm'
+        : chain.symbol.toLowerCase();
+    const networkData = networkInfo[normalizedChainSymbol] ||
+        networkInfo[ChainEnumToVerifiedCredentialName[normalizedChainSymbol.toUpperCase()]];
+    if (!networkData)
+        return;
+    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 = {
@@ -45,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

@@ -117,7 +117,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,
@@ -137,7 +137,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

@@ -113,7 +113,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,
@@ -133,7 +133,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');
@@ -151,7 +152,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 = ((_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _e === void 0 ? void 0 : _e.automaticEmbeddedWalletCreation) === false;
         // if user has a wallet and it's not embedded,
         // throw error to follow another flow and set up the right wallet
@@ -177,7 +179,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 = (_g = embeddedWalletVerifiedCredential === null || embeddedWalletVerifiedCredential === void 0 ? void 0 : embeddedWalletVerifiedCredential.walletProperties) === null || _g === void 0 ? void 0 : _g.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';
@@ -147,7 +148,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 = ((_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _e === void 0 ? void 0 : _e.automaticEmbeddedWalletCreation) === false;
         // if user has a wallet and it's not embedded,
         // throw error to follow another flow and set up the right wallet
@@ -173,7 +175,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 = (_g = embeddedWalletVerifiedCredential === null || embeddedWalletVerifiedCredential === void 0 ? void 0 : embeddedWalletVerifiedCredential.walletProperties) === null || _g === void 0 ? void 0 : _g.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

@@ -98,17 +98,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,
@@ -184,7 +193,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
@@ -211,7 +223,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');
                 }