Skip to content

Commit 7954cbb

Browse files
adamgrzybowskiWojtekBoman
authored andcommitted
fix goBack on per diem flow
1 parent b504588 commit 7954cbb

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ function IOURequestStepDestination({
9393
if (backTo) {
9494
navigateBack();
9595
} else if (explicitPolicyID) {
96-
Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_TIME.getRoute(action, iouType, transactionID, policyExpenseReport?.reportID ?? reportID, Navigation.getActiveRoute()));
96+
Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_TIME.getRoute(action, iouType, transactionID, policyExpenseReport?.reportID ?? reportID));
9797
} else {
98-
Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_TIME.getRoute(action, iouType, transactionID, reportID, Navigation.getActiveRoute()));
98+
Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_TIME.getRoute(action, iouType, transactionID, reportID));
9999
}
100100
};
101101

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

+7-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,13 @@ function IOURequestStepTime({
6262
Navigation.goBack(backTo);
6363
return;
6464
}
65-
Navigation.goBack(ROUTES.MONEY_REQUEST_STEP_DESTINATION.getRoute(action, iouType, transactionID, reportID));
65+
66+
if (transaction?.isFromGlobalCreate) {
67+
Navigation.goBack(ROUTES.MONEY_REQUEST_STEP_DESTINATION.getRoute(action, iouType, transactionID, reportID));
68+
return;
69+
}
70+
71+
Navigation.goBack(ROUTES.MONEY_REQUEST_CREATE_TAB_PER_DIEM.getRoute(action, iouType, transactionID, reportID));
6672
};
6773

6874
const validate = (value: FormOnyxValues<typeof ONYXKEYS.FORMS.MONEY_REQUEST_TIME_FORM>) => {

0 commit comments

Comments
 (0)