Merge pull request #56833 from software-mansion-labs/fixes/split-nav-go-back

[CP Staging] [Navigation] Per Diem - After selecting Dates, the flow goes back to the country list page

Author: mountiny

src/components/MoneyRequestConfirmationListFooter.tsx

@@ -806,7 +806,7 @@ function MoneyRequestConfirmationListFooter({
                             if (!transactionID) {
                                 return;
                             }
-                            Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_TIME_EDIT.getRoute(action, iouType, transactionID, reportID, Navigation.getActiveRoute()));
+                            Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_TIME_EDIT.getRoute(action, iouType, transactionID, reportID));
                         }}
                         disabled={didConfirm}
                         interactive={!isReadOnly}

src/pages/iou/request/step/IOURequestStepTime.tsx

@@ -17,7 +17,7 @@ import {getIOURequestPolicyID, setMoneyRequestDateAttribute} from '@userActions/
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type SCREENS from '@src/SCREENS';
+import SCREENS from '@src/SCREENS';
 import INPUT_IDS from '@src/types/form/MoneyRequestTimeForm';
 import type * as OnyxTypes from '@src/types/onyx';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
@@ -26,7 +26,7 @@ import withFullTransactionOrNotFound from './withFullTransactionOrNotFound';
 import type {WithWritableReportOrNotFoundProps} from './withWritableReportOrNotFound';
 import withWritableReportOrNotFound from './withWritableReportOrNotFound';
 
-type IOURequestStepTimeProps = WithWritableReportOrNotFoundProps<typeof SCREENS.MONEY_REQUEST.STEP_TIME> & {
+type IOURequestStepTimeProps = WithWritableReportOrNotFoundProps<typeof SCREENS.MONEY_REQUEST.STEP_TIME | typeof SCREENS.MONEY_REQUEST.STEP_TIME_EDIT> & {
     /** Holds data related to Money Request view state, rather than the underlying Money Request data. */
     transaction: OnyxEntry<OnyxTypes.Transaction>;
 
@@ -37,6 +37,7 @@ type IOURequestStepTimeProps = WithWritableReportOrNotFoundProps<typeof SCREENS.
 function IOURequestStepTime({
     route: {
         params: {action, iouType, reportID, transactionID, backTo},
+        name,
     },
     transaction,
     report,
@@ -49,8 +50,14 @@ function IOURequestStepTime({
     const currentEndDate = currentDateAttributes?.end ? DateUtils.extractDate(currentDateAttributes.end) : undefined;
     // eslint-disable-next-line rulesdir/no-negated-variables
     const shouldShowNotFound = !isValidMoneyRequestType(iouType) || isEmptyObject(transaction?.comment?.customUnit) || isEmptyObject(policy);
+    const isEditPage = name === SCREENS.MONEY_REQUEST.STEP_TIME_EDIT;
 
     const navigateBack = () => {
+        if (isEditPage) {
+            Navigation.goBack(ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(action, iouType, transactionID, reportID));
+            return;
+        }
+
         if (backTo) {
             Navigation.goBack(backTo);
             return;
@@ -78,7 +85,7 @@ function IOURequestStepTime({
 
         setMoneyRequestDateAttribute(transactionID, newStart, newEnd);
 
-        if (backTo) {
+        if (isEditPage) {
             navigateBack();
         } else {
             Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_SUBRATE.getRoute(action, iouType, transactionID, reportID));

src/pages/iou/request/step/withFullTransactionOrNotFound.tsx

@@ -43,6 +43,7 @@ type MoneyRequestRouteName =
     | typeof SCREENS.MONEY_REQUEST.STEP_COMPANY_INFO
     | typeof SCREENS.MONEY_REQUEST.STEP_DESTINATION
     | typeof SCREENS.MONEY_REQUEST.STEP_TIME
+    | typeof SCREENS.MONEY_REQUEST.STEP_TIME_EDIT
     | typeof SCREENS.MONEY_REQUEST.STEP_SUBRATE;
 
 type WithFullTransactionOrNotFoundProps<RouteName extends MoneyRequestRouteName> = WithFullTransactionOrNotFoundOnyxProps &

src/pages/iou/request/step/withWritableReportOrNotFound.tsx

@@ -45,6 +45,7 @@ type MoneyRequestRouteName =
     | typeof SCREENS.MONEY_REQUEST.STEP_UPGRADE
     | typeof SCREENS.MONEY_REQUEST.STEP_DESTINATION
     | typeof SCREENS.MONEY_REQUEST.STEP_TIME
+    | typeof SCREENS.MONEY_REQUEST.STEP_TIME_EDIT
     | typeof SCREENS.MONEY_REQUEST.STEP_SUBRATE;
 
 type WithWritableReportOrNotFoundProps<RouteName extends MoneyRequestRouteName> = WithWritableReportOrNotFoundOnyxProps & PlatformStackScreenProps<MoneyRequestNavigatorParamList, RouteName>;