@dynamic-labs/sdk-react-core 2.1.0-alpha.2 → 2.1.0-alpha.4

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

@@ -868,6 +868,48 @@ const translation = {
             continue: 'Continue',
         },
     },
+    /**
+     * @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
@@ -880,7 +922,6 @@ 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_with_same_email: {
@@ -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

@@ -864,6 +864,48 @@ export declare const translation: {
             continue: string;
         };
     };
+    /**
+     * @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
@@ -876,7 +918,6 @@ 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_with_same_email: {
@@ -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

@@ -864,6 +864,48 @@ const translation = {
             continue: 'Continue',
         },
     },
+    /**
+     * @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
@@ -876,7 +918,6 @@ 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_with_same_email: {
@@ -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!',
         },

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;