diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts index e084a99df0c7..aa720ab06501 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,8 +1587,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 index 41f63b22f8f3..1898fc8ad212 100644 --- a/src/pages/ReimbursementAccount/ValidationStep.js +++ b/src/pages/ReimbursementAccount/ValidationStep.js @@ -201,7 +201,7 @@ function ValidationStep({reimbursementAccount, translate, onBackButtonPress, acc {translate('validationStep.letsChatText')}