Merge pull request #35130 from bernhardoj/fix/34456-unable-to-close-b…

…a-page Fix unable to close bank account page
Expensify · Jan 29, 2024 · 93011f4 · 93011f4
2 parents 2c28a47 + 75c0dca
commit 93011f4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
@@ -1526,7 +1526,7 @@ function updateWriteCapabilityAndNavigate(report: Report, newValue: WriteCapabil
  *
  * @param ignoreConciergeReportID - Flag to ignore conciergeChatReportID during navigation. The default behavior is to not ignore.
  */
-function navigateToConciergeChat(ignoreConciergeReportID = false) {
+function navigateToConciergeChat(ignoreConciergeReportID = false, shouldDismissModal = false) {
     // If conciergeChatReportID contains a concierge report ID, we navigate to the concierge chat using the stored report ID.
     // Otherwise, we would find the concierge chat and navigate to it.
     // Now, when user performs sign-out and a sign-in again, conciergeChatReportID may contain a stale value.
@@ -1536,8 +1536,10 @@ function navigateToConciergeChat(ignoreConciergeReportID = false) {
         // we need to ensure that the server data has been successfully pulled
         Welcome.serverDataIsReadyPromise().then(() => {
             // If we don't have a chat with Concierge then create it
-            navigateToAndOpenReport([CONST.EMAIL.CONCIERGE], false);
+            navigateToAndOpenReport([CONST.EMAIL.CONCIERGE], shouldDismissModal);
         });
+    } else if (shouldDismissModal) {
+        Navigation.dismissModal(conciergeChatReportID);
     } else {
         Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(conciergeChatReportID));
     }

diff --git a/src/pages/ReimbursementAccount/ValidationStep.js b/src/pages/ReimbursementAccount/ValidationStep.js
@@ -201,7 +201,7 @@ function ValidationStep({reimbursementAccount, translate, onBackButtonPress, acc
                         <Text>{translate('validationStep.letsChatText')}</Text>
                         <Button
                             text={translate('validationStep.letsChatCTA')}
-                            onPress={Report.navigateToConciergeChat}
+                            onPress={() => Report.navigateToConciergeChat(false, true)}
                             icon={Expensicons.ChatBubble}
                             style={[styles.mt4]}
                             iconStyles={[styles.buttonCTAIcon]}