Merge pull request #42628 from narefyev91/fix-open-linked-messages

Fix linked message visibility in offline mode
Expensify · May 27, 2024 · 7abb749 · 7abb749
2 parents dd454ba + 3969435
commit 7abb749
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
@@ -3579,6 +3579,13 @@ function updateLastVisitTime(reportID: string) {
     Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`, {lastVisitTime: DateUtils.getDBTime()});
 }
 
+function updateLoadingInitialReportAction(reportID: string) {
+    if (!ReportUtils.isValidReportIDFromPath(reportID)) {
+        return;
+    }
+    Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`, {isLoadingInitialReportActions: false});
+}
+
 function clearNewRoomFormError() {
     Onyx.set(ONYXKEYS.FORMS.NEW_ROOM_FORM, {
         isLoading: false,
@@ -3819,6 +3826,7 @@ export {
     leaveGroupChat,
     removeFromGroupChat,
     updateGroupChatMemberRoles,
+    updateLoadingInitialReportAction,
     clearAddRoomMemberError,
     clearAvatarErrors,
 };
diff --git a/src/pages/home/report/ReportActionsView.tsx b/src/pages/home/report/ReportActionsView.tsx
@@ -104,6 +104,7 @@ function ReportActionsView({
     const didLayout = useRef(false);
     const didLoadOlderChats = useRef(false);
     const didLoadNewerChats = useRef(false);
+    const {isOffline} = useNetwork();
 
     // triggerListID is used when navigating to a chat with messages loaded from LHN. Typically, these include thread actions, task actions, etc. Since these messages aren't the latest,we don't maintain their position and instead trigger a recalculation of their positioning in the list.
     // we don't set currentReportActionID on initial render as linkedID as it should trigger visibleReportActions after linked message was positioned
@@ -128,6 +129,14 @@ function ReportActionsView({
         Report.openReport(reportID, reportActionID);
     };
 
+    useEffect(() => {
+        // When we linked to message - we do not need to wait for initial actions - they already exists
+        if (!reportActionID || !isOffline) {
+            return;
+        }
+        Report.updateLoadingInitialReportAction(report.reportID);
+    }, [isOffline, report.reportID, reportActionID]);
+
     useLayoutEffect(() => {
         setCurrentReportActionID('');
     }, [route]);
@@ -199,7 +208,7 @@ function ReportActionsView({
      */
     const fetchNewerAction = useCallback(
         (newestReportAction: OnyxTypes.ReportAction) => {
-            if (isLoadingNewerReportActions || isLoadingInitialReportActions) {
+            if (isLoadingNewerReportActions || isLoadingInitialReportActions || (reportActionID && isOffline)) {
                 return;
             }
 
@@ -216,7 +225,7 @@ function ReportActionsView({
                 Report.getNewerActions(reportID, newestReportAction.reportActionID);
             }
         },
-        [isLoadingNewerReportActions, isLoadingInitialReportActions, reportID, transactionThreadReport, reportActionIDMap],
+        [isLoadingNewerReportActions, isLoadingInitialReportActions, reportActionID, isOffline, transactionThreadReport, reportActionIDMap, reportID],
     );
 
     const hasMoreCached = reportActions.length < combinedReportActions.length;
@@ -348,7 +357,6 @@ function ReportActionsView({
                     // If there was an error only try again once on initial mount. We should also still load
                     // more in case we have cached messages.
                     (!hasMoreCached && didLoadNewerChats.current && hasLoadingNewerReportActionsError) ||
-                    network.isOffline ||
                     newestReportAction.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE)
             ) {
                 return;
@@ -367,7 +375,6 @@ function ReportActionsView({
             reportActionID,
             indexOfLinkedAction,
             handleReportActionPagination,
-            network.isOffline,
             reportActions.length,
             newestReportAction,
             isFocused,