From ac4685b76093e47d018d952e92319d32a1c6898e Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Tue, 6 Aug 2024 16:36:14 +0800
Subject: [PATCH] delay the navigation so we navigate back only after the RHP
 is dismissed

---
 src/pages/ReportDetailsPage.tsx | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx
index 88611c600d8f..ad27bf925495 100644
--- a/src/pages/ReportDetailsPage.tsx
+++ b/src/pages/ReportDetailsPage.tsx
@@ -219,12 +219,14 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
 
     const leaveChat = useCallback(() => {
         Navigation.dismissModal();
-        if (isRootGroupChat) {
-            Report.leaveGroupChat(report.reportID);
-            return;
-        }
-        const isWorkspaceMemberLeavingWorkspaceRoom = (report.visibility === CONST.REPORT.VISIBILITY.RESTRICTED || isPolicyExpenseChat) && isPolicyEmployee;
-        Report.leaveRoom(report.reportID, isWorkspaceMemberLeavingWorkspaceRoom);
+        Navigation.isNavigationReady().then(() => {
+            if (isRootGroupChat) {
+                Report.leaveGroupChat(report.reportID);
+                return;
+            }
+            const isWorkspaceMemberLeavingWorkspaceRoom = (report.visibility === CONST.REPORT.VISIBILITY.RESTRICTED || isPolicyExpenseChat) && isPolicyEmployee;
+            Report.leaveRoom(report.reportID, isWorkspaceMemberLeavingWorkspaceRoom);
+        });
     }, [isPolicyEmployee, isPolicyExpenseChat, isRootGroupChat, report.reportID, report.visibility]);
 
     const [moneyRequestReportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${moneyRequestReport?.reportID}`);