@dynamic-labs/sdk-react-core 4.67.0 → 4.67.2

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

@@ -1,18 +1,18 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useState, useRef, useCallback } from 'react';
-import { verifyOTP, authenticatePasskeyMFA, authenticateTotpMfaDevice, sendEmailOTP, supportedCountries, sendSmsOTP } from '@dynamic-labs-sdk/client';
-import { JwtVerifiedCredentialFormatEnum } from '@dynamic-labs/sdk-api-core';
+import { verifyOTP, authenticatePasskeyMFA, authenticateTotpMfaDevice, authenticateMfaRecoveryCode, onEvent, sendEmailOTP, supportedCountries, sendSmsOTP } from '@dynamic-labs-sdk/client';
+import { MFADeviceType, JwtVerifiedCredentialFormatEnum } from '@dynamic-labs/sdk-api-core';
+import { DeferredPromise } from '@dynamic-labs/utils';
 import '@dynamic-labs-sdk/client/core';
-import '../../../client/client.js';
+import { useDynamicClient } from '../../../client/client.js';
 import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
-import '../../../context/ViewContext/ViewContext.js';
+import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
 import { logger } from '../../../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';
@@ -24,11 +24,88 @@ import { useEnvironmentId } from '../../../store/state/dynamicContextProps/dynam
 import '../../../store/state/primaryWalletId/primaryWalletId.js';
 import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.js';
-import '../../../events/dynamicEvents.js';
+import { dynamicEvents } from '../../../events/dynamicEvents.js';
 import { useUser } from '../../../client/extension/user/useUser/useUser.js';
 import { hasElevatedAccessToken } from '../../../client/extension/functions/hasElevatedAccessToken/hasElevatedAccessToken.js';
+import '../../../context/DynamicContext/DynamicContext.js';
+import '../../../store/state/loadingAndLifecycle/loadingAndLifecycle.js';
 import { useConnectAndSign } from '../authenticationHooks/useConnectAndSign/useConnectAndSign.js';
+import '../../../context/ErrorContext/ErrorContext.js';
+import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
+import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import { useInternalUserWallets } from '../../../context/UserWalletsContext/UserWalletsContext.js';
+import '../../../store/state/authMode/authMode.js';
+import '../../../context/CaptchaContext/CaptchaContext.js';
+import '../../../context/VerificationContext/VerificationContext.js';
+import 'react-dom';
+import '../../functions/compareChains/compareChains.js';
+import '../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
+import '../../../context/ThemeContext/ThemeContext.js';
+import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
+import 'bs58';
+import '@dynamic-labs/types';
+import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
+import '../../../context/LoadingContext/LoadingContext.js';
+import '../../../context/WalletContext/WalletContext.js';
+import '../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
+import 'yup';
+import '../../../context/MockContext/MockContext.js';
+import '../../../views/CollectUserDataView/useFields.js';
+import '../../../context/FieldsStateContext/FieldsStateContext.js';
+import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
+import '@dynamic-labs/rpc-providers';
+import '../../../store/state/walletOptions/walletOptions.js';
+import 'react-i18next';
+import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';
+import '../../../components/Alert/Alert.js';
+import '../../../components/ShadowDOM/ShadowDOM.js';
+import '../../../components/IconButton/IconButton.js';
+import '../../../components/InlineWidget/InlineWidget.js';
+import '../../../components/Input/Input.js';
+import '../../../components/IsBrowser/IsBrowser.js';
+import '../../../components/MenuList/Dropdown/Dropdown.js';
+import '../../../components/OverlayCard/OverlayCard.js';
+import '../../../components/Transition/ZoomTransition/ZoomTransition.js';
+import '../../../components/Transition/SlideInUpTransition/SlideInUpTransition.js';
+import '../../../components/Transition/OpacityTransition/OpacityTransition.js';
+import '../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
+import '../../../components/Popper/Popper/Popper.js';
+import '../../../components/Popper/PopperContext/PopperContext.js';
+import 'react-focus-lock';
+import 'qrcode';
+import 'formik';
+import '../useSubdomainCheck/useSubdomainCheck.js';
+import '../../../context/WalletGroupContext/WalletGroupContext.js';
+import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
+import '../useWalletBackup/useWalletBackup.js';
+import '../useWalletBackup/types.js';
+import '../useWalletBackup/cloudProviders.js';
+import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
+import '../../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
+import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
+import '@hcaptcha/react-hcaptcha';
+import '../../../widgets/DynamicWidget/helpers/convertExchangeKeyAndProviderEnum.js';
+import '../../../views/ExchangeWhitelistWarning/ExchangeWhitelistWarning.js';
+import '../../../context/ErrorContext/hooks/useErrorText/useErrorText.js';
+import '../../../context/FooterAnimationContext/index.js';
+import '../../../views/MfaChooseDeviceView/useGetMfaOptions/useGetMfaOptions.js';
+import '../../../context/PasskeyContext/PasskeyContext.js';
+import '../../../context/OnrampContext/OnrampContext.js';
+import '../../../store/state/sendBalances.js';
+import '../../../store/state/connectorsInitializing/connectorsInitializing.js';
+import '../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.js';
+import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
+import '../../../views/TransactionConfirmationView/TransactionConfirmationView.js';
+import '../../../widgets/DynamicWidget/components/PasskeyCard/PasskeyCard.js';
+import '../../../widgets/DynamicWidget/views/CryptoComOnramp/CryptoComOnramp.js';
+import '../../../../index.js';
+import '../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.js';
+import '../../../store/state/tokenBalances.js';
+import '../../../store/state/multichainBalances.js';
+import { useGetUserMfaMethods } from '../useGetUserMfaMethods/useGetUserMfaMethods.js';
+import { useAuthenticatePasskeyMFA } from '../useAuthenticatePasskeyMFA/useAuthenticatePasskeyMFA.js';
+import '../../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
+import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.js';
 
 const INITIAL_STATE = {
     error: null,
@@ -106,6 +183,11 @@ const useStepUpAuthentication = ({ credentialId, } = {}) => {
     const [state, setState] = useState(INITIAL_STATE);
     const connectAndSign = useConnectAndSign();
     const { userWallets } = useInternalUserWallets();
+    const { setShowAuthFlow } = useInternalDynamicContext();
+    const { pushView } = useViewContext();
+    const getUserMfaMethods = useGetUserMfaMethods();
+    const authenticatePasskeyMFA$1 = useAuthenticatePasskeyMFA();
+    const dynamicClient = useDynamicClient();
     // Ref keeps the latest otpVerification available inside the verifyOtp
     // callback without creating a stale closure over state.
     const otpVerificationRef = useRef(null);
@@ -209,18 +291,10 @@ const useStepUpAuthentication = ({ credentialId, } = {}) => {
                 userId: user === null || user === void 0 ? void 0 : user.id,
             });
         }
