@dynamic-labs/sdk-react-core 4.29.4 → 4.29.5

package/src/lib/utils/constants/authViewLayoutChecks.cjs

@@ -54,6 +54,9 @@ const viewsThatHideHeader = [
     'global-wallet-info',
     'mfa-choose-device',
     'mfa-verification',
+    'waas-upgrade-view',
+    'wallet-upgrade-flow-view',
+    'account-upgraded',
 ];
 const viewsThatShowConnectedWalletProgress = [
     'wallet-list',
@@ -98,6 +101,7 @@ const viewsThatPreventModalClose = [
     'login-with-email-verification',
     'login-with-sms-verification',
     'backup-unsuccessful',
+    'wallet-upgrade-flow-view',
 ];
 /**
  * When hasPendingMfaAction returns true, user is not able to close the modal in these views at all

package/src/lib/utils/constants/authViewLayoutChecks.js

@@ -50,6 +50,9 @@ const viewsThatHideHeader = [
     'global-wallet-info',
     'mfa-choose-device',
     'mfa-verification',
+    'waas-upgrade-view',
+    'wallet-upgrade-flow-view',
+    'account-upgraded',
 ];
 const viewsThatShowConnectedWalletProgress = [
     'wallet-list',
@@ -94,6 +97,7 @@ const viewsThatPreventModalClose = [
     'login-with-email-verification',
     'login-with-sms-verification',
     'backup-unsuccessful',
+    'wallet-upgrade-flow-view',
 ];
 /**
  * When hasPendingMfaAction returns true, user is not able to close the modal in these views at all

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

@@ -0,0 +1,57 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../../../../_virtual/_tslib.cjs');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+var logger = require('../../../shared/logger.cjs');
+var turnkeyExport = require('../../../views/EmbeddedReveal/utils/turnkeyExport/turnkeyExport.cjs');
+var waasExport = require('../../../views/EmbeddedReveal/utils/waasExport/waasExport.cjs');
+
+const exportWalletCredential = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ isTurnkeyWallet, isWaasWallet, wallet, user, environmentId, exportPrivateKey, iframeContainerRef, handleAcknowledgeExportPrompt, }) {
+    var _b, _c, _d;
+    handleAcknowledgeExportPrompt();
+    if (isTurnkeyWallet) {
+        try {
+            return yield turnkeyExport.exportCredential({
+                address: exportPrivateKey ? wallet === null || wallet === void 0 ? void 0 : wallet.address : undefined,
+                environmentId,
+                user,
+                wallet: wallet,
+            });
+        }
+        catch (err) {
+            if (walletConnectorCore.isSessionKeyCompatibleWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector) &&
+                ((_b = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _b === void 0 ? void 0 : _b.removeSessionKeys)) {
+                yield ((_c = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _c === void 0 ? void 0 : _c.removeSessionKeys());
+                yield ((_d = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _d === void 0 ? void 0 : _d.createOrRestoreSession({
+                    ignoreRestore: true,
+                }));
+                logger.logger.error('[TK - removeSessionKeys] failed to perform revealEmbeddedWalletKey activity', {
+                    address: wallet === null || wallet === void 0 ? void 0 : wallet.address,
+                    err,
+                    userId: user === null || user === void 0 ? void 0 : user.userId,
+                });
+            }
+            return turnkeyExport.exportCredential({
+                address: exportPrivateKey ? wallet === null || wallet === void 0 ? void 0 : wallet.address : undefined,
+                environmentId,
+                user,
+                wallet: wallet,
+            });
+        }
+    }
+    if (isWaasWallet) {
+        // Start the export in the background
+        return waasExport.exportWaasCredential({
+            address: exportPrivateKey ? wallet === null || wallet === void 0 ? void 0 : wallet.address : undefined,
+            iframeContainer: iframeContainerRef,
+            user,
+            wallet: wallet,
+        });
+    }
+    return undefined;
+});
+
+exports.exportWalletCredential = exportWalletCredential;

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

@@ -0,0 +1,13 @@
+import { Wallet, WalletConnectorCore } from '@dynamic-labs/wallet-connector-core';
+import { UserProfile } from '@dynamic-labs/types';
+export interface ExportWalletCredentialParams {
+    isTurnkeyWallet: boolean;
+    isWaasWallet: boolean;
+    wallet: Wallet<WalletConnectorCore.WalletConnector>;
+    user: UserProfile | undefined;
+    environmentId: string;
+    exportPrivateKey?: boolean;
+    iframeContainerRef?: HTMLIFrameElement | null;
+    handleAcknowledgeExportPrompt: () => void;
+}
+export declare const exportWalletCredential: ({ isTurnkeyWallet, isWaasWallet, wallet, user, environmentId, exportPrivateKey, iframeContainerRef, handleAcknowledgeExportPrompt, }: ExportWalletCredentialParams) => Promise<boolean | undefined>;

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

@@ -0,0 +1,53 @@
+'use client'
+import { __awaiter } from '../../../../../_virtual/_tslib.js';
+import { isSessionKeyCompatibleWalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { logger } from '../../../shared/logger.js';
+import { exportCredential } from '../../../views/EmbeddedReveal/utils/turnkeyExport/turnkeyExport.js';
+import { exportWaasCredential } from '../../../views/EmbeddedReveal/utils/waasExport/waasExport.js';
+
+const exportWalletCredential = (_a) => __awaiter(void 0, [_a], void 0, function* ({ isTurnkeyWallet, isWaasWallet, wallet, user, environmentId, exportPrivateKey, iframeContainerRef, handleAcknowledgeExportPrompt, }) {
+    var _b, _c, _d;
+    handleAcknowledgeExportPrompt();
+    if (isTurnkeyWallet) {
+        try {
+            return yield exportCredential({
+                address: exportPrivateKey ? wallet === null || wallet === void 0 ? void 0 : wallet.address : undefined,
+                environmentId,
+                user,
+                wallet: wallet,
+            });
+        }
+        catch (err) {
+            if (isSessionKeyCompatibleWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector) &&
+                ((_b = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _b === void 0 ? void 0 : _b.removeSessionKeys)) {
+                yield ((_c = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _c === void 0 ? void 0 : _c.removeSessionKeys());
+                yield ((_d = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _d === void 0 ? void 0 : _d.createOrRestoreSession({
+                    ignoreRestore: true,
+                }));
+                logger.error('[TK - removeSessionKeys] failed to perform revealEmbeddedWalletKey activity', {
+                    address: wallet === null || wallet === void 0 ? void 0 : wallet.address,
+                    err,
+                    userId: user === null || user === void 0 ? void 0 : user.userId,
+                });
+            }
+            return exportCredential({
+                address: exportPrivateKey ? wallet === null || wallet === void 0 ? void 0 : wallet.address : undefined,
+                environmentId,
+                user,
+                wallet: wallet,
+            });
+        }
+    }
+    if (isWaasWallet) {
+        // Start the export in the background
+        return exportWaasCredential({
+            address: exportPrivateKey ? wallet === null || wallet === void 0 ? void 0 : wallet.address : undefined,
+            iframeContainer: iframeContainerRef,
+            user,
+            wallet: wallet,
+        });
+    }
+    return undefined;
+});
+
+export { exportWalletCredential };

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

@@ -0,0 +1,2 @@
+export { exportWalletCredential } from './exportWalletCredential';
+export type { ExportWalletCredentialParams } from './exportWalletCredential';

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

@@ -0,0 +1,57 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var sdkApiCore = require('@dynamic-labs/sdk-api-core');
+var findPrimaryEmbeddedChain = require('../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
+var findEmbeddedWalletFromVerifiedCredentials = require('../findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.cjs');
+
+/**
+ * Finds the primary wallet VC for the user based on wallet type priority and most recent lastSelectedAt
+ * @param user - The SDK user object or UserProfile
+ * @param projectSettings - Project settings containing embedded wallet configuration
+ * @param onlyEmbeddedWallets - Whether to only return embedded wallets
+ * @returns JwtVerifiedCredential | undefined - The primary wallet VC for the user
+ */
+const findPrimaryWalletVCForUser = (user, projectSettings, onlyEmbeddedWallets = false) => {
+    if (!(user === null || user === void 0 ? void 0 : user.verifiedCredentials))
+        return undefined;
+    // Sort all verified credentials by lastSelectedAt (most recent first)
+    const sortedCredentials = [...user.verifiedCredentials].sort((a, b) => {
+        // Handle credentials without lastSelectedAt
+        if (!a.lastSelectedAt && !b.lastSelectedAt)
+            return 0;
+        if (!a.lastSelectedAt)
+            return 1; // a goes to end
+        if (!b.lastSelectedAt)
+            return -1; // b goes to end
+        // Both have lastSelectedAt, sort by most recent first
+        return b.lastSelectedAt.getTime() - a.lastSelectedAt.getTime();
+    });
+    // Find AA wallet credential (highest priority)
+    const aaWalletCredential = sortedCredentials.find((vc) => vc.walletProvider === sdkApiCore.WalletProviderEnum.SmartContractWallet);
+    if (aaWalletCredential) {
+        return aaWalletCredential;
+    }
+    // Find embedded wallet credential (second priority)
+    let embeddedWalletCredential;
+    if (projectSettings) {
+        const primaryEmbeddedChain = findPrimaryEmbeddedChain.findPrimaryEmbeddedChain(projectSettings);
+        embeddedWalletCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(Object.assign(Object.assign({}, user), { verifiedCredentials: sortedCredentials }), [primaryEmbeddedChain]);
+    }
+    if (embeddedWalletCredential) {
+        return embeddedWalletCredential;
+    }
+    if (onlyEmbeddedWallets) {
+        return undefined;
+    }
+    // Find external wallet credential (lowest priority)
+    const externalWalletCredential = sortedCredentials.find((vc) => vc.format === 'blockchain');
+    if (externalWalletCredential) {
+        return externalWalletCredential;
+    }
+    return undefined;
+};
+
+exports.findPrimaryWalletVCForUser = findPrimaryWalletVCForUser;

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

@@ -0,0 +1,11 @@
+import { SdkUser } from '@dynamic-labs/sdk-api-core';
+import type { JwtVerifiedCredential, ProjectSettings } from '@dynamic-labs/sdk-api-core';
+import { UserProfile } from '@dynamic-labs/types';
+/**
+ * Finds the primary wallet VC for the user based on wallet type priority and most recent lastSelectedAt
+ * @param user - The SDK user object or UserProfile
+ * @param projectSettings - Project settings containing embedded wallet configuration
+ * @param onlyEmbeddedWallets - Whether to only return embedded wallets
+ * @returns JwtVerifiedCredential | undefined - The primary wallet VC for the user
+ */
+export declare const findPrimaryWalletVCForUser: (user: SdkUser | UserProfile | null, projectSettings?: ProjectSettings, onlyEmbeddedWallets?: boolean) => JwtVerifiedCredential | undefined;

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

@@ -0,0 +1,53 @@
+'use client'
+import { WalletProviderEnum } from '@dynamic-labs/sdk-api-core';
+import { findPrimaryEmbeddedChain } from '../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
+import { findEmbeddedWalletFromVerifiedCredentials } from '../findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.js';
+
+/**
+ * Finds the primary wallet VC for the user based on wallet type priority and most recent lastSelectedAt
+ * @param user - The SDK user object or UserProfile
+ * @param projectSettings - Project settings containing embedded wallet configuration
+ * @param onlyEmbeddedWallets - Whether to only return embedded wallets
+ * @returns JwtVerifiedCredential | undefined - The primary wallet VC for the user
+ */
+const findPrimaryWalletVCForUser = (user, projectSettings, onlyEmbeddedWallets = false) => {
+    if (!(user === null || user === void 0 ? void 0 : user.verifiedCredentials))
+        return undefined;
+    // Sort all verified credentials by lastSelectedAt (most recent first)
+    const sortedCredentials = [...user.verifiedCredentials].sort((a, b) => {
+        // Handle credentials without lastSelectedAt
+        if (!a.lastSelectedAt && !b.lastSelectedAt)
+            return 0;
+        if (!a.lastSelectedAt)
+            return 1; // a goes to end
+        if (!b.lastSelectedAt)
+            return -1; // b goes to end
+        // Both have lastSelectedAt, sort by most recent first
+        return b.lastSelectedAt.getTime() - a.lastSelectedAt.getTime();
+    });
+    // Find AA wallet credential (highest priority)
+    const aaWalletCredential = sortedCredentials.find((vc) => vc.walletProvider === WalletProviderEnum.SmartContractWallet);
+    if (aaWalletCredential) {
+        return aaWalletCredential;
+    }
+    // Find embedded wallet credential (second priority)
+    let embeddedWalletCredential;
+    if (projectSettings) {
+        const primaryEmbeddedChain = findPrimaryEmbeddedChain(projectSettings);
+        embeddedWalletCredential = findEmbeddedWalletFromVerifiedCredentials(Object.assign(Object.assign({}, user), { verifiedCredentials: sortedCredentials }), [primaryEmbeddedChain]);
+    }
+    if (embeddedWalletCredential) {
+        return embeddedWalletCredential;
+    }
+    if (onlyEmbeddedWallets) {
+        return undefined;
+    }
+    // Find external wallet credential (lowest priority)
+    const externalWalletCredential = sortedCredentials.find((vc) => vc.format === 'blockchain');
+    if (externalWalletCredential) {
+        return externalWalletCredential;
+    }
+    return undefined;
+};
+
+export { findPrimaryWalletVCForUser };

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

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

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

@@ -82,3 +82,4 @@ export * from './isZKSyncEnabled';
 export * from './clientSessionKeys';
 export * from './usingV3Wallets';
 export * from './isPasskeyProviderEnabled';
+export * from './exportWalletCredential';

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

@@ -84,6 +84,7 @@ export { usePromptAmountAndFundWithExchange } from './usePromptAndFundWithExchan
 export { usePayWithDynamic, type PayWithDynamicProps, } from './usePayWithDynamic';
 export { useSubmitExchangeFunding } from './useSubmitExchangeFunding';
 export { useGetPasskeys } from './useGetPasskeys';
+export { useDeletePasskey } from './useDeletePasskey';
 export { useRegisterPasskey } from './useRegisterPasskey';
 export { useAuthenticatePasskeyMFA } from './useAuthenticatePasskeyMFA';
 export { useIsMfaEnabled } from './useIsMfaEnabled';
@@ -92,3 +93,4 @@ export { useIsTotpMfaEnabled } from './useIsTotpMfaEnabled';
 export { useSignInWithPasskey } from './useSignInWithPasskey';
 export { useGetUserMfaMethods } from './useGetUserMfaMethods';
 export { usePromptMfaAuth } from './usePromptMfaAuth';
+export { useUpgradeToDynamicWaasFlow } from './useUpgradeToDynamicWaasFlow';

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

@@ -29,15 +29,15 @@ var updatePrimaryWalletId = require('../../functions/updatePrimaryWalletId/updat
 require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
-require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
-require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
-require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('@dynamic-labs-sdk/client/core');
 require('../../../client/client.cjs');
 require('@dynamic-labs-sdk/client');
 require('../../../config/ApiEndpoint.cjs');
 require('../../../store/state/projectSettings/projectSettings.cjs');
 require('../../../locale/locale.cjs');
+require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
+require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
+require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../../store/state/authMode/authMode.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');

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

@@ -25,15 +25,15 @@ import { updatePrimaryWalletId } from '../../functions/updatePrimaryWalletId/upd
 import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';
-import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
-import '../../../context/AccountExistsContext/AccountExistsContext.js';
-import '../../../context/UserWalletsContext/UserWalletsContext.js';
 import '@dynamic-labs-sdk/client/core';
 import '../../../client/client.js';
 import '@dynamic-labs-sdk/client';
 import '../../../config/ApiEndpoint.js';
 import '../../../store/state/projectSettings/projectSettings.js';
 import '../../../locale/locale.js';
+import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
+import '../../../context/AccountExistsContext/AccountExistsContext.js';
+import '../../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../../store/state/authMode/authMode.js';
 import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';

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

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

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

@@ -0,0 +1,33 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../../../../_virtual/_tslib.cjs');
+var React = require('react');
+var client = require('@dynamic-labs-sdk/client');
+
+/**
+ * Delete passkey
+ *
+ * @returns Function to delete passkey for the current user
+ *
+ * @example
+ * ```tsx
+ * const App = () => {
+ *   const deletePasskey = useDeletePasskey();
+ *
+ *   return (
+ *     <button
+ *       onClick={async () => {
+ *         await deletePasskey(passkeyId);
+ *       }}
+ *     >
+ *       Delete passkey
+ *     </button>
+ *  );
+ * }
+ */
+const useDeletePasskey = () => React.useCallback((passkeyId) => _tslib.__awaiter(void 0, void 0, void 0, function* () { return client.deletePasskey({ passkeyId }); }), []);
+
+exports.useDeletePasskey = useDeletePasskey;

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

@@ -0,0 +1,22 @@
+/**
+ * Delete passkey
+ *
+ * @returns Function to delete passkey for the current user
+ *
+ * @example
+ * ```tsx
+ * const App = () => {
+ *   const deletePasskey = useDeletePasskey();
+ *
+ *   return (
+ *     <button
+ *       onClick={async () => {
+ *         await deletePasskey(passkeyId);
+ *       }}
+ *     >
+ *       Delete passkey
+ *     </button>
+ *  );
+ * }
+ */
+export declare const useDeletePasskey: () => ((passkeyId: string) => Promise<void>);

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

@@ -0,0 +1,29 @@
+'use client'
+import { __awaiter } from '../../../../../_virtual/_tslib.js';
+import { useCallback } from 'react';
+import { deletePasskey } from '@dynamic-labs-sdk/client';
+
+/**
+ * Delete passkey
+ *
+ * @returns Function to delete passkey for the current user
+ *
+ * @example
+ * ```tsx
+ * const App = () => {
+ *   const deletePasskey = useDeletePasskey();
+ *
+ *   return (
+ *     <button
+ *       onClick={async () => {
+ *         await deletePasskey(passkeyId);
+ *       }}
+ *     >
+ *       Delete passkey
+ *     </button>
+ *  );
+ * }
+ */
+const useDeletePasskey = () => useCallback((passkeyId) => __awaiter(void 0, void 0, void 0, function* () { return deletePasskey({ passkeyId }); }), []);
+
+export { useDeletePasskey };

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

@@ -31,6 +31,8 @@ require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 var dynamicContextProps = require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
 var projectSettings = require('../../../store/state/projectSettings/projectSettings.cjs');
+require('../../../locale/locale.cjs');
+var wallets = require('../../../data/api/wallets/wallets.cjs');
 var useOnboardingCompleteUser = require('../../../client/extension/user/useOnboardingCompleteUser/useOnboardingCompleteUser.cjs');
 require('../../../context/DynamicContext/DynamicContext.cjs');
 require('../../../store/state/loadingAndLifecycle/loadingAndLifecycle.cjs');
@@ -39,8 +41,6 @@ require('../../../context/ErrorContext/ErrorContext.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 var UserWalletsContext = require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
-require('../../../locale/locale.cjs');
-var wallets = require('../../../data/api/wallets/wallets.cjs');
 require('../../../store/state/authMode/authMode.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
@@ -96,6 +96,11 @@ require('../../../context/FooterAnimationContext/index.cjs');
 require('../../../views/MfaChooseDeviceView/getMfaOptions/getMfaOptions.cjs');
 require('../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../../context/OnrampContext/OnrampContext.cjs');
+var apiUrl = require('../../constants/waas/apiUrl.cjs');
+var useClientSessionKeys = require('../useClientSessionKeys/useClientSessionKeys.cjs');
+var useRefreshUser = require('../useRefreshUser/useRefreshUser.cjs');
+var useGetMfaToken = require('../useGetMfaToken/useGetMfaToken.cjs');
+var constants = require('./constants.cjs');
 require('../../../store/state/sendBalances.cjs');
 require('../../../store/state/connectorsInitializing/connectorsInitializing.cjs');
 require('../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.cjs');
@@ -104,11 +109,6 @@ require('../../../views/TransactionConfirmationView/TransactionConfirmationView.
 require('../../../widgets/DynamicWidget/components/PasskeyCard/PasskeyCard.cjs');
 require('../../../../index.cjs');
 require('../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.cjs');
-var apiUrl = require('../../constants/waas/apiUrl.cjs');
-var useClientSessionKeys = require('../useClientSessionKeys/useClientSessionKeys.cjs');
-var useRefreshUser = require('../useRefreshUser/useRefreshUser.cjs');
-var useGetMfaToken = require('../useGetMfaToken/useGetMfaToken.cjs');
-var constants = require('./constants.cjs');
 require('../../../store/state/tokenBalances.cjs');
 require('../../../store/state/multichainBalances.cjs');
 require('../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
@@ -155,6 +155,7 @@ const useDynamicWaas = () => {
     const { getSignedSessionId } = useClientSessionKeys.useClientSessionKeys();
     const getMfaToken = useGetMfaToken.useGetMfaToken();
     const isCookieAuthEnabled = projectSettings$1 && isCookieEnabled.isCookieEnabled(projectSettings$1);
+    const isUpgrading = React.useRef(false);
     const getWalletConnector = React.useCallback((chainName) => {
         var _a;
         if (!isCookieAuthEnabled && !authToken) {
@@ -190,6 +191,9 @@ 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* () {
+        if (isUpgrading.current) {
+            return;
+        }
         if (!(enabledChainNames === null || enabledChainNames === void 0 ? void 0 : enabledChainNames.length)) {
             throw new utils.DynamicError(constants.NO_ENABLED_CHAINS_ERROR);
         }
@@ -272,15 +276,7 @@ const useDynamicWaas = () => {
         }
         setShowAuthFlow(false, { performMultiWalletChecks: false }); // close email otp pin modal
         return createdWalletAccounts;
-    }), [
-        getWalletConnector,
-        primaryChain,
-        enabledChainNames,
-        refresh,
-        setShowAuthFlow,
-        user === null || user === void 0 ? void 0 : user.verifiedCredentials,
-        addedWalletsIds,
-    ]);
+    }), [getWalletConnector, primaryChain, enabledChainNames, setShowAuthFlow]);
     const needsAutoCreateWalletChains = React.useMemo(() => {
         if (!user ||
             !dynamicWaasIsEnabled ||
@@ -320,41 +316,45 @@ const useDynamicWaas = () => {
         });
         yield refresh();
     });
-    const upgradeToDynamicWaas = React.useCallback((_e) => _tslib.__awaiter(void 0, [_e], void 0, function* ({ privateKey }) {
+    const upgradeToDynamicWaas = React.useCallback((_e) => _tslib.__awaiter(void 0, [_e], void 0, function* ({ privateKey, wallet, }) {
+        isUpgrading.current = true;
         if (!primaryWallet) {
             throw new utils.DynamicError('Primary wallet not found');
         }
-        const chainName = primaryWallet.chain;
-        const walletId = primaryWallet.id;
+        const chainName = wallet.chain;
+        const walletId = wallet.id;
         const walletConnector = getWalletConnector(chainName);
         if (!walletConnector) {
             throw new utils.DynamicError('Wallet connector not found');
         }
         let softDeleteSucceeded = false;
+        // 7702 wallets have a -zerodev suffix because it's a credential created on the fly
+        const normalizedWalletId = (walletId === null || walletId === void 0 ? void 0 : walletId.replace('-zerodev', '')) || walletId;
         try {
             yield wallets.softDeleteEmbeddedWallet({
                 environmentId,
-                walletId,
+                walletId: normalizedWalletId,
             });
             softDeleteSucceeded = true;
             yield walletConnector.importPrivateKey({
                 chainName,
                 privateKey,
             });
-            yield refresh();
+            isUpgrading.current = false;
         }
         catch (error) {
             // If soft delete succeeded but import failed, try to restore the wallet
             if (softDeleteSucceeded) {
                 yield wallets.restoreEmbeddedWallet({
                     environmentId,
-                    walletId,
+                    walletId: normalizedWalletId,
                 });
                 yield refresh();
             }
+            isUpgrading.current = false;
             throw error instanceof utils.DynamicError
                 ? error
-                : new utils.DynamicError('Upgrade failed');
+                : new utils.DynamicError('Upgrade failed, please try again.');
         }
     }), [environmentId, getWalletConnector, primaryWallet, refresh]);
     const delegateKeyShares = React.useCallback((_f) => _tslib.__awaiter(void 0, [_f], void 0, function* ({ chainName, accountAddress, }) {

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

@@ -1,5 +1,5 @@
 import { ChainEnum, MFAAction } from '@dynamic-labs/sdk-api-core';
-import { IDynamicWaasConnector } from '@dynamic-labs/wallet-connector-core';
+import { IDynamicWaasConnector, Wallet, WalletConnectorCore } from '@dynamic-labs/wallet-connector-core';
 export declare const configWaasWalletConnector: ({ walletConnector, environmentId, apiBaseUrl, authToken, relayUrl, authMode, getSignedSessionId, getMfaToken, }: {
     walletConnector: IDynamicWaasConnector;
     environmentId: string;
@@ -18,20 +18,21 @@ export declare const useDynamicWaas: () => {
         accountAddress: string;
         publicKeyHex: string;
         rawPublicKey: string | Uint8Array | undefined;
-    } | undefined)[]>;
+    } | undefined)[] | undefined>;
     delegateKeyShares: ({ chainName, accountAddress, }: {
         chainName: ChainEnum;
         accountAddress: string;
     }) => Promise<void>;
     dynamicWaasIsEnabled: boolean;
-    getWaasWallets: () => import("@dynamic-labs/wallet-connector-core").Wallet<import("@dynamic-labs/wallet-connector-core").WalletConnectorCore.WalletConnector>[];
+    getWaasWallets: () => Wallet<WalletConnectorCore.WalletConnector>[];
     getWalletConnector: (chainName: string) => IDynamicWaasConnector | undefined;
     importPrivateKey: ({ chainName, privateKey, }: {
         chainName: ChainEnum;
         privateKey: string;
     }) => Promise<void>;
     needsAutoCreateWalletChains: ChainEnum[];
-    upgradeToDynamicWaas: ({ privateKey }: {
+    upgradeToDynamicWaas: ({ privateKey, wallet, }: {
         privateKey: string;
+        wallet: Wallet<WalletConnectorCore.WalletConnector>;
     }) => Promise<void>;
 };