Merge pull request #41484 from wildan-m/wildan/fix-34829-mark-message…

…-from-notification

src/CONST.ts

@@ -4750,6 +4750,10 @@ const CONST = {
     SEARCH_DATA_TYPES: {
         TRANSACTION: 'transaction',
     },
+
+    REFERRER: {
+        NOTIFICATION: 'notification',
+    },
 } as const;
 
 type Country = keyof typeof CONST.ALL_COUNTRIES;

src/ROUTES.ts

@@ -212,7 +212,11 @@ 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) => {
+            const baseRoute = reportActionID ? (`r/${reportID}/${reportActionID}` as const) : (`r/${reportID}` as const);
+            const referrerParam = referrer ? `?referrer=${encodeURIComponent(referrer)}` : '';
+            return `${baseRoute}${referrerParam}` as const;
+        },
     },
     REPORT_AVATAR: {
         route: 'r/:reportID/avatar',

src/libs/Navigation/types.ts

@@ -53,6 +53,7 @@ type CentralPaneNavigatorParamList = {
         reportActionID: string;
         reportID: string;
         openOnAdminRoom?: boolean;
+        referrer?: string;
     };
     [SCREENS.SETTINGS.PROFILE.ROOT]: undefined;
     [SCREENS.SETTINGS.PREFERENCES.ROOT]: undefined;

src/libs/actions/Report.ts

@@ -103,6 +103,7 @@ import type {EmptyObject} from '@src/types/utils/EmptyObject';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import * as CachedPDFPaths from './CachedPDFPaths';
 import * as Modal from './Modal';
+import navigateFromNotification from './navigateFromNotification';
 import * as Session from './Session';
 import * as Welcome from './Welcome';
 
@@ -2302,7 +2303,7 @@ function showReportActionNotification(reportID: string, reportAction: ReportActi
             if (!reportBelongsToWorkspace) {
                 Navigation.navigateWithSwitchPolicyID({route: ROUTES.HOME});
             }
-            Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(reportID));
+            navigateFromNotification(reportID);
         });
 
     if (reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE) {

src/libs/actions/navigateFromNotification/index.desktop.ts

@@ -0,0 +1,9 @@
+import Navigation from '@libs/Navigation/Navigation';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+const navigateFromNotification = (reportID: string) => {
+    Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(reportID, undefined, CONST.REFERRER.NOTIFICATION));
+};
+
+export default navigateFromNotification;

src/libs/actions/navigateFromNotification/index.ts

@@ -0,0 +1,8 @@
+import Navigation from '@libs/Navigation/Navigation';
+import ROUTES from '@src/ROUTES';
+
+const navigateFromNotification = (reportID: string) => {
+    Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(reportID));
+};
+
+export default navigateFromNotification;

src/pages/home/report/ReportActionsList.tsx

@@ -257,10 +257,14 @@ function ReportActionsList({
         if (!userActiveSince.current || report.reportID !== prevReportID) {
             return;
         }
-
         if (ReportUtils.isUnread(report)) {
-            if (Visibility.isVisible() && scrollingVerticalOffset.current < MSG_VISIBLE_THRESHOLD) {
+            // On desktop, when the notification center is displayed, Visibility.isVisible() will return false.
+            // Currently, there's no programmatic way to dismiss the notification center panel.
+            // To handle this, we use the 'referrer' parameter to check if the current navigation is triggered from a notification.
+            const isFromNotification = route?.params?.referrer === CONST.REFERRER.NOTIFICATION;
+            if ((Visibility.isVisible() || isFromNotification) && scrollingVerticalOffset.current < MSG_VISIBLE_THRESHOLD) {
                 Report.readNewestAction(report.reportID);
+                Navigation.setParams({referrer: undefined});
             } else {
                 readActionSkipped.current = true;
             }