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

package/src/lib/context/ErrorBoundary/ErrorBoundaryExclude.cjs

@@ -0,0 +1,17 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var ErrorBoundaryBase = require('./ErrorBoundaryBase.cjs');
+
+class ErrorBoundaryExclude extends ErrorBoundaryBase.ErrorBoundaryBase {
+    render() {
+        const { children } = this.props;
+        return this.renderOrError(children, {
+            isDynamicSdkError: false,
+        });
+    }
+}
+
+exports.ErrorBoundaryExclude = ErrorBoundaryExclude;

package/src/lib/context/ErrorBoundary/ErrorBoundaryExclude.d.ts

@@ -0,0 +1,4 @@
+import { ErrorBoundaryBase } from './ErrorBoundaryBase';
+export declare class ErrorBoundaryExclude extends ErrorBoundaryBase {
+    render(): any;
+}

package/src/lib/context/ErrorBoundary/ErrorBoundaryExclude.js

@@ -0,0 +1,13 @@
+'use client'
+import { ErrorBoundaryBase } from './ErrorBoundaryBase.js';
+
+class ErrorBoundaryExclude extends ErrorBoundaryBase {
+    render() {
+        const { children } = this.props;
+        return this.renderOrError(children, {
+            isDynamicSdkError: false,
+        });
+    }
+}
+
+export { ErrorBoundaryExclude };

package/src/lib/context/ErrorBoundary/ErrorBoundaryInclude.cjs

@@ -0,0 +1,17 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var ErrorBoundaryBase = require('./ErrorBoundaryBase.cjs');
+
+class ErrorBoundaryInclude extends ErrorBoundaryBase.ErrorBoundaryBase {
+    render() {
+        const { children } = this.props;
+        return this.renderOrError(children, {
+            isDynamicSdkError: true,
+        });
+    }
+}
+
+exports.ErrorBoundaryInclude = ErrorBoundaryInclude;

package/src/lib/context/ErrorBoundary/ErrorBoundaryInclude.d.ts

@@ -0,0 +1,4 @@
+import { ErrorBoundaryBase } from './ErrorBoundaryBase';
+export declare class ErrorBoundaryInclude extends ErrorBoundaryBase {
+    render(): any;
+}

package/src/lib/context/ErrorBoundary/ErrorBoundaryInclude.js

@@ -0,0 +1,13 @@
+'use client'
+import { ErrorBoundaryBase } from './ErrorBoundaryBase.js';
+
+class ErrorBoundaryInclude extends ErrorBoundaryBase {
+    render() {
+        const { children } = this.props;
+        return this.renderOrError(children, {
+            isDynamicSdkError: true,
+        });
+    }
+}
+
+export { ErrorBoundaryInclude };

package/src/lib/context/ErrorBoundary/index.d.ts

@@ -0,0 +1,3 @@
+export { ErrorBoundary } from './ErrorBoundary';
+export { ErrorBoundaryExclude } from './ErrorBoundaryExclude';
+export { ErrorBoundaryInclude } from './ErrorBoundaryInclude';

package/src/lib/context/ErrorBoundary/types.d.ts

@@ -0,0 +1,13 @@
+import { ErrorInfo, PropsWithChildren } from 'react';
+export type ErrorBoundaryProps = PropsWithChildren<{
+    onError?: (error: Error, info: ErrorInfo) => void;
+}>;
+export type ErrorBoundaryState = {
+    hasError: boolean;
+    error: Error | null;
+};
+export type ErrorBoundaryContextType = {
+    hasError: boolean;
+    error: any;
+    isDynamicSdkError: boolean;
+};

package/src/lib/context/ViewContext/ViewContext.cjs

