Merge pull request #40740 from bernhardoj/fix/40490-confirmation-page…

…-isnt-closed-after-share-expense Fix confirmation page isn't closed after completing share expense
Expensify · Apr 23, 2024 · dadf0ba · dadf0ba
2 parents f408977 + e1e22f0
commit dadf0ba
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/src/libs/IOUUtils.ts b/src/libs/IOUUtils.ts
@@ -9,7 +9,7 @@ import Navigation from './Navigation/Navigation';
 import * as TransactionUtils from './TransactionUtils';
 
 function navigateToStartMoneyRequestStep(requestType: IOURequestType, iouType: IOUType, transactionID: string, reportID: string, iouAction?: IOUAction): void {
-    if (iouAction === CONST.IOU.ACTION.CATEGORIZE || iouAction === CONST.IOU.ACTION.SUBMIT) {
+    if (iouAction === CONST.IOU.ACTION.CATEGORIZE || iouAction === CONST.IOU.ACTION.SUBMIT || iouAction === CONST.IOU.ACTION.SHARE) {
         Navigation.goBack();
         return;
     }

diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
@@ -3072,6 +3072,7 @@ function trackExpense(
         }
     }
     if (action === CONST.IOU.ACTION.SHARE) {
+        Navigation.dismissModal();
         Navigation.navigate(ROUTES.ROOM_INVITE.getRoute(activeReportID ?? '', CONST.IOU.SHARE.ROLE.ACCOUNTANT));
     } else {
         Navigation.dismissModal(activeReportID);

diff --git a/src/pages/RoomInvitePage.tsx b/src/pages/RoomInvitePage.tsx
@@ -184,6 +184,14 @@ function RoomInvitePage({
         Navigation.navigate(backRoute);
     }, [selectedOptions, backRoute, reportID, validate]);
 
+    const goBack = useCallback(() => {
+        if (role === CONST.IOU.SHARE.ROLE.ACCOUNTANT) {
+            Navigation.dismissModal(reportID);
+            return;
+        }
+        Navigation.goBack(backRoute);
+    }, [role, reportID, backRoute]);
+
     const headerMessage = useMemo(() => {
         const searchValue = searchTerm.trim().toLowerCase();
         const expensifyEmails = CONST.EXPENSIFY_EMAILS as string[];
@@ -212,14 +220,12 @@ function RoomInvitePage({
             <FullPageNotFoundView
                 shouldShow={isEmptyObject(report)}
                 subtitleKey={isEmptyObject(report) ? undefined : 'roomMembersPage.notAuthorized'}
-                onBackButtonPress={() => Navigation.goBack(backRoute)}
+                onBackButtonPress={goBack}
             >
                 <HeaderWithBackButton
                     title={translate('workspace.invite.invitePeople')}
                     subtitle={reportName}
-                    onBackButtonPress={() => {
-                        Navigation.goBack(backRoute);
-                    }}
+                    onBackButtonPress={goBack}
                 />
                 <SelectionList
                     canSelectMultiple