Skip to content

Commit

Permalink
Merge pull request #42612 from Expensify/revert-42396-fix-broken-view…
Browse files Browse the repository at this point in the history
…-of-linked-messages

Revert "Fix linked message visibility in offline mode"
  • Loading branch information
roryabraham authored May 24, 2024
2 parents d7a7982 + c34e979 commit 525ad6f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 19 deletions.
8 changes: 0 additions & 8 deletions src/libs/actions/Report.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3579,13 +3579,6 @@ 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,
Expand Down Expand Up @@ -3826,7 +3819,6 @@ export {
leaveGroupChat,
removeFromGroupChat,
updateGroupChatMemberRoles,
updateLoadingInitialReportAction,
clearAddRoomMemberError,
clearAvatarErrors,
};
14 changes: 3 additions & 11 deletions src/pages/home/report/ReportActionsView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ 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
Expand All @@ -129,14 +128,6 @@ 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]);
Expand Down Expand Up @@ -208,7 +199,7 @@ function ReportActionsView({
*/
const fetchNewerAction = useCallback(
(newestReportAction: OnyxTypes.ReportAction) => {
if (isLoadingNewerReportActions || isLoadingInitialReportActions || (reportActionID && isOffline)) {
if (isLoadingNewerReportActions || isLoadingInitialReportActions) {
return;
}

Expand All @@ -225,7 +216,7 @@ function ReportActionsView({
Report.getNewerActions(reportID, newestReportAction.reportActionID);
}
},
[isLoadingNewerReportActions, isLoadingInitialReportActions, reportActionID, isOffline, transactionThreadReport, reportActionIDMap, reportID],
[isLoadingNewerReportActions, isLoadingInitialReportActions, reportID, transactionThreadReport, reportActionIDMap],
);

const hasMoreCached = reportActions.length < combinedReportActions.length;
Expand Down Expand Up @@ -357,6 +348,7 @@ 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;
Expand Down

0 comments on commit 525ad6f

Please sign in to comment.