-    }), [
-        connectAndSign,
-        credentialId,
-        environmentId,
-        setError,
-        user === null || user === void 0 ? void 0 : user.id,
-        userWallets,
-    ]);
+    }), [connectAndSign, credentialId, environmentId, setError, user, userWallets]);
     const verifyPasskeyMfa = useCallback((_c) => __awaiter(void 0, [_c], void 0, function* ({ requestedScopes, }) {
         setState((prev) => (Object.assign(Object.assign({}, prev), { error: null, isLoading: true })));
         try {
-            // requestedScopes is available in @dynamic-labs-sdk/client >= 0.14.0
             const response = yield authenticatePasskeyMFA({
                 requestedScopes,
             });
@@ -235,11 +309,10 @@ const useStepUpAuthentication = ({ credentialId, } = {}) => {
             logger.error('Failed to authenticate passkey for step-up authentication', { environmentId, error, userId: user === null || user === void 0 ? void 0 : user.id });
             return null;
         }
-    }), [environmentId, user === null || user === void 0 ? void 0 : user.id]);
+    }), [environmentId, user]);
     const verifyTotpMfa = useCallback((_d) => __awaiter(void 0, [_d], void 0, function* ({ code, deviceId, requestedScopes, }) {
         setState((prev) => (Object.assign(Object.assign({}, prev), { error: null, isLoading: true })));
         try {
-            // requestedScopes is available in @dynamic-labs-sdk/client >= 0.14.0
             const response = yield authenticateTotpMfaDevice({
                 code,
                 deviceId,
@@ -256,14 +329,112 @@ const useStepUpAuthentication = ({ credentialId, } = {}) => {
             logger.error('Failed to authenticate TOTP device for step-up authentication', { environmentId, error, userId: user === null || user === void 0 ? void 0 : user.id });
             return null;
         }
-    }), [environmentId, user === null || user === void 0 ? void 0 : user.id]);
+    }), [environmentId, user]);
+    const verifyRecoveryCode = useCallback((_e) => __awaiter(void 0, [_e], void 0, function* ({ code, requestedScopes, }) {
+        setState((prev) => (Object.assign(Object.assign({}, prev), { error: null, isLoading: true })));
+        try {
+            const response = yield authenticateMfaRecoveryCode({
+                code,
+                requestedScopes,
+            });
+            setState((prev) => (Object.assign(Object.assign({}, prev), { error: null, isLoading: false })));
+            return response;
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error
+                ? error.message
+                : 'Failed to authenticate recovery code for step-up authentication';
+            setState((prev) => (Object.assign(Object.assign({}, prev), { error: errorMessage, isLoading: false })));
+            logger.error('Failed to authenticate recovery code for step-up authentication', { environmentId, error, userId: user === null || user === void 0 ? void 0 : user.id });
+            return null;
+        }
+    }), [environmentId, user]);
+    const promptMfa = useCallback((props) => __awaiter(void 0, void 0, void 0, function* () {
+        var _f;
+        const methods = yield getUserMfaMethods();
+        const allMethods = [
+            ...methods.passkeys.map((passkey) => (Object.assign(Object.assign({}, passkey), { type: MFADeviceType.Passkey }))),
+            ...methods.devices.map((device) => (Object.assign(Object.assign({}, device), { type: MFADeviceType.Totp }))),
+        ];
+        if (!methods.userHasVerifiedMfaMethods || allMethods.length === 0) {
+            setShowAuthFlow(true);
+            pushView('mfa-choose-device', {
+                createMfaToken: props === null || props === void 0 ? void 0 : props.createMfaToken,
+                requestedScopes: props === null || props === void 0 ? void 0 : props.requestedScopes,
+            });
+            return;
+        }
+        const lastCreatedMethod = allMethods.reduce((a, b) => {
+            if (!a)
+                return b;
+            if (!b)
+                return a;
+            if (a.createdAt && b.createdAt) {
+                return a.createdAt >= b.createdAt ? a : b;
+            }
+            if (b.createdAt) {
+                return b;
+            }
+            return a;
+        }, allMethods[0]);
+        switch (lastCreatedMethod.type) {
+            case MFADeviceType.Passkey: {
+                const createMfaTokenOptions = (props === null || props === void 0 ? void 0 : props.createMfaToken)
+                    ? { singleUse: true }
+                    : undefined;
+                const authenticatePasskeyPromise = authenticatePasskeyMFA$1({
+                    createMfaToken: createMfaTokenOptions,
+                    requestedScopes: props === null || props === void 0 ? void 0 : props.requestedScopes,
+                });
+                setShowAuthFlow(true);
+                pushView('passkey-confirm', {
+                    authenticatePasskeyPromise,
+                    createMfaToken: props === null || props === void 0 ? void 0 : props.createMfaToken,
+                    requestedScopes: props === null || props === void 0 ? void 0 : props.requestedScopes,
+                });
+                return authenticatePasskeyPromise;
+            }
+            case MFADeviceType.Totp: {
+                if ((dynamicClient === null || dynamicClient === void 0 ? void 0 : dynamicClient.mfaToken) && !((_f = props === null || props === void 0 ? void 0 : props.requestedScopes) === null || _f === void 0 ? void 0 : _f.length)) {
+                    return dynamicClient === null || dynamicClient === void 0 ? void 0 : dynamicClient.mfaToken;
+                }
+                const deferred = new DeferredPromise();
+                setShowAuthFlow(true);
+                pushView('mfa-verification', {
+                    createMfaToken: props === null || props === void 0 ? void 0 : props.createMfaToken,
+                    requestedScopes: props === null || props === void 0 ? void 0 : props.requestedScopes,
+                });
+                const mfaCompletionSuccessOff = onEvent({
+                    event: 'mfaCompletionSuccess',
+                    listener: ({ mfaToken }) => deferred.resolve(mfaToken),
+                }, dynamicClient);
+                const onAuthFlowCloseHandler = () => deferred.reject(new Error('MFA view closed'));
+                dynamicEvents.on('authFlowClose', onAuthFlowCloseHandler);
+                deferred.promise.finally(() => {
+                    mfaCompletionSuccessOff();
+                    dynamicEvents.off('authFlowClose', onAuthFlowCloseHandler);
+                });
+                return deferred.promise;
+            }
+            default:
+                throw new Error('Error determining MFA method to use');
+        }
+    }), [
+        authenticatePasskeyMFA$1,
+        dynamicClient,
+        getUserMfaMethods,
+        pushView,
+        setShowAuthFlow,
+    ]);
     return {
         isStepUpRequired,
+        promptMfa,
         resetState,
         sendOtp,
         state,
         verifyOtp,
         verifyPasskeyMfa,
+        verifyRecoveryCode,
         verifyTotpMfa,
         verifyWallet,
     };

