@dynamic-labs/sdk-react-core 4.91.1 → 4.91.3

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

@@ -2,7 +2,7 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { logger } from '../../../shared/logger.js';
 import { generateMessages } from '../generateMessages/index.js';
-import { consumeNonce } from '../../../store/state/nonce/nonce.js';
+import { getNonce, fetchAndStoreNonce, consumeNonce } from '../../../store/state/nonce/nonce.js';
 
 // TODO - This function is doing too much we should split it up.
 const getVerifyArgs = (_a) => __awaiter(void 0, [_a], void 0, function* ({ walletConnector, walletProvider, environmentId, displaySiweStatement, skipEmptyAccountCheck, siweStatement, publicWalletAddress, signedMessageOverride, messageToSignOverride, }) {
@@ -55,6 +55,10 @@ const getVerifyArgs = (_a) => __awaiter(void 0, [_a], void 0, function* ({ walle
         });
         return result;
     }
+    if (!getNonce()) {
+        logger.debug('[getVerifyArgs] Nonce missing, attempting to fetch');
+        yield fetchAndStoreNonce();
+    }
     const nonce = consumeNonce();
     // generate message to sign and then initiate signing step to prove ownership
     const { messageToSign, signedMessage } = yield generateMessages(publicWalletAddress, walletConnector, nonce, environmentId, displaySiweStatement, siweStatement);

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.cjs

@@ -76,7 +76,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
     });
     const handleWalletVerifyError = (err) => {
         var _a;
-        const userCancelled = (err === null || err === void 0 ? void 0 : err.code) === 'user-cancelled';
+        const userCancelled = (err === null || err === void 0 ? void 0 : err.code) === utils.SdkErrorCode.USER_CANCELLED;
         if (!userCancelled)
             logger.logger.debug(err);
         instrumentAuthLoginFailed.instrumentAuthLoginFailed(err, {

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.js

@@ -1,6 +1,6 @@
 'use client'
 import { __awaiter } from '../../../../../../_virtual/_tslib.js';
-import { DeferredPromise, StorageService, CustomError, GetAddressCancelledError } from '@dynamic-labs/utils';
+import { DeferredPromise, StorageService, SdkErrorCode, CustomError, GetAddressCancelledError } from '@dynamic-labs/utils';
 import { isEmailWalletConnector, isEmailOTPWalletConnector, isBloctoConnector, getWalletProvider, isSameAddress } from '@dynamic-labs/wallet-connector-core';
 import { useCaptchaContext } from '../../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../../context/DynamicContext/useDynamicContext/useDynamicContext.js';
@@ -72,7 +72,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
     });
     const handleWalletVerifyError = (err) => {
         var _a;
-        const userCancelled = (err === null || err === void 0 ? void 0 : err.code) === 'user-cancelled';
+        const userCancelled = (err === null || err === void 0 ? void 0 : err.code) === SdkErrorCode.USER_CANCELLED;
         if (!userCancelled)
             logger.debug(err);
         instrumentAuthLoginFailed(err, {

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

@@ -454,7 +454,24 @@ const useDynamicWaas = () => {
         });
         yield refresh();
     });
-    const upgradeToDynamicWaas = React.useCallback((_h) => _tslib.__awaiter(void 0, [_h], void 0, function* ({ privateKey, wallet, password, }) {
+    const migrateFromFireblocks = (_h) => _tslib.__awaiter(void 0, [_h], void 0, function* ({ deviceId, jwt, password, storage, expectedAddresses, }) {
+        const [chainName] = enabledChainNames !== null && enabledChainNames !== void 0 ? enabledChainNames : [];
+        if (!chainName)
+            return undefined;
+        const walletConnector = getWaasWalletConnector(chainName);
+        if (!walletConnector)
+            return undefined;
+        const result = yield walletConnector.migrateFromFireblocks({
+            deviceId,
+            expectedAddresses,
+            jwt,
+            ncwStorage: storage,
+            walletPassword: password,
+        });
+        yield refresh();
+        return result;
+    });
+    const upgradeToDynamicWaas = React.useCallback((_j) => _tslib.__awaiter(void 0, [_j], void 0, function* ({ privateKey, wallet, password, }) {
         isUpgrading.current = true;
         if (!wallet) {
             throw new utils.DynamicError('Wallet to upgrade was not provided');
@@ -534,14 +551,14 @@ const useDynamicWaas = () => {
             values.VerifiedCredentialNameToChainEnum[cred.chain]);
     }, [user === null || user === void 0 ? void 0 : user.verifiedCredentials]);
     const processSignOnWalletSettings = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _j;
+        var _k;
         if (!(user === null || user === void 0 ? void 0 : user.verifiedCredentials)) {
             return;
         }
         const waasWallets = user.verifiedCredentials.filter((vc) => { var _a; return vc.walletName === 'dynamicwaas' && ((_a = vc.walletProperties) === null || _a === void 0 ? void 0 : _a.settings); });
         for (const wallet of waasWallets) {
             try {
-                const settings = (_j = wallet.walletProperties) === null || _j === void 0 ? void 0 : _j.settings;
+                const settings = (_k = wallet.walletProperties) === null || _k === void 0 ? void 0 : _k.settings;
                 const { address, chain } = wallet;
                 if (!settings || !address || !chain) {
                     continue;
@@ -612,6 +629,7 @@ const useDynamicWaas = () => {
         getWaasWalletsByCredentials,
         importPrivateKey,
         initializeWaas,
+        migrateFromFireblocks,
         needsAutoCreateWalletChains,
         needsSettingsProcessing,
         processSignOnWalletSettings,

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

@@ -54,6 +54,13 @@ export declare const useDynamicWaas: () => {
     initializeWaas: ({ forceClientRebuild, }?: {
         forceClientRebuild?: boolean;
     }) => Promise<void>;
+    migrateFromFireblocks: ({ deviceId, jwt, password, storage, expectedAddresses, }: {
+        deviceId: string;
+        jwt: string;
+        password: string;
+        storage: Record<string, string>;
+        expectedAddresses: Record<string, string>;
+    }) => Promise<import("@dynamic-labs-wallet/browser-wallet-client").MigrateFromFireblocksResponse | undefined>;
     needsAutoCreateWalletChains: WalletCreationRequirement[];
     needsSettingsProcessing: boolean;
     processSignOnWalletSettings: () => Promise<void>;

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

@@ -450,7 +450,24 @@ const useDynamicWaas = () => {
         });
         yield refresh();
     });
-    const upgradeToDynamicWaas = useCallback((_h) => __awaiter(void 0, [_h], void 0, function* ({ privateKey, wallet, password, }) {
+    const migrateFromFireblocks = (_h) => __awaiter(void 0, [_h], void 0, function* ({ deviceId, jwt, password, storage, expectedAddresses, }) {
+        const [chainName] = enabledChainNames !== null && enabledChainNames !== void 0 ? enabledChainNames : [];
+        if (!chainName)
+            return undefined;
+        const walletConnector = getWaasWalletConnector(chainName);
+        if (!walletConnector)
+            return undefined;
+        const result = yield walletConnector.migrateFromFireblocks({
+            deviceId,
+            expectedAddresses,
+            jwt,
+            ncwStorage: storage,
+            walletPassword: password,
+        });
+        yield refresh();
+        return result;
+    });
+    const upgradeToDynamicWaas = useCallback((_j) => __awaiter(void 0, [_j], void 0, function* ({ privateKey, wallet, password, }) {
         isUpgrading.current = true;
         if (!wallet) {
             throw new DynamicError('Wallet to upgrade was not provided');
@@ -530,14 +547,14 @@ const useDynamicWaas = () => {
             VerifiedCredentialNameToChainEnum[cred.chain]);
     }, [user === null || user === void 0 ? void 0 : user.verifiedCredentials]);
     const processSignOnWalletSettings = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
-        var _j;
+        var _k;
         if (!(user === null || user === void 0 ? void 0 : user.verifiedCredentials)) {
             return;
         }
         const waasWallets = user.verifiedCredentials.filter((vc) => { var _a; return vc.walletName === 'dynamicwaas' && ((_a = vc.walletProperties) === null || _a === void 0 ? void 0 : _a.settings); });
         for (const wallet of waasWallets) {
             try {
-                const settings = (_j = wallet.walletProperties) === null || _j === void 0 ? void 0 : _j.settings;
+                const settings = (_k = wallet.walletProperties) === null || _k === void 0 ? void 0 : _k.settings;
                 const { address, chain } = wallet;
                 if (!settings || !address || !chain) {
                     continue;
@@ -608,6 +625,7 @@ const useDynamicWaas = () => {
         getWaasWalletsByCredentials,
         importPrivateKey,
         initializeWaas,
+        migrateFromFireblocks,
         needsAutoCreateWalletChains,
         needsSettingsProcessing,
         processSignOnWalletSettings,

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

@@ -63,9 +63,10 @@ const useEmbeddedReveal = () => {
             throw new Error('Wallet is non-HD and does not have a recovery phrase');
         }
     };
-    const initExportProcess = React.useCallback((...args_1) => _tslib.__awaiter(void 0, [...args_1], void 0, function* (recoveryPhrase = false, isPromptForExport = false) {
-        if (!primaryWallet) {
-            throw new Error('No primary wallet');
+    const initExportProcess = React.useCallback((...args_1) => _tslib.__awaiter(void 0, [...args_1], void 0, function* (recoveryPhrase = false, isPromptForExport = false, walletId) {
+        const targetWalletId = walletId !== null && walletId !== void 0 ? walletId : primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id;
+        if (!targetWalletId) {
+            throw new Error('No wallet available for export');
         }
         if (!user) {
             throw new Error(errors.USER_NOT_LOGGED_IN);
@@ -83,6 +84,7 @@ const useEmbeddedReveal = () => {
         pushView('embedded-reveal-view', {
             exportPrivateKey: !recoveryPhrase,
             isPromptForExport,
+            walletId: targetWalletId,
         });
         return new Promise((resolve, reject) => {
             dynamicEvents.dynamicEvents.once('embeddedWalletRevealCompleted', (wallet) => resolve(wallet));

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

@@ -1,4 +1,4 @@
 import { Wallet } from '../../../shared';
 export declare const useEmbeddedReveal: () => {
-    readonly initExportProcess: (recoveryPhrase?: boolean, isPromptForExport?: boolean) => Promise<Wallet>;
+    readonly initExportProcess: (recoveryPhrase?: boolean, isPromptForExport?: boolean, walletId?: string) => Promise<Wallet>;
 };

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

@@ -59,9 +59,10 @@ const useEmbeddedReveal = () => {
             throw new Error('Wallet is non-HD and does not have a recovery phrase');
         }
     };
-    const initExportProcess = useCallback((...args_1) => __awaiter(void 0, [...args_1], void 0, function* (recoveryPhrase = false, isPromptForExport = false) {
-        if (!primaryWallet) {
-            throw new Error('No primary wallet');
+    const initExportProcess = useCallback((...args_1) => __awaiter(void 0, [...args_1], void 0, function* (recoveryPhrase = false, isPromptForExport = false, walletId) {
+        const targetWalletId = walletId !== null && walletId !== void 0 ? walletId : primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id;
+        if (!targetWalletId) {
+            throw new Error('No wallet available for export');
         }
         if (!user) {
             throw new Error(USER_NOT_LOGGED_IN);
@@ -79,6 +80,7 @@ const useEmbeddedReveal = () => {
         pushView('embedded-reveal-view', {
             exportPrivateKey: !recoveryPhrase,
             isPromptForExport,
+            walletId: targetWalletId,
         });
         return new Promise((resolve, reject) => {
             dynamicEvents.once('embeddedWalletRevealCompleted', (wallet) => resolve(wallet));

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

@@ -7,12 +7,12 @@ var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 var sdkApiCore = require('@dynamic-labs/sdk-api-core');
 var types = require('@dynamic-labs/types');
+var utils = require('@dynamic-labs/utils');
 require('../../../context/DynamicContext/useDynamicContext/useDynamicContext.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.cjs');
 var SocialRedirectContext = require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs-sdk/client');
-require('@dynamic-labs/utils');
 require('@dynamic-labs-sdk/client/core');
 require('eventemitter3');
 require('../../../config/ApiEndpoint.cjs');
@@ -61,7 +61,7 @@ const useSocialAccounts = ({ onError } = {}) => {
                 option: sdkApiCore.ProviderEnum.Farcaster,
                 provider: sdkApiCore.ProviderEnum.Farcaster,
                 type: 'social',
-            }, 'user-cancelled');
+            }, utils.SdkErrorCode.USER_CANCELLED);
         },
     }), [pushView, setSocialProvider]);
     const { handleError, setError, checkValidProvider, error, connectSocialAccount, } = useSocialAuth.useSocialAuth({

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

@@ -3,12 +3,12 @@ import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useState, useCallback, useMemo } from 'react';
 import { ProviderEnum } from '@dynamic-labs/sdk-api-core';
 import { SocialOAuthErrorCode } from '@dynamic-labs/types';
+import { SdkErrorCode } from '@dynamic-labs/utils';
 import '../../../context/DynamicContext/useDynamicContext/useDynamicContext.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.js';
 import { useSocialRedirectContext } from '../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs-sdk/client';
-import '@dynamic-labs/utils';
 import '@dynamic-labs-sdk/client/core';
 import 'eventemitter3';
 import '../../../config/ApiEndpoint.js';
@@ -57,7 +57,7 @@ const useSocialAccounts = ({ onError } = {}) => {
                 option: ProviderEnum.Farcaster,
                 provider: ProviderEnum.Farcaster,
                 type: 'social',
-            }, 'user-cancelled');
+            }, SdkErrorCode.USER_CANCELLED);
         },
     }), [pushView, setSocialProvider]);
     const { handleError, setError, checkValidProvider, error, connectSocialAccount, } = useSocialAuth({

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

@@ -95,7 +95,7 @@ const useSyncEmbeddedWalletFlow = () => {
                 primaryWallet) {
                 try {
                     setShowAuthFlow(true);
-                    yield initExportProcess(true, true);
+                    yield initExportProcess(true, true, primaryWallet.id);
                 }
                 catch (error) {
                     logger.logger.error('Error initializing embedded wallet export', error);

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

@@ -91,7 +91,7 @@ const useSyncEmbeddedWalletFlow = () => {
                 primaryWallet) {
                 try {
                     setShowAuthFlow(true);
-                    yield initExportProcess(true, true);
+                    yield initExportProcess(true, true, primaryWallet.id);
                 }
                 catch (error) {
                     logger.error('Error initializing embedded wallet export', error);

package/src/lib/views/EmailVerification/EmailVerification.cjs

@@ -9,9 +9,9 @@ var React = require('react');
 var reactI18next = require('react-i18next');
 var sdkApiCore = require('@dynamic-labs/sdk-api-core');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+var utils = require('@dynamic-labs/utils');
 require('@dynamic-labs-sdk/client/core');
 require('eventemitter3');
-require('@dynamic-labs/utils');
 require('@dynamic-labs-sdk/client');
 require('../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/iconic');
@@ -179,7 +179,7 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
         const emailString = email$1 !== null && email$1 !== void 0 ? email$1 : '';
         dynamicEvents.dynamicEvents.emit('emailVerificationResult', isValidatedRef.current, emailString);
         if (!isValidatedRef.current)
-            dynamicEvents.dynamicEvents.emit('authFailure', { email: emailString, option: emailString, type: 'email' }, 'user-cancelled');
+            dynamicEvents.dynamicEvents.emit('authFailure', { email: emailString, option: emailString, type: 'email' }, utils.SdkErrorCode.USER_CANCELLED);
         if (!email$1)
             logger.logger.warn("WARNING: emitted emailVerificationResult with incomplete params because useVerification's displayedDestination was undefined");
     });
@@ -358,10 +358,10 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
             logger.logger.debug(error);
             instrumentAuthLoginFailed.instrumentAuthLoginFailed(error, { authOrigin: 'email-verification' });
             setErrorMessage(error.code, error, 'email-verification');
-            if (error.code === 'too_many_email_verification_attempts') {
+            if (error.code === utils.SdkErrorCode.TOO_MANY_EMAIL_VERIFICATION_ATTEMPTS) {
                 setShowRetryButton(false);
             }
-            if (error.code === 'invalid_email_verification') {
+            if (error.code === utils.SdkErrorCode.INVALID_EMAIL_VERIFICATION) {
                 clearStackAndPushInitialView();
             }
         }

package/src/lib/views/EmailVerification/EmailVerification.js

@@ -5,9 +5,9 @@ import { useState, useRef, useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { EmbeddedWalletVersionEnum } from '@dynamic-labs/sdk-api-core';
 import { isSessionKeyCompatibleWallet } from '@dynamic-labs/wallet-connector-core';
+import { SdkErrorCode } from '@dynamic-labs/utils';
 import '@dynamic-labs-sdk/client/core';
 import 'eventemitter3';
-import '@dynamic-labs/utils';
 import '@dynamic-labs-sdk/client';
 import '../../config/ApiEndpoint.js';
 import '@dynamic-labs/iconic';
@@ -175,7 +175,7 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
         const emailString = email !== null && email !== void 0 ? email : '';
         dynamicEvents.emit('emailVerificationResult', isValidatedRef.current, emailString);
         if (!isValidatedRef.current)
-            dynamicEvents.emit('authFailure', { email: emailString, option: emailString, type: 'email' }, 'user-cancelled');
+            dynamicEvents.emit('authFailure', { email: emailString, option: emailString, type: 'email' }, SdkErrorCode.USER_CANCELLED);
         if (!email)
             logger.warn("WARNING: emitted emailVerificationResult with incomplete params because useVerification's displayedDestination was undefined");
     });
@@ -354,10 +354,10 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
             logger.debug(error);
             instrumentAuthLoginFailed(error, { authOrigin: 'email-verification' });
             setErrorMessage(error.code, error, 'email-verification');
-            if (error.code === 'too_many_email_verification_attempts') {
+            if (error.code === SdkErrorCode.TOO_MANY_EMAIL_VERIFICATION_ATTEMPTS) {
                 setShowRetryButton(false);
             }
-            if (error.code === 'invalid_email_verification') {
+            if (error.code === SdkErrorCode.INVALID_EMAIL_VERIFICATION) {
                 clearStackAndPushInitialView();
             }
         }

package/src/lib/views/EmailWalletOTPVerificationView/EmailWalletOTPVerificationView.cjs

@@ -6,12 +6,12 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+var utils = require('@dynamic-labs/utils');
 require('../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
 require('react-i18next');
 require('@dynamic-labs/iconic');
 var ViewContext = require('../../context/ViewContext/ViewContext.cjs');
 require('../../../../_virtual/_tslib.cjs');
-require('@dynamic-labs/utils');
 require('../../shared/logger.cjs');
 require('@dynamic-labs/wallet-book');
 require('../../utils/constants/colors.cjs');
@@ -137,7 +137,7 @@ const EmailWalletOTPVerificationView = () => {
             email,
             option: email,
             type: 'email',
-        }, 'user-cancelled');
+        }, utils.SdkErrorCode.USER_CANCELLED);
     };
     const { data: isValid, isLoading, mutate: onSubmit, } = useMutation.useMutation((otp) => emailWalletConnector.verifyOneTimePassword(otp), {
         onFailure: (error) => {

package/src/lib/views/EmailWalletOTPVerificationView/EmailWalletOTPVerificationView.js

@@ -2,12 +2,12 @@
 import { jsx } from 'react/jsx-runtime';
 import { useState } from 'react';
 import { isEmailOTPWalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { SdkErrorCode } from '@dynamic-labs/utils';
 import '../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import 'react-i18next';
 import '@dynamic-labs/iconic';
 import { useViewContext } from '../../context/ViewContext/ViewContext.js';
 import '../../../../_virtual/_tslib.js';
-import '@dynamic-labs/utils';
 import '../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
 import '../../utils/constants/colors.js';
@@ -133,7 +133,7 @@ const EmailWalletOTPVerificationView = () => {
             email,
             option: email,
             type: 'email',
-        }, 'user-cancelled');
+        }, SdkErrorCode.USER_CANCELLED);
     };
     const { data: isValid, isLoading, mutate: onSubmit, } = useMutation((otp) => emailWalletConnector.verifyOneTimePassword(otp), {
         onFailure: (error) => {

package/src/lib/views/EmbeddedReveal/EmbeddedRevealView/EmbeddedRevealView.cjs

@@ -55,7 +55,7 @@ require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../utils/functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
-require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
+var UserWalletsContext = require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../../store/state/authMode/authMode.cjs');
 require('../../../store/state/loadingAndLifecycle/loadingAndLifecycle.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
@@ -66,7 +66,6 @@ require('../../../context/ThemeContext/ThemeContext.cjs');
 var useSmartWallets = require('../../../utils/hooks/useSmartWallets/useSmartWallets.cjs');
 require('../../../utils/hooks/useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 var useMutation = require('../../../utils/hooks/useMutation/useMutation.cjs');
-var useIsTurnkeyWallet = require('../../../utils/hooks/useIsTurnkeyWallet/useIsTurnkeyWallet.cjs');
 require('bs58');
 require('@dynamic-labs/types');
 require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
@@ -136,32 +135,40 @@ var useSyncEmbeddedWalletFlow = require('../../../utils/hooks/useSyncEmbeddedWal
 require('@dynamic-labs/store');
 require('../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
 
-const EmbeddedRevealView = ({ exportPrivateKey, isPromptForExport = false, }) => {
-    var _a, _b, _c;
+const EmbeddedRevealView = ({ exportPrivateKey, isPromptForExport = false, walletId, }) => {
+    var _a, _b, _c, _d, _e;
     const { primaryWallet, user, setShowAuthFlow, environmentId } = useInternalDynamicContext.useInternalDynamicContext();
+    const { userWallets } = UserWalletsContext.useInternalUserWallets();
     const { handleAcknowledgeExportPrompt } = useSyncEmbeddedWalletFlow.useSyncEmbeddedWalletFlow();
-    const { isTurnkeyWallet } = useIsTurnkeyWallet.useIsTurnkeyWallet();
     const isWaasWallet = Boolean(user === null || user === void 0 ? void 0 : user.verifiedCredentials.find((vc) => { var _a; return (_a = vc.walletName) === null || _a === void 0 ? void 0 : _a.startsWith('dynamicwaas'); }));
     const { setDynamicWidgetView } = DynamicWidgetContext.useWidgetContext();
     const { pushView } = ViewContext.useViewContext();
     const { getEOAWallet, isSmartWallet } = useSmartWallets.useSmartWallets();
     const [isAcknowledged, setIsAcknowledged] = React.useState(false);
     const [iframeContainerRef, setIframeContainerRef] = React.useState(null);
-    if (!primaryWallet) {
+    const walletFromId = walletId
+        ? userWallets.find((w) => w.id === walletId)
+        : undefined;
+    if (walletId && !walletFromId) {
+        throw new utils.DynamicError('Wallet not found. Please try again.', errors.INVALID_WALLET_DATA);
+    }
+    const targetWallet = walletFromId !== null && walletFromId !== void 0 ? walletFromId : primaryWallet;
+    if (!targetWallet) {
         throw new utils.DynamicError('No primary wallet found', errors.INVALID_WALLET_DATA);
     }
     let primaryTurnkeyWalletId;
     try {
-        primaryTurnkeyWalletId = getTurnkeyWalletId.getTurnkeyWalletId(primaryWallet.id, (user === null || user === void 0 ? void 0 : user.verifiedCredentials) || []);
+        primaryTurnkeyWalletId = getTurnkeyWalletId.getTurnkeyWalletId(targetWallet.id, (user === null || user === void 0 ? void 0 : user.verifiedCredentials) || []);
     }
     catch (error) {
         // waas wallet
     }
     const turnkeyCredential = (_a = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find(({ walletName, id }) => (walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey')) && id === primaryTurnkeyWalletId);
     const walletProperties = turnkeyCredential === null || turnkeyCredential === void 0 ? void 0 : turnkeyCredential.walletProperties;
-    const walletCredential = (_b = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _b === void 0 ? void 0 : _b.find((cred) => cred.address === primaryWallet.address);
+    const walletCredential = (_b = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _b === void 0 ? void 0 : _b.find((cred) => cred.address === targetWallet.address);
     const isTurnkeyHDWallet = walletProperties === null || walletProperties === void 0 ? void 0 : walletProperties.turnkeyHDWalletId;
-    const wallet = (_c = (primaryWallet && getEOAWallet(primaryWallet))) !== null && _c !== void 0 ? _c : primaryWallet;
+    const wallet = (_c = (targetWallet && getEOAWallet(targetWallet))) !== null && _c !== void 0 ? _c : targetWallet;
+    const isTurnkeyWallet = Boolean((_e = (_d = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _d === void 0 ? void 0 : _d.key) === null || _e === void 0 ? void 0 : _e.startsWith('turnkey'));
     // eslint-disable-next-line arrow-body-style
     React.useEffect(() => {
         return () => {
@@ -252,8 +259,8 @@ const EmbeddedRevealView = ({ exportPrivateKey, isPromptForExport = false, }) =>
         }
         return baseClass;
     };
-    const isEip7702SmartWallet = Boolean(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id.endsWith('-zerodev'));
-    const isErc4337SmartWallet = Boolean(primaryWallet && isSmartWallet(primaryWallet)) &&
+    const isEip7702SmartWallet = Boolean(targetWallet === null || targetWallet === void 0 ? void 0 : targetWallet.id.endsWith('-zerodev'));
+    const isErc4337SmartWallet = Boolean(targetWallet && isSmartWallet(targetWallet)) &&
         !isEip7702SmartWallet;
     const shouldShowAaWarning = isErc4337SmartWallet && !isLoading && Boolean(data) && !error;
     const aaWarning = shouldShowAaWarning && (jsxRuntime.jsxs("div", { className: 'embedded-reveal-view__zerodev-warning', children: [jsxRuntime.jsxs("div", { className: 'embedded-reveal-view__zerodev-warning__title-row', children: [jsxRuntime.jsx(info.ReactComponent, { className: 'embedded-reveal-view__zerodev-warning__icon' }), jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', weight: 'bold', copykey: 'dyn_embedded_reveal.aa_warning.title', children: t('dyn_embedded_reveal.aa_warning.title') })] }), jsxRuntime.jsxs(Typography.Typography, { variant: 'body_normal', weight: 'regular', copykey: 'dyn_embedded_reveal.aa_warning.subtitle', children: [t('dyn_embedded_reveal.aa_warning.subtitle'), jsxRuntime.jsx("button", { onClick: () => {

package/src/lib/views/EmbeddedReveal/EmbeddedRevealView/EmbeddedRevealView.d.ts

@@ -2,5 +2,6 @@ import { FC } from 'react';
 export type EmbeddedRevealViewProps = {
     exportPrivateKey?: boolean;
     isPromptForExport?: boolean;
+    walletId?: string;
 };
 export declare const EmbeddedRevealView: FC<EmbeddedRevealViewProps>;

package/src/lib/views/EmbeddedReveal/EmbeddedRevealView/EmbeddedRevealView.js

@@ -51,7 +51,7 @@ import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../utils/functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
-import '../../../context/UserWalletsContext/UserWalletsContext.js';
+import { useInternalUserWallets } from '../../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../../store/state/authMode/authMode.js';
 import '../../../store/state/loadingAndLifecycle/loadingAndLifecycle.js';
 import '../../../context/VerificationContext/VerificationContext.js';
@@ -62,7 +62,6 @@ import '../../../context/ThemeContext/ThemeContext.js';
 import { useSmartWallets } from '../../../utils/hooks/useSmartWallets/useSmartWallets.js';
 import '../../../utils/hooks/useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import { useMutation } from '../../../utils/hooks/useMutation/useMutation.js';
-import { useIsTurnkeyWallet } from '../../../utils/hooks/useIsTurnkeyWallet/useIsTurnkeyWallet.js';
 import 'bs58';
 import '@dynamic-labs/types';
 import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
@@ -132,32 +131,40 @@ import { useSyncEmbeddedWalletFlow } from '../../../utils/hooks/useSyncEmbeddedW
 import '@dynamic-labs/store';
 import '../../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
 
-const EmbeddedRevealView = ({ exportPrivateKey, isPromptForExport = false, }) => {
-    var _a, _b, _c;
+const EmbeddedRevealView = ({ exportPrivateKey, isPromptForExport = false, walletId, }) => {
+    var _a, _b, _c, _d, _e;
     const { primaryWallet, user, setShowAuthFlow, environmentId } = useInternalDynamicContext();
+    const { userWallets } = useInternalUserWallets();
     const { handleAcknowledgeExportPrompt } = useSyncEmbeddedWalletFlow();
-    const { isTurnkeyWallet } = useIsTurnkeyWallet();
     const isWaasWallet = Boolean(user === null || user === void 0 ? void 0 : user.verifiedCredentials.find((vc) => { var _a; return (_a = vc.walletName) === null || _a === void 0 ? void 0 : _a.startsWith('dynamicwaas'); }));
     const { setDynamicWidgetView } = useWidgetContext();
     const { pushView } = useViewContext();
     const { getEOAWallet, isSmartWallet } = useSmartWallets();
     const [isAcknowledged, setIsAcknowledged] = useState(false);
     const [iframeContainerRef, setIframeContainerRef] = useState(null);
-    if (!primaryWallet) {
+    const walletFromId = walletId
+        ? userWallets.find((w) => w.id === walletId)
+        : undefined;
+    if (walletId && !walletFromId) {
+        throw new DynamicError('Wallet not found. Please try again.', INVALID_WALLET_DATA);
+    }
+    const targetWallet = walletFromId !== null && walletFromId !== void 0 ? walletFromId : primaryWallet;
+    if (!targetWallet) {
         throw new DynamicError('No primary wallet found', INVALID_WALLET_DATA);
     }
     let primaryTurnkeyWalletId;
     try {
-        primaryTurnkeyWalletId = getTurnkeyWalletId(primaryWallet.id, (user === null || user === void 0 ? void 0 : user.verifiedCredentials) || []);
+        primaryTurnkeyWalletId = getTurnkeyWalletId(targetWallet.id, (user === null || user === void 0 ? void 0 : user.verifiedCredentials) || []);
     }
     catch (error) {
         // waas wallet
     }
     const turnkeyCredential = (_a = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find(({ walletName, id }) => (walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey')) && id === primaryTurnkeyWalletId);
     const walletProperties = turnkeyCredential === null || turnkeyCredential === void 0 ? void 0 : turnkeyCredential.walletProperties;
-    const walletCredential = (_b = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _b === void 0 ? void 0 : _b.find((cred) => cred.address === primaryWallet.address);
+    const walletCredential = (_b = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _b === void 0 ? void 0 : _b.find((cred) => cred.address === targetWallet.address);
     const isTurnkeyHDWallet = walletProperties === null || walletProperties === void 0 ? void 0 : walletProperties.turnkeyHDWalletId;
-    const wallet = (_c = (primaryWallet && getEOAWallet(primaryWallet))) !== null && _c !== void 0 ? _c : primaryWallet;
+    const wallet = (_c = (targetWallet && getEOAWallet(targetWallet))) !== null && _c !== void 0 ? _c : targetWallet;
+    const isTurnkeyWallet = Boolean((_e = (_d = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _d === void 0 ? void 0 : _d.key) === null || _e === void 0 ? void 0 : _e.startsWith('turnkey'));
     // eslint-disable-next-line arrow-body-style
     useEffect(() => {
         return () => {
@@ -248,8 +255,8 @@ const EmbeddedRevealView = ({ exportPrivateKey, isPromptForExport = false, }) =>
         }
         return baseClass;
     };
-    const isEip7702SmartWallet = Boolean(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id.endsWith('-zerodev'));
-    const isErc4337SmartWallet = Boolean(primaryWallet && isSmartWallet(primaryWallet)) &&
+    const isEip7702SmartWallet = Boolean(targetWallet === null || targetWallet === void 0 ? void 0 : targetWallet.id.endsWith('-zerodev'));
+    const isErc4337SmartWallet = Boolean(targetWallet && isSmartWallet(targetWallet)) &&
         !isEip7702SmartWallet;
     const shouldShowAaWarning = isErc4337SmartWallet && !isLoading && Boolean(data) && !error;
     const aaWarning = shouldShowAaWarning && (jsxs("div", { className: 'embedded-reveal-view__zerodev-warning', children: [jsxs("div", { className: 'embedded-reveal-view__zerodev-warning__title-row', children: [jsx(SvgInfo, { className: 'embedded-reveal-view__zerodev-warning__icon' }), jsx(Typography, { variant: 'body_normal', weight: 'bold', copykey: 'dyn_embedded_reveal.aa_warning.title', children: t('dyn_embedded_reveal.aa_warning.title') })] }), jsxs(Typography, { variant: 'body_normal', weight: 'regular', copykey: 'dyn_embedded_reveal.aa_warning.subtitle', children: [t('dyn_embedded_reveal.aa_warning.subtitle'), jsx("button", { onClick: () => {

package/src/lib/views/LoginView/sections/SocialSignInSection/DynamicSocialSignIn/DynamicSocialSignIn.cjs

@@ -6,12 +6,12 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var sdkApiCore = require('@dynamic-labs/sdk-api-core');
+var utils = require('@dynamic-labs/utils');
 require('../../../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
 require('react-i18next');
 require('@dynamic-labs/iconic');
 var ViewContext = require('../../../../../context/ViewContext/ViewContext.cjs');
 require('../../../../../../../_virtual/_tslib.cjs');
-require('@dynamic-labs/utils');
 require('@dynamic-labs/wallet-connector-core');
 require('../../../../../shared/logger.cjs');
 require('@dynamic-labs/wallet-book');
@@ -131,7 +131,7 @@ const DynamicSocialSignIn = ({ defaultProvider, numOfItemsToDisplay, collapsedLa
                 option: sdkApiCore.ProviderEnum.Farcaster,
                 provider: sdkApiCore.ProviderEnum.Farcaster,
                 type: 'social',
-            }, 'user-cancelled');
+            }, utils.SdkErrorCode.USER_CANCELLED);
             // Navigate back to the initial login view.
             clearStackAndPushInitialView();
         },

package/src/lib/views/LoginView/sections/SocialSignInSection/DynamicSocialSignIn/DynamicSocialSignIn.js

@@ -2,12 +2,12 @@
 import { jsx } from 'react/jsx-runtime';
 import { useCallback } from 'react';
 import { ProviderEnum } from '@dynamic-labs/sdk-api-core';
+import { SdkErrorCode } from '@dynamic-labs/utils';
 import '../../../../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import 'react-i18next';
 import '@dynamic-labs/iconic';
 import { useViewContext } from '../../../../../context/ViewContext/ViewContext.js';
 import '../../../../../../../_virtual/_tslib.js';
-import '@dynamic-labs/utils';
 import '@dynamic-labs/wallet-connector-core';
 import '../../../../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
@@ -127,7 +127,7 @@ const DynamicSocialSignIn = ({ defaultProvider, numOfItemsToDisplay, collapsedLa
                 option: ProviderEnum.Farcaster,
                 provider: ProviderEnum.Farcaster,
                 type: 'social',
-            }, 'user-cancelled');
+            }, SdkErrorCode.USER_CANCELLED);
             // Navigate back to the initial login view.
             clearStackAndPushInitialView();
         },