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

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

@@ -77,8 +77,9 @@ require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCa
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 const useAuthLayoutChecks = () => {
+    var _a;
     const { view } = ViewContext.useViewContext();
-    const { user, customPrivacyPolicy, customTermsOfServices, privacyPolicyUrl, termsOfServiceUrl, isBridgeFlow, authMode, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { user, customPrivacyPolicy, customTermsOfServices, privacyPolicyUrl, termsOfServiceUrl, isBridgeFlow, authMode, projectSettings, } = useInternalDynamicContext.useInternalDynamicContext();
     const { isFooterExpanded } = index.useFooterAnimationContext();
     const { mockedSDK } = MockContext.useMockContext();
     const { helpHeaderData } = useDynamicLayoutData.useDynamicLayoutData({
@@ -148,22 +149,25 @@ const useAuthLayoutChecks = () => {
                     privacyPolicyUrl ||
                     customPrivacyPolicy ||
                     customTermsOfServices))));
-    const showDynamicFooter = view.type === 'login-with-email-or-wallet' ||
-        view.type === 'login-with-email-or-wallet-full-wallet-list' ||
-        view.type === 'login-with-wallet-only' ||
-        view.type === 'login-with-email-verification' ||
-        view.type === 'login-with-sms-verification' ||
-        view.type === 'verify-email' ||
-        view.type === 'verify-sms' ||
-        view.type === 'pending-connect' ||
-        view.type === 'wallet-group' ||
-        view.type === 'select-wallet-in-wallet-group' ||
-        view.type === 'select-hardware-wallet' ||
-        view.type === 'pending-signature' ||
-        view.type === 'qr-code' ||
-        view.type === 'wallet-used' ||
-        view.type === 'email-wallet-otp-verification-view' ||
-        view.type === 'farcaster-connect-view';
+    const showDynamicFooter = Boolean((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.displayDynamicMessaging) &&
+        (view.type === 'login-with-email-or-wallet' ||
+            view.type === 'login-with-email-or-wallet-full-wallet-list' ||
+            view.type === 'login-with-wallet-only' ||
+            view.type === 'login-with-email-verification' ||
+            view.type === 'login-with-sms-verification' ||
+            view.type === 'verify-email' ||
+            view.type === 'verify-sms' ||
+            view.type === 'pending-connect' ||
+            view.type === 'wallet-group' ||
+            view.type === 'select-wallet-in-wallet-group' ||
+            view.type === 'select-hardware-wallet' ||
+            view.type === 'pending-signature' ||
+            view.type === 'qr-code' ||
+            view.type === 'wallet-used' ||
+            view.type === 'email-wallet-otp-verification-view' ||
+            view.type === 'farcaster-connect-view' ||
+            view.type === 'merge-user-accounts' ||
+            view.type === 'merge-user-accounts-conflicts');
     const showCloseButton = view.type !== 'login-with-email-or-wallet-full-wallet-list' &&
         view.type !== 'login-with-email-verification' &&
         view.type !== 'login-with-sms-verification' &&
@@ -187,6 +191,7 @@ const useAuthLayoutChecks = () => {
         view.type === 'passkey-intro' ||
         view.type === 'qr-code' ||
         view.type === 'farcaster-connect-view' ||
+        view.type === 'merge-user-accounts-conflicts' ||
         (view.type === 'merge-user-accounts-with-same-email' && !user);
     const showDefaultFooter = !showConnectedWalletProgress && !showDynamicFooter && !showToSFooter;
     const shouldHideDynamicFooterSeparator = showDynamicFooter && showToSFooter;

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

@@ -73,8 +73,9 @@ import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCar
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 const useAuthLayoutChecks = () => {
+    var _a;
     const { view } = useViewContext();
-    const { user, customPrivacyPolicy, customTermsOfServices, privacyPolicyUrl, termsOfServiceUrl, isBridgeFlow, authMode, } = useInternalDynamicContext();
+    const { user, customPrivacyPolicy, customTermsOfServices, privacyPolicyUrl, termsOfServiceUrl, isBridgeFlow, authMode, projectSettings, } = useInternalDynamicContext();
     const { isFooterExpanded } = useFooterAnimationContext();
     const { mockedSDK } = useMockContext();
     const { helpHeaderData } = useDynamicLayoutData({
@@ -144,22 +145,25 @@ const useAuthLayoutChecks = () => {
                     privacyPolicyUrl ||
                     customPrivacyPolicy ||
                     customTermsOfServices))));
-    const showDynamicFooter = view.type === 'login-with-email-or-wallet' ||
-        view.type === 'login-with-email-or-wallet-full-wallet-list' ||
-        view.type === 'login-with-wallet-only' ||
-        view.type === 'login-with-email-verification' ||
-        view.type === 'login-with-sms-verification' ||
-        view.type === 'verify-email' ||
-        view.type === 'verify-sms' ||
-        view.type === 'pending-connect' ||
-        view.type === 'wallet-group' ||
-        view.type === 'select-wallet-in-wallet-group' ||
-        view.type === 'select-hardware-wallet' ||
-        view.type === 'pending-signature' ||
-        view.type === 'qr-code' ||
-        view.type === 'wallet-used' ||
-        view.type === 'email-wallet-otp-verification-view' ||
-        view.type === 'farcaster-connect-view';
+    const showDynamicFooter = Boolean((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.displayDynamicMessaging) &&
+        (view.type === 'login-with-email-or-wallet' ||
+            view.type === 'login-with-email-or-wallet-full-wallet-list' ||
+            view.type === 'login-with-wallet-only' ||
+            view.type === 'login-with-email-verification' ||
+            view.type === 'login-with-sms-verification' ||
+            view.type === 'verify-email' ||
+            view.type === 'verify-sms' ||
+            view.type === 'pending-connect' ||
+            view.type === 'wallet-group' ||
+            view.type === 'select-wallet-in-wallet-group' ||
+            view.type === 'select-hardware-wallet' ||
+            view.type === 'pending-signature' ||
+            view.type === 'qr-code' ||
+            view.type === 'wallet-used' ||
+            view.type === 'email-wallet-otp-verification-view' ||
+            view.type === 'farcaster-connect-view' ||
+            view.type === 'merge-user-accounts' ||
+            view.type === 'merge-user-accounts-conflicts');
     const showCloseButton = view.type !== 'login-with-email-or-wallet-full-wallet-list' &&
         view.type !== 'login-with-email-verification' &&
         view.type !== 'login-with-sms-verification' &&
@@ -183,6 +187,7 @@ const useAuthLayoutChecks = () => {
         view.type === 'passkey-intro' ||
         view.type === 'qr-code' ||
         view.type === 'farcaster-connect-view' ||
+        view.type === 'merge-user-accounts-conflicts' ||
         (view.type === 'merge-user-accounts-with-same-email' && !user);
     const showDefaultFooter = !showConnectedWalletProgress && !showDynamicFooter && !showToSFooter;
     const shouldHideDynamicFooterSeparator = showDynamicFooter && showToSFooter;

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

@@ -132,7 +132,7 @@ const useCreateDynamicEmbeddedWalletMutation = () => {
             }
             setUser(updateJWTAndCreateUserProfile.updateJWTAndCreateUserProfile(signersResponse.jwt, signersResponse.minifiedJwt));
             setShowAuthFlow(false, { performMultiWalletChecks: false });
-            dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', passkeyWallet, turnkeyVerifiedCredentials);
+            dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', passkeyWallet, turnkeyVerifiedCredentials, authToken);
         }
         catch (err) {
             setError(err);

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

@@ -128,7 +128,7 @@ const useCreateDynamicEmbeddedWalletMutation = () => {
             }
             setUser(updateJWTAndCreateUserProfile(signersResponse.jwt, signersResponse.minifiedJwt));
             setShowAuthFlow(false, { performMultiWalletChecks: false });
-            dynamicEvents.emit('embeddedWalletCreated', passkeyWallet, turnkeyVerifiedCredentials);
+            dynamicEvents.emit('embeddedWalletCreated', passkeyWallet, turnkeyVerifiedCredentials, authToken);
         }
         catch (err) {
             setError(err);

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

@@ -97,6 +97,14 @@ const useDynamicLayoutData = ({ view, authMode, }) => {
             copykey: 'dyn_login.title.wallet_only',
             heading: t('dyn_login.title.wallet_only'),
         },
+        'merge-user-accounts': {
+            copykey: 'dyn_merge_user_accounts.same_wallet.title',
+            heading: t('dyn_merge_user_accounts.same_wallet.title'),
+        },
+        'merge-user-accounts-conflicts': {
+            copykey: 'dyn_merge_user_accounts_conflicts.title',
+            heading: t('dyn_merge_user_accounts_conflicts.title'),
+        },
         'mfa-choose-device': {
             copykey: 'dyn_mfa.choose_device_view.title',
             heading: t('dyn_mfa.choose_device_view.title'),

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

@@ -93,6 +93,14 @@ const useDynamicLayoutData = ({ view, authMode, }) => {
             copykey: 'dyn_login.title.wallet_only',
             heading: t('dyn_login.title.wallet_only'),
         },
+        'merge-user-accounts': {
+            copykey: 'dyn_merge_user_accounts.same_wallet.title',
+            heading: t('dyn_merge_user_accounts.same_wallet.title'),
+        },
+        'merge-user-accounts-conflicts': {
+            copykey: 'dyn_merge_user_accounts_conflicts.title',
+            heading: t('dyn_merge_user_accounts_conflicts.title'),
+        },
         'mfa-choose-device': {
             copykey: 'dyn_mfa.choose_device_view.title',
             heading: t('dyn_mfa.choose_device_view.title'),

package/src/lib/utils/hooks/useEmbeddedWallet/useMPCEmbeddedWallet/useCoinbaseMPC/useCoinbaseMPC.cjs

@@ -162,7 +162,7 @@ const useCoinbaseMPC = () => {
                 connector,
                 id: jwtVerifiedCredential.id,
             };
-            dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', coinbaseMPCWallet, jwtVerifiedCredential);
+            dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', coinbaseMPCWallet, jwtVerifiedCredential, jwt);
             return coinbaseMPCWallet;
         }
         catch (error) {

package/src/lib/utils/hooks/useEmbeddedWallet/useMPCEmbeddedWallet/useCoinbaseMPC/useCoinbaseMPC.js

@@ -158,7 +158,7 @@ const useCoinbaseMPC = () => {
                 connector,
                 id: jwtVerifiedCredential.id,
             };
-            dynamicEvents.emit('embeddedWalletCreated', coinbaseMPCWallet, jwtVerifiedCredential);
+            dynamicEvents.emit('embeddedWalletCreated', coinbaseMPCWallet, jwtVerifiedCredential, jwt);
             return coinbaseMPCWallet;
         }
         catch (error) {

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

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

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

@@ -0,0 +1,99 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../../../../_virtual/_tslib.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('react');
+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('@dynamic-labs/multi-wallet');
+var getAuthToken = require('../../functions/getAuthToken/getAuthToken.cjs');
+require('react-international-phone');
+require('viem');
+require('viem/chains');
+require('../../../config/ApiEndpoint.cjs');
+require('../../../locale/locale.cjs');
+var user = require('../../../data/api/user/user.cjs');
+var updateJWTAndCreateUserProfile = require('../../functions/updateJWTAndCreateUserProfile/updateJWTAndCreateUserProfile.cjs');
+require('../../../context/DynamicContext/DynamicContext.cjs');
+require('../../../events/dynamicEvents.cjs');
+require('../../../context/CaptchaContext/CaptchaContext.cjs');
+require('../../../context/ErrorContext/ErrorContext.cjs');
+require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
+require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
+var UserWalletsContext = require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
+require('../../../context/VerificationContext/VerificationContext.cjs');
+require('react-dom');
+require('../../../context/WalletContext/WalletContext.cjs');
+require('../../../context/ThemeContext/ThemeContext.cjs');
+require('@dynamic-labs/types');
+require('yup');
+require('../../../context/MockContext/MockContext.cjs');
+require('react-i18next');
+require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
+require('../useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
+require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
+require('@dynamic-labs/rpc-providers');
+require('../../../components/Alert/Alert.cjs');
+require('../../../components/ShadowDOM/ShadowDOM.cjs');
+require('../../../components/IconButton/IconButton.cjs');
+require('../../../components/InlineWidget/InlineWidget.cjs');
+require('../../../components/Input/Input.cjs');
+require('../../../components/IsBrowser/IsBrowser.cjs');
+require('../../../components/MenuList/Dropdown/Dropdown.cjs');
+require('../../../components/Transition/ZoomTransition/ZoomTransition.cjs');
+require('../../../components/Transition/SlideInUpTransition/SlideInUpTransition.cjs');
+require('../../../components/Transition/OpacityTransition/OpacityTransition.cjs');
+require('../../../components/OverlayCard/OverlayCardTarget/OverlayCardTarget.cjs');
+require('../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
+require('../../../components/Popper/Popper/Popper.cjs');
+require('../../../components/Popper/PopperContext/PopperContext.cjs');
+require('react-focus-lock');
+require('qrcode');
+require('formik');
+require('../../../views/WalletList/WalletList.cjs');
+require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
+require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
+require('@hcaptcha/react-hcaptcha');
+require('../../../context/LoadingContext/LoadingContext.cjs');
+require('../../../context/FooterAnimationContext/index.cjs');
+require('../../../views/LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.cjs');
+require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
+require('../../../context/PasskeyContext/PasskeyContext.cjs');
+require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
+require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
+require('../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
+require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
+var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
+
+const useMergeUserAccounts = () => {
+    const { environmentId, setShowAuthFlow, setUser } = useInternalDynamicContext.useInternalDynamicContext();
+    const { addedWalletsIds } = UserWalletsContext.useInternalUserWallets();
+    const mergeUserAccounts = (mergeConflictResolutions) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        const authToken = getAuthToken.getAuthToken();
+        const response = yield user.verifyMergeUsers(authToken, environmentId, mergeConflictResolutions);
+        const userProfile = updateJWTAndCreateUserProfile.updateJWTAndCreateUserProfile(response === null || response === void 0 ? void 0 : response.jwt, response === null || response === void 0 ? void 0 : response.minifiedJwt);
+        setUser(userProfile);
+        const walletId = userProfile.lastVerifiedCredentialId;
+        if (walletId) {
+            addedWalletsIds.current.push(walletId);
+        }
+        setShowAuthFlow(false);
+    });
+    return {
+        mergeUserAccounts,
+    };
+};
+
+exports.useMergeUserAccounts = useMergeUserAccounts;

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

@@ -0,0 +1,4 @@
+import { MergeUserConflictResolution } from '@dynamic-labs/sdk-api-core';
+export declare const useMergeUserAccounts: () => {
+    mergeUserAccounts: (mergeConflictResolutions: MergeUserConflictResolution[]) => Promise<void>;
+};

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

@@ -0,0 +1,95 @@
+'use client'
+import { __awaiter } from '../../../../../_virtual/_tslib.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 'react';
+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 { verifyMergeUsers } from '../../../data/api/user/user.js';
+import { updateJWTAndCreateUserProfile } from '../../functions/updateJWTAndCreateUserProfile/updateJWTAndCreateUserProfile.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 { useInternalUserWallets } from '../../../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';
+
+const useMergeUserAccounts = () => {
+    const { environmentId, setShowAuthFlow, setUser } = useInternalDynamicContext();
+    const { addedWalletsIds } = useInternalUserWallets();
+    const mergeUserAccounts = (mergeConflictResolutions) => __awaiter(void 0, void 0, void 0, function* () {
+        const authToken = getAuthToken();
+        const response = yield verifyMergeUsers(authToken, environmentId, mergeConflictResolutions);
+        const userProfile = updateJWTAndCreateUserProfile(response === null || response === void 0 ? void 0 : response.jwt, response === null || response === void 0 ? void 0 : response.minifiedJwt);
+        setUser(userProfile);
+        const walletId = userProfile.lastVerifiedCredentialId;
+        if (walletId) {
+            addedWalletsIds.current.push(walletId);
+        }
+        setShowAuthFlow(false);
+    });
+    return {
+        mergeUserAccounts,
+    };
+};
+
+export { useMergeUserAccounts };

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/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',