package/src/lib/utils/hooks/useValidateSession/handleWalletInfoOutOfSync/handleWalletInfoOutOfSync.cjs

@@ -4,17 +4,17 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../../_virtual/_tslib.cjs');
+var client = require('@dynamic-labs-sdk/client');
 require('@dynamic-labs-sdk/client/core');
 require('@dynamic-labs/sdk-api-core');
 require('../../../../client/client.cjs');
 require('react');
-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');
+var logger = require('../../../../shared/logger.cjs');
 require('@dynamic-labs/wallet-book');
 require('@dynamic-labs/utils');
 require('../../../constants/colors.cjs');
@@ -29,7 +29,8 @@ var primaryWalletId = require('../../../../store/state/primaryWalletId/primaryWa
 var connectedWalletsInfo = require('../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.cjs');
 require('../../../../events/dynamicEvents.cjs');
-var getUserProfile = require('../../../../client/extension/user/getUserProfile/getUserProfile.cjs');
+var getMinAuthToken = require('../../../../client/extension/functions/getMinAuthToken/getMinAuthToken.cjs');
+var getExpiresAt = require('../../../../client/extension/functions/getExpiresAt/getExpiresAt.cjs');
 
 /**
  * Detects mismatch between wallet info.
@@ -41,12 +42,24 @@ const handleWalletInfoOutOfSync = (_a) => _tslib.__awaiter(void 0, [_a], void 0,
     if (!primaryWalletId$1) {
         return;
     }
-    const user = getUserProfile.getUserProfile();
+    const { user } = client.getDefaultClient();
     const connectedWallets = connectedWalletsInfo.getConnectedWalletsInfo();
+    const token = getMinAuthToken.getMinAuthToken();
+    const sessionExpiresAt = getExpiresAt.getExpiresAt();
+    const isTokenExpired = sessionExpiresAt !== null && sessionExpiresAt <= Date.now();
+    logger.logger.debug('[handleWalletInfoOutOfSync] validation check', {
+        connectedWalletsCount: connectedWallets.length,
+        hasClientUser: Boolean(user),
+        hasToken: Boolean(token),
+        isTokenExpired,
+        primaryWalletId: primaryWalletId$1,
+        sessionExpiresAt,
+    });
     if (user || connectedWallets.length > 0) {
         return;
     }
-    yield logout('wallet info is out of sync', {
+    const reason = token && !isTokenExpired ? 'wallet info is out of sync' : 'session expired';
+    yield logout(reason, {
         connectedWallets,
         primaryWalletId: primaryWalletId$1,
         user,

package/src/lib/utils/hooks/useValidateSession/handleWalletInfoOutOfSync/handleWalletInfoOutOfSync.js

@@ -1,16 +1,16 @@
 'use client'
 import { __awaiter } from '../../../../../../_virtual/_tslib.js';
+import { getDefaultClient } from '@dynamic-labs-sdk/client';
 import '@dynamic-labs-sdk/client/core';
 import '@dynamic-labs/sdk-api-core';
 import '../../../../client/client.js';
 import 'react';
-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 { logger } from '../../../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
 import '@dynamic-labs/utils';
 import '../../../constants/colors.js';
@@ -25,7 +25,8 @@ import { getPrimaryWalletId } from '../../../../store/state/primaryWalletId/prim
 import { getConnectedWalletsInfo } from '../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.js';
 import '../../../../events/dynamicEvents.js';
-import { getUserProfile } from '../../../../client/extension/user/getUserProfile/getUserProfile.js';
+import { getMinAuthToken } from '../../../../client/extension/functions/getMinAuthToken/getMinAuthToken.js';
+import { getExpiresAt } from '../../../../client/extension/functions/getExpiresAt/getExpiresAt.js';
 
 /**
  * Detects mismatch between wallet info.
@@ -37,12 +38,24 @@ const handleWalletInfoOutOfSync = (_a) => __awaiter(void 0, [_a], void 0, functi
     if (!primaryWalletId) {
         return;
     }
-    const user = getUserProfile();
+    const { user } = getDefaultClient();
     const connectedWallets = getConnectedWalletsInfo();
+    const token = getMinAuthToken();
+    const sessionExpiresAt = getExpiresAt();
+    const isTokenExpired = sessionExpiresAt !== null && sessionExpiresAt <= Date.now();
+    logger.debug('[handleWalletInfoOutOfSync] validation check', {
+        connectedWalletsCount: connectedWallets.length,
+        hasClientUser: Boolean(user),
+        hasToken: Boolean(token),
+        isTokenExpired,
+        primaryWalletId,
+        sessionExpiresAt,
+    });
     if (user || connectedWallets.length > 0) {
         return;
     }
-    yield logout('wallet info is out of sync', {
+    const reason = token && !isTokenExpired ? 'wallet info is out of sync' : 'session expired';
+    yield logout(reason, {
         connectedWallets,
         primaryWalletId,
         user,

package/src/lib/utils/hooks/useWalletConnectors/utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.cjs

@@ -5,6 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var sdkApiCore = require('@dynamic-labs/sdk-api-core');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+var values = require('../../../../constants/values.cjs');
 var findWalletOptionFor = require('../../../../functions/findWalletOptionFor/findWalletOptionFor.cjs');
 var shouldManuallyReconnectOnRefresh = require('../../../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.cjs');
 var convertLegacyPhantomLedgerConnector = require('../convertLegacyPhantomLedgerConnector/convertLegacyPhantomLedgerConnector.cjs');
@@ -50,10 +51,17 @@ const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, pr
                     walletConnectorOptions,
                 });
             }
+            // Prefer the chain from the account's verified credential over the
+            // connector's connectedChain. When a wallet falls back to a connector
+            // for a different chain (e.g. FallbackSolanaConnector for a SUI
+            // wallet), the connector's chain would be wrong.
+            const accountChain = account.chain
+                ? values.VerifiedCredentialNameToChainEnum[account.chain]
+                : undefined;
             return wallet.walletConnector.createWallet({
                 additionalAddresses: account.walletAdditionalAddresses,
                 address: account.address,
-                chain: wallet.walletConnector.connectedChain,
+                chain: accountChain !== null && accountChain !== void 0 ? accountChain : wallet.walletConnector.connectedChain,
                 connector: wallet.walletConnector,
                 id: account.id,
                 isAuthenticated: true,

package/src/lib/utils/hooks/useWalletConnectors/utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.js

@@ -1,6 +1,7 @@
 'use client'
 import { HardwareWalletEnum, WalletProviderEnum } from '@dynamic-labs/sdk-api-core';
 import { isHardwareWalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { VerifiedCredentialNameToChainEnum } from '../../../../constants/values.js';
 import { findWalletOptionFor } from '../../../../functions/findWalletOptionFor/findWalletOptionFor.js';
 import { shouldManuallyReconnectOnRefresh } from '../../../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.js';
 import { convertLegacyPhantomLedgerConnector } from '../convertLegacyPhantomLedgerConnector/convertLegacyPhantomLedgerConnector.js';
@@ -46,10 +47,17 @@ const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, pr
                     walletConnectorOptions,
                 });
             }
+            // Prefer the chain from the account's verified credential over the
+            // connector's connectedChain. When a wallet falls back to a connector
+            // for a different chain (e.g. FallbackSolanaConnector for a SUI
+            // wallet), the connector's chain would be wrong.
+            const accountChain = account.chain
+                ? VerifiedCredentialNameToChainEnum[account.chain]
+                : undefined;
             return wallet.walletConnector.createWallet({
                 additionalAddresses: account.walletAdditionalAddresses,
                 address: account.address,
-                chain: wallet.walletConnector.connectedChain,
+                chain: accountChain !== null && accountChain !== void 0 ? accountChain : wallet.walletConnector.connectedChain,
                 connector: wallet.walletConnector,
                 id: account.id,
                 isAuthenticated: true,

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

@@ -245,15 +245,16 @@ const EmbeddedRevealView = ({ exportPrivateKey, isPromptForExport = false, }) =>
         }
         return baseClass;
     };
-    const contentHeader = (jsxRuntime.jsxs("div", { children: [primaryWallet &&
-                isSmartWallet(primaryWallet) &&
-                !isLoading &&
-                data &&
-                !error && (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: () => {
-                                    setShowAuthFlow(false);
-                                    setDynamicWidgetView('send-balance');
-                                }, className: 'embedded-reveal-view__zerodev-warning__link-button', children: jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', weight: 'regular', color: 'primary', className: 'underline', copykey: 'dyn_embedded_reveal.aa_warning.button', children: t('dyn_embedded_reveal.aa_warning.button') }) })] })] })), jsxRuntime.jsx("div", { className: 'embedded-reveal-view__body__description', children: !hasInjectedCredential && (jsxRuntime.jsx("div", { className: 'embedded-reveal-view__header', children: jsxRuntime.jsx("div", { className: 'embedded-reveal-view__header__hero', children: jsxRuntime.jsx(exportEmbeddedHero.ReactComponent, {}) }) })) })] }));
-    return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(ModalHeader.ModalHeader, { trailing: isPromptForExport ? null : closeButton, children: jsxRuntime.jsx(Typography.Typography, { as: 'h1', variant: 'title', color: 'primary', "data-testid": 'dynamic-auth-modal-heading', className: 'header__typography', children: title }) }), jsxRuntime.jsx("div", { className: 'embedded-reveal-view', children: jsxRuntime.jsxs("div", { className: getBodyClassName(), children: [(!isWaasWallet ||
+    const isEip7702SmartWallet = Boolean(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id.endsWith('-zerodev'));
+    const isErc4337SmartWallet = Boolean(primaryWallet && isSmartWallet(primaryWallet)) &&
+        !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: () => {
+                            setShowAuthFlow(false);
+                            setDynamicWidgetView('send-balance');
+                        }, className: 'embedded-reveal-view__zerodev-warning__link-button', children: jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', weight: 'regular', color: 'primary', className: 'underline', copykey: 'dyn_embedded_reveal.aa_warning.button', children: t('dyn_embedded_reveal.aa_warning.button') }) })] })] }));
+    const contentHeader = (jsxRuntime.jsx("div", { children: jsxRuntime.jsx("div", { className: 'embedded-reveal-view__body__description', children: !hasInjectedCredential && (jsxRuntime.jsx("div", { className: 'embedded-reveal-view__header', children: jsxRuntime.jsx("div", { className: 'embedded-reveal-view__header__hero', children: jsxRuntime.jsx(exportEmbeddedHero.ReactComponent, {}) }) })) }) }));
+    return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(ModalHeader.ModalHeader, { trailing: isPromptForExport ? null : closeButton, children: jsxRuntime.jsx(Typography.Typography, { as: 'h1', variant: 'title', color: 'primary', "data-testid": 'dynamic-auth-modal-heading', className: 'header__typography', children: title }) }), jsxRuntime.jsx("div", { className: 'embedded-reveal-view', children: jsxRuntime.jsxs("div", { className: getBodyClassName(), children: [aaWarning, (!isWaasWallet ||
                             !hasInjectedCredential ||
                             title !== credentialTitle) &&
                             contentHeader, (isTurnkeyWallet || isWaasWallet) && (jsxRuntime.jsx(EmbeddedWalletExport.EmbeddedWalletExport, { wallet: wallet, isTurnkeyWallet: isTurnkeyWallet, isWaasWallet: isWaasWallet, data: data, onIframeContainerRef: setIframeContainerRef, isVisible: !title.includes('Agree') })), hasInjectedCredential ? (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(TypographyButton.TypographyButton, { buttonPadding: 'medium', buttonVariant: 'brand-primary', onClick: () => {

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

@@ -241,15 +241,16 @@ const EmbeddedRevealView = ({ exportPrivateKey, isPromptForExport = false, }) =>
         }
         return baseClass;
     };
-    const contentHeader = (jsxs("div", { children: [primaryWallet &&
-                isSmartWallet(primaryWallet) &&
-                !isLoading &&
-                data &&
-                !error && (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: () => {
-                                    setShowAuthFlow(false);
-                                    setDynamicWidgetView('send-balance');
-                                }, className: 'embedded-reveal-view__zerodev-warning__link-button', children: jsx(Typography, { variant: 'body_normal', weight: 'regular', color: 'primary', className: 'underline', copykey: 'dyn_embedded_reveal.aa_warning.button', children: t('dyn_embedded_reveal.aa_warning.button') }) })] })] })), jsx("div", { className: 'embedded-reveal-view__body__description', children: !hasInjectedCredential && (jsx("div", { className: 'embedded-reveal-view__header', children: jsx("div", { className: 'embedded-reveal-view__header__hero', children: jsx(SvgExportEmbeddedHero, {}) }) })) })] }));
-    return (jsxs(Fragment, { children: [jsx(ModalHeader, { trailing: isPromptForExport ? null : closeButton, children: jsx(Typography, { as: 'h1', variant: 'title', color: 'primary', "data-testid": 'dynamic-auth-modal-heading', className: 'header__typography', children: title }) }), jsx("div", { className: 'embedded-reveal-view', children: jsxs("div", { className: getBodyClassName(), children: [(!isWaasWallet ||
+    const isEip7702SmartWallet = Boolean(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id.endsWith('-zerodev'));
+    const isErc4337SmartWallet = Boolean(primaryWallet && isSmartWallet(primaryWallet)) &&
+        !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: () => {
+                            setShowAuthFlow(false);
+                            setDynamicWidgetView('send-balance');
+                        }, className: 'embedded-reveal-view__zerodev-warning__link-button', children: jsx(Typography, { variant: 'body_normal', weight: 'regular', color: 'primary', className: 'underline', copykey: 'dyn_embedded_reveal.aa_warning.button', children: t('dyn_embedded_reveal.aa_warning.button') }) })] })] }));
+    const contentHeader = (jsx("div", { children: jsx("div", { className: 'embedded-reveal-view__body__description', children: !hasInjectedCredential && (jsx("div", { className: 'embedded-reveal-view__header', children: jsx("div", { className: 'embedded-reveal-view__header__hero', children: jsx(SvgExportEmbeddedHero, {}) }) })) }) }));
+    return (jsxs(Fragment, { children: [jsx(ModalHeader, { trailing: isPromptForExport ? null : closeButton, children: jsx(Typography, { as: 'h1', variant: 'title', color: 'primary', "data-testid": 'dynamic-auth-modal-heading', className: 'header__typography', children: title }) }), jsx("div", { className: 'embedded-reveal-view', children: jsxs("div", { className: getBodyClassName(), children: [aaWarning, (!isWaasWallet ||
                             !hasInjectedCredential ||
                             title !== credentialTitle) &&
                             contentHeader, (isTurnkeyWallet || isWaasWallet) && (jsx(EmbeddedWalletExport, { wallet: wallet, isTurnkeyWallet: isTurnkeyWallet, isWaasWallet: isWaasWallet, data: data, onIframeContainerRef: setIframeContainerRef, isVisible: !title.includes('Agree') })), hasInjectedCredential ? (jsxs(Fragment, { children: [jsx(TypographyButton, { buttonPadding: 'medium', buttonVariant: 'brand-primary', onClick: () => {

package/src/lib/views/MfaChooseDeviceView/MfaChooseDeviceView.cjs

@@ -115,7 +115,7 @@ require('../../components/IsBrowser/IsBrowser.cjs');
 require('../../components/Popper/Popper/Popper.cjs');
 require('../../components/Popper/PopperContext/PopperContext.cjs');
 
-const MfaChooseDeviceView = ({ isInitialSetup = true, createMfaToken = false, }) => {
+const MfaChooseDeviceView = ({ isInitialSetup = true, createMfaToken = false, requestedScopes, }) => {
     const { handleLogOut } = useDynamicContext.useDynamicContext();
     const { t } = reactI18next.useTranslation();
     const { pushView } = ViewContext.useViewContext();
@@ -139,14 +139,14 @@ const MfaChooseDeviceView = ({ isInitialSetup = true, createMfaToken = false, })
                 singleUse: true,
             }
             : undefined;
-        // we're calling authenticatePasskeyMFA here because we don't want
-        // it to be called twice by the usePromise in the confirmPasskey view
         const authenticatePasskeyPromise = authenticatePasskeyMFA({
             createMfaToken: createMfaTokenOptions,
+            requestedScopes,
         });
         pushView('passkey-confirm', {
             authenticatePasskeyPromise,
             createMfaToken,
+            requestedScopes,
         });
     };
     const handleTotpClick = () => {
@@ -160,6 +160,7 @@ const MfaChooseDeviceView = ({ isInitialSetup = true, createMfaToken = false, })
         pushView('mfa-verification', {
             createMfaToken,
             isInitialSetup,
+            requestedScopes,
             showBackButton: true,
             type: sdkApiCore.MFADeviceType.Totp,
         });

package/src/lib/views/MfaChooseDeviceView/MfaChooseDeviceView.d.ts

@@ -1,6 +1,8 @@
 import { FC } from 'react';
+import type { TokenScope } from '@dynamic-labs/sdk-api-core';
 export type MfaChooseDeviceViewProps = {
     isInitialSetup?: boolean;
     createMfaToken?: boolean;
+    requestedScopes?: TokenScope[];
 };
 export declare const MfaChooseDeviceView: FC<MfaChooseDeviceViewProps>;

package/src/lib/views/MfaChooseDeviceView/MfaChooseDeviceView.js

@@ -111,7 +111,7 @@ import '../../components/IsBrowser/IsBrowser.js';
 import '../../components/Popper/Popper/Popper.js';
 import '../../components/Popper/PopperContext/PopperContext.js';
 
-const MfaChooseDeviceView = ({ isInitialSetup = true, createMfaToken = false, }) => {
+const MfaChooseDeviceView = ({ isInitialSetup = true, createMfaToken = false, requestedScopes, }) => {
     const { handleLogOut } = useDynamicContext();
     const { t } = useTranslation();
     const { pushView } = useViewContext();
@@ -135,14 +135,14 @@ const MfaChooseDeviceView = ({ isInitialSetup = true, createMfaToken = false, })
                 singleUse: true,
             }
             : undefined;
-        // we're calling authenticatePasskeyMFA here because we don't want
-        // it to be called twice by the usePromise in the confirmPasskey view
         const authenticatePasskeyPromise = authenticatePasskeyMFA({
             createMfaToken: createMfaTokenOptions,
+            requestedScopes,
         });
         pushView('passkey-confirm', {
             authenticatePasskeyPromise,
             createMfaToken,
+            requestedScopes,
         });
     };
     const handleTotpClick = () => {
@@ -156,6 +156,7 @@ const MfaChooseDeviceView = ({ isInitialSetup = true, createMfaToken = false, })
         pushView('mfa-verification', {
             createMfaToken,
             isInitialSetup,
+            requestedScopes,
             showBackButton: true,
             type: MFADeviceType.Totp,
         });

package/src/lib/views/MfaVerificationView/MfaVerificationView.cjs

@@ -112,7 +112,7 @@ require('../../components/IsBrowser/IsBrowser.cjs');
 require('../../components/Popper/Popper/Popper.cjs');
 require('../../components/Popper/PopperContext/PopperContext.cjs');
 
-const MfaVerificationView = ({ type, isInitialSetup = false, showBackButton = false, createMfaToken = false, deviceId, }) => {
+const MfaVerificationView = ({ type, isInitialSetup = false, showBackButton = false, createMfaToken = false, deviceId, requestedScopes, }) => {
     const { t } = reactI18next.useTranslation();
     const { handleLogOut } = useDynamicContext.useDynamicContext();
     const { clearStackAndPush, pushView, goBack, canGoBack } = ViewContext.useViewContext();
@@ -130,6 +130,7 @@ const MfaVerificationView = ({ type, isInitialSetup = false, showBackButton = fa
             code,
             createMfaToken: createMfaTokenOptions,
             deviceId,
+            requestedScopes,
             type,
         });
     }, {
@@ -164,6 +165,7 @@ const MfaVerificationView = ({ type, isInitialSetup = false, showBackButton = fa
     return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(OTPVerificationView.OTPVerificationView, { MainIcon: passwordHero.ReactComponent, error: error, isLoading: isLoading, onPinComplete: onSubmit, isValid: Boolean(mfaToken), onPinChange: onCodeChange, description: t('dyn_mfa.otp_verification_view.body'), onClickBack: onClickBack, disabled: isRateLimited }), !isInitialSetup && (jsxRuntime.jsxs("div", { className: 'mfa-verification-view__choose-another-method', children: [jsxRuntime.jsx(TextButton.TextButton, { className: 'mfa-verification-view__choose-another-method-button', onClick: () => pushView('mfa-choose-device', {
                             createMfaToken,
                             isInitialSetup,
+                            requestedScopes,
                         }), copykey: 'dyn_mfa.otp_verification_view.choose_another_method', children: t('dyn_mfa.otp_verification_view.choose_another_method') }), jsxRuntime.jsx(TextButton.TextButton, { onClick: handleLogOut, copykey: 'dyn_mfa.otp_verification_view.logout', children: t('dyn_mfa.otp_verification_view.logout') })] }))] }));
 };
 

package/src/lib/views/MfaVerificationView/MfaVerificationView.d.ts

@@ -1,10 +1,11 @@
 /// <reference types="react" />
-import { MFADeviceType } from '@dynamic-labs/sdk-api-core';
+import { MFADeviceType, TokenScope } from '@dynamic-labs/sdk-api-core';
 export type MfaVerificationViewProps = {
     deviceId?: string;
     type?: MFADeviceType;
     isInitialSetup?: boolean;
     showBackButton?: boolean;
     createMfaToken?: boolean;
+    requestedScopes?: TokenScope[];
 };
-export declare const MfaVerificationView: ({ type, isInitialSetup, showBackButton, createMfaToken, deviceId, }: MfaVerificationViewProps) => JSX.Element;
+export declare const MfaVerificationView: ({ type, isInitialSetup, showBackButton, createMfaToken, deviceId, requestedScopes, }: MfaVerificationViewProps) => JSX.Element;