Fix/30868: Incorrect group displayed

src/libs/ReportUtils.js

@@ -283,6 +283,10 @@ function isReportApproved(report) {
  */
 function sortReportsByLastRead(reports) {
     return _.chain(reports)
+        .map((report) => {
+            const lastReadTime = lodashGet(report, 'lastVisitTime') || lodashGet(report, 'lastReadTime');
+            return {...report, lastReadTime};
+        })
         .toArray()
         .filter((report) => report && report.reportID && report.lastReadTime)
         .sortBy('lastReadTime')

src/libs/actions/Report.js

@@ -2506,6 +2506,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,
@@ -2567,4 +2578,5 @@ export {
     openRoomMembersPage,
     savePrivateNotesDraft,
     getDraftPrivateNote,
+    updateLastVisitTime,
 };

src/pages/home/ReportScreen.js

@@ -160,6 +160,14 @@ function ReportScreen({
     const [listHeight, setListHeight] = useState(0);
 
     const reportID = getReportID(route);
+
+    useEffect(() => {
+        if (!reportID) {
+            return;
+        }
+        Report.updateLastVisitTime(reportID);
+    }, [reportID]);
+
     const {addWorkspaceRoomOrChatPendingAction, addWorkspaceRoomOrChatErrors} = ReportUtils.getReportOfflinePendingActionAndErrors(report);
     const screenWrapperStyle = [styles.appContent, styles.flex1, {marginTop: viewportOffsetTop}];