Fix/30868: Incorrect group displayed

src/libs/ReportUtils.ts

@@ -559,10 +559,10 @@ function isDraftExpenseReport(report: OnyxEntry<Report>): boolean {
  */
 function sortReportsByLastRead(reports: OnyxCollection<Report>): Array<OnyxEntry<Report>> {
     return Object.values(reports ?? {})
-        .filter((report) => !!report?.reportID && !!report?.lastReadTime)
+        .filter((report) => !!report?.reportID && (!!report?.lastVisitTime || !!report?.lastReadTime))
         .sort((a, b) => {
-            const aTime = new Date(a?.lastReadTime ?? '');
-            const bTime = new Date(b?.lastReadTime ?? '');
+            const aTime = new Date(a?.lastVisitTime ?? a?.lastReadTime ?? '');
+            const bTime = new Date(b?.lastVisitTime ?? b?.lastReadTime ?? '');
 
             return aTime.valueOf() - bTime.valueOf();
         });

src/libs/actions/Report.js

@@ -2502,6 +2502,17 @@ function searchInServer(searchInput) {
     debouncedSearchInServer(searchInput);
 }
 
+/**
+ * @param {String} reportID
+ */
+
+function updateLastVisitTime(reportID) {
+    if (!ReportUtils.isValidReportIDFromPath(reportID)) {
+        return;
+    }
+    Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {lastVisitTime: DateUtils.getDBTime()});
+}
+
 export {
     searchInServer,
     addComment,
@@ -2563,4 +2574,5 @@ export {
     openRoomMembersPage,
     savePrivateNotesDraft,
     getDraftPrivateNote,
+    updateLastVisitTime,
 };

src/pages/home/ReportScreen.js

@@ -1,3 +1,4 @@
+import {useIsFocused} from '@react-navigation/native';
 import lodashGet from 'lodash/get';
 import PropTypes from 'prop-types';
 import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
@@ -165,6 +166,18 @@ function ReportScreen({
     const [scrollPosition, setScrollPosition] = useState({});
 
     const reportID = getReportID(route);
+
+    const isFocused = useIsFocused();
+
+    // We need to update the lastVisitTime every time the report is focused
+    // because lastReadTime does not have up-to-date time stamp every time the user visits a report.
+    useEffect(() => {
+        if (!report.reportID || !isFocused) {
+            return;
+        }
+        Report.updateLastVisitTime(report.reportID);
+    }, [report.reportID, isFocused]);
+
     const {addWorkspaceRoomOrChatPendingAction, addWorkspaceRoomOrChatErrors} = ReportUtils.getReportOfflinePendingActionAndErrors(report);
     const screenWrapperStyle = [styles.appContent, styles.flex1, {marginTop: viewportOffsetTop}];
 
@@ -237,7 +250,6 @@ function ReportScreen({
 
     const fetchReportIfNeeded = useCallback(() => {
         const reportIDFromPath = getReportID(route);
-
         // Report ID will be empty when the reports collection is empty.
         // This could happen when we are loading the collection for the first time after logging in.
         if (!ReportUtils.isValidReportIDFromPath(reportIDFromPath)) {
@@ -250,7 +262,6 @@ function ReportScreen({
         if (report.reportID && report.reportID === getReportID(route) && !isLoadingInitialReportActions) {
             return;
         }
-
         Report.openReport(reportIDFromPath);
     }, [report.reportID, route, isLoadingInitialReportActions]);
 

src/types/onyx/Report.ts

@@ -37,6 +37,9 @@ type Report = {
     /** The last time the report was visited */
     lastReadTime?: string;
 
+    /** The time of the last visit of the report */
+    lastVisitTime?: string;
+
     /** The sequence number of the last report visit */
     lastReadSequenceNumber?: number;