@@ -16,13 +16,13 @@ const ViewContextProvider = ({ children, initialView = { props: { isWalletConnec
     const goToInitialView = React.useCallback(() => {
         _setView(null);
     }, []);
-    const setView = React.useCallback((type, props) => {
+    const setView = React.useCallback((type, props, events) => {
         // we need to clear errors before proceeding to the next view
         // but only if the next view is different from the current view
         // this is to prevent the error from being cleared when the same view is re-rendered
         if (view.type !== type)
             clearError();
-        _setView({ props, type });
+        _setView({ events, props, type });
     }, []);
     useDynamicEvents.useInternalDynamicEvents('logout', () => goToInitialView());
     const value = React.useMemo(() => ({

package/src/lib/context/ViewContext/ViewContext.js

@@ -12,13 +12,13 @@ const ViewContextProvider = ({ children, initialView = { props: { isWalletConnec
     const goToInitialView = useCallback(() => {
         _setView(null);
     }, []);
-    const setView = useCallback((type, props) => {
+    const setView = useCallback((type, props, events) => {
         // we need to clear errors before proceeding to the next view
         // but only if the next view is different from the current view
         // this is to prevent the error from being cleared when the same view is re-rendered
         if (view.type !== type)
             clearError();
-        _setView({ props, type });
+        _setView({ events, props, type });
     }, []);
     useInternalDynamicEvents('logout', () => goToInitialView());
     const value = useMemo(() => ({

package/src/lib/context/ViewContext/types/index.d.ts

@@ -1,12 +1,17 @@
 import { FC } from 'react';
 import { viewToComponentMap } from '../../../views/viewToComponentMap';
-export type ViewType = 'select-hardware-wallet' | 'captcha' | 'chainalysis-blocked-wallet' | 'collect-user-data' | 'collect-user-data-login-no-wallet' | 'login-with-email-or-wallet-full-wallet-list' | 'login-with-email-or-wallet' | 'login-with-wallet-only' | 'login-with-email-verification' | 'login-with-sms-verification' | 'network-not-supported' | 'network-not-supported-manual' | 'no-access' | 'no-qr-not-installed' | 'pending-connect' | 'pending-signature-without-back-button' | 'pending-signature' | 'qr-code' | 'update-email' | 'verify-email' | 'verify-sms' | 'wallet-connect-mobile-wallets-list' | 'wallet-list' | 'multi-wallet-wallet-list' | 'wallet-sign' | 'wallet-used' | 'wallet-group' | 'select-wallet-in-wallet-group' | 'wait-for-email-confirmation-view' | 'email-wallet-otp-verification-view' | 'social-redirect-view' | 'wallet-locked-view' | 'social-wrong-account' | 'gate-blocked-wallet' | 'bridge-welcome' | 'bridge-summary' | 'bridge-next-wallet-connection' | 'account-exists' | 'merge-user-accounts-with-same-email' | 'mfa-choose-device' | 'mfa-secure-device' | 'wallet-cannot-be-transferred' | 'passkey-intro' | 'passkey-recovery-add-email' | 'passkey-recovery-start' | 'passkey-recovery-bundle' | 'passkey-recovery-complete' | 'passkey-new-domain-detected' | 'embedded-reveal-view' | 'embedded-reveal-account-view' | 'embedded-wallet-auth-choice' | 'rename-passkey' | 'wallet-redirect-view' | 'create-password-view' | 'wallet-claim-intro' | 'farcaster-connect-view';
+export type ViewType = 'select-hardware-wallet' | 'captcha' | 'chainalysis-blocked-wallet' | 'collect-user-data' | 'collect-user-data-login-no-wallet' | 'login-with-email-or-wallet-full-wallet-list' | 'login-with-email-or-wallet' | 'login-with-wallet-only' | 'login-with-email-verification' | 'login-with-sms-verification' | 'network-not-supported' | 'network-not-supported-manual' | 'no-access' | 'no-qr-not-installed' | 'pending-connect' | 'pending-signature-without-back-button' | 'pending-signature' | 'qr-code' | 'update-email' | 'verify-email' | 'verify-sms' | 'wallet-connect-mobile-wallets-list' | 'wallet-list' | 'multi-wallet-wallet-list' | 'wallet-sign' | 'wallet-used' | 'wallet-group' | 'select-wallet-in-wallet-group' | 'wait-for-email-confirmation-view' | 'email-wallet-otp-verification-view' | 'social-redirect-view' | 'wallet-locked-view' | 'social-wrong-account' | 'gate-blocked-wallet' | 'bridge-welcome' | 'bridge-summary' | 'bridge-next-wallet-connection' | 'account-exists' | 'merge-user-accounts' | 'merge-user-accounts-conflicts' | 'merge-user-accounts-with-same-email' | 'mfa-choose-device' | 'mfa-secure-device' | 'wallet-cannot-be-transferred' | 'passkey-intro' | 'passkey-recovery-add-email' | 'passkey-recovery-start' | 'passkey-recovery-bundle' | 'passkey-recovery-complete' | 'passkey-new-domain-detected' | 'embedded-reveal-view' | 'embedded-reveal-account-view' | 'embedded-wallet-auth-choice' | 'rename-passkey' | 'wallet-redirect-view' | 'create-password-view' | 'wallet-claim-intro' | 'farcaster-connect-view';
 export type ViewMapConstraint = Record<ViewType, FC<any>>;
 type ComponentProps<T extends FC<any>> = T extends FC<infer P> ? P : never;
 export type ViewMap = typeof viewToComponentMap;
 export type ViewState<T extends ViewType> = {
     type: T;
     props?: ComponentProps<ViewMap[T]>;
+    events?: ViewEvents;
 };
-export type SetView = <T extends ViewType>(view: T, props?: ViewState<T>['props']) => void;
+export type ViewEvents = {
+    onBackClick?: () => void;
+    onClose?: () => void;
+};
+export type SetView = <T extends ViewType>(view: T, props?: ViewState<T>['props'], events?: ViewEvents) => void;
 export {};

package/src/lib/data/api/user/user.cjs

@@ -61,6 +61,21 @@ const mergeUserAccounts = (userJwt, environmentId) => _tslib.__awaiter(void 0, v
         throw e;
     }
 });
+const verifyMergeUsers = (userJwt, environmentId, mergeConflictResolutions) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    try {
+        const response = yield api.sdkApi(userJwt).verifyMergeUsers({
+            environmentId,
+            mergeUserConflictResolutions: {
+                mergeUserResolutions: mergeConflictResolutions,
+            },
+        });
+        return response;
+    }
+    catch (e) {
+        logger.logger.error(e);
+        throw e;
+    }
+});
 const refreshUserJwt = (_a, userJwt_1) => _tslib.__awaiter(void 0, [_a, userJwt_1], void 0, function* ({ environmentId, }, userJwt) {
     try {
         const { jwt, minifiedJwt } = yield api.sdkApi(userJwt).refreshAuth({
@@ -76,3 +91,4 @@ const refreshUserJwt = (_a, userJwt_1) => _tslib.__awaiter(void 0, [_a, userJwt_
 exports.mergeUserAccounts = mergeUserAccounts;
 exports.refreshUserJwt = refreshUserJwt;
 exports.updateUserProfileFields = updateUserProfileFields;
+exports.verifyMergeUsers = verifyMergeUsers;

package/src/lib/data/api/user/user.js

@@ -57,6 +57,21 @@ const mergeUserAccounts = (userJwt, environmentId) => __awaiter(void 0, void 0,
         throw e;
     }
 });
+const verifyMergeUsers = (userJwt, environmentId, mergeConflictResolutions) => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        const response = yield sdkApi(userJwt).verifyMergeUsers({
+            environmentId,
+            mergeUserConflictResolutions: {
+                mergeUserResolutions: mergeConflictResolutions,
+            },
+        });
+        return response;
+    }
+    catch (e) {
+        logger.error(e);
+        throw e;
+    }
+});
 const refreshUserJwt = (_a, userJwt_1) => __awaiter(void 0, [_a, userJwt_1], void 0, function* ({ environmentId, }, userJwt) {
     try {
         const { jwt, minifiedJwt } = yield sdkApi(userJwt).refreshAuth({
@@ -69,4 +84,4 @@ const refreshUserJwt = (_a, userJwt_1) => __awaiter(void 0, [_a, userJwt_1], voi
     }
 });
 
-export { mergeUserAccounts, refreshUserJwt, updateUserProfileFields };
+export { mergeUserAccounts, refreshUserJwt, updateUserProfileFields, verifyMergeUsers };

package/src/lib/data/api/wallets/wallets.cjs

@@ -19,7 +19,22 @@ require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('../../../shared/consts/index.cjs');
 var api = require('../api.cjs');
 
-const linkWallet = (environmentId_1, _a, userJwt_1) => _tslib.__awaiter(void 0, [environmentId_1, _a, userJwt_1], void 0, function* (environmentId, { messageToSign, network, signedMessage, publicWalletAddress, chain, walletName, walletProvider, additionalWalletAddresses, backup, password, passwordSource, }, userJwt) {
+const storeSelectedWallet = (_a, userJwt_1) => _tslib.__awaiter(void 0, [_a, userJwt_1], void 0, function* ({ environmentId, walletId, }, userJwt) {
+    try {
+        const response = yield api.sdkApi(userJwt).selectUserWallet({
+            environmentId,
+            userWalletSelectionRequest: {
+                walletId,
+            },
+        });
+        return response;
+    }
+    catch (e) {
+        logger.logger.error('error storing selected wallet', e);
+        return undefined;
+    }
+});
+const linkWallet = (environmentId_1, _b, userJwt_2) => _tslib.__awaiter(void 0, [environmentId_1, _b, userJwt_2], void 0, function* (environmentId, { messageToSign, network, signedMessage, publicWalletAddress, chain, walletName, walletProvider, additionalWalletAddresses, backup, password, passwordSource, }, userJwt) {
     const verifyRequest = sdkApiCore.VerifyRequestFromJSON({
         additionalWalletAddresses,
         backup,
@@ -48,12 +63,16 @@ const linkWallet = (environmentId_1, _a, userJwt_1) => _tslib.__awaiter(void 0,
             throw new utils.WalletUsedError(data.code);
         }
         if (data.code === 'merge_accounts_confirmation') {
-            throw new utils.MergeAccountsConfirmationError(data.code, data.payload.mergeUserConflicts);
+            throw new utils.MergeAccountsConfirmationError({
+                code: data.code,
+                mergeConflicts: data.payload.mergeConflicts,
+                walletAddress: publicWalletAddress,
+            });
         }
         return undefined;
     }
 });
-const unlinkWallet = (_b, userJwt_2) => _tslib.__awaiter(void 0, [_b, userJwt_2], void 0, function* ({ environmentId, primaryWalletId, walletId, }, userJwt) {
+const unlinkWallet = (_c, userJwt_3) => _tslib.__awaiter(void 0, [_c, userJwt_3], void 0, function* ({ environmentId, primaryWalletId, walletId, }, userJwt) {
     try {
         const response = yield api.sdkApi(userJwt).verifyUnlink({
             environmentId,
@@ -68,7 +87,7 @@ const unlinkWallet = (_b, userJwt_2) => _tslib.__awaiter(void 0, [_b, userJwt_2]
         return undefined;
     }
 });
-const transferWallet = (environmentId_2, _c, userJwt_3) => _tslib.__awaiter(void 0, [environmentId_2, _c, userJwt_3], void 0, function* (environmentId, { network, messageToSign, signedMessage, publicWalletAddress, chain, walletName, walletProvider, skipEmptyAccountCheck = false, }, userJwt) {
+const transferWallet = (environmentId_2, _d, userJwt_4) => _tslib.__awaiter(void 0, [environmentId_2, _d, userJwt_4], void 0, function* (environmentId, { network, messageToSign, signedMessage, publicWalletAddress, chain, walletName, walletProvider, skipEmptyAccountCheck = false, }, userJwt) {
     // We should find a better way to do this than force type casting
     const verifyRequest = {
         chain,
@@ -87,11 +106,11 @@ const transferWallet = (environmentId_2, _c, userJwt_3) => _tslib.__awaiter(void
         });
         return response;
     }
-    catch (_d) {
+    catch (_e) {
         return undefined;
     }
 });
-const verifyWallet = (environmentId_3, _e) => _tslib.__awaiter(void 0, [environmentId_3, _e], void 0, function* (environmentId, { messageToSign, signedMessage, publicWalletAddress, chain, walletName, walletProvider, captchaToken, network, oauth, additionalWalletAddresses, }) {
+const verifyWallet = (environmentId_3, _f) => _tslib.__awaiter(void 0, [environmentId_3, _f], void 0, function* (environmentId, { messageToSign, signedMessage, publicWalletAddress, chain, walletName, walletProvider, captchaToken, network, oauth, additionalWalletAddresses, }) {
     const verifyRequest = sdkApiCore.VerifyRequestFromJSON({
         additionalWalletAddresses,
         captchaToken,
@@ -136,6 +155,7 @@ const verifyWallet = (environmentId_3, _e) => _tslib.__awaiter(void 0, [environm
 });
 
 exports.linkWallet = linkWallet;
+exports.storeSelectedWallet = storeSelectedWallet;
 exports.transferWallet = transferWallet;
 exports.unlinkWallet = unlinkWallet;
 exports.verifyWallet = verifyWallet;

package/src/lib/data/api/wallets/wallets.d.ts

@@ -1,5 +1,9 @@
 import { VerifyResponse } from '@dynamic-labs/sdk-api-core';
 import { VerifyWallet } from '../../../shared/types';
+export declare const storeSelectedWallet: ({ environmentId, walletId, }: {
+    environmentId: string;
+    walletId: string;
+}, userJwt: string) => Promise<VerifyResponse | undefined>;
 export declare const linkWallet: (environmentId: string, { messageToSign, network, signedMessage, publicWalletAddress, chain, walletName, walletProvider, additionalWalletAddresses, backup, password, passwordSource, }: VerifyWallet, userJwt: string) => Promise<VerifyResponse | undefined>;
 export declare const unlinkWallet: ({ environmentId, primaryWalletId, walletId, }: {
     environmentId: string;

package/src/lib/data/api/wallets/wallets.js

@@ -15,7 +15,22 @@ import '../../../shared/utils/classes/storage/localStorage.js';
 import '../../../shared/consts/index.js';
 import { sdkApi } from '../api.js';
 
-const linkWallet = (environmentId_1, _a, userJwt_1) => __awaiter(void 0, [environmentId_1, _a, userJwt_1], void 0, function* (environmentId, { messageToSign, network, signedMessage, publicWalletAddress, chain, walletName, walletProvider, additionalWalletAddresses, backup, password, passwordSource, }, userJwt) {
+const storeSelectedWallet = (_a, userJwt_1) => __awaiter(void 0, [_a, userJwt_1], void 0, function* ({ environmentId, walletId, }, userJwt) {
+    try {
+        const response = yield sdkApi(userJwt).selectUserWallet({
+            environmentId,
+            userWalletSelectionRequest: {
+                walletId,
+            },
+        });
+        return response;
+    }
+    catch (e) {
+        logger.error('error storing selected wallet', e);
+        return undefined;
+    }
+});
+const linkWallet = (environmentId_1, _b, userJwt_2) => __awaiter(void 0, [environmentId_1, _b, userJwt_2], void 0, function* (environmentId, { messageToSign, network, signedMessage, publicWalletAddress, chain, walletName, walletProvider, additionalWalletAddresses, backup, password, passwordSource, }, userJwt) {
     const verifyRequest = VerifyRequestFromJSON({
         additionalWalletAddresses,
         backup,
@@ -44,12 +59,16 @@ const linkWallet = (environmentId_1, _a, userJwt_1) => __awaiter(void 0, [enviro
             throw new WalletUsedError(data.code);
         }
         if (data.code === 'merge_accounts_confirmation') {
-            throw new MergeAccountsConfirmationError(data.code, data.payload.mergeUserConflicts);
+            throw new MergeAccountsConfirmationError({
+                code: data.code,
+                mergeConflicts: data.payload.mergeConflicts,
+                walletAddress: publicWalletAddress,
+            });
         }
         return undefined;
     }
 });
-const unlinkWallet = (_b, userJwt_2) => __awaiter(void 0, [_b, userJwt_2], void 0, function* ({ environmentId, primaryWalletId, walletId, }, userJwt) {
+const unlinkWallet = (_c, userJwt_3) => __awaiter(void 0, [_c, userJwt_3], void 0, function* ({ environmentId, primaryWalletId, walletId, }, userJwt) {
     try {
         const response = yield sdkApi(userJwt).verifyUnlink({
             environmentId,
@@ -64,7 +83,7 @@ const unlinkWallet = (_b, userJwt_2) => __awaiter(void 0, [_b, userJwt_2], void
         return undefined;
     }
 });
-const transferWallet = (environmentId_2, _c, userJwt_3) => __awaiter(void 0, [environmentId_2, _c, userJwt_3], void 0, function* (environmentId, { network, messageToSign, signedMessage, publicWalletAddress, chain, walletName, walletProvider, skipEmptyAccountCheck = false, }, userJwt) {
+const transferWallet = (environmentId_2, _d, userJwt_4) => __awaiter(void 0, [environmentId_2, _d, userJwt_4], void 0, function* (environmentId, { network, messageToSign, signedMessage, publicWalletAddress, chain, walletName, walletProvider, skipEmptyAccountCheck = false, }, userJwt) {
     // We should find a better way to do this than force type casting
     const verifyRequest = {
         chain,
@@ -83,11 +102,11 @@ const transferWallet = (environmentId_2, _c, userJwt_3) => __awaiter(void 0, [en
         });
         return response;
     }
-    catch (_d) {
+    catch (_e) {
         return undefined;
     }
 });
-const verifyWallet = (environmentId_3, _e) => __awaiter(void 0, [environmentId_3, _e], void 0, function* (environmentId, { messageToSign, signedMessage, publicWalletAddress, chain, walletName, walletProvider, captchaToken, network, oauth, additionalWalletAddresses, }) {
+const verifyWallet = (environmentId_3, _f) => __awaiter(void 0, [environmentId_3, _f], void 0, function* (environmentId, { messageToSign, signedMessage, publicWalletAddress, chain, walletName, walletProvider, captchaToken, network, oauth, additionalWalletAddresses, }) {
     const verifyRequest = VerifyRequestFromJSON({
         additionalWalletAddresses,
         captchaToken,
@@ -131,4 +150,4 @@ const verifyWallet = (environmentId_3, _e) => __awaiter(void 0, [environmentId_3
     }
 });
 
-export { linkWallet, transferWallet, unlinkWallet, verifyWallet };
+export { linkWallet, storeSelectedWallet, transferWallet, unlinkWallet, verifyWallet };

package/src/lib/events/dynamicEvents.d.ts

@@ -11,7 +11,7 @@ export type DynamicEvents = {
     authFlowCancelled: () => void;
     emailVerificationResult: (param: boolean, email: string) => void;
     smsVerificationResult: (param: boolean, phone: PhoneData) => void;
-    embeddedWalletCreated: (wallet: Wallet, verifiedCredential: JwtVerifiedCredential | undefined) => void;
+    embeddedWalletCreated: (wallet: Wallet, verifiedCredential: JwtVerifiedCredential | undefined, authToken: string | undefined) => void;
     embeddedWalletFailed: (error: unknown) => void;
     passkeyRecoveryCompleted: (wallet: Wallet) => void;
     passkeyRecoveryFailed: (error: unknown) => void;

package/src/lib/layout/DynamicAuthLayout/Header/header.cjs

@@ -92,6 +92,11 @@ const Header = ({ onClose: handleClose, heading, projectSettings, copykey, }) =>
     const { setExistentAccountData } = AccountExistsContext.useAccountExistsContext();
     const { setSocialProvider } = SocialRedirectContext.useSocialRedirectContext();
     const handleBackClick = React.useCallback(() => {
+        var _a;
+        if ((_a = view.events) === null || _a === void 0 ? void 0 : _a.onBackClick) {
+            view.events.onBackClick();
+            return;
+        }
         if (view.type === 'farcaster-connect-view') {
             setSocialProvider(undefined);
             dynamicEvents.dynamicEvents.emit('farcasterConnectCancelled');
@@ -106,6 +111,7 @@ const Header = ({ onClose: handleClose, heading, projectSettings, copykey, }) =>
         goToInitialView();
     }, [
         view.type,
+        view.events,
         goToInitialView,
         setExistentAccountData,
         setError,

package/src/lib/layout/DynamicAuthLayout/Header/header.js

@@ -88,6 +88,11 @@ const Header = ({ onClose: handleClose, heading, projectSettings, copykey, }) =>
     const { setExistentAccountData } = useAccountExistsContext();
     const { setSocialProvider } = useSocialRedirectContext();
     const handleBackClick = useCallback(() => {
+        var _a;
+        if ((_a = view.events) === null || _a === void 0 ? void 0 : _a.onBackClick) {
+            view.events.onBackClick();
+            return;
+        }
         if (view.type === 'farcaster-connect-view') {
             setSocialProvider(undefined);
             dynamicEvents.emit('farcasterConnectCancelled');
@@ -102,6 +107,7 @@ const Header = ({ onClose: handleClose, heading, projectSettings, copykey, }) =>
         goToInitialView();
     }, [
         view.type,
+        view.events,
         goToInitialView,
         setExistentAccountData,
         setError,

package/src/lib/locale/en/translation.cjs

@@ -871,6 +871,48 @@ const translation = {
     /**
      * @description copy keys for merge user accounts view
      * @default
+     * {
+        confirm_button: 'Merge accounts',
+        errors: {
+          merge_error: 'Something went wrong, please try again.',
+        },
+        same_wallet: {
+          content: 'Your wallet is currently used by 2 different accounts.',
+          title: 'Same wallet in use',
+        },
+      }
+     */
+    dyn_merge_user_accounts: {
+        confirm_button: 'Merge accounts',
+        errors: {
+            merge_error: 'Something went wrong, please try again.',
+        },
+        same_wallet: {
+            content: 'Your wallet is currently used by 2 different accounts.',
+            title: 'Same wallet in use',
+        },
+    },
+    /**
+     * @description copy keys for merge user accounts conflicts view
+     * @default
+     * {
+        confirm_button: 'Confirm & Merge',
+        errors: {
+          merge_error: 'Something went wrong, please try again.',
+        },
+        title: 'Confirm your preferences',
+      }
+     */
+    dyn_merge_user_accounts_conflicts: {
+        confirm_button: 'Confirm & Merge',
+        errors: {
+            merge_error: 'Something went wrong, please try again.',
+        },
+        title: 'Confirm your preferences',
+    },
+    /**
+     * @description copy keys for merge user accounts view when using email associated to a different account
+     * @default
      * {
         cancel_button: "No, I'll use a different email",
         confirm_button: 'Yes, link to existing account',
@@ -880,10 +922,9 @@ const translation = {
         existing_account: 'An account already exists that uses',
         existing_account_trail: 'email.',
         title: 'Would you like to link this wallet to this existing account?',
-      },
       }
      */
-    dyn_merge_user_accounts: {
+    dyn_merge_user_accounts_with_same_email: {
         cancel_button: "No, I'll use a different email",
         confirm_button: 'Yes, link to existing account',
         errors: {
@@ -1110,7 +1151,7 @@ const translation = {
             'Don’t get locked out if you delete your passkey or lose your device.',
           input_label: 'Enter your email',
           title: 'Add a recovery email',
-          confirm_button: 'Done',
+          confirm_button: 'Confirm with a passkey',
           skip_button: 'Skip for now',
           success_message: 'Recovery email added!',
         },
@@ -1141,7 +1182,7 @@ const translation = {
             description: 'Don’t get locked out if you delete your passkey or lose your device.',
             input_label: 'Enter your email',
             title: 'Add a recovery email',
-            confirm_button: 'Done',
+            confirm_button: 'Confirm with a passkey',
             skip_button: 'Skip for now',
             success_message: 'Recovery email added!',
         },

package/src/lib/locale/en/translation.d.ts

@@ -867,6 +867,48 @@ export declare const translation: {
     /**
      * @description copy keys for merge user accounts view
      * @default
+     * {
+        confirm_button: 'Merge accounts',
+        errors: {
+          merge_error: 'Something went wrong, please try again.',
+        },
+        same_wallet: {
+          content: 'Your wallet is currently used by 2 different accounts.',
+          title: 'Same wallet in use',
+        },
+      }
+     */
+    dyn_merge_user_accounts: {
+        confirm_button: string;
+        errors: {
+            merge_error: string;
+        };
+        same_wallet: {
+            content: string;
+            title: string;
+        };
+    };
+    /**
+     * @description copy keys for merge user accounts conflicts view
+     * @default
+     * {
+        confirm_button: 'Confirm & Merge',
+        errors: {
+          merge_error: 'Something went wrong, please try again.',
+        },
+        title: 'Confirm your preferences',
+      }
+     */
+    dyn_merge_user_accounts_conflicts: {
+        confirm_button: string;
+        errors: {
+            merge_error: string;
+        };
+        title: string;
+    };
+    /**
+     * @description copy keys for merge user accounts view when using email associated to a different account
+     * @default
      * {
         cancel_button: "No, I'll use a different email",
         confirm_button: 'Yes, link to existing account',
@@ -876,10 +918,9 @@ export declare const translation: {
         existing_account: 'An account already exists that uses',
         existing_account_trail: 'email.',
         title: 'Would you like to link this wallet to this existing account?',
-      },
       }
      */
-    dyn_merge_user_accounts: {
+    dyn_merge_user_accounts_with_same_email: {
         cancel_button: string;
         confirm_button: string;
         errors: {
@@ -1106,7 +1147,7 @@ export declare const translation: {
             'Don’t get locked out if you delete your passkey or lose your device.',
           input_label: 'Enter your email',
           title: 'Add a recovery email',
-          confirm_button: 'Done',
+          confirm_button: 'Confirm with a passkey',
           skip_button: 'Skip for now',
           success_message: 'Recovery email added!',
         },

package/src/lib/locale/en/translation.js

@@ -867,6 +867,48 @@ const translation = {
     /**
      * @description copy keys for merge user accounts view
      * @default
+     * {
+        confirm_button: 'Merge accounts',
+        errors: {
+          merge_error: 'Something went wrong, please try again.',
+        },
+        same_wallet: {
+          content: 'Your wallet is currently used by 2 different accounts.',
+          title: 'Same wallet in use',
+        },
+      }
+     */
+    dyn_merge_user_accounts: {
+        confirm_button: 'Merge accounts',
+        errors: {
+            merge_error: 'Something went wrong, please try again.',
+        },
+        same_wallet: {
+            content: 'Your wallet is currently used by 2 different accounts.',
+            title: 'Same wallet in use',
+        },
+    },
+    /**
+     * @description copy keys for merge user accounts conflicts view
+     * @default
+     * {
+        confirm_button: 'Confirm & Merge',
+        errors: {
+          merge_error: 'Something went wrong, please try again.',
+        },
+        title: 'Confirm your preferences',
+      }
+     */
+    dyn_merge_user_accounts_conflicts: {
+        confirm_button: 'Confirm & Merge',
+        errors: {
+            merge_error: 'Something went wrong, please try again.',
+        },
+        title: 'Confirm your preferences',
+    },
+    /**
+     * @description copy keys for merge user accounts view when using email associated to a different account
+     * @default
      * {
         cancel_button: "No, I'll use a different email",
         confirm_button: 'Yes, link to existing account',
@@ -876,10 +918,9 @@ const translation = {
         existing_account: 'An account already exists that uses',
         existing_account_trail: 'email.',
         title: 'Would you like to link this wallet to this existing account?',
-      },
       }
      */
-    dyn_merge_user_accounts: {
+    dyn_merge_user_accounts_with_same_email: {
         cancel_button: "No, I'll use a different email",
         confirm_button: 'Yes, link to existing account',
         errors: {
@@ -1106,7 +1147,7 @@ const translation = {
             'Don’t get locked out if you delete your passkey or lose your device.',
           input_label: 'Enter your email',
           title: 'Add a recovery email',
-          confirm_button: 'Done',
+          confirm_button: 'Confirm with a passkey',
           skip_button: 'Skip for now',
           success_message: 'Recovery email added!',
         },
@@ -1137,7 +1178,7 @@ const translation = {
             description: 'Don’t get locked out if you delete your passkey or lose your device.',
             input_label: 'Enter your email',
             title: 'Add a recovery email',
-            confirm_button: 'Done',
+            confirm_button: 'Confirm with a passkey',
             skip_button: 'Skip for now',
             success_message: 'Recovery email added!',
         },