feat: Show warning modal when Merge local data option is unchecked (#2953) [skip e2e]

* feat: Show warning modal when Merge local data option is unchecked * keep checkbox available when using recovery sign in
2025-11-04 09:51:09 -03:00
parent 11e36e1d4c
commit 531cc70667
6 changed files with 142 additions and 11 deletions
--- a/packages/snjs/lib/Domain/UseCase/SignInWithRecoveryCodes/SignInWithRecoveryCodes.ts
+++ b/packages/snjs/lib/Domain/UseCase/SignInWithRecoveryCodes/SignInWithRecoveryCodes.ts
@@ -103,7 +103,7 @@ export class SignInWithRecoveryCodes implements UseCaseInterface<void> {
        payload: {
          payload: {
            ephemeral: false,
-            mergeLocal: false,
+            mergeLocal: dto.mergeLocal ?? true,
            awaitSync: true,
            checkIntegrity: false,
          },
--- a/packages/snjs/lib/Domain/UseCase/SignInWithRecoveryCodes/SignInWithRecoveryCodesDTO.ts
+++ b/packages/snjs/lib/Domain/UseCase/SignInWithRecoveryCodes/SignInWithRecoveryCodesDTO.ts
@@ -3,4 +3,5 @@ export interface SignInWithRecoveryCodesDTO {
  username: string
  password: string
  hvmToken?: string
+  mergeLocal?: boolean
 }