From 9624b4818782f31cbf38432f69d1b979df890ee1 Mon Sep 17 00:00:00 2001 From: truph01 Date: Wed, 17 Dec 2025 09:59:31 +0700 Subject: [PATCH 1/4] fix: Infinite loading when delete message in reply --- src/pages/home/ReportScreen.tsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/pages/home/ReportScreen.tsx b/src/pages/home/ReportScreen.tsx index 4257dff47b972..63cddbf2013c5 100644 --- a/src/pages/home/ReportScreen.tsx +++ b/src/pages/home/ReportScreen.tsx @@ -722,6 +722,10 @@ function ReportScreen({route, navigation}: ReportScreenProps) { // Early return if the report we're passing isn't in a focused state. We only want to navigate to Concierge if the user leaves the room from another device or gets removed from the room while the report is in a focused state. // Prevent auto navigation for report in RHP if ((!isFocused && !isReportDetailOpenInRHP) || isInNarrowPaneModal) { + if (isInNarrowPaneModal) { + Navigation.goBack(backTo as Route); + return; + } return; } Navigation.dismissModal(); From 230ef58dae1590bd523ecd4e7b5b4c7c3edf3fe9 Mon Sep 17 00:00:00 2001 From: truph01 Date: Tue, 23 Dec 2025 23:42:32 +0700 Subject: [PATCH 2/4] fix: fix navigation issue when deleting parent message --- src/libs/actions/Report.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts index 9d5d7da3e9fdf..091e4451d0e77 100644 --- a/src/libs/actions/Report.ts +++ b/src/libs/actions/Report.ts @@ -2098,7 +2098,11 @@ function deleteReportComment( // we should navigate to its report in order to not show not found page if (Navigation.isActiveRoute(ROUTES.REPORT_WITH_ID.getRoute(reportID, reportActionID)) && !isDeletedParentAction) { Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(reportID)); - } else if (Navigation.isActiveRoute(ROUTES.REPORT_WITH_ID.getRoute(reportAction.childReportID)) && !isDeletedParentAction) { + } else if ( + (Navigation.isActiveRoute(ROUTES.REPORT_WITH_ID.getRoute(reportAction.childReportID)) || + Navigation.isActiveRoute(ROUTES.SEARCH_REPORT.getRoute({reportID: reportAction.childReportID}))) && + !isDeletedParentAction + ) { Navigation.goBack(undefined); } } From 66881fd283fc56802fa1b55db4d0dd3eae24dacb Mon Sep 17 00:00:00 2001 From: truph01 Date: Tue, 30 Dec 2025 16:26:35 +0700 Subject: [PATCH 3/4] fix: refactor condition --- src/pages/home/ReportScreen.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pages/home/ReportScreen.tsx b/src/pages/home/ReportScreen.tsx index fb21375b87539..47e278b434c31 100644 --- a/src/pages/home/ReportScreen.tsx +++ b/src/pages/home/ReportScreen.tsx @@ -734,11 +734,11 @@ function ReportScreen({route, navigation, isInSidePanel = false}: ReportScreenPr reportIDFromRoute === currentRoute.params.reportID; // Early return if the report we're passing isn't in a focused state. We only want to navigate to Concierge if the user leaves the room from another device or gets removed from the room while the report is in a focused state. // Prevent auto navigation for report in RHP - if ((!isFocused && !isReportDetailOpenInRHP) || isInNarrowPaneModal) { - if (isInNarrowPaneModal) { - Navigation.goBack(backTo as Route); - return; - } + if (isInNarrowPaneModal) { + Navigation.goBack(backTo as Route); + return; + } + if (!isFocused && !isReportDetailOpenInRHP) { return; } Navigation.dismissModal(); From ac9f1093c07475d9335a3e50e4dfa163d4e01727 Mon Sep 17 00:00:00 2001 From: truph01 Date: Tue, 13 Jan 2026 11:48:21 +0700 Subject: [PATCH 4/4] fix: merge main --- Mobile-Expensify | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mobile-Expensify b/Mobile-Expensify index b23afb25aa9b5..ce0c377e15321 160000 --- a/Mobile-Expensify +++ b/Mobile-Expensify @@ -1 +1 @@ -Subproject commit b23afb25aa9b526444ec2c906a71e315e2e853af +Subproject commit ce0c377e153212d326e26b77dd066c4c4febd660