Merge pull request Expensify#31051 from dukenv0307/fix/30509-differen…

…t-chat-report-opens-when-clicking-on-the-back-button-in-status-modal App should navigate back to current chat report after closing status modal
kubabutkiewicz · Nov 16, 2023 · 47c7819 · 47c7819
2 parents 5e01376 + 69368d3
commit 47c7819
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/pages/settings/Profile/CustomStatus/StatusPage.js b/src/pages/settings/Profile/CustomStatus/StatusPage.js
@@ -49,7 +49,15 @@ function StatusPage({draftStatus, currentUserPersonalDetails}) {
         User.clearDraftCustomStatus();
     };
 
-    const navigateBackToSettingsPage = useCallback(() => Navigation.goBack(ROUTES.SETTINGS_PROFILE, false, true), []);
+    const navigateBackToSettingsPage = useCallback(() => {
+        const topMostReportID = Navigation.getTopmostReportId();
+        if (topMostReportID) {
+            Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(topMostReportID));
+        } else {
+            Navigation.goBack(ROUTES.SETTINGS_PROFILE, false, true);
+        }
+    }, []);
+
     const updateStatus = useCallback(() => {
         User.updateCustomStatus({text: defaultText, emojiCode: defaultEmoji});