@dynamic-labs/sdk-react-core 4.52.5 → 4.53.1

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

@@ -30,6 +30,7 @@ var dynamicContextProps = require('../../../store/state/dynamicContextProps/dyna
 require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
 require('@dynamic-labs/locale');
 var wallets = require('../../../data/api/wallets/wallets.cjs');
+require('../../functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.cjs');
 var convertSdkUserToUserProfile = require('../../../client/extension/user/convertSdkUserToUserProfile/convertSdkUserToUserProfile.cjs');
 var useUser = require('../../../client/extension/user/useUser/useUser.cjs');
 var useProjectSettings = require('../../../client/extension/projectSettings/useProjectSettings/useProjectSettings.cjs');
@@ -90,6 +91,7 @@ var useClientSessionKeys = require('../useClientSessionKeys/useClientSessionKeys
 var useGetMfaToken = require('../useGetMfaToken/useGetMfaToken.cjs');
 var useRefreshUser = require('../useRefreshUser/useRefreshUser.cjs');
 var constants = require('./constants.cjs');
+var normalizeWalletRequirements = require('./normalizeWalletRequirements.cjs');
 require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
 require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
@@ -317,93 +319,120 @@ const useDynamicWaas = () => {
     ]);
     // If no chain names are provided, filter out chains that already have a wallet
     // and make a wallet for each enabled chain
-    const createWalletAccount = React.useCallback((chainNames, password) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    const createWalletAccount = React.useCallback((requirementsOrChainNames, password, bitcoinConfig) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         if (isUpgrading.current) {
             return;
         }
         if (!(enabledChainNames === null || enabledChainNames === void 0 ? void 0 : enabledChainNames.length)) {
             throw new utils.DynamicError(constants.NO_ENABLED_CHAINS_ERROR);
         }
-        const invalidChains = chainNames.filter((chain) => !enabledChainNames.includes(chain));
-        if (invalidChains && invalidChains.length) {
-            throw new utils.DynamicError(`${constants.INVALID_CHAINS_ERROR}: ${invalidChains.join(', ')}`);
-        }
+        // Convert legacy ChainEnum[] format to WalletCreationRequirement[]
+        const requirements = normalizeWalletRequirements.normalizeWalletRequirements(requirementsOrChainNames, bitcoinConfig);
+        // Validate all chains are enabled
+        const validateChains = (reqs) => {
+            const allChains = reqs.map((req) => req.chain);
+            const invalidChains = allChains.filter((chain) => !enabledChainNames.includes(chain));
+            if (invalidChains.length > 0) {
+                throw new utils.DynamicError(`${constants.INVALID_CHAINS_ERROR}: ${invalidChains.join(', ')}`);
+            }
+        };
+        validateChains(requirements);
         const previousVerifiedCredentials = (user === null || user === void 0 ? void 0 : user.verifiedCredentials) || [];
-        const results = yield Promise.allSettled(chainNames.map((chain) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-            const walletConnector = getWaasWalletConnector(chain);
+        const results = yield Promise.allSettled(requirements.map((requirement) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+            const walletConnector = getWaasWalletConnector(requirement.chain);
             if (!walletConnector)
                 throw new Error('No connector');
-            const account = yield walletConnector.createWalletAccount({
-                password,
-                thresholdSignatureScheme: 'TWO_OF_TWO',
-            });
-            return Object.assign(Object.assign({}, account), { chainName: chain });
+            const requirementBitcoinConfig = requirement.chain === sdkApiCore.ChainEnum.Btc
+                ? requirement.bitcoinConfig
+                : undefined;
+            const createWalletAccountParams = Object.assign({ password, thresholdSignatureScheme: 'TWO_OF_TWO' }, (requirementBitcoinConfig && {
+                bitcoinConfig: requirementBitcoinConfig,
+            }));
+            const account = yield walletConnector.createWalletAccount(createWalletAccountParams);
+            return Object.assign(Object.assign({}, account), { chainName: requirement.chain });
         })));
-        const failedChains = [];
-        const errors = [];
-        results.forEach((result, i) => {
-            if (result.status === 'rejected') {
-                const chainName = chainNames[i];
-                failedChains.push(chainName);
-                const errorMessage = result.reason instanceof Error
-                    ? result.reason.message
-                    : String(result.reason);
-                errors.push(`${chainName}: ${errorMessage}`);
+        const processCreationResults = (settledResults, reqs) => {
+            const failedChains = [];
+            const errors = [];
+            settledResults.forEach((result, i) => {
+                if (result.status === 'rejected') {
+                    const requirement = reqs[i];
+                    failedChains.push(requirement.chain);
+                    const errorMessage = result.reason instanceof Error
+                        ? result.reason.message
+                        : String(result.reason);
+                    errors.push(`${requirement.chain}: ${errorMessage}`);
+                }
+            });
+            if (failedChains.length > 0) {
+                refresh();
+                throw new utils.DynamicError(`${constants.WALLET_CREATION_FAILED_ERROR}: ${failedChains.join(', ')}. Errors: ${errors.join('; ')}`);
             }
-        });
-        if (failedChains.length > 0) {
-            refresh();
-            throw new utils.DynamicError(`${constants.WALLET_CREATION_FAILED_ERROR}: ${failedChains.join(', ')}. Errors: ${errors.join('; ')}`);
-        }
-        const createdWalletAccounts = results.map((r) => r.status === 'fulfilled' ? r.value : undefined);
+            return settledResults.map((r) => r.status === 'fulfilled' ? r.value : undefined);
+        };
+        const createdWalletAccounts = processCreationResults(results, requirements);
         const primaryWalletAccount = createdWalletAccounts === null || createdWalletAccounts === void 0 ? void 0 : createdWalletAccounts.find((wallet) => (wallet === null || wallet === void 0 ? void 0 : wallet.chainName) === (primaryChain === null || primaryChain === void 0 ? void 0 : primaryChain.name));
         const refreshedUser = yield refresh();
         if (refreshedUser) {
             // Add new wallet IDs to trigger walletAdded events
             const newWalletVerifiedCredentials = getNewVerifiedCredentialsFromDiff.getNewVerifiedCredentialsFromDiff(previousVerifiedCredentials, refreshedUser.verifiedCredentials).filter(({ format }) => format === sdkApiCore.JwtVerifiedCredentialFormatEnum.Blockchain);
-            newWalletVerifiedCredentials.forEach((walletVerifiedCredential) => {
-                var _a, _b, _c;
-                try {
-                    const chain = values.VerifiedCredentialNameToChainEnum[(_a = walletVerifiedCredential === null || walletVerifiedCredential === void 0 ? void 0 : walletVerifiedCredential.chain) !== null && _a !== void 0 ? _a : ''];
-                    const walletConnector = getWaasWalletConnector(chain);
-                    if (!walletConnector)
-                        return;
-                    const wallet = walletConnector.createWallet({
-                        address: (_b = walletVerifiedCredential.address) !== null && _b !== void 0 ? _b : '',
-                        chain,
-                        connector: walletConnector,
-                        id: walletVerifiedCredential.id,
-                        isAuthenticated: true,
-                        key: (_c = walletVerifiedCredential.walletName) !== null && _c !== void 0 ? _c : '',
-                    });
-                    dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', wallet, walletVerifiedCredential, user ? convertSdkUserToUserProfile.convertSdkUserToUserProfile(user) : undefined);
-                }
-                catch (error) {
-                    walletConnectorCore.logger.error(error);
-                }
-            });
+            const emitWalletCreatedEvents = (walletCredentials) => {
+                walletCredentials.forEach((walletVerifiedCredential) => {
+                    var _a, _b, _c;
+                    try {
+                        const chain = values.VerifiedCredentialNameToChainEnum[(_a = walletVerifiedCredential === null || walletVerifiedCredential === void 0 ? void 0 : walletVerifiedCredential.chain) !== null && _a !== void 0 ? _a : ''];
+                        const walletConnector = getWaasWalletConnector(chain);
+                        if (!walletConnector)
+                            return;
+                        const wallet = walletConnector.createWallet({
+                            address: (_b = walletVerifiedCredential.address) !== null && _b !== void 0 ? _b : '',
+                            chain,
+                            connector: walletConnector,
+                            id: walletVerifiedCredential.id,
+                            isAuthenticated: true,
+                            key: (_c = walletVerifiedCredential.walletName) !== null && _c !== void 0 ? _c : '',
+                        });
+                        dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', wallet, walletVerifiedCredential, user ? convertSdkUserToUserProfile.convertSdkUserToUserProfile(user) : undefined);
+                    }
+                    catch (error) {
+                        walletConnectorCore.logger.error(error);
+                    }
+                });
+            };
+            emitWalletCreatedEvents(newWalletVerifiedCredentials);
             const newWalletIds = newWalletVerifiedCredentials.map(({ id }) => id);
             addedWalletsIds.current = addedWalletsIds.current.concat(newWalletIds);
-            if (primaryWalletAccount) {
-                const createdPrimaryWallet = refreshedUser.verifiedCredentials.find((wallet) => {
+            const updatePrimaryWalletIfNeeded = (primaryAccount, refreshed) => {
+                if (!primaryAccount)
+                    return;
+                const createdPrimaryWallet = refreshed.verifiedCredentials.find((wallet) => {
                     var _a, _b, _c;
                     return ((_a = wallet.walletName) === null || _a === void 0 ? void 0 : _a.includes(dynamicWaasKey)) &&
                         ((_b = wallet.address) === null || _b === void 0 ? void 0 : _b.toLowerCase()) ===
-                            ((_c = primaryWalletAccount.accountAddress) === null || _c === void 0 ? void 0 : _c.toLowerCase());
+                            ((_c = primaryAccount.accountAddress) === null || _c === void 0 ? void 0 : _c.toLowerCase());
                 });
-                if (createdPrimaryWallet) {
-                    // if the user already has a blockchain wallet, don't update the primary wallet
-                    if (!previousVerifiedCredentials.find((vc) => vc.format === 'blockchain')) {
-                        const smartWalletAccount = smartWallet.findSmartWallet(createdPrimaryWallet, refreshedUser.verifiedCredentials);
-                        const walletIdToUse = (smartWalletAccount === null || smartWalletAccount === void 0 ? void 0 : smartWalletAccount.id) || createdPrimaryWallet.id;
-                        updatePrimaryWalletId.updatePrimaryWalletId(walletIdToUse);
-                    }
-                }
-            }
+                if (!createdPrimaryWallet)
+                    return;
+                const hasExistingBlockchainWallet = previousVerifiedCredentials.find((vc) => vc.format === 'blockchain');
+                if (hasExistingBlockchainWallet)
+                    return;
+                const smartWalletAccount = smartWallet.findSmartWallet(createdPrimaryWallet, refreshed.verifiedCredentials);
+                const walletIdToUse = (smartWalletAccount === null || smartWalletAccount === void 0 ? void 0 : smartWalletAccount.id) || createdPrimaryWallet.id;
+                updatePrimaryWalletId.updatePrimaryWalletId(walletIdToUse);
+            };
+            updatePrimaryWalletIfNeeded(primaryWalletAccount, refreshedUser);
         }
         setShowAuthFlow(false, { performMultiWalletChecks: false }); // close email otp pin modal
         return createdWalletAccounts;
-    }), [getWaasWalletConnector, primaryChain, enabledChainNames, setShowAuthFlow]);
+    }), [
+        getWaasWalletConnector,
+        primaryChain,
+        enabledChainNames,
+        setShowAuthFlow,
+        user,
+        refresh,
+        addedWalletsIds,
+    ]);
     const needsAutoCreateWalletChains = React.useMemo(() => {
         var _a;
         if (!user ||
@@ -418,15 +447,32 @@ const useDynamicWaas = () => {
                 compareChains.compareChains(wallet.chain, chain) &&
                 wallet.walletProvider === sdkApiCore.WalletProviderEnum.EmbeddedWallet)) !== null && _b !== void 0 ? _b : false;
         };
-        // For each enabled chain, if user does NOT have a V3 wallet and does NOT have a V1/V2 wallet, add to missing
-        const missingChains = enabledChainNames === null || enabledChainNames === void 0 ? void 0 : enabledChainNames.filter((chain) => !hasEmbeddedWalletForChain(chain));
         // If user has an external wallet, only create if automaticEmbeddedWalletCreationForExternalEnabled is true
         const hasExternalWallet = (_a = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.some((vc) => vc.format === sdkApiCore.JwtVerifiedCredentialFormatEnum.Blockchain &&
             vc.walletProvider !== sdkApiCore.WalletProviderEnum.EmbeddedWallet);
         const shouldCreateDynamicWaasWallet = hasExternalWallet
             ? automaticEmbeddedWalletCreationForExternalEnabled
             : true;
-        return shouldCreateDynamicWaasWallet ? missingChains : [];
+        if (!shouldCreateDynamicWaasWallet) {
+            return [];
+        }
+        const requirements = [];
+        // Handle BTC separately - only create native_segwit wallet if BTC is enabled and user doesn't have a BTC wallet
+        if (enabledChainNames === null || enabledChainNames === void 0 ? void 0 : enabledChainNames.includes(sdkApiCore.ChainEnum.Btc)) {
+            if (!hasEmbeddedWalletForChain(sdkApiCore.ChainEnum.Btc)) {
+                requirements.push({
+                    bitcoinConfig: { addressType: 'native_segwit' },
+                    chain: sdkApiCore.ChainEnum.Btc,
+                });
+            }
+        }
+        // For other chains, check if user does NOT have a V3 wallet and does NOT have a V1/V2 wallet
+        const otherMissingChains = enabledChainNames === null || enabledChainNames === void 0 ? void 0 : enabledChainNames.filter((chain) => chain !== sdkApiCore.ChainEnum.Btc && !hasEmbeddedWalletForChain(chain));
+        // Add other missing chains without address type requirements
+        otherMissingChains === null || otherMissingChains === void 0 ? void 0 : otherMissingChains.forEach((chain) => {
+            requirements.push({ chain: chain });
+        });
+        return requirements;
     }, [
         user,
         dynamicWaasIsEnabled,
@@ -434,11 +480,12 @@ const useDynamicWaas = () => {
         automaticEmbeddedWalletCreationForExternalEnabled,
         enabledChainNames,
     ]);
-    const importPrivateKey = (_g) => _tslib.__awaiter(void 0, [_g], void 0, function* ({ chainName, privateKey, }) {
+    const importPrivateKey = (_g) => _tslib.__awaiter(void 0, [_g], void 0, function* ({ chainName, privateKey, addressType, }) {
         const walletConnector = getWaasWalletConnector(chainName);
         if (!walletConnector)
             return;
         yield walletConnector.importPrivateKey({
+            addressType,
             chainName,
             privateKey,
         });

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

@@ -1,5 +1,17 @@
 import { ChainEnum, MFAAction } from '@dynamic-labs/sdk-api-core';
 import { IDynamicWaasConnector, Wallet, WalletConnectorCore } from '@dynamic-labs/wallet-connector-core';
+/**
+ * Type for wallet creation requirements
+ * For BTC: includes bitcoinConfig with addressType
+ * For other chains: bitcoinConfig is optional
+ */
+export type WalletCreationRequirement = {
+    chain: ChainEnum;
+    bitcoinConfig?: {
+        addressType?: string;
+        network?: string;
+    };
+};
 export declare const configWaasWalletConnector: ({ walletConnector, environmentId, apiBaseUrl, relayUrl, baseClientKeysharesRelayApiUrl, authMode, getSignedSessionId, getMfaToken, }: {
     walletConnector: IDynamicWaasConnector;
     environmentId: string;
@@ -13,22 +25,21 @@ export declare const configWaasWalletConnector: ({ walletConnector, environmentI
     }) => Promise<string | undefined>;
 }) => IDynamicWaasConnector;
 export declare const useDynamicWaas: () => {
-    createWalletAccount: (chainNames: ChainEnum[], password?: string) => Promise<({
-        chainName: ChainEnum;
-        accountAddress: string;
-        publicKeyHex: string;
-        rawPublicKey: string | Uint8Array | undefined;
-    } | undefined)[] | undefined>;
+    createWalletAccount: (requirementsOrChainNames: WalletCreationRequirement[] | ChainEnum[], password?: string, bitcoinConfig?: {
+        addressType?: string;
+        network?: string;
+    }) => Promise<any[] | undefined>;
     dynamicWaasIsEnabled: boolean;
     getWaasWalletConnector: (chainName: string) => IDynamicWaasConnector | undefined;
     getWaasWallets: () => Wallet<WalletConnectorCore.WalletConnector>[];
     getWaasWalletsByCredentials: () => import("@dynamic-labs/sdk-api-core").JwtVerifiedCredential[];
-    importPrivateKey: ({ chainName, privateKey, }: {
+    importPrivateKey: ({ chainName, privateKey, addressType, }: {
         chainName: ChainEnum;
         privateKey: string;
+        addressType?: string;
     }) => Promise<void>;
     initializeWaas: () => Promise<void>;
-    needsAutoCreateWalletChains: ChainEnum[];
+    needsAutoCreateWalletChains: WalletCreationRequirement[];
     needsSettingsProcessing: boolean;
     processSignOnWalletSettings: () => Promise<void>;
     shouldInitializeWaas: boolean;

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

@@ -1,7 +1,7 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useRef, useCallback, useMemo } from 'react';
-import { EmbeddedWalletVersionEnum, JwtVerifiedCredentialFormatEnum, WalletProviderEnum } from '@dynamic-labs/sdk-api-core';
+import { EmbeddedWalletVersionEnum, JwtVerifiedCredentialFormatEnum, WalletProviderEnum, ChainEnum } from '@dynamic-labs/sdk-api-core';
 import { DynamicError } from '@dynamic-labs/utils';
 import { logger } from '@dynamic-labs/wallet-connector-core';
 import { dynamicEvents } from '../../../events/dynamicEvents.js';
@@ -26,6 +26,7 @@ import { useApiBaseUrl, useEnvironmentId } from '../../../store/state/dynamicCon
 import '../../../store/state/primaryWalletId/primaryWalletId.js';
 import '@dynamic-labs/locale';
 import { softDeleteEmbeddedWallet, restoreEmbeddedWallet } from '../../../data/api/wallets/wallets.js';
+import '../../functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.js';
 import { convertSdkUserToUserProfile } from '../../../client/extension/user/convertSdkUserToUserProfile/convertSdkUserToUserProfile.js';
 import { useUser } from '../../../client/extension/user/useUser/useUser.js';
 import { useProjectSettings } from '../../../client/extension/projectSettings/useProjectSettings/useProjectSettings.js';
@@ -86,6 +87,7 @@ import { useClientSessionKeys } from '../useClientSessionKeys/useClientSessionKe
 import { useGetMfaToken } from '../useGetMfaToken/useGetMfaToken.js';
 import { useRefreshUser } from '../useRefreshUser/useRefreshUser.js';
 import { DYNAMIC_WAAS_CONNECTOR_NOT_FOUND_ERROR, NO_ENABLED_CHAINS_ERROR, INVALID_CHAINS_ERROR, WALLET_CREATION_FAILED_ERROR } from './constants.js';
+import { normalizeWalletRequirements } from './normalizeWalletRequirements.js';
 import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
 import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
@@ -313,93 +315,120 @@ const useDynamicWaas = () => {
     ]);
     // If no chain names are provided, filter out chains that already have a wallet
     // and make a wallet for each enabled chain
-    const createWalletAccount = useCallback((chainNames, password) => __awaiter(void 0, void 0, void 0, function* () {
+    const createWalletAccount = useCallback((requirementsOrChainNames, password, bitcoinConfig) => __awaiter(void 0, void 0, void 0, function* () {
         if (isUpgrading.current) {
             return;
         }
         if (!(enabledChainNames === null || enabledChainNames === void 0 ? void 0 : enabledChainNames.length)) {
             throw new DynamicError(NO_ENABLED_CHAINS_ERROR);
         }
-        const invalidChains = chainNames.filter((chain) => !enabledChainNames.includes(chain));
-        if (invalidChains && invalidChains.length) {
-            throw new DynamicError(`${INVALID_CHAINS_ERROR}: ${invalidChains.join(', ')}`);
-        }
+        // Convert legacy ChainEnum[] format to WalletCreationRequirement[]
+        const requirements = normalizeWalletRequirements(requirementsOrChainNames, bitcoinConfig);
+        // Validate all chains are enabled
+        const validateChains = (reqs) => {
+            const allChains = reqs.map((req) => req.chain);
+            const invalidChains = allChains.filter((chain) => !enabledChainNames.includes(chain));
+            if (invalidChains.length > 0) {
+                throw new DynamicError(`${INVALID_CHAINS_ERROR}: ${invalidChains.join(', ')}`);
+            }
+        };
+        validateChains(requirements);
         const previousVerifiedCredentials = (user === null || user === void 0 ? void 0 : user.verifiedCredentials) || [];
-        const results = yield Promise.allSettled(chainNames.map((chain) => __awaiter(void 0, void 0, void 0, function* () {
-            const walletConnector = getWaasWalletConnector(chain);
+        const results = yield Promise.allSettled(requirements.map((requirement) => __awaiter(void 0, void 0, void 0, function* () {
+            const walletConnector = getWaasWalletConnector(requirement.chain);
             if (!walletConnector)
                 throw new Error('No connector');
-            const account = yield walletConnector.createWalletAccount({
-                password,
-                thresholdSignatureScheme: 'TWO_OF_TWO',
-            });
-            return Object.assign(Object.assign({}, account), { chainName: chain });
+            const requirementBitcoinConfig = requirement.chain === ChainEnum.Btc
+                ? requirement.bitcoinConfig
+                : undefined;
+            const createWalletAccountParams = Object.assign({ password, thresholdSignatureScheme: 'TWO_OF_TWO' }, (requirementBitcoinConfig && {
+                bitcoinConfig: requirementBitcoinConfig,
+            }));
+            const account = yield walletConnector.createWalletAccount(createWalletAccountParams);
+            return Object.assign(Object.assign({}, account), { chainName: requirement.chain });
         })));
-        const failedChains = [];
-        const errors = [];
-        results.forEach((result, i) => {
-            if (result.status === 'rejected') {
-                const chainName = chainNames[i];
-                failedChains.push(chainName);
-                const errorMessage = result.reason instanceof Error
-                    ? result.reason.message
-                    : String(result.reason);
-                errors.push(`${chainName}: ${errorMessage}`);
+        const processCreationResults = (settledResults, reqs) => {
+            const failedChains = [];
+            const errors = [];
+            settledResults.forEach((result, i) => {
+                if (result.status === 'rejected') {
+                    const requirement = reqs[i];
+                    failedChains.push(requirement.chain);
+                    const errorMessage = result.reason instanceof Error
+                        ? result.reason.message
+                        : String(result.reason);
+                    errors.push(`${requirement.chain}: ${errorMessage}`);
+                }
+            });
+            if (failedChains.length > 0) {
+                refresh();
+                throw new DynamicError(`${WALLET_CREATION_FAILED_ERROR}: ${failedChains.join(', ')}. Errors: ${errors.join('; ')}`);
             }
-        });
-        if (failedChains.length > 0) {
-            refresh();
-            throw new DynamicError(`${WALLET_CREATION_FAILED_ERROR}: ${failedChains.join(', ')}. Errors: ${errors.join('; ')}`);
-        }
-        const createdWalletAccounts = results.map((r) => r.status === 'fulfilled' ? r.value : undefined);
+            return settledResults.map((r) => r.status === 'fulfilled' ? r.value : undefined);
+        };
+        const createdWalletAccounts = processCreationResults(results, requirements);
         const primaryWalletAccount = createdWalletAccounts === null || createdWalletAccounts === void 0 ? void 0 : createdWalletAccounts.find((wallet) => (wallet === null || wallet === void 0 ? void 0 : wallet.chainName) === (primaryChain === null || primaryChain === void 0 ? void 0 : primaryChain.name));
         const refreshedUser = yield refresh();
         if (refreshedUser) {
             // Add new wallet IDs to trigger walletAdded events
             const newWalletVerifiedCredentials = getNewVerifiedCredentialsFromDiff(previousVerifiedCredentials, refreshedUser.verifiedCredentials).filter(({ format }) => format === JwtVerifiedCredentialFormatEnum.Blockchain);
-            newWalletVerifiedCredentials.forEach((walletVerifiedCredential) => {
-                var _a, _b, _c;
-                try {
-                    const chain = VerifiedCredentialNameToChainEnum[(_a = walletVerifiedCredential === null || walletVerifiedCredential === void 0 ? void 0 : walletVerifiedCredential.chain) !== null && _a !== void 0 ? _a : ''];
-                    const walletConnector = getWaasWalletConnector(chain);
-                    if (!walletConnector)
-                        return;
-                    const wallet = walletConnector.createWallet({
-                        address: (_b = walletVerifiedCredential.address) !== null && _b !== void 0 ? _b : '',
-                        chain,
-                        connector: walletConnector,
-                        id: walletVerifiedCredential.id,
-                        isAuthenticated: true,
-                        key: (_c = walletVerifiedCredential.walletName) !== null && _c !== void 0 ? _c : '',
-                    });
-                    dynamicEvents.emit('embeddedWalletCreated', wallet, walletVerifiedCredential, user ? convertSdkUserToUserProfile(user) : undefined);
-                }
-                catch (error) {
-                    logger.error(error);
-                }
-            });
+            const emitWalletCreatedEvents = (walletCredentials) => {
+                walletCredentials.forEach((walletVerifiedCredential) => {
+                    var _a, _b, _c;
+                    try {
+                        const chain = VerifiedCredentialNameToChainEnum[(_a = walletVerifiedCredential === null || walletVerifiedCredential === void 0 ? void 0 : walletVerifiedCredential.chain) !== null && _a !== void 0 ? _a : ''];
+                        const walletConnector = getWaasWalletConnector(chain);
+                        if (!walletConnector)
+                            return;
+                        const wallet = walletConnector.createWallet({
+                            address: (_b = walletVerifiedCredential.address) !== null && _b !== void 0 ? _b : '',
+                            chain,
+                            connector: walletConnector,
+                            id: walletVerifiedCredential.id,
+                            isAuthenticated: true,
+                            key: (_c = walletVerifiedCredential.walletName) !== null && _c !== void 0 ? _c : '',
+                        });
+                        dynamicEvents.emit('embeddedWalletCreated', wallet, walletVerifiedCredential, user ? convertSdkUserToUserProfile(user) : undefined);
+                    }
+                    catch (error) {
+                        logger.error(error);
+                    }
+                });
+            };
+            emitWalletCreatedEvents(newWalletVerifiedCredentials);
             const newWalletIds = newWalletVerifiedCredentials.map(({ id }) => id);
             addedWalletsIds.current = addedWalletsIds.current.concat(newWalletIds);
-            if (primaryWalletAccount) {
-                const createdPrimaryWallet = refreshedUser.verifiedCredentials.find((wallet) => {
+            const updatePrimaryWalletIfNeeded = (primaryAccount, refreshed) => {
+                if (!primaryAccount)
+                    return;
+                const createdPrimaryWallet = refreshed.verifiedCredentials.find((wallet) => {
                     var _a, _b, _c;
                     return ((_a = wallet.walletName) === null || _a === void 0 ? void 0 : _a.includes(dynamicWaasKey)) &&
                         ((_b = wallet.address) === null || _b === void 0 ? void 0 : _b.toLowerCase()) ===
-                            ((_c = primaryWalletAccount.accountAddress) === null || _c === void 0 ? void 0 : _c.toLowerCase());
+                            ((_c = primaryAccount.accountAddress) === null || _c === void 0 ? void 0 : _c.toLowerCase());
                 });
-                if (createdPrimaryWallet) {
-                    // if the user already has a blockchain wallet, don't update the primary wallet
-                    if (!previousVerifiedCredentials.find((vc) => vc.format === 'blockchain')) {
-                        const smartWalletAccount = findSmartWallet(createdPrimaryWallet, refreshedUser.verifiedCredentials);
-                        const walletIdToUse = (smartWalletAccount === null || smartWalletAccount === void 0 ? void 0 : smartWalletAccount.id) || createdPrimaryWallet.id;
-                        updatePrimaryWalletId(walletIdToUse);
-                    }
-                }
-            }
+                if (!createdPrimaryWallet)
+                    return;
+                const hasExistingBlockchainWallet = previousVerifiedCredentials.find((vc) => vc.format === 'blockchain');
+                if (hasExistingBlockchainWallet)
+                    return;
+                const smartWalletAccount = findSmartWallet(createdPrimaryWallet, refreshed.verifiedCredentials);
+                const walletIdToUse = (smartWalletAccount === null || smartWalletAccount === void 0 ? void 0 : smartWalletAccount.id) || createdPrimaryWallet.id;
+                updatePrimaryWalletId(walletIdToUse);
+            };
+            updatePrimaryWalletIfNeeded(primaryWalletAccount, refreshedUser);
         }
         setShowAuthFlow(false, { performMultiWalletChecks: false }); // close email otp pin modal
         return createdWalletAccounts;
-    }), [getWaasWalletConnector, primaryChain, enabledChainNames, setShowAuthFlow]);
+    }), [
+        getWaasWalletConnector,
+        primaryChain,
+        enabledChainNames,
+        setShowAuthFlow,
+        user,
+        refresh,
+        addedWalletsIds,
+    ]);
     const needsAutoCreateWalletChains = useMemo(() => {
         var _a;
         if (!user ||
@@ -414,15 +443,32 @@ const useDynamicWaas = () => {
                 compareChains(wallet.chain, chain) &&
                 wallet.walletProvider === WalletProviderEnum.EmbeddedWallet)) !== null && _b !== void 0 ? _b : false;
         };
-        // For each enabled chain, if user does NOT have a V3 wallet and does NOT have a V1/V2 wallet, add to missing
-        const missingChains = enabledChainNames === null || enabledChainNames === void 0 ? void 0 : enabledChainNames.filter((chain) => !hasEmbeddedWalletForChain(chain));
         // If user has an external wallet, only create if automaticEmbeddedWalletCreationForExternalEnabled is true
         const hasExternalWallet = (_a = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.some((vc) => vc.format === JwtVerifiedCredentialFormatEnum.Blockchain &&
             vc.walletProvider !== WalletProviderEnum.EmbeddedWallet);
         const shouldCreateDynamicWaasWallet = hasExternalWallet
             ? automaticEmbeddedWalletCreationForExternalEnabled
             : true;
-        return shouldCreateDynamicWaasWallet ? missingChains : [];
+        if (!shouldCreateDynamicWaasWallet) {
+            return [];
+        }
+        const requirements = [];
+        // Handle BTC separately - only create native_segwit wallet if BTC is enabled and user doesn't have a BTC wallet
+        if (enabledChainNames === null || enabledChainNames === void 0 ? void 0 : enabledChainNames.includes(ChainEnum.Btc)) {
+            if (!hasEmbeddedWalletForChain(ChainEnum.Btc)) {
+                requirements.push({
+                    bitcoinConfig: { addressType: 'native_segwit' },
+                    chain: ChainEnum.Btc,
+                });
+            }
+        }
+        // For other chains, check if user does NOT have a V3 wallet and does NOT have a V1/V2 wallet
+        const otherMissingChains = enabledChainNames === null || enabledChainNames === void 0 ? void 0 : enabledChainNames.filter((chain) => chain !== ChainEnum.Btc && !hasEmbeddedWalletForChain(chain));
+        // Add other missing chains without address type requirements
+        otherMissingChains === null || otherMissingChains === void 0 ? void 0 : otherMissingChains.forEach((chain) => {
+            requirements.push({ chain: chain });
+        });
+        return requirements;
     }, [
         user,
         dynamicWaasIsEnabled,
@@ -430,11 +476,12 @@ const useDynamicWaas = () => {
         automaticEmbeddedWalletCreationForExternalEnabled,
         enabledChainNames,
     ]);
-    const importPrivateKey = (_g) => __awaiter(void 0, [_g], void 0, function* ({ chainName, privateKey, }) {
+    const importPrivateKey = (_g) => __awaiter(void 0, [_g], void 0, function* ({ chainName, privateKey, addressType, }) {
         const walletConnector = getWaasWalletConnector(chainName);
         if (!walletConnector)
             return;
         yield walletConnector.importPrivateKey({
+            addressType,
             chainName,
             privateKey,
         });

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

@@ -32,6 +32,7 @@ require('@dynamic-labs/locale');
 require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
 require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
+require('../../functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/UserWalletsContext/UserWalletsContext.cjs');

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

@@ -28,6 +28,7 @@ import '@dynamic-labs/locale';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';
 import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
+import '../../functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../context/UserWalletsContext/UserWalletsContext.js';

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

@@ -34,6 +34,7 @@ require('@dynamic-labs/locale');
 require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
 require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
+require('../../functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/UserWalletsContext/UserWalletsContext.cjs');

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

@@ -30,6 +30,7 @@ import '@dynamic-labs/locale';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';
 import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
+import '../../functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../context/UserWalletsContext/UserWalletsContext.js';

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

@@ -36,6 +36,7 @@ require('@dynamic-labs-sdk/client/core');
 require('@dynamic-labs-sdk/client');
 require('../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/locale');
+require('../../functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/UserWalletsContext/UserWalletsContext.cjs');

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

@@ -32,6 +32,7 @@ import '@dynamic-labs-sdk/client/core';
 import '@dynamic-labs-sdk/client';
 import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/locale';
+import '../../functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../context/UserWalletsContext/UserWalletsContext.js';