@dynamic-labs/sdk-react-core 2.1.0-alpha.1 → 2.1.0-alpha.11

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

@@ -0,0 +1,137 @@
+'use client'
+import { __awaiter } from '../../../../../_virtual/_tslib.js';
+import { useState, useCallback, useEffect } from 'react';
+import { ChainEnum, GetAccountBalancesNetworkIdEnum } from '@dynamic-labs/sdk-api-core';
+import '@dynamic-labs/wallet-connector-core';
+import '../../../shared/logger.js';
+import '@dynamic-labs/iconic';
+import 'react/jsx-runtime';
+import '../../../context/ViewContext/ViewContext.js';
+import '@dynamic-labs/wallet-book';
+import '../../constants/colors.js';
+import '../../constants/values.js';
+import '../../../shared/utils/classes/storage/localStorage.js';
+import '@dynamic-labs/utils';
+import '../../../shared/consts/index.js';
+import '@dynamic-labs/multi-wallet';
+import { getAuthToken } from '../../functions/getAuthToken/getAuthToken.js';
+import 'react-international-phone';
+import 'viem';
+import 'viem/chains';
+import '../../../config/ApiEndpoint.js';
+import '../../../locale/locale.js';
+import { getAccountTokenBalances } from '../../../data/api/chains/balances.js';
+import '../../../context/DynamicContext/DynamicContext.js';
+import '../../../events/dynamicEvents.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';
+import '../../../context/VerificationContext/VerificationContext.js';
+import 'react-dom';
+import '../../../context/WalletContext/WalletContext.js';
+import '../../../context/ThemeContext/ThemeContext.js';
+import '@dynamic-labs/types';
+import 'yup';
+import '../../../context/MockContext/MockContext.js';
+import 'react-i18next';
+import '../../../context/FieldsStateContext/FieldsStateContext.js';
+import '../useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
+import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
+import '@dynamic-labs/rpc-providers';
+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/Transition/ZoomTransition/ZoomTransition.js';
+import '../../../components/Transition/SlideInUpTransition/SlideInUpTransition.js';
+import '../../../components/Transition/OpacityTransition/OpacityTransition.js';
+import '../../../components/OverlayCard/OverlayCardTarget/OverlayCardTarget.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 '../../../views/WalletList/WalletList.js';
+import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
+import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
+import '@hcaptcha/react-hcaptcha';
+import '../../../context/LoadingContext/LoadingContext.js';
+import '../../../context/FooterAnimationContext/index.js';
+import '../../../views/LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.js';
+import '../../../context/WalletGroupContext/WalletGroupContext.js';
+import '../../../context/PasskeyContext/PasskeyContext.js';
+import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
+import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
+import '../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
+import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
+import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
+
+// Hook exposed to customers and used internally to fetch account balances
+const useTokenBalances = ({ accountAddress, networkId, chainName = ChainEnum.Evm, tokenAddresses, } = {}) => {
+    const [tokenBalancesData, setTokenBalancesData] = useState(undefined);
+    const [isLoading, setIsLoading] = useState(false);
+    const [error, setError] = useState(undefined);
+    const { primaryWallet, environmentId, network, walletConnector } = useInternalDynamicContext();
+    const requestChainName = chainName !== null && chainName !== void 0 ? chainName : walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.connectedChain;
+    const requestAccount = accountAddress !== null && accountAddress !== void 0 ? accountAddress : primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address;
+    const requestNetwork = networkId !== null && networkId !== void 0 ? networkId : network;
+    const fetchAccountBalances = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
+        const jwt = getAuthToken();
+        if (!jwt) {
+            setError('User is not logged in');
+            return;
+        }
+        if (requestChainName !== ChainEnum.Evm) {
+            setError(`Chain ${requestChainName} is not supported for token balances`);
+            return;
+        }
+        if (!isLoading &&
+            requestAccount &&
+            requestNetwork &&
+            Object.values(GetAccountBalancesNetworkIdEnum).includes(requestNetwork)) {
+            setIsLoading(true);
+            getAccountTokenBalances({
+                accountAddress: requestAccount,
+                chainName: requestChainName,
+                environmentId,
+                networkId: Number(requestNetwork),
+                userJwt: jwt,
+            })
+                .then((response) => {
+                if (response) {
+                    setTokenBalancesData(response);
+                    setError(undefined);
+                }
+            })
+                .catch((e) => {
+                setError(e.message);
+            })
+                .finally(() => {
+                setIsLoading(false);
+            });
+        }
+    }), [
+        isLoading,
+        requestAccount,
+        requestNetwork,
+        requestChainName,
+        environmentId,
+    ]);
+    useEffect(() => {
+        fetchAccountBalances();
+    }, [requestAccount, requestNetwork]);
+    let tokenBalances = tokenBalancesData;
+    if (tokenAddresses) {
+        const lowerTokenAddresses = tokenAddresses === null || tokenAddresses === void 0 ? void 0 : tokenAddresses.map((address) => address.toLowerCase());
+        tokenBalances = tokenBalancesData === null || tokenBalancesData === void 0 ? void 0 : tokenBalancesData.filter((token) => lowerTokenAddresses === null || lowerTokenAddresses === void 0 ? void 0 : lowerTokenAddresses.includes(token.address.toLowerCase()));
+    }
+    return { error, isError: Boolean(error), isLoading, tokenBalances };
+};
+
+export { useTokenBalances };

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

