@dynamic-labs/sdk-react-core 4.9.1-preview.0 → 4.9.2-preview.0

package/src/lib/utils/functions/generateMessages/index.cjs

@@ -7,6 +7,24 @@ var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var multiWallet = require('@dynamic-labs/multi-wallet');
 var utils = require('@dynamic-labs/utils');
 
+const getChainIdForMessage = (walletConnector) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    // If it's a Solana wallet, we should not specify a chainId
+    // since it breaks the message signature in some wallets (e.g. Trust Wallet)
+    if (walletConnector.connectedChain === 'SOL') {
+        return undefined;
+    }
+    const chain = yield walletConnector.getNetwork(true);
+    if (chain) {
+        return chain;
+    }
+    if (walletConnector.key === 'bloctoevm') {
+        return 137;
+    }
+    if (walletConnector.connectedChain === 'EVM') {
+        return 1;
+    }
+    return chain;
+});
 const generateMessages = (publicWalletAddress, walletConnector, nonce, projectEnvironmentId, displaySiweStatement, siweStatement) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     if (publicWalletAddress === undefined) {
         throw new utils.DynamicError('Unable to fetch the public address from the wallet');
@@ -14,15 +32,7 @@ const generateMessages = (publicWalletAddress, walletConnector, nonce, projectEn
     if (!walletConnector.connectedChain) {
         throw new utils.DynamicError('Wallet is not connected');
     }
-    let chainId = yield walletConnector.getNetwork(true);
-    if (chainId === undefined) {
-        if (walletConnector.key === 'bloctoevm') {
-            chainId = 137;
-        }
-        else if (walletConnector.connectedChain === 'EVM') {
-            chainId = 1;
-        }
-    }
+    const chainId = yield getChainIdForMessage(walletConnector);
     const parsedAddress = walletConnector.parseAddress(publicWalletAddress);
     const currentUrl = utils.PlatformService.getUrl();
     const messageToSign = multiWallet.generateMessageToSign({

package/src/lib/utils/functions/generateMessages/index.js

@@ -3,6 +3,24 @@ import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { generateMessageToSign } from '@dynamic-labs/multi-wallet';
 import { DynamicError, PlatformService } from '@dynamic-labs/utils';
 
+const getChainIdForMessage = (walletConnector) => __awaiter(void 0, void 0, void 0, function* () {
+    // If it's a Solana wallet, we should not specify a chainId
+    // since it breaks the message signature in some wallets (e.g. Trust Wallet)
+    if (walletConnector.connectedChain === 'SOL') {
+        return undefined;
+    }
+    const chain = yield walletConnector.getNetwork(true);
+    if (chain) {
+        return chain;
+    }
+    if (walletConnector.key === 'bloctoevm') {
+        return 137;
+    }
+    if (walletConnector.connectedChain === 'EVM') {
+        return 1;
+    }
+    return chain;
+});
 const generateMessages = (publicWalletAddress, walletConnector, nonce, projectEnvironmentId, displaySiweStatement, siweStatement) => __awaiter(void 0, void 0, void 0, function* () {
     if (publicWalletAddress === undefined) {
         throw new DynamicError('Unable to fetch the public address from the wallet');
@@ -10,15 +28,7 @@ const generateMessages = (publicWalletAddress, walletConnector, nonce, projectEn
     if (!walletConnector.connectedChain) {
         throw new DynamicError('Wallet is not connected');
     }
-    let chainId = yield walletConnector.getNetwork(true);
-    if (chainId === undefined) {
-        if (walletConnector.key === 'bloctoevm') {
-            chainId = 137;
-        }
-        else if (walletConnector.connectedChain === 'EVM') {
-            chainId = 1;
-        }
-    }
+    const chainId = yield getChainIdForMessage(walletConnector);
     const parsedAddress = walletConnector.parseAddress(publicWalletAddress);
     const currentUrl = PlatformService.getUrl();
     const messageToSign = generateMessageToSign({

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

@@ -78,5 +78,4 @@ export * from './isAuthenticatedWithAWallet';
 export * from './networksAndChains';
 export * from './updatePrimaryWalletId';
 export * from './getWalletUniqueId';
-export * from './coinbaseOnramp';
 export * from './openPopup';

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

@@ -4,28 +4,41 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var openOnrampPopup = require('../openOnrampPopup.cjs');
+var index = require('../onrampProviders/index.cjs');
 
+/**
+ * Converts an OnrampConfiguration to an OnrampOption based on the provider's display mode
+ */
 const onrampConfigurationToOnrampOption = (provider, onClick, setShowOnramp) => {
-    var _a, _b, _c;
-    const isPopupImplementation = provider.provider === 'coinbaseOnramp';
-    return {
-        displayName: (_b = (_a = provider.name) !== null && _a !== void 0 ? _a : provider.provider) !== null && _b !== void 0 ? _b : '',
-        iconUrl: (_c = provider.iconUrl) !== null && _c !== void 0 ? _c : '',
+    var _a, _b, _c, _d;
+    // Determine if this provider uses popup or iframe mode
+    const providerKey = provider.provider;
+    const openMode = (_a = index.providerDisplayModes[providerKey]) !== null && _a !== void 0 ? _a : 'iframe';
+    // Create common properties
+    const baseProperties = {
+        displayName: (_c = (_b = provider.name) !== null && _b !== void 0 ? _b : provider.provider) !== null && _c !== void 0 ? _c : '',
+        iconUrl: (_d = provider.iconUrl) !== null && _d !== void 0 ? _d : '',
         id: String(provider.provider),
-        // For Coinbase, we don't use the iframeUrl in the widget, we handle it in onClick
-        iframeUrl: isPopupImplementation ? undefined : provider.url,
-        onClick: (params) => {
-            // Call the provided onClick to set the selected provider
-            onClick({
-                onrampProvider: provider.provider,
-            });
-            // For Coinbase, handle the popup opening directly in the onClick
-            if (isPopupImplementation && provider.url && setShowOnramp) {
-                // Use the new openOnrampPopup function to handle the popup logic
-                openOnrampPopup.openOnrampPopup(provider.url, params.wallet, setShowOnramp);
-            }
-        },
+        openMode,
+        url: provider.url,
     };
+    // Create base onClick handler
+    const baseOnClick = (params) => {
+        onClick({
+            onrampProvider: provider.provider,
+        });
+    };
+    // For popup mode, enhance the onClick handler to open the popup
+    if (openMode === 'popup') {
+        return Object.assign(Object.assign({}, baseProperties), { onClick: (params) => {
+                baseOnClick();
+                if (provider.url && setShowOnramp) {
+                    openOnrampPopup.openOnrampPopup(provider.url, params.wallet, setShowOnramp, provider.provider);
+                }
+            } });
+    }
+    // For iframe mode, use the base onClick handler
+    return Object.assign(Object.assign({}, baseProperties), { onClick: baseOnClick });
 };
 
 exports.onrampConfigurationToOnrampOption = onrampConfigurationToOnrampOption;

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

@@ -1,5 +1,8 @@
 import type { OnrampConfiguration, OnrampProviders } from '@dynamic-labs/sdk-api-core';
 import type { OnrampOption } from '../../../context/DynamicContext';
+/**
+ * Converts an OnrampConfiguration to an OnrampOption based on the provider's display mode
+ */
 export declare const onrampConfigurationToOnrampOption: (provider: OnrampConfiguration, onClick: ({ onrampProvider }: {
     onrampProvider: OnrampProviders;
 }) => void, setShowOnramp?: (show: boolean) => void) => OnrampOption;

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

@@ -1,27 +1,40 @@
 'use client'
 import { openOnrampPopup } from '../openOnrampPopup.js';
+import { providerDisplayModes } from '../onrampProviders/index.js';
 
+/**
+ * Converts an OnrampConfiguration to an OnrampOption based on the provider's display mode
+ */
 const onrampConfigurationToOnrampOption = (provider, onClick, setShowOnramp) => {
-    var _a, _b, _c;
-    const isPopupImplementation = provider.provider === 'coinbaseOnramp';
-    return {
-        displayName: (_b = (_a = provider.name) !== null && _a !== void 0 ? _a : provider.provider) !== null && _b !== void 0 ? _b : '',
-        iconUrl: (_c = provider.iconUrl) !== null && _c !== void 0 ? _c : '',
+    var _a, _b, _c, _d;
+    // Determine if this provider uses popup or iframe mode
+    const providerKey = provider.provider;
+    const openMode = (_a = providerDisplayModes[providerKey]) !== null && _a !== void 0 ? _a : 'iframe';
+    // Create common properties
+    const baseProperties = {
+        displayName: (_c = (_b = provider.name) !== null && _b !== void 0 ? _b : provider.provider) !== null && _c !== void 0 ? _c : '',
+        iconUrl: (_d = provider.iconUrl) !== null && _d !== void 0 ? _d : '',
         id: String(provider.provider),
-        // For Coinbase, we don't use the iframeUrl in the widget, we handle it in onClick
-        iframeUrl: isPopupImplementation ? undefined : provider.url,
-        onClick: (params) => {
-            // Call the provided onClick to set the selected provider
-            onClick({
-                onrampProvider: provider.provider,
-            });
-            // For Coinbase, handle the popup opening directly in the onClick
-            if (isPopupImplementation && provider.url && setShowOnramp) {
-                // Use the new openOnrampPopup function to handle the popup logic
-                openOnrampPopup(provider.url, params.wallet, setShowOnramp);
-            }
-        },
+        openMode,
+        url: provider.url,
     };
+    // Create base onClick handler
+    const baseOnClick = (params) => {
+        onClick({
+            onrampProvider: provider.provider,
+        });
+    };
+    // For popup mode, enhance the onClick handler to open the popup
+    if (openMode === 'popup') {
+        return Object.assign(Object.assign({}, baseProperties), { onClick: (params) => {
+                baseOnClick();
+                if (provider.url && setShowOnramp) {
+                    openOnrampPopup(provider.url, params.wallet, setShowOnramp, provider.provider);
+                }
+            } });
+    }
+    // For iframe mode, use the base onClick handler
+    return Object.assign(Object.assign({}, baseProperties), { onClick: baseOnClick });
 };
 
 export { onrampConfigurationToOnrampOption };

package/src/lib/utils/functions/onrampProviders/coinbase.cjs

@@ -0,0 +1,55 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+/**
+ * Gets the enabled non-testnet networks for a wallet
+ * @param wallet User's wallet
+ * @returns Array of enabled non-testnet networks, or empty array if no wallet or networks
+ */
+const getEnabledNonTestnetNetworks = (wallet) => {
+    if (!wallet ||
+        !wallet.connector ||
+        typeof wallet.connector.getEnabledNetworks !== 'function') {
+        return [];
+    }
+    const networks = wallet.connector.getEnabledNetworks();
+    if (!networks || networks.length === 0) {
+        return [];
+    }
+    return networks.filter((network) => !network.isTestnet);
+};
+/**
+ * Formats a Coinbase onramp URL with wallet information
+ * @param url Base URL from Coinbase
+ * @param wallet User's wallet
+ * @returns Formatted URL with wallet information
+ */
+const formatCoinbaseOnrampUrl = (url, wallet) => {
+    const nonTestnetNetworks = getEnabledNonTestnetNetworks(wallet);
+    if (nonTestnetNetworks.length === 0 || !(wallet === null || wallet === void 0 ? void 0 : wallet.address)) {
+        return url;
+    }
+    const baseUrl = new URL(url);
+    const appId = baseUrl.searchParams.get('appId');
+    // If no appId is present, return the original URL
+    if (!appId) {
+        return url;
+    }
+    // Filter out networks with empty or undefined keys and remove duplicates
+    const uniqueNetworkKeys = Array.from(new Set(nonTestnetNetworks
+        .map((network) => network.key)
+        .filter((key) => Boolean(key))));
+    if (uniqueNetworkKeys.length === 0) {
+        return url;
+    }
+    // Construct the URL with the raw query parameters
+    const finalUrl = `${baseUrl.origin}${baseUrl.pathname}?appId=${appId}&addresses=${encodeURIComponent(JSON.stringify({
+        [wallet.address]: uniqueNetworkKeys,
+    }))}`;
+    return finalUrl;
+};
+
+exports.formatCoinbaseOnrampUrl = formatCoinbaseOnrampUrl;
+exports.getEnabledNonTestnetNetworks = getEnabledNonTestnetNetworks;

package/src/lib/utils/functions/onrampProviders/coinbase.d.ts

@@ -0,0 +1,15 @@
+import type { Wallet } from '@dynamic-labs/wallet-connector-core';
+import type { GenericNetwork } from '@dynamic-labs/types';
+/**
+ * Gets the enabled non-testnet networks for a wallet
+ * @param wallet User's wallet
+ * @returns Array of enabled non-testnet networks, or empty array if no wallet or networks
+ */
+export declare const getEnabledNonTestnetNetworks: (wallet?: Wallet) => GenericNetwork[];
+/**
+ * Formats a Coinbase onramp URL with wallet information
+ * @param url Base URL from Coinbase
+ * @param wallet User's wallet
+ * @returns Formatted URL with wallet information
+ */
+export declare const formatCoinbaseOnrampUrl: (url: string, wallet?: Wallet) => string;

package/src/lib/utils/functions/onrampProviders/coinbase.js

@@ -0,0 +1,50 @@
+'use client'
+/**
+ * Gets the enabled non-testnet networks for a wallet
+ * @param wallet User's wallet
+ * @returns Array of enabled non-testnet networks, or empty array if no wallet or networks
+ */
+const getEnabledNonTestnetNetworks = (wallet) => {
+    if (!wallet ||
+        !wallet.connector ||
+        typeof wallet.connector.getEnabledNetworks !== 'function') {
+        return [];
+    }
+    const networks = wallet.connector.getEnabledNetworks();
+    if (!networks || networks.length === 0) {
+        return [];
+    }
+    return networks.filter((network) => !network.isTestnet);
+};
+/**
+ * Formats a Coinbase onramp URL with wallet information
+ * @param url Base URL from Coinbase
+ * @param wallet User's wallet
+ * @returns Formatted URL with wallet information
+ */
+const formatCoinbaseOnrampUrl = (url, wallet) => {
+    const nonTestnetNetworks = getEnabledNonTestnetNetworks(wallet);
+    if (nonTestnetNetworks.length === 0 || !(wallet === null || wallet === void 0 ? void 0 : wallet.address)) {
+        return url;
+    }
+    const baseUrl = new URL(url);
+    const appId = baseUrl.searchParams.get('appId');
+    // If no appId is present, return the original URL
+    if (!appId) {
+        return url;
+    }
+    // Filter out networks with empty or undefined keys and remove duplicates
+    const uniqueNetworkKeys = Array.from(new Set(nonTestnetNetworks
+        .map((network) => network.key)
+        .filter((key) => Boolean(key))));
+    if (uniqueNetworkKeys.length === 0) {
+        return url;
+    }
+    // Construct the URL with the raw query parameters
+    const finalUrl = `${baseUrl.origin}${baseUrl.pathname}?appId=${appId}&addresses=${encodeURIComponent(JSON.stringify({
+        [wallet.address]: uniqueNetworkKeys,
+    }))}`;
+    return finalUrl;
+};
+
+export { formatCoinbaseOnrampUrl, getEnabledNonTestnetNetworks };

package/src/lib/utils/functions/onrampProviders/index.cjs

@@ -0,0 +1,24 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var coinbase = require('./coinbase.cjs');
+
+/**
+ * Registry of provider-specific URL formatters
+ */
+const providerUrlFormatters = {
+    coinbaseOnramp: coinbase.formatCoinbaseOnrampUrl,
+};
+/**
+ * Registry of provider display modes (iframe or popup)
+ */
+const providerDisplayModes = {
+    coinbaseOnramp: 'popup',
+    // Default for other providers is iframe
+};
+
+exports.formatCoinbaseOnrampUrl = coinbase.formatCoinbaseOnrampUrl;
+exports.providerDisplayModes = providerDisplayModes;
+exports.providerUrlFormatters = providerUrlFormatters;

package/src/lib/utils/functions/onrampProviders/index.d.ts

@@ -0,0 +1,11 @@
+import type { Wallet } from '@dynamic-labs/wallet-connector-core';
+import { formatCoinbaseOnrampUrl } from './coinbase';
+/**
+ * Registry of provider-specific URL formatters
+ */
+export declare const providerUrlFormatters: Record<string, (url: string, wallet: Wallet) => string>;
+/**
+ * Registry of provider display modes (iframe or popup)
+ */
+export declare const providerDisplayModes: Record<string, 'iframe' | 'popup'>;
+export { formatCoinbaseOnrampUrl };

package/src/lib/utils/functions/onrampProviders/index.js

@@ -0,0 +1,19 @@
+'use client'
+import { formatCoinbaseOnrampUrl } from './coinbase.js';
+export { formatCoinbaseOnrampUrl } from './coinbase.js';
+
+/**
+ * Registry of provider-specific URL formatters
+ */
+const providerUrlFormatters = {
+    coinbaseOnramp: formatCoinbaseOnrampUrl,
+};
+/**
+ * Registry of provider display modes (iframe or popup)
+ */
+const providerDisplayModes = {
+    coinbaseOnramp: 'popup',
+    // Default for other providers is iframe
+};
+
+export { providerDisplayModes, providerUrlFormatters };

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

@@ -4,7 +4,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../_virtual/_tslib.cjs');
-var formatCoinbaseOnrampUrl = require('./coinbaseOnramp/formatCoinbaseOnrampUrl.cjs');
+var sdkApiCore = require('@dynamic-labs/sdk-api-core');
+var index = require('./onrampProviders/index.cjs');
 var openPopup = require('./openPopup/openPopup.cjs');
 
 const ONRAMP_POPUP_CONFIG = {
@@ -12,15 +13,17 @@ const ONRAMP_POPUP_CONFIG = {
     width: 500,
 };
 /**
- * Opens an onramp popup for Coinbase and sets up event listeners to handle popup closure
+ * Opens an onramp popup and sets up event listeners to handle popup closure
  * @param url The base URL to open in the popup
  * @param wallet The user's wallet (optional)
  * @param setShowOnramp Callback to update the UI state when popup is closed
+ * @param provider The onramp provider ID
  * @returns A promise that resolves when the popup is opened
  */
-const openOnrampPopup = (url, wallet, setShowOnramp) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-    // Format the URL with wallet information for Coinbase if wallet is provided
-    const formattedUrl = wallet ? formatCoinbaseOnrampUrl.formatCoinbaseOnrampUrl(url, wallet) : url;
+const openOnrampPopup = (url_1, wallet_1, setShowOnramp_1, ...args_1) => _tslib.__awaiter(void 0, [url_1, wallet_1, setShowOnramp_1, ...args_1], void 0, function* (url, wallet, setShowOnramp, provider = sdkApiCore.OnrampProviders.CoinbaseOnramp) {
+    // Format the URL with wallet information if a formatter exists for this provider
+    const formatUrl = index.providerUrlFormatters[provider] || ((url) => url);
+    const formattedUrl = wallet ? formatUrl(url, wallet) : url;
     // Open the popup - errors will propagate to the caller
     yield openPopup.openPopup(formattedUrl, ONRAMP_POPUP_CONFIG.width, ONRAMP_POPUP_CONFIG.height, () => {
         // When the popup is closed (by user or programmatically), update the UI

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

@@ -1,13 +1,15 @@
 import type { Wallet } from '@dynamic-labs/wallet-connector-core';
+import { OnrampProviders } from '@dynamic-labs/sdk-api-core';
 export declare const ONRAMP_POPUP_CONFIG: {
     readonly height: 600;
     readonly width: 500;
 };
 /**
- * Opens an onramp popup for Coinbase and sets up event listeners to handle popup closure
+ * Opens an onramp popup and sets up event listeners to handle popup closure
  * @param url The base URL to open in the popup
  * @param wallet The user's wallet (optional)
  * @param setShowOnramp Callback to update the UI state when popup is closed
+ * @param provider The onramp provider ID
  * @returns A promise that resolves when the popup is opened
  */
-export declare const openOnrampPopup: (url: string, wallet: Wallet | undefined, setShowOnramp: (show: boolean) => void) => Promise<void>;
+export declare const openOnrampPopup: (url: string, wallet: Wallet | undefined, setShowOnramp: (show: boolean) => void, provider?: OnrampProviders) => Promise<void>;

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

@@ -1,6 +1,7 @@
 'use client'
 import { __awaiter } from '../../../../_virtual/_tslib.js';
-import { formatCoinbaseOnrampUrl } from './coinbaseOnramp/formatCoinbaseOnrampUrl.js';
+import { OnrampProviders } from '@dynamic-labs/sdk-api-core';
+import { providerUrlFormatters } from './onrampProviders/index.js';
 import { openPopup } from './openPopup/openPopup.js';
 
 const ONRAMP_POPUP_CONFIG = {
@@ -8,15 +9,17 @@ const ONRAMP_POPUP_CONFIG = {
     width: 500,
 };
 /**
- * Opens an onramp popup for Coinbase and sets up event listeners to handle popup closure
+ * Opens an onramp popup and sets up event listeners to handle popup closure
  * @param url The base URL to open in the popup
  * @param wallet The user's wallet (optional)
  * @param setShowOnramp Callback to update the UI state when popup is closed
+ * @param provider The onramp provider ID
  * @returns A promise that resolves when the popup is opened
  */
-const openOnrampPopup = (url, wallet, setShowOnramp) => __awaiter(void 0, void 0, void 0, function* () {
-    // Format the URL with wallet information for Coinbase if wallet is provided
-    const formattedUrl = wallet ? formatCoinbaseOnrampUrl(url, wallet) : url;
+const openOnrampPopup = (url_1, wallet_1, setShowOnramp_1, ...args_1) => __awaiter(void 0, [url_1, wallet_1, setShowOnramp_1, ...args_1], void 0, function* (url, wallet, setShowOnramp, provider = OnrampProviders.CoinbaseOnramp) {
+    // Format the URL with wallet information if a formatter exists for this provider
+    const formatUrl = providerUrlFormatters[provider] || ((url) => url);
+    const formattedUrl = wallet ? formatUrl(url, wallet) : url;
     // Open the popup - errors will propagate to the caller
     yield openPopup(formattedUrl, ONRAMP_POPUP_CONFIG.width, ONRAMP_POPUP_CONFIG.height, () => {
         // When the popup is closed (by user or programmatically), update the UI

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

@@ -13,6 +13,8 @@ export type SocialStorageItem = {
     code?: string;
     /** Social auth mode, either sign-in or link */
     mode: SocialAuthMode;
+    /** Whether to show the widget after a connection is made */
+    showWidgetAfterConnection?: boolean;
 };
 export type SocialStorage = Partial<Record<ProviderEnum, SocialStorageItem>>;
 export declare const searchSocialStorageByState: (targetState: string) => SocialStorageItem | undefined;

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

@@ -133,8 +133,8 @@ const useDynamicWaas = () => {
         }
         if (!walletConnectorOptions.length || !environmentId || !apiBaseUrl)
             return undefined;
-        const connectorKey = chainName === 'EVM' ? dynamicWaasKey : `${dynamicWaasKey}-svm`;
-        const walletConnector = (_a = walletConnectorOptions.find((option) => option.key.includes(connectorKey))) === null || _a === void 0 ? void 0 : _a.walletConnector;
+        const walletConnector = (_a = walletConnectorOptions.find((option) => option.key.includes(dynamicWaasKey) &&
+            option.walletConnector.connectedChain === chainName)) === null || _a === void 0 ? void 0 : _a.walletConnector;
         if (!walletConnector) {
             throw new utils.DynamicError(constants.DYNAMIC_WAAS_CONNECTOR_NOT_FOUND_ERROR);
         }

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

@@ -129,8 +129,8 @@ const useDynamicWaas = () => {
         }
         if (!walletConnectorOptions.length || !environmentId || !apiBaseUrl)
             return undefined;
-        const connectorKey = chainName === 'EVM' ? dynamicWaasKey : `${dynamicWaasKey}-svm`;
-        const walletConnector = (_a = walletConnectorOptions.find((option) => option.key.includes(connectorKey))) === null || _a === void 0 ? void 0 : _a.walletConnector;
+        const walletConnector = (_a = walletConnectorOptions.find((option) => option.key.includes(dynamicWaasKey) &&
+            option.walletConnector.connectedChain === chainName)) === null || _a === void 0 ? void 0 : _a.walletConnector;
         if (!walletConnector) {
             throw new DynamicError(DYNAMIC_WAAS_CONNECTOR_NOT_FOUND_ERROR);
         }

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

@@ -160,6 +160,7 @@ const useEmbeddedWallet = () => {
         return revealTurnkeyEmbeddedWalletKey(options);
     });
     const shouldPromptForKeyExport = React.useCallback(() => { var _a; return Boolean((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _a === void 0 ? void 0 : _a.promptForKeyExport); }, [projectSettings]);
+    const embeddedWalletSettingVersion = React.useCallback(() => { var _a; return (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _a === void 0 ? void 0 : _a.defaultWalletVersion; }, [projectSettings]);
     const shouldAutoCreateEmbeddedWallet = React.useCallback((verifiedUser) => {
         var _a, _b, _c, _d, _e, _f;
         const hasEmbeddedWalletProviderEnabled = isTurnkeyEnabled.isTurnkeyEnabled(projectSettings);
@@ -197,6 +198,7 @@ const useEmbeddedWallet = () => {
         createEmbeddedWalletAccount,
         createOrRestoreSession,
         createPasskey,
+        embeddedWalletSettingVersion,
         getPasskeys,
         getWalletVersion,
         isLoadingEmbeddedWallet,

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

@@ -1,4 +1,4 @@
-import { EmbeddedWalletChainEnum } from '@dynamic-labs/sdk-api-core';
+import { EmbeddedWalletChainEnum, EmbeddedWalletVersionEnum } from '@dynamic-labs/sdk-api-core';
 import { Wallet } from '../../../shared';
 import { UserProfile } from '../../../..';
 /**
@@ -27,6 +27,7 @@ export declare const useEmbeddedWallet: () => {
     readonly createPasskey: (options: {
         oneTimeCode: string;
     } | undefined) => Promise<import("dist/packages/wallet-connector-core/src").WebAuthnAttestation>;
+    readonly embeddedWalletSettingVersion: () => EmbeddedWalletVersionEnum | undefined;
     readonly getPasskeys: () => Promise<import("@dynamic-labs/sdk-api-core").UserPasskey[]>;
     readonly getWalletVersion: () => import(".").EmbeddedWalletVersion | undefined;
     readonly isLoadingEmbeddedWallet: boolean;

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

@@ -156,6 +156,7 @@ const useEmbeddedWallet = () => {
         return revealTurnkeyEmbeddedWalletKey(options);
     });
     const shouldPromptForKeyExport = useCallback(() => { var _a; return Boolean((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _a === void 0 ? void 0 : _a.promptForKeyExport); }, [projectSettings]);
+    const embeddedWalletSettingVersion = useCallback(() => { var _a; return (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _a === void 0 ? void 0 : _a.defaultWalletVersion; }, [projectSettings]);
     const shouldAutoCreateEmbeddedWallet = useCallback((verifiedUser) => {
         var _a, _b, _c, _d, _e, _f;
         const hasEmbeddedWalletProviderEnabled = isTurnkeyEnabled(projectSettings);
@@ -193,6 +194,7 @@ const useEmbeddedWallet = () => {
         createEmbeddedWalletAccount,
         createOrRestoreSession,
         createPasskey,
+        embeddedWalletSettingVersion,
         getPasskeys,
         getWalletVersion,
         isLoadingEmbeddedWallet,

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

@@ -9,7 +9,6 @@ var logger = require('../../../shared/logger.cjs');
 var index = require('../../../shared/utils/functions/lastAuthenticatedAccount/index.cjs');
 var shouldFetchNonce = require('../../../shared/utils/functions/shouldFetchNonce/shouldFetchNonce.cjs');
 var loadingAndLifecycle = require('../../../store/state/loadingAndLifecycle.cjs');
-var connectorsInitializing = require('../../../store/state/connectorsInitializing/connectorsInitializing.cjs');
 
 const useGlobalLoading = ({ authMode, connectedInfo, connectedWallets, projectSettings, primaryWalletId, primaryWallet, user, isUserLoading, walletBook: walletBook$1, enableInstrumentation, appName, environmentId, nonce, }) => {
     var _a;
@@ -17,8 +16,6 @@ const useGlobalLoading = ({ authMode, connectedInfo, connectedWallets, projectSe
     const hasLoaded = React.useRef(false);
     const loadingStart = React.useRef(new Date().getTime());
     const { sessionValidation } = loadingAndLifecycle.useLoadingAndLifecycle();
-    const connectorsInitializingState = connectorsInitializing.useConnectorsInitializing();
-    const isWaitingForConnectorsInitialization = React.useMemo(() => Object.values(connectorsInitializingState).some(Boolean), [connectorsInitializingState]);
     const isFetchingNonce = React.useMemo(() => shouldFetchNonce.shouldFetchNonce({
         authMode,
     }) && !nonce, [authMode, nonce]);
@@ -59,14 +56,12 @@ const useGlobalLoading = ({ authMode, connectedInfo, connectedWallets, projectSe
         connectedWallets.length === 0;
     const isValidatingSession = !sessionValidation;
     logger.logger.logVerboseTroubleshootingMessage('[useGlobalLoading] SDK loading', {
-        connectorsInitializingState,
         isConnectOnlyWalletsLoading,
         isFetchingNonce,
         isPrimaryWalletLoading,
         isProjectSettingsLoading,
         isUserLoading,
         isValidatingSession,
-        isWaitingForConnectorsInitialization,
         isWalletBookLoading,
     });
     if (!isWalletBookLoading &&
@@ -75,8 +70,7 @@ const useGlobalLoading = ({ authMode, connectedInfo, connectedWallets, projectSe
         !isPrimaryWalletLoading &&
         !isConnectOnlyWalletsLoading &&
         !isValidatingSession &&
-        !isFetchingNonce &&
-        !isWaitingForConnectorsInitialization) {
+        !isFetchingNonce) {
         finishLoading();
     }
     return hasLoaded.current;