Fix issue message unread from notification center panel

ishpaul777 · Apr 25, 2024 · 6023e76 · 6023e76
1 parent 9a727de
commit 6023e76
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/src/ROUTES.ts b/src/ROUTES.ts
@@ -202,7 +202,13 @@ const ROUTES = {
     REPORT: 'r',
     REPORT_WITH_ID: {
         route: 'r/:reportID?/:reportActionID?',
-        getRoute: (reportID: string, reportActionID?: string) => (reportActionID ? (`r/${reportID}/${reportActionID}` as const) : (`r/${reportID}` as const)),
+        getRoute: (reportID: string, reportActionID?: string, referrer?: string) => {
+            let route = reportActionID ? `r/${reportID}/${reportActionID}` : `r/${reportID}`;
+            if (referrer) {
+                route += `?referrer=${referrer}`;
+            }
+            return route;
+        },
     },
     REPORT_AVATAR: {
         route: 'r/:reportID/avatar',

diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
@@ -2245,7 +2245,7 @@ function showReportActionNotification(reportID: string, reportAction: ReportActi
             if (!reportBelongsToWorkspace) {
                 Navigation.navigateWithSwitchPolicyID({route: ROUTES.HOME});
             }
-            Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(reportID));
+            Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(reportID, undefined, 'notification'));
         });
 
     if (reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE) {

diff --git a/src/pages/home/report/ReportActionsList.tsx b/src/pages/home/report/ReportActionsList.tsx
@@ -250,10 +250,10 @@ function ReportActionsList({
         if (!userActiveSince.current || report.reportID !== prevReportID) {
             return;
         }
-
         if (ReportUtils.isUnread(report)) {
-            if (Visibility.isVisible() && scrollingVerticalOffset.current < MSG_VISIBLE_THRESHOLD) {
+            if ((Visibility.isVisible() || route?.params?.referrer === 'notification') && scrollingVerticalOffset.current < MSG_VISIBLE_THRESHOLD) {
                 Report.readNewestAction(report.reportID);
+                Navigation.setParams({ referrer: undefined });
             } else {
                 readActionSkipped.current = true;
             }