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

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

@@ -48,7 +48,11 @@ 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;
     }

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

@@ -44,7 +44,11 @@ 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;
     }

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: {

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: {

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: {

package/src/lib/shared/types/dynamicEventsCallbacks.d.ts

@@ -22,6 +22,7 @@ export type DynamicEventsCallbacks = {
 export type OnAuthSuccess = (params: {
     authToken: string;
     handleLogOut: () => Promise<void>;
+    minAuthToken: string;
     isAuthenticated: boolean;
     primaryWallet: Wallet | null;
     user: UserProfile;
@@ -46,4 +47,4 @@ destination: {
     value: PhoneData;
 }) => void;
 export type OnUserProfileUpdate = (user: UserProfile) => void;
-export type OnEmbeddedWalletCreated = (verifiedCredential: JwtVerifiedCredential | undefined) => void;
+export type OnEmbeddedWalletCreated = (verifiedCredential: JwtVerifiedCredential | undefined, authToken: string | undefined) => void;