From 66f6551a8d3ec9eb151b643faf50fbfa48ff4ad3 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Thu, 25 Jan 2024 14:22:48 +0800
Subject: [PATCH 1/2] dismiss modal before navigating to concierge

---
 src/libs/actions/Report.ts                       | 10 +++++++---
 src/pages/ReimbursementAccount/ValidationStep.js |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
index 36ac445a78d4..fa75c9961fc7 100644
--- a/src/libs/actions/Report.ts
+++ b/src/libs/actions/Report.ts
@@ -1577,7 +1577,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.
@@ -1587,10 +1587,14 @@ 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 {
-        Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(conciergeChatReportID));
+        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
index f1dfc944a24c..ec2d7597685e 100644
--- 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]}

From a54388129436b281b8c609f9897dfd445ab684a7 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Thu, 25 Jan 2024 14:36:57 +0800
Subject: [PATCH 2/2] lint

---
 src/libs/actions/Report.ts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
index fa75c9961fc7..1b4c8f9b602d 100644
--- a/src/libs/actions/Report.ts
+++ b/src/libs/actions/Report.ts
@@ -1589,12 +1589,10 @@ function navigateToConciergeChat(ignoreConciergeReportID = false, shouldDismissM
             // If we don't have a chat with Concierge then create it
             navigateToAndOpenReport([CONST.EMAIL.CONCIERGE], shouldDismissModal);
         });
+    } else if (shouldDismissModal) {
+        Navigation.dismissModal(conciergeChatReportID);
     } else {
-        if (shouldDismissModal) {
-            Navigation.dismissModal(conciergeChatReportID);
-        } else {
-            Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(conciergeChatReportID));
-        }
+        Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(conciergeChatReportID));
     }
 }