@@ -177,6 +177,11 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
             handleDisconnectWallet({ endSession: false, walletConnector });
             return handleWalletUsedError(e);
         }
+        if (e instanceof utils.MergeAccountsConfirmationError) {
+            setView('merge-user-accounts', Object.assign({}, e));
+            setShowAuthFlow(true);
+            return;
+        }
         if (e instanceof utils.ChainalysisError) {
             handleDisconnectWallet({ walletConnector });
             setDeniedAddress(address);

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

@@ -1,6 +1,6 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { DynamicError, WalletUsedError, ChainalysisError, GateBlockedError, NoAccessError, AccountExistsError } from '@dynamic-labs/utils';
+import { DynamicError, WalletUsedError, MergeAccountsConfirmationError, ChainalysisError, GateBlockedError, NoAccessError, AccountExistsError } from '@dynamic-labs/utils';
 import { isSocialWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import 'react';
 import '../../../events/dynamicEvents.js';
@@ -173,6 +173,11 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
             handleDisconnectWallet({ endSession: false, walletConnector });
             return handleWalletUsedError(e);
         }
+        if (e instanceof MergeAccountsConfirmationError) {
+            setView('merge-user-accounts', Object.assign({}, e));
+            setShowAuthFlow(true);
+            return;
+        }
         if (e instanceof ChainalysisError) {
             handleDisconnectWallet({ walletConnector });
             setDeniedAddress(address);

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

@@ -5,9 +5,31 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var React = require('react');
 var data = require('../../../views/WalletList/data.cjs');
+require('@dynamic-labs/wallet-connector-core');
+require('@dynamic-labs/sdk-api-core');
+require('../../../shared/logger.cjs');
+require('@dynamic-labs/iconic');
+require('react/jsx-runtime');
+require('../../../context/ViewContext/ViewContext.cjs');
+require('@dynamic-labs/wallet-book');
+require('../../constants/colors.cjs');
+require('../../constants/values.cjs');
+require('../../../shared/utils/classes/storage/localStorage.cjs');
+require('@dynamic-labs/utils');
+require('../../../shared/consts/index.cjs');
+require('../../../../../_virtual/_tslib.cjs');
+require('@dynamic-labs/multi-wallet');
+require('react-international-phone');
+require('viem');
+require('viem/chains');
+require('../../../config/ApiEndpoint.cjs');
+require('../../../locale/locale.cjs');
+var serializeWalletConnectors = require('../../functions/serializeWalletConnectors/serializeWalletConnectors.cjs');
 var verifyRequiredConnectorsAreSetup = require('./utils/verifyRequiredConnectorsAreSetup/verifyRequiredConnectorsAreSetup.cjs');
 
 const useWalletConnectorOptions = ({ projectSettings, appLogoUrl, appName, deepLinkPreference, flowNetwork, mobileExperience, networkConfigurations, walletBook, walletUiUtils, walletConnectorsProp, walletConnectPreferredChains, walletConnectorExtensions, }) => {
+    const walletConnectorsKey = React.useMemo(() => { var _a; return (_a = serializeWalletConnectors.serializeWalletConnectors(walletConnectorsProp)) === null || _a === void 0 ? void 0 : _a.join(','); }, [walletConnectorsProp]);
+    const walletBookLength = React.useMemo(() => Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length, [walletBook]);
     const walletConnectorOptions = React.useMemo(() => {
         if (!projectSettings ||
             !Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length ||
@@ -31,14 +53,15 @@ const useWalletConnectorOptions = ({ projectSettings, appLogoUrl, appName, deepL
             walletConnectorExtensions,
         });
         // Cannot include walletUiUtils in the dependency array because it will cause an infinite loop
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [
         appLogoUrl,
         appName,
         projectSettings,
-        walletConnectorsProp,
+        walletConnectorsKey,
         walletConnectPreferredChains,
         flowNetwork,
-        Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length,
+        walletBookLength,
         networkConfigurations,
     ]);
     React.useEffect(() => {

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

@@ -1,9 +1,31 @@
 'use client'
 import { useMemo, useEffect } from 'react';
 import { getWallets } from '../../../views/WalletList/data.js';
+import '@dynamic-labs/wallet-connector-core';
+import '@dynamic-labs/sdk-api-core';
+import '../../../shared/logger.js';
+import '@dynamic-labs/iconic';
+import 'react/jsx-runtime';
+import '../../../context/ViewContext/ViewContext.js';
+import '@dynamic-labs/wallet-book';
+import '../../constants/colors.js';
+import '../../constants/values.js';
+import '../../../shared/utils/classes/storage/localStorage.js';
+import '@dynamic-labs/utils';
+import '../../../shared/consts/index.js';
+import '../../../../../_virtual/_tslib.js';
+import '@dynamic-labs/multi-wallet';
+import 'react-international-phone';
+import 'viem';
+import 'viem/chains';
+import '../../../config/ApiEndpoint.js';
+import '../../../locale/locale.js';
+import { serializeWalletConnectors } from '../../functions/serializeWalletConnectors/serializeWalletConnectors.js';
 import { verifyRequiredConnectorsAreSetup } from './utils/verifyRequiredConnectorsAreSetup/verifyRequiredConnectorsAreSetup.js';
 
 const useWalletConnectorOptions = ({ projectSettings, appLogoUrl, appName, deepLinkPreference, flowNetwork, mobileExperience, networkConfigurations, walletBook, walletUiUtils, walletConnectorsProp, walletConnectPreferredChains, walletConnectorExtensions, }) => {
+    const walletConnectorsKey = useMemo(() => { var _a; return (_a = serializeWalletConnectors(walletConnectorsProp)) === null || _a === void 0 ? void 0 : _a.join(','); }, [walletConnectorsProp]);
+    const walletBookLength = useMemo(() => Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length, [walletBook]);
     const walletConnectorOptions = useMemo(() => {
         if (!projectSettings ||
             !Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length ||
@@ -27,14 +49,15 @@ const useWalletConnectorOptions = ({ projectSettings, appLogoUrl, appName, deepL
             walletConnectorExtensions,
         });
         // Cannot include walletUiUtils in the dependency array because it will cause an infinite loop
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [
         appLogoUrl,
         appName,
         projectSettings,
-        walletConnectorsProp,
+        walletConnectorsKey,
         walletConnectPreferredChains,
         flowNetwork,
-        Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length,
+        walletBookLength,
         networkConfigurations,
     ]);
     useEffect(() => {

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

@@ -20,7 +20,7 @@ require('../../../shared/consts/index.cjs');
 require('../../../events/dynamicEvents.cjs');
 var useWalletConnectorEvent = require('../events/useWalletConnectorEvent/useWalletConnectorEvent.cjs');
 
-const useWalletEventListeners = ({ handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnectorKey, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, }) => {
+const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnectorKey, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, }) => {
     useWalletConnectorEvent.useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'disconnect', () => {
         logger.logger.debug('primary wallet disconnect');
         handleLogOut();
@@ -109,13 +109,11 @@ const useWalletEventListeners = ({ handleLogOut, multiWallet, multiWalletWidgetS
     }));
     useWalletConnectorEvent.useWalletConnectorEvent(uniqueNonPrimaryWallets, 'disconnect', (affectedConnector) => {
         logger.logger.debug('secondary wallet disconnect');
-        // argent sends a disconnect event when the user adds a new account
         if (authMode === 'connect-only') {
             // Get all wallets with this connector
             const affectedWallets = secondaryWallets.filter(({ connector }) => connector.key === affectedConnector.key);
             for (const wallet of affectedWallets) {
-                if (wallet.connector.key === 'argentx')
-                    refreshConnectedWallet(wallet.id, wallet.connector);
+                disconnectWallet(wallet.id);
             }
         }
     });

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

@@ -4,6 +4,7 @@ import { IDynamicContext } from '../../../context/DynamicContext/types';
 import { AuthModeType, MultiWalletWidgetState, Wallet, WalletWithAction } from '../../../shared';
 import { MultiWalletWidgetStateSetter } from '../multiWallet';
 export type UseWalletEventListenersArgs = {
+    disconnectWallet: (walletId: string) => Promise<void>;
     handleLogOut(): Promise<void>;
     multiWallet: boolean;
     multiWalletWidgetState: MultiWalletWidgetState;
@@ -19,4 +20,4 @@ export type UseWalletEventListenersArgs = {
     authMode: AuthModeType;
     refreshConnectedWallet: (walletId: string, walletConnector: WalletConnector, shouldCallCallback?: boolean) => Promise<void>;
 };
-export declare const useWalletEventListeners: ({ handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnectorKey, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, }: UseWalletEventListenersArgs) => void;
+export declare const useWalletEventListeners: ({ disconnectWallet, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnectorKey, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, }: UseWalletEventListenersArgs) => void;

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

@@ -16,7 +16,7 @@ import '../../../shared/consts/index.js';
 import '../../../events/dynamicEvents.js';
 import { useWalletConnectorEvent } from '../events/useWalletConnectorEvent/useWalletConnectorEvent.js';
 
-const useWalletEventListeners = ({ handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnectorKey, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, }) => {
+const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnectorKey, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, }) => {
     useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'disconnect', () => {
         logger.debug('primary wallet disconnect');
         handleLogOut();
@@ -105,13 +105,11 @@ const useWalletEventListeners = ({ handleLogOut, multiWallet, multiWalletWidgetS
     }));
     useWalletConnectorEvent(uniqueNonPrimaryWallets, 'disconnect', (affectedConnector) => {
         logger.debug('secondary wallet disconnect');
-        // argent sends a disconnect event when the user adds a new account
         if (authMode === 'connect-only') {
             // Get all wallets with this connector
             const affectedWallets = secondaryWallets.filter(({ connector }) => connector.key === affectedConnector.key);
             for (const wallet of affectedWallets) {
-                if (wallet.connector.key === 'argentx')
-                    refreshConnectedWallet(wallet.id, wallet.connector);
+                disconnectWallet(wallet.id);
             }
         }
     });

package/src/lib/views/CollectUserDataView/UserDataFields/UserField/UserField.cjs

@@ -78,7 +78,7 @@ require('@hcaptcha/react-hcaptcha');
 require('../../../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.cjs');
 var Select = require('../../../../components/Select/Select.cjs');
 
-const UserField = ({ fieldData: { key, label, type }, fieldSettings: { enabled, name, required, verify }, errors, touched, disabled, policiesConsentInnerComponentArray, }) => {
+const UserField = ({ fieldData: { key, label, type, autoComplete }, fieldSettings: { enabled, name, required, verify }, errors, touched, disabled, policiesConsentInnerComponentArray, }) => {
     if (name === 'tShirtSize') {
         return (jsxRuntime.jsx(formik.Field, { copykey: key, as: Select.Select, type: type, id: name, name: name, label: label, error: errors[name] && touched[name], selectDataTestId: 'tShirtSizeSelect', message: touched[name] && getDisplayErrorMessage.getDisplayErrorMessage(label, errors[name]), disabled: disabled, children: index.tShirtSizes.map((size) => (jsxRuntime.jsx("option", { value: size, children: size }, size))) }, name));
     }
@@ -94,10 +94,10 @@ const UserField = ({ fieldData: { key, label, type }, fieldSettings: { enabled,
     else if (name === 'phoneNumber') {
         return (jsxRuntime.jsx(formik.Field, { name: name, as: UserPhoneField.UserPhoneField, disabled: disabled, label: label, required: required, error: touched[name] && errors[name]
                 ? getDisplayErrorMessage.getDisplayErrorMessage(label, errors[name])
-                : undefined, verify: verify }, name));
+                : undefined, verify: verify, autoComplete: autoComplete }, name));
     }
     else {
-        return (jsxRuntime.jsx(formik.Field, { copykey: key, disabled: disabled, as: Input.Input, type: type, id: name, name: name, label: label, optional: enabled && !required, error: errors[name] && touched[name], message: touched[name] && getDisplayErrorMessage.getDisplayErrorMessage(label, errors[name]) }, name));
+        return (jsxRuntime.jsx(formik.Field, { copykey: key, disabled: disabled, as: Input.Input, type: type, id: name, name: name, label: label, optional: enabled && !required, error: errors[name] && touched[name], message: touched[name] && getDisplayErrorMessage.getDisplayErrorMessage(label, errors[name]), autoComplete: autoComplete }, name));
     }
 };
 

package/src/lib/views/CollectUserDataView/UserDataFields/UserField/UserField.js

@@ -74,7 +74,7 @@ import '@hcaptcha/react-hcaptcha';
 import '../../../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.js';
 import { Select } from '../../../../components/Select/Select.js';
 
-const UserField = ({ fieldData: { key, label, type }, fieldSettings: { enabled, name, required, verify }, errors, touched, disabled, policiesConsentInnerComponentArray, }) => {
+const UserField = ({ fieldData: { key, label, type, autoComplete }, fieldSettings: { enabled, name, required, verify }, errors, touched, disabled, policiesConsentInnerComponentArray, }) => {
     if (name === 'tShirtSize') {
         return (jsx(Field, { copykey: key, as: Select, type: type, id: name, name: name, label: label, error: errors[name] && touched[name], selectDataTestId: 'tShirtSizeSelect', message: touched[name] && getDisplayErrorMessage(label, errors[name]), disabled: disabled, children: tShirtSizes.map((size) => (jsx("option", { value: size, children: size }, size))) }, name));
     }
@@ -90,10 +90,10 @@ const UserField = ({ fieldData: { key, label, type }, fieldSettings: { enabled,
     else if (name === 'phoneNumber') {
         return (jsx(Field, { name: name, as: UserPhoneField, disabled: disabled, label: label, required: required, error: touched[name] && errors[name]
                 ? getDisplayErrorMessage(label, errors[name])
-                : undefined, verify: verify }, name));
+                : undefined, verify: verify, autoComplete: autoComplete }, name));
     }
     else {
-        return (jsx(Field, { copykey: key, disabled: disabled, as: Input, type: type, id: name, name: name, label: label, optional: enabled && !required, error: errors[name] && touched[name], message: touched[name] && getDisplayErrorMessage(label, errors[name]) }, name));
+        return (jsx(Field, { copykey: key, disabled: disabled, as: Input, type: type, id: name, name: name, label: label, optional: enabled && !required, error: errors[name] && touched[name], message: touched[name] && getDisplayErrorMessage(label, errors[name]), autoComplete: autoComplete }, name));
     }
 };
 

package/src/lib/views/CollectUserDataView/useFields.cjs

@@ -46,6 +46,7 @@ const useFields = () => {
             validation: yup.string().oneOf(index.countryCodes.map((c) => c.code)),
         },
         email: {
+            autoComplete: 'email',
             key: 'dyn_collect_user_data.fields.email.label',
             label: t('dyn_collect_user_data.fields.email.label'),
             type: 'email',

package/src/lib/views/CollectUserDataView/useFields.d.ts

@@ -4,6 +4,7 @@ export type FieldConfig = {
     key: string;
     type: string;
     validation: StringSchema | BooleanSchema;
+    autoComplete?: string;
 };
 export declare const useFields: () => {
     fieldsConfig: {
@@ -20,6 +21,7 @@ export declare const useFields: () => {
             validation: StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
         };
         email: {
+            autoComplete: string;
             key: string;
             label: string;
             type: string;

package/src/lib/views/CollectUserDataView/useFields.js

@@ -42,6 +42,7 @@ const useFields = () => {
             validation: string().oneOf(countryCodes.map((c) => c.code)),
         },
         email: {
+            autoComplete: 'email',
             key: 'dyn_collect_user_data.fields.email.label',
             label: t('dyn_collect_user_data.fields.email.label'),
             type: 'email',

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

@@ -27,6 +27,7 @@ require('../../shared/consts/index.cjs');
 var useInternalDynamicContext = require('../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 require('../../context/CaptchaContext/CaptchaContext.cjs');
 var ErrorContext = require('../../context/ErrorContext/ErrorContext.cjs');
+var findEmbeddedWalletFromVerifiedCredentials = require('../../utils/functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 var shortenEmail = require('../../shared/utils/functions/shortenEmail/shortenEmail.cjs');
@@ -100,7 +101,7 @@ require('../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection
 const SECONDS_TO_RETRY = 15;
 const sleepToShowSuccessMessage = () => utils.sleep(1500);
 const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _showRetryButton = true, showTransferMessage: _showTransferMessage = false, }) => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f;
     const [showRetryButton, setShowRetryButton] = React.useState(_showRetryButton);
     const [showTransferMessage, setShowTransferMessage] = React.useState(_showTransferMessage);
     const { handleVerifiedUserWithJWT } = useHandleVerifiedUser.useHandleVerifiedUser();
@@ -135,7 +136,7 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
     const { createUserProfileByJWT } = useCreateUserProfileByJWTCallback.useCreateUserProfileByJWTCallback();
     const isTurnkeyProviderEnabled = isTurnkeyEnabled.isTurnkeyEnabled(projectSettings);
     const handleComplete = React.useCallback((verificationToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _e, _f, _g;
+        var _g, _h, _j, _k, _l, _m, _o;
         setError(undefined);
         setLoading(true);
         if (!verificationUUID || (!authToken && !onboardingOnlyJwt)) {
@@ -172,16 +173,41 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
             if (isTurnkeyWallet &&
                 hasTurnkeyVerifiedCredentialAuthenticator &&
                 !hasRecoveryEmail &&
-                ((_e = updateUserProfileResponse === null || updateUserProfileResponse === void 0 ? void 0 : updateUserProfileResponse.user) === null || _e === void 0 ? void 0 : _e.email)) {
+                ((_g = updateUserProfileResponse === null || updateUserProfileResponse === void 0 ? void 0 : updateUserProfileResponse.user) === null || _g === void 0 ? void 0 : _g.email)) {
                 setUser(updateJWTAndCreateUserProfile.updateJWTAndCreateUserProfile(updateUserProfileResponse.jwt, updateUserProfileResponse.minifiedJwt));
                 yield addRecoveryEmail(updateUserProfileResponse.user.email);
                 setShowAuthFlow(false);
                 return;
             }
-            if (isTurnkeyProviderEnabled &&
-                !((_g = (_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _f === void 0 ? void 0 : _f.embeddedWallets) === null || _g === void 0 ? void 0 : _g.automaticEmbeddedWalletCreation)) {
-                setShowAuthFlow(false);
-                return;
+            if (isTurnkeyProviderEnabled) {
+                const isManualMode = !((_j = (_h = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _h === void 0 ? void 0 : _h.embeddedWallets) === null || _j === void 0 ? void 0 : _j.automaticEmbeddedWalletCreation);
+                const isUsingPregeneratedWallets = Boolean(((_l = (_k = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _k === void 0 ? void 0 : _k.embeddedWallets) === null || _l === void 0 ? void 0 : _l.automaticEmbeddedWalletCreation) &&
+                    !((_o = (_m = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _m === void 0 ? void 0 : _m.embeddedWallets) === null || _o === void 0 ? void 0 : _o.forceAuthenticatorAtSignup));
+                if (isUsingPregeneratedWallets) {
+                    // Pregenerated wallet was created during an
+                    // additional email validation step as part of onboarding
+                    // cannot rely on newUser JWT field here due to session being counted twice
+                    // when authentication happens followed by a separate email kyc step
+                    const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(updateUserProfileResponse.jwt);
+                    if (!embeddedWalletVerifiedCredential) {
+                        throw new Error('Could not find an embedded wallet');
+                    }
+                    const wallet = {
+                        address: embeddedWalletVerifiedCredential.address,
+                        authenticated: false,
+                        chain: embeddedWalletVerifiedCredential.chain,
+                        connected: true,
+                        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                        // @ts-ignore
+                        connector: undefined,
+                        id: embeddedWalletVerifiedCredential.id,
+                    };
+                    dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', wallet, embeddedWalletVerifiedCredential, updateUserProfileResponse.jwt);
+                }
+                if (isUsingPregeneratedWallets || isManualMode) {
+                    setShowAuthFlow(false);
+                    return;
+                }
             }
             // this function will check turnkey wallet enabled and create wallet if needed
             // if not enabled, it will throw an error.
@@ -217,7 +243,6 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
         hasTurnkeyVerifiedCredentialAuthenticator,
         hasRecoveryEmail,
         isTurnkeyProviderEnabled,
-        (_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.automaticEmbeddedWalletCreation,
         createEmbeddedWallet,
         setOnboardingOnlyJwt,
         setView,
@@ -226,10 +251,12 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
         setUser,
         addRecoveryEmail,
         setShowAuthFlow,
+        (_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.automaticEmbeddedWalletCreation,
+        (_d = (_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _c === void 0 ? void 0 : _c.embeddedWallets) === null || _d === void 0 ? void 0 : _d.forceAuthenticatorAtSignup,
         setErrorMessage,
     ]);
     const handleEmailLogin = React.useCallback((verificationToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _h, _j;
+        var _p, _q;
         setError(undefined);
         setLoading(true);
         if (!verificationUUID) {
@@ -264,7 +291,7 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
             yield sleepToShowSuccessMessage();
             yield createUserProfileByJWT(jwt, minifiedJwt);
             if (isTurnkeyProviderEnabled &&
-                !((_j = (_h = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _h === void 0 ? void 0 : _h.embeddedWallets) === null || _j === void 0 ? void 0 : _j.automaticEmbeddedWalletCreation)) {
+                !((_q = (_p = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _p === void 0 ? void 0 : _p.embeddedWallets) === null || _q === void 0 ? void 0 : _q.automaticEmbeddedWalletCreation)) {
                 setShowAuthFlow(false);
                 return;
             }
@@ -297,7 +324,7 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
         setCallback,
         createUserProfileByJWT,
         isTurnkeyProviderEnabled,
-        (_d = (_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _c === void 0 ? void 0 : _c.embeddedWallets) === null || _d === void 0 ? void 0 : _d.automaticEmbeddedWalletCreation,
+        (_f = (_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _e === void 0 ? void 0 : _e.embeddedWallets) === null || _f === void 0 ? void 0 : _f.automaticEmbeddedWalletCreation,
         createEmbeddedWallet,
         setOnboardingOnlyJwt,
         setView,