Merge pull request #48887 from shubham1206agra/fix-notification-prefe…

…rence Fix notification preference by defaulting to hidden
Expensify · Sep 12, 2024 · 4d0c30d · 4d0c30d
2 parents 56f4ee7 + 593c33a
commit 4d0c30d
Show file tree

Hide file tree

Showing 9 changed files with 246 additions and 332 deletions.
diff --git a/src/hooks/useResponsiveLayout/__mocks__/index.native.ts b/src/hooks/useResponsiveLayout/__mocks__/index.native.ts
@@ -0,0 +1,13 @@
+export default function useResponsiveLayout() {
+    return {
+        shouldUseNarrowLayout: false,
+        isSmallScreenWidth: false,
+        isInNarrowPaneModal: false,
+        isExtraSmallScreenHeight: false,
+        isExtraSmallScreenWidth: false,
+        isMediumScreenWidth: false,
+        onboardingIsMediumOrLargerScreenWidth: true,
+        isLargeScreenWidth: true,
+        isSmallScreen: false,
+    };
+}
diff --git a/src/hooks/useResponsiveLayout/__mocks__/index.ts b/src/hooks/useResponsiveLayout/__mocks__/index.ts
@@ -0,0 +1,13 @@
+export default function useResponsiveLayout() {
+    return {
+        shouldUseNarrowLayout: false,
+        isSmallScreenWidth: false,
+        isInNarrowPaneModal: false,
+        isExtraSmallScreenHeight: false,
+        isExtraSmallScreenWidth: false,
+        isMediumScreenWidth: false,
+        onboardingIsMediumOrLargerScreenWidth: true,
+        isLargeScreenWidth: true,
+        isSmallScreen: false,
+    };
+}
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
@@ -1163,8 +1163,11 @@ function getDefaultNotificationPreferenceForReport(report: OnyxEntry<Report>): V
 /**
  * Get the notification preference given a report
  */
-function getReportNotificationPreference(report: OnyxEntry<Report>): ValueOf<typeof CONST.REPORT.NOTIFICATION_PREFERENCE> {
-    return report?.participants?.[currentUserAccountID ?? -1]?.notificationPreference ?? getDefaultNotificationPreferenceForReport(report);
+function getReportNotificationPreference(report: OnyxEntry<Report>, shouldDefaltToHidden = true): ValueOf<typeof CONST.REPORT.NOTIFICATION_PREFERENCE> {
+    if (!shouldDefaltToHidden) {
+        return report?.participants?.[currentUserAccountID ?? -1]?.notificationPreference ?? getDefaultNotificationPreferenceForReport(report);
+    }
+    return report?.participants?.[currentUserAccountID ?? -1]?.notificationPreference ?? CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN;
 }
 
 const CONCIERGE_ACCOUNT_ID_STRING = CONST.ACCOUNT_ID.CONCIERGE.toString();

diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
@@ -2871,7 +2871,7 @@ function leaveRoom(reportID: string, isWorkspaceMemberLeavingWorkspaceRoom = fal
         failureData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.parentReportID}`,
-            value: {[report.parentReportActionID]: {childReportNotificationPreference: ReportUtils.getReportNotificationPreference(report)}},
+            value: {[report.parentReportActionID]: {childReportNotificationPreference: ReportUtils.getReportNotificationPreference(report, false)}},
         });
     }
 

diff --git a/tests/perf-test/SidebarLinks.perf-test.tsx b/tests/perf-test/SidebarLinks.perf-test.tsx
@@ -59,7 +59,11 @@ describe('SidebarLinks', () => {
 
         // Initialize the network key for OfflineWithFeedback
         Onyx.merge(ONYXKEYS.NETWORK, {isOffline: false});
-        Onyx.clear().then(waitForBatchedUpdates);
+        TestHelper.signInWithTestUser(1, '[email protected]', undefined, undefined, 'One').then(waitForBatchedUpdates);
+    });
+
+    afterEach(() => {
+        Onyx.clear();
     });
 
     test('[SidebarLinks] should render Sidebar with 500 reports stored', async () => {
@@ -87,7 +91,7 @@ describe('SidebarLinks', () => {
              * Query for display names of participants [1, 2].
              * This will ensure that the sidebar renders a list of items.
              */
-            await screen.findAllByText('One, Two');
+            await screen.findAllByText('Email Two');
         };
 
         await waitForBatchedUpdates();

diff --git a/tests/ui/PaginationTest.tsx b/tests/ui/PaginationTest.tsx
@@ -198,7 +198,10 @@ async function signInAndGetApp(): Promise<void> {
             reportID: REPORT_ID,
             reportName: CONST.REPORT.DEFAULT_REPORT_NAME,
             lastMessageText: 'Test',
-            participants: {[USER_B_ACCOUNT_ID]: {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS}},
+            participants: {
+                [USER_B_ACCOUNT_ID]: {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS},
+                [USER_A_ACCOUNT_ID]: {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS},
+            },
             lastActorAccountID: USER_B_ACCOUNT_ID,
             type: CONST.REPORT.TYPE.CHAT,
         });

diff --git a/tests/ui/UnreadIndicatorsTest.tsx b/tests/ui/UnreadIndicatorsTest.tsx
@@ -140,7 +140,10 @@ function signInAndGetAppWithUnreadChat(): Promise<void> {
                 lastReadTime: reportAction3CreatedDate,
                 lastVisibleActionCreated: reportAction9CreatedDate,
                 lastMessageText: 'Test',
-                participants: {[USER_B_ACCOUNT_ID]: {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS}},
+                participants: {
+                    [USER_B_ACCOUNT_ID]: {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS},
+                    [USER_A_ACCOUNT_ID]: {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS},
+                },
                 lastActorAccountID: USER_B_ACCOUNT_ID,
                 type: CONST.REPORT.TYPE.CHAT,
             });
@@ -301,7 +304,10 @@ describe('Unread Indicators', () => {
                             lastVisibleActionCreated: DateUtils.getDBTime(utcToZonedTime(NEW_REPORT_FIST_MESSAGE_CREATED_DATE, 'UTC').valueOf()),
                             lastMessageText: 'Comment 1',
                             lastActorAccountID: USER_C_ACCOUNT_ID,
-                            participants: {[USER_C_ACCOUNT_ID]: {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS}},
+                            participants: {
+                                [USER_C_ACCOUNT_ID]: {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS},
+                                [USER_A_ACCOUNT_ID]: {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS},
+                            },
                             type: CONST.REPORT.TYPE.CHAT,
                         },
                     },