@dynamic-labs/sdk-react-core 4.71.0 → 4.73.0

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

@@ -26,6 +26,7 @@ import '../../../client/client.js';
 import '@dynamic-labs-sdk/client';
 import '../../../config/ApiEndpoint.js';
 import { isCookieEnabled } from '../../../client/extension/functions/isCookieEnabled/isCookieEnabled.js';
+import { generateChainingSignature } from '../../../client/extension/functions/generateChainingSignature/generateChainingSignature.js';
 import '@dynamic-labs/locale';
 import { useApiBaseUrl } from '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';
@@ -107,13 +108,11 @@ import { useGetMfaToken } from '../useGetMfaToken/useGetMfaToken.js';
 import '../../../store/state/tokenBalances.js';
 import '../../../store/state/multichainBalances.js';
 import '../../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
-import { useClientSessionKeys } from '../useClientSessionKeys/useClientSessionKeys.js';
 
 const useSetWalletConnectorFetchers = (walletOptions, environmentId, projectSettings) => {
     var _a, _b, _c;
     const apiBaseUrl = useApiBaseUrl();
     const { registerEmbeddedWalletSessionKey, removeSessionKey } = useEmbeddedWalletSessionKeys({ environmentId, projectSettings });
-    const { getSignedSessionId } = useClientSessionKeys();
     const getMfaToken = useGetMfaToken();
     const isCookieAuthEnabled = projectSettings && isCookieEnabled();
     const svmGasSponsorshipEnabled = (_c = (_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.embeddedWallets) === null || _b === void 0 ? void 0 : _b.svmGasSponsorshipEnabled) !== null && _c !== void 0 ? _c : false;
@@ -133,7 +132,7 @@ const useSetWalletConnectorFetchers = (walletOptions, environmentId, projectSett
                 authMode: isCookieAuthEnabled ? 'cookie' : 'header',
                 environmentId,
                 getMfaToken,
-                getSignedSessionId,
+                getSignedSessionId: generateChainingSignature,
                 getSvmGasSponsorshipEnabled: () => svmGasSponsorshipEnabledRef.current,
                 relayUrl: (_e = (_d = (_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _c === void 0 ? void 0 : _c.waas) === null || _d === void 0 ? void 0 : _d.relayUrl) !== null && _e !== void 0 ? _e : '',
                 walletConnector: walletOption.walletConnector,

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

@@ -6,34 +6,34 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 var client = require('@dynamic-labs-sdk/client');
-require('@dynamic-labs/sdk-api-core');
-require('../../constants/values.cjs');
-require('@dynamic-labs/utils');
-require('@dynamic-labs/multi-wallet');
-require('../../../shared/logger.cjs');
-require('react-international-phone');
-require('../../constants/colors.cjs');
+require('../../../context/DynamicContext/DynamicContext.cjs');
+require('../../../store/state/loadingAndLifecycle/loadingAndLifecycle.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
+require('../../../shared/logger.cjs');
 require('@dynamic-labs/wallet-book');
+require('@dynamic-labs/utils');
+require('../../constants/colors.cjs');
+require('../../constants/values.cjs');
+require('@dynamic-labs/sdk-api-core');
 require('../../../shared/consts/index.cjs');
+require('../../../events/dynamicEvents.cjs');
+require('../../../context/CaptchaContext/CaptchaContext.cjs');
+require('../../../context/ErrorContext/ErrorContext.cjs');
+require('@dynamic-labs/multi-wallet');
+require('react-international-phone');
 require('../../../store/state/nonce/nonce.cjs');
 require('@dynamic-labs-sdk/client/core');
 require('../../../client/client.cjs');
 require('../../../config/ApiEndpoint.cjs');
-require('../../../events/dynamicEvents.cjs');
+var generateSessionKeys = require('../../../client/extension/functions/generateSessionKeys/generateSessionKeys.cjs');
 require('@dynamic-labs/locale');
 require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
 require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
-var getClientSessionKeys = require('../../functions/clientSessionKeys/getClientSessionKeys.cjs');
 require('../../functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.cjs');
-require('../../../context/DynamicContext/DynamicContext.cjs');
-require('../../../store/state/loadingAndLifecycle/loadingAndLifecycle.cjs');
-require('../../../context/CaptchaContext/CaptchaContext.cjs');
-require('../../../context/ErrorContext/ErrorContext.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
@@ -132,7 +132,7 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useDyna
 const useSignInWithPasskey = ({ relatedOriginRpId, } = {}) => {
     const { setCallback } = useInternalDynamicContext.useInternalDynamicContext();
     return React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        yield getClientSessionKeys.generateClientSessionKeys();
+        yield generateSessionKeys.generateSessionKeys();
         const response = yield client.signInWithPasskey({ relatedOriginRpId });
         setCallback('authSuccess');
         return response;

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

@@ -2,34 +2,34 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useCallback } from 'react';
 import { signInWithPasskey } from '@dynamic-labs-sdk/client';
-import '@dynamic-labs/sdk-api-core';
-import '../../constants/values.js';
-import '@dynamic-labs/utils';
-import '@dynamic-labs/multi-wallet';
-import '../../../shared/logger.js';
-import 'react-international-phone';
-import '../../constants/colors.js';
+import '../../../context/DynamicContext/DynamicContext.js';
+import '../../../store/state/loadingAndLifecycle/loadingAndLifecycle.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
+import '../../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
+import '@dynamic-labs/utils';
+import '../../constants/colors.js';
+import '../../constants/values.js';
+import '@dynamic-labs/sdk-api-core';
 import '../../../shared/consts/index.js';
+import '../../../events/dynamicEvents.js';
+import '../../../context/CaptchaContext/CaptchaContext.js';
+import '../../../context/ErrorContext/ErrorContext.js';
+import '@dynamic-labs/multi-wallet';
+import 'react-international-phone';
 import '../../../store/state/nonce/nonce.js';
 import '@dynamic-labs-sdk/client/core';
 import '../../../client/client.js';
 import '../../../config/ApiEndpoint.js';
-import '../../../events/dynamicEvents.js';
+import { generateSessionKeys } from '../../../client/extension/functions/generateSessionKeys/generateSessionKeys.js';
 import '@dynamic-labs/locale';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';
 import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
-import { generateClientSessionKeys } from '../../functions/clientSessionKeys/getClientSessionKeys.js';
 import '../../functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.js';
-import '../../../context/DynamicContext/DynamicContext.js';
-import '../../../store/state/loadingAndLifecycle/loadingAndLifecycle.js';
-import '../../../context/CaptchaContext/CaptchaContext.js';
-import '../../../context/ErrorContext/ErrorContext.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../context/UserWalletsContext/UserWalletsContext.js';
@@ -128,7 +128,7 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useDy
 const useSignInWithPasskey = ({ relatedOriginRpId, } = {}) => {
     const { setCallback } = useInternalDynamicContext();
     return useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
-        yield generateClientSessionKeys();
+        yield generateSessionKeys();
         const response = yield signInWithPasskey({ relatedOriginRpId });
         setCallback('authSuccess');
         return response;

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

@@ -35,12 +35,12 @@ var randomString = require('../../functions/randomString/randomString.cjs');
 require('@dynamic-labs-sdk/client/core');
 require('@dynamic-labs-sdk/client');
 require('../../../config/ApiEndpoint.cjs');
+var generateSessionKeys = require('../../../client/extension/functions/generateSessionKeys/generateSessionKeys.cjs');
 var oauth = require('../../../data/api/oauth/oauth.cjs');
 require('@dynamic-labs/locale');
 require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
 require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
-var getClientSessionKeys = require('../../functions/clientSessionKeys/getClientSessionKeys.cjs');
 require('../../functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
@@ -232,7 +232,7 @@ const useSocialAuth = ({ onSettled, onError, onFarcasterUrl, }) => {
                 }));
             }
             if (authMode === 'signin') {
-                yield getClientSessionKeys.generateClientSessionKeys();
+                yield generateSessionKeys.generateSessionKeys();
                 if (provider === sdkApiCore.ProviderEnum.Telegram && telegramAuthToken) {
                     const apiCall = () => oauth.telegramSignIn(environmentId, {
                         captchaToken,
@@ -357,7 +357,7 @@ const useSocialAuth = ({ onSettled, onError, onFarcasterUrl, }) => {
                 const keypair = yield generateSessionKey();
                 sessionPublicKey = keypair.publicKey;
             }
-            yield getClientSessionKeys.generateClientSessionKeys();
+            yield generateSessionKeys.generateSessionKeys();
             const apiCall = () => oauth.farcasterSignIn(environmentId, {
                 address,
                 captchaToken,

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

@@ -31,12 +31,12 @@ import { randomString } from '../../functions/randomString/randomString.js';
 import '@dynamic-labs-sdk/client/core';
 import '@dynamic-labs-sdk/client';
 import '../../../config/ApiEndpoint.js';
+import { generateSessionKeys } from '../../../client/extension/functions/generateSessionKeys/generateSessionKeys.js';
 import { telegramSignIn, signInOAuth, verifyOAuth, telegramVerify, getOAuthResult, initAuth, farcasterSignIn, farcasterVerify } from '../../../data/api/oauth/oauth.js';
 import '@dynamic-labs/locale';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';
 import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
-import { generateClientSessionKeys } from '../../functions/clientSessionKeys/getClientSessionKeys.js';
 import '../../functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
@@ -228,7 +228,7 @@ const useSocialAuth = ({ onSettled, onError, onFarcasterUrl, }) => {
                 }));
             }
             if (authMode === 'signin') {
-                yield generateClientSessionKeys();
+                yield generateSessionKeys();
                 if (provider === ProviderEnum.Telegram && telegramAuthToken) {
                     const apiCall = () => telegramSignIn(environmentId, {
                         captchaToken,
@@ -353,7 +353,7 @@ const useSocialAuth = ({ onSettled, onError, onFarcasterUrl, }) => {
                 const keypair = yield generateSessionKey();
                 sessionPublicKey = keypair.publicKey;
             }
-            yield generateClientSessionKeys();
+            yield generateSessionKeys();
             const apiCall = () => farcasterSignIn(environmentId, {
                 address,
                 captchaToken,

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

@@ -3,34 +3,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
-var sdkApiCore = require('@dynamic-labs/sdk-api-core');
-require('@dynamic-labs-sdk/client/core');
-require('../../../client/client.cjs');
-require('@dynamic-labs-sdk/client');
-require('../../../config/ApiEndpoint.cjs');
-require('@dynamic-labs/iconic');
-require('@dynamic-labs/wallet-connector-core');
-require('react/jsx-runtime');
-require('../../../context/ViewContext/ViewContext.cjs');
-require('../../../shared/logger.cjs');
-require('@dynamic-labs/wallet-book');
-require('@dynamic-labs/utils');
-require('../../constants/colors.cjs');
-require('../../constants/values.cjs');
-require('../../../shared/consts/index.cjs');
-require('../../../../../_virtual/_tslib.cjs');
-require('@dynamic-labs/multi-wallet');
-require('react-international-phone');
-require('../../../store/state/nonce/nonce.cjs');
-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('../../../events/dynamicEvents.cjs');
-var getProjectSettings = require('../../../client/extension/projectSettings/getProjectSettings/getProjectSettings.cjs');
-var hasElevatedAccessToken = require('../../../client/extension/functions/hasElevatedAccessToken/hasElevatedAccessToken.cjs');
+var client = require('@dynamic-labs-sdk/client');
 var useStepUpState = require('./useStepUpState.cjs');
 var useStepUpOtp = require('./useStepUpOtp.cjs');
 var useStepUpSocial = require('./useStepUpSocial.cjs');
@@ -40,8 +15,6 @@ var useStepUpPromptMfa = require('./useStepUpPromptMfa.cjs');
 var useStepUpPromptReauth = require('./useStepUpPromptReauth.cjs');
 var usePromptStepUpAuth = require('./usePromptStepUpAuth.cjs');
 
-// MinSdkVersionEnum values are formatted as "v<number>" (e.g. "v4", "v5")
-const parseSdkVersionNum = (version) => parseInt(version.replace(/\D/g, ''), 10);
 /**
  * Perform step-up authentication for an already-authenticated user.
  *
@@ -94,20 +67,23 @@ const useStepUpAuthentication = ({ credentialId, } = {}) => {
     const { promptMfa } = useStepUpPromptMfa.useStepUpPromptMfa();
     const { promptReauthenticate } = useStepUpPromptReauth.useStepUpPromptReauth();
     const { promptStepUpAuth } = usePromptStepUpAuth.usePromptStepUpAuth();
-    const isStepUpRequired = React.useCallback(({ scope }) => {
-        var _a, _b;
-        const { minSdkVersion } = (_b = (_a = getProjectSettings.getProjectSettings()) === null || _a === void 0 ? void 0 : _a.sdk) !== null && _b !== void 0 ? _b : {};
-        if (!minSdkVersion ||
-            parseSdkVersionNum(minSdkVersion) <
-                parseSdkVersionNum(sdkApiCore.MinSdkVersionEnum.V5))
-            return false;
-        return !hasElevatedAccessToken.hasElevatedAccessToken(scope);
-    }, []);
+    const isStepUpRequired = React.useCallback((_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ scope }) {
+        try {
+            const { isRequired } = yield client.checkStepUpAuth({ scope });
+            return isRequired;
+        }
+        catch (_b) {
+            // Default to required on failure — matches checkStepUpAuth's
+            // own fail-safe, but guards against unexpected rejections
+            return true;
+        }
+    }), []);
     const resetState = React.useCallback(() => {
         resetOtpRef();
         stateActions.resetState();
     }, [resetOtpRef, stateActions.resetState]);
     return {
+        checkStepUpAuth: client.checkStepUpAuth,
         isStepUpRequired,
         promptMfa,
         promptReauthenticate,

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

@@ -1,32 +1,7 @@
 'use client'
+import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useCallback } from 'react';
-import { MinSdkVersionEnum } from '@dynamic-labs/sdk-api-core';
-import '@dynamic-labs-sdk/client/core';
-import '../../../client/client.js';
-import '@dynamic-labs-sdk/client';
-import '../../../config/ApiEndpoint.js';
-import '@dynamic-labs/iconic';
-import '@dynamic-labs/wallet-connector-core';
-import 'react/jsx-runtime';
-import '../../../context/ViewContext/ViewContext.js';
-import '../../../shared/logger.js';
-import '@dynamic-labs/wallet-book';
-import '@dynamic-labs/utils';
-import '../../constants/colors.js';
-import '../../constants/values.js';
-import '../../../shared/consts/index.js';
-import '../../../../../_virtual/_tslib.js';
-import '@dynamic-labs/multi-wallet';
-import 'react-international-phone';
-import '../../../store/state/nonce/nonce.js';
-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 '../../../events/dynamicEvents.js';
-import { getProjectSettings } from '../../../client/extension/projectSettings/getProjectSettings/getProjectSettings.js';
-import { hasElevatedAccessToken } from '../../../client/extension/functions/hasElevatedAccessToken/hasElevatedAccessToken.js';
+import { checkStepUpAuth } from '@dynamic-labs-sdk/client';
 import { useStepUpState } from './useStepUpState.js';
 import { useStepUpOtp } from './useStepUpOtp.js';
 import { useStepUpSocial } from './useStepUpSocial.js';
@@ -36,8 +11,6 @@ import { useStepUpPromptMfa } from './useStepUpPromptMfa.js';
 import { useStepUpPromptReauth } from './useStepUpPromptReauth.js';
 import { usePromptStepUpAuth } from './usePromptStepUpAuth.js';
 
-// MinSdkVersionEnum values are formatted as "v<number>" (e.g. "v4", "v5")
-const parseSdkVersionNum = (version) => parseInt(version.replace(/\D/g, ''), 10);
 /**
  * Perform step-up authentication for an already-authenticated user.
  *
@@ -90,20 +63,23 @@ const useStepUpAuthentication = ({ credentialId, } = {}) => {
     const { promptMfa } = useStepUpPromptMfa();
     const { promptReauthenticate } = useStepUpPromptReauth();
     const { promptStepUpAuth } = usePromptStepUpAuth();
-    const isStepUpRequired = useCallback(({ scope }) => {
-        var _a, _b;
-        const { minSdkVersion } = (_b = (_a = getProjectSettings()) === null || _a === void 0 ? void 0 : _a.sdk) !== null && _b !== void 0 ? _b : {};
-        if (!minSdkVersion ||
-            parseSdkVersionNum(minSdkVersion) <
-                parseSdkVersionNum(MinSdkVersionEnum.V5))
-            return false;
-        return !hasElevatedAccessToken(scope);
-    }, []);
+    const isStepUpRequired = useCallback((_a) => __awaiter(void 0, [_a], void 0, function* ({ scope }) {
+        try {
+            const { isRequired } = yield checkStepUpAuth({ scope });
+            return isRequired;
+        }
+        catch (_b) {
+            // Default to required on failure — matches checkStepUpAuth's
+            // own fail-safe, but guards against unexpected rejections
+            return true;
+        }
+    }), []);
     const resetState = useCallback(() => {
         resetOtpRef();
         stateActions.resetState();
     }, [resetOtpRef, stateActions.resetState]);
     return {
+        checkStepUpAuth,
         isStepUpRequired,
         promptMfa,
         promptReauthenticate,

package/src/lib/utils/hooks/useStepUpAuthentication/useStepUpAuthentication.types.d.ts

@@ -1,16 +1,20 @@
-import type { OTPVerification } from '@dynamic-labs-sdk/client';
+import type { checkStepUpAuth, OTPVerification } from '@dynamic-labs-sdk/client';
 import type { ProviderEnum, TokenScope, VerifyResponse } from '@dynamic-labs/sdk-api-core';
 export type StepUpAuthenticationState = {
     error: string | null;
     isLoading: boolean;
     otpVerification: OTPVerification | null;
 };
+export type SendOtpParams = {
+    credentialId?: string;
+};
 export type VerifyOtpParams = {
     requestedScopes?: TokenScope[];
     verificationToken: string;
 };
 export type VerifyWalletParams = {
     requestedScopes?: TokenScope[];
+    walletId?: string;
 };
 export type VerifyPasskeyMfaParams = {
     requestedScopes?: TokenScope[];
@@ -47,12 +51,13 @@ export type PromptStepUpAuthParams = {
     requestedScopes?: TokenScope[];
 };
 export type UseStepUpAuthenticationReturn = {
-    isStepUpRequired: (params: IsStepUpRequiredParams) => boolean;
+    checkStepUpAuth: typeof checkStepUpAuth;
+    isStepUpRequired: (params: IsStepUpRequiredParams) => Promise<boolean>;
     promptMfa: (props?: PromptMfaParams) => Promise<string | undefined>;
     promptReauthenticate: (props?: PromptReauthParams) => Promise<string | undefined>;
     promptStepUpAuth: (props?: PromptStepUpAuthParams) => Promise<string | undefined>;
     resetState: () => void;
-    sendOtp: () => Promise<OTPVerification | null>;
+    sendOtp: (params?: SendOtpParams) => Promise<OTPVerification | null>;
     state: StepUpAuthenticationState;
     verifyOtp: (params: VerifyOtpParams) => Promise<VerifyResponse | null>;
     verifyPasskeyMfa: (params: VerifyPasskeyMfaParams) => Promise<VerifyResponse | null>;

package/src/lib/utils/hooks/useStepUpAuthentication/useStepUpOtp.cjs

@@ -68,13 +68,15 @@ const useStepUpOtp = ({ credentialId, stateActions, }) => {
     const user = useUser.useUser();
     const { setError, setLoading, setSuccess } = stateActions;
     const otpVerificationRef = React.useRef(null);
-    const sendOtp = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    const sendOtp = React.useCallback((params) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        var _a;
         const credentials = user === null || user === void 0 ? void 0 : user.verifiedCredentials;
         if (!(credentials === null || credentials === void 0 ? void 0 : credentials.length)) {
             setError('No verified credentials found for the authenticated user');
             return null;
         }
-        const result = resolveTargetCredential(credentials, credentialId);
+        const effectiveCredentialId = (_a = params === null || params === void 0 ? void 0 : params.credentialId) !== null && _a !== void 0 ? _a : credentialId;
+        const result = resolveTargetCredential(credentials, effectiveCredentialId);
         if (typeof result === 'string') {
             setError(result);
             return null;
@@ -95,14 +97,8 @@ const useStepUpOtp = ({ credentialId, stateActions, }) => {
             setError(errorMessage);
             return null;
         }
-    }), [
-        credentialId,
-        setError,
-        setLoading,
-        setSuccess,
-        user === null || user === void 0 ? void 0 : user.verifiedCredentials,
-    ]);
-    const verifyOtp = React.useCallback((_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ requestedScopes, verificationToken, }) {
+    }), [credentialId, setError, setLoading, setSuccess, user === null || user === void 0 ? void 0 : user.verifiedCredentials]);
+    const verifyOtp = React.useCallback((_b) => _tslib.__awaiter(void 0, [_b], void 0, function* ({ requestedScopes, verificationToken, }) {
         const otpVerification = otpVerificationRef.current;
         if (!otpVerification) {
             setError('OTP verification has not been initiated. Call sendOtp() first');

package/src/lib/utils/hooks/useStepUpAuthentication/useStepUpOtp.d.ts

@@ -1,6 +1,6 @@
 import type { OTPVerification } from '@dynamic-labs-sdk/client';
 import { VerifyResponse } from '@dynamic-labs/sdk-api-core';
-import type { VerifyOtpParams } from './useStepUpAuthentication.types';
+import type { SendOtpParams, VerifyOtpParams } from './useStepUpAuthentication.types';
 import type { useStepUpState } from './useStepUpState';
 type StepUpStateActions = ReturnType<typeof useStepUpState>;
 type UseStepUpOtpParams = {
@@ -9,7 +9,7 @@ type UseStepUpOtpParams = {
 };
 export declare const useStepUpOtp: ({ credentialId, stateActions, }: UseStepUpOtpParams) => {
     resetOtpRef: () => void;
-    sendOtp: () => Promise<OTPVerification | null>;
+    sendOtp: (params?: SendOtpParams) => Promise<OTPVerification | null>;
     verifyOtp: ({ requestedScopes, verificationToken, }: VerifyOtpParams) => Promise<VerifyResponse | null>;
 };
 export {};

package/src/lib/utils/hooks/useStepUpAuthentication/useStepUpOtp.js

@@ -64,13 +64,15 @@ const useStepUpOtp = ({ credentialId, stateActions, }) => {
     const user = useUser();
     const { setError, setLoading, setSuccess } = stateActions;
     const otpVerificationRef = useRef(null);
-    const sendOtp = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
+    const sendOtp = useCallback((params) => __awaiter(void 0, void 0, void 0, function* () {
+        var _a;
         const credentials = user === null || user === void 0 ? void 0 : user.verifiedCredentials;
         if (!(credentials === null || credentials === void 0 ? void 0 : credentials.length)) {
             setError('No verified credentials found for the authenticated user');
             return null;
         }
-        const result = resolveTargetCredential(credentials, credentialId);
+        const effectiveCredentialId = (_a = params === null || params === void 0 ? void 0 : params.credentialId) !== null && _a !== void 0 ? _a : credentialId;
+        const result = resolveTargetCredential(credentials, effectiveCredentialId);
         if (typeof result === 'string') {
             setError(result);
             return null;
@@ -91,14 +93,8 @@ const useStepUpOtp = ({ credentialId, stateActions, }) => {
             setError(errorMessage);
             return null;
         }
-    }), [
-        credentialId,
-        setError,
-        setLoading,
-        setSuccess,
-        user === null || user === void 0 ? void 0 : user.verifiedCredentials,
-    ]);
-    const verifyOtp = useCallback((_a) => __awaiter(void 0, [_a], void 0, function* ({ requestedScopes, verificationToken, }) {
+    }), [credentialId, setError, setLoading, setSuccess, user === null || user === void 0 ? void 0 : user.verifiedCredentials]);
+    const verifyOtp = useCallback((_b) => __awaiter(void 0, [_b], void 0, function* ({ requestedScopes, verificationToken, }) {
         const otpVerification = otpVerificationRef.current;
         if (!otpVerification) {
             setError('OTP verification has not been initiated. Call sendOtp() first');

package/src/lib/utils/hooks/useStepUpAuthentication/useStepUpPromptMfa.cjs

@@ -182,7 +182,10 @@ const useStepUpPromptMfa = () => {
                     mfaCompletionSuccessOff();
                     dynamicEvents.dynamicEvents.off('authFlowClose', onAuthFlowCloseHandler);
                 });
-                return deferred.promise;
+                return deferred.promise.then((result) => {
+                    setShowAuthFlow(false);
+                    return result;
+                });
             }
             default:
                 throw new Error('Error determining MFA method to use');

package/src/lib/utils/hooks/useStepUpAuthentication/useStepUpPromptMfa.js

@@ -178,7 +178,10 @@ const useStepUpPromptMfa = () => {
                     mfaCompletionSuccessOff();
                     dynamicEvents.off('authFlowClose', onAuthFlowCloseHandler);
                 });
-                return deferred.promise;
+                return deferred.promise.then((result) => {
+                    setShowAuthFlow(false);
+                    return result;
+                });
             }
             default:
                 throw new Error('Error determining MFA method to use');

package/src/lib/utils/hooks/useStepUpAuthentication/useStepUpPromptReauth.cjs

@@ -193,8 +193,25 @@ const useStepUpPromptReauth = () => {
             return Promise.reject(new Error('No reauthentication methods available. Add email, SMS, wallet, or a social account to your account.'));
         }
         const deferred = new utils.DeferredPromise();
-        const onSuccess = () => deferred.resolve(undefined);
-        const onError = (error) => deferred.reject(error);
+        let authFlowCleanedUp = false;
+        const cleanupAuthFlowListener = () => {
+            if (authFlowCleanedUp)
+                return;
+            authFlowCleanedUp = true;
+            dynamicEvents.dynamicEvents.off('authFlowClose', onAuthFlowClose);
+        };
+        const onAuthFlowClose = () => {
+            cleanupAuthFlowListener();
+            deferred.reject(new Error('Reauthentication flow closed'));
+        };
+        const onSuccess = () => {
+            cleanupAuthFlowListener();
+            deferred.resolve(undefined);
+        };
+        const onError = (error) => {
+            cleanupAuthFlowListener();
+            deferred.reject(error);
+        };
         setShowAuthFlow(true);
         if (options.length === 1) {
             const [onlyOption] = options;
@@ -239,12 +256,11 @@ const useStepUpPromptReauth = () => {
                 requestedScopes: props === null || props === void 0 ? void 0 : props.requestedScopes,
             });
         }
-        const onAuthFlowClose = () => deferred.reject(new Error('Reauthentication flow closed'));
         dynamicEvents.dynamicEvents.on('authFlowClose', onAuthFlowClose);
-        deferred.promise.finally(() => {
-            dynamicEvents.dynamicEvents.off('authFlowClose', onAuthFlowClose);
+        return deferred.promise.then((result) => {
+            setShowAuthFlow(false);
+            return result;
         });
-        return deferred.promise;
     }), [options, pushView, setShowAuthFlow]);
     return { promptReauthenticate };
 };

package/src/lib/utils/hooks/useStepUpAuthentication/useStepUpPromptReauth.js

@@ -189,8 +189,25 @@ const useStepUpPromptReauth = () => {
             return Promise.reject(new Error('No reauthentication methods available. Add email, SMS, wallet, or a social account to your account.'));
         }
         const deferred = new DeferredPromise();
-        const onSuccess = () => deferred.resolve(undefined);
-        const onError = (error) => deferred.reject(error);
+        let authFlowCleanedUp = false;
+        const cleanupAuthFlowListener = () => {
+            if (authFlowCleanedUp)
+                return;
+            authFlowCleanedUp = true;
+            dynamicEvents.off('authFlowClose', onAuthFlowClose);
+        };
+        const onAuthFlowClose = () => {
+            cleanupAuthFlowListener();
+            deferred.reject(new Error('Reauthentication flow closed'));
+        };
+        const onSuccess = () => {
+            cleanupAuthFlowListener();
+            deferred.resolve(undefined);
+        };
+        const onError = (error) => {
+            cleanupAuthFlowListener();
+            deferred.reject(error);
+        };
         setShowAuthFlow(true);
         if (options.length === 1) {
             const [onlyOption] = options;
@@ -235,12 +252,11 @@ const useStepUpPromptReauth = () => {
                 requestedScopes: props === null || props === void 0 ? void 0 : props.requestedScopes,
             });
         }
-        const onAuthFlowClose = () => deferred.reject(new Error('Reauthentication flow closed'));
         dynamicEvents.on('authFlowClose', onAuthFlowClose);
-        deferred.promise.finally(() => {
-            dynamicEvents.off('authFlowClose', onAuthFlowClose);
+        return deferred.promise.then((result) => {
+            setShowAuthFlow(false);
+            return result;
         });
-        return deferred.promise;
     }), [options, pushView, setShowAuthFlow]);
     return { promptReauthenticate };
 };

package/src/lib/utils/hooks/useStepUpAuthentication/useStepUpWallet.cjs

@@ -115,11 +115,17 @@ const useStepUpWallet = ({ credentialId, stateActions, }) => {
     const connectAndSign = useConnectAndSign.useConnectAndSign();
     const { userWallets } = UserWalletsContext.useInternalUserWallets();
     const { setError, setLoading, setSuccess } = stateActions;
-    const verifyWallet = React.useCallback((_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ requestedScopes }) {
+    const verifyWallet = React.useCallback((_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ requestedScopes, walletId, }) {
         setLoading();
-        const wallet = userWallets.find((w) => w.id === credentialId);
+        const effectiveId = walletId !== null && walletId !== void 0 ? walletId : credentialId;
+        const wallet = effectiveId
+            ? userWallets.find((w) => w.id === effectiveId)
+            : userWallets[0];
         if (!wallet) {
-            setError(`Wallet with id "${credentialId}" not found`);
+            const message = effectiveId
+                ? `Wallet with id "${effectiveId}" not found`
+                : 'No connected wallets found for step-up authentication';
+            setError(message);
             return;
         }
         const connector = wallet.connector;