From 2f5d838e0f5e32dcf97aabaabd5b24633b30ebaf Mon Sep 17 00:00:00 2001 From: Kristina <7614497+khjrtbrg@users.noreply.github.com> Date: Mon, 18 May 2026 09:51:24 +0200 Subject: [PATCH] Merge pull request #33704 from overleaf/kh-add-reject-change-preference-check [web] add reject tracked change preference check GitOrigin-RevId: b55dba21b3d4f42e68528d2b5906862c57794cd1 --- .../settings/hooks/use-project-notification-preferences.ts | 4 ++++ .../settings/project-notifications-setting.test.tsx | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/services/web/frontend/js/features/settings/hooks/use-project-notification-preferences.ts b/services/web/frontend/js/features/settings/hooks/use-project-notification-preferences.ts index 479bc38aa3..ac72d85532 100644 --- a/services/web/frontend/js/features/settings/hooks/use-project-notification-preferences.ts +++ b/services/web/frontend/js/features/settings/hooks/use-project-notification-preferences.ts @@ -33,6 +33,7 @@ function levelToPreferences( trackedChangesOnOwnProject: true, trackedChangesOnInvitedProject: true, trackChangesAcceptedOnAuthoredChange: true, + trackChangesRejectedOnAuthoredChange: true, } case 'replies': return { @@ -47,6 +48,7 @@ function levelToPreferences( trackedChangesOnOwnProject: false, trackedChangesOnInvitedProject: false, trackChangesAcceptedOnAuthoredChange: true, + trackChangesRejectedOnAuthoredChange: true, } case 'off': return { @@ -61,6 +63,7 @@ function levelToPreferences( trackedChangesOnOwnProject: false, trackedChangesOnInvitedProject: false, trackChangesAcceptedOnAuthoredChange: false, + trackChangesRejectedOnAuthoredChange: false, } } } @@ -91,6 +94,7 @@ function preferencesToLevel( preferences.repliesOnAuthoredThread || preferences.repliesOnParticipatingThread || preferences.trackChangesAcceptedOnAuthoredChange || + preferences.trackChangesRejectedOnAuthoredChange || preferences.commentResolvedOnAuthoredThread || preferences.commentResolvedOnParticipatingThread || preferences.commentReopenedOnAuthoredThread || diff --git a/services/web/test/frontend/features/settings-modal/settings/project-notifications-setting.test.tsx b/services/web/test/frontend/features/settings-modal/settings/project-notifications-setting.test.tsx index 680062e466..40af2bd05d 100644 --- a/services/web/test/frontend/features/settings-modal/settings/project-notifications-setting.test.tsx +++ b/services/web/test/frontend/features/settings-modal/settings/project-notifications-setting.test.tsx @@ -20,6 +20,7 @@ const allNotificationsOn = { trackedChangesOnOwnProject: true, trackedChangesOnInvitedProject: true, trackChangesAcceptedOnAuthoredChange: true, + trackChangesRejectedOnAuthoredChange: true, } const repliesOnlyPreferences = { @@ -34,6 +35,7 @@ const repliesOnlyPreferences = { trackedChangesOnOwnProject: false, trackedChangesOnInvitedProject: false, trackChangesAcceptedOnAuthoredChange: true, + trackChangesRejectedOnAuthoredChange: true, } const globallyMutedPreferences = { @@ -49,6 +51,7 @@ const globallyMutedPreferences = { commentReopenedOnAuthoredThread: false, commentReopenedOnParticipatingThread: false, trackChangesAcceptedOnAuthoredChange: false, + trackChangesRejectedOnAuthoredChange: false, } const allNotificationsOff = { @@ -63,6 +66,7 @@ const allNotificationsOff = { trackedChangesOnOwnProject: false, trackedChangesOnInvitedProject: false, trackChangesAcceptedOnAuthoredChange: false, + trackChangesRejectedOnAuthoredChange: false, } const defaultPreferences = {