From 875478e2f4579cbb463a8582fdc8716182eae4bc Mon Sep 17 00:00:00 2001 From: Bernhard Owen Josephus Date: Thu, 4 Jul 2024 20:30:42 +0800 Subject: [PATCH 1/3] fix missing header --- .../request/step/IOURequestStepDistance.tsx | 2 +- .../request/step/IOURequestStepWaypoint.tsx | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/pages/iou/request/step/IOURequestStepDistance.tsx b/src/pages/iou/request/step/IOURequestStepDistance.tsx index 11d5687a55e9..f1d9d7e67bbc 100644 --- a/src/pages/iou/request/step/IOURequestStepDistance.tsx +++ b/src/pages/iou/request/step/IOURequestStepDistance.tsx @@ -182,7 +182,7 @@ function IOURequestStepDistance({ const navigateToWaypointEditPage = useCallback( (index: number) => { Navigation.navigate( - ROUTES.MONEY_REQUEST_STEP_WAYPOINT.getRoute(action, CONST.IOU.TYPE.SUBMIT, transactionID, report?.reportID, index.toString(), Navigation.getActiveRouteWithoutParams()), + ROUTES.MONEY_REQUEST_STEP_WAYPOINT.getRoute(action, CONST.IOU.TYPE.SUBMIT, transactionID, report?.reportID, index.toString(), Navigation.getActiveRoute()), ); }, [action, transactionID, report?.reportID], diff --git a/src/pages/iou/request/step/IOURequestStepWaypoint.tsx b/src/pages/iou/request/step/IOURequestStepWaypoint.tsx index 6df92cf1da4d..d7e42764620e 100644 --- a/src/pages/iou/request/step/IOURequestStepWaypoint.tsx +++ b/src/pages/iou/request/step/IOURequestStepWaypoint.tsx @@ -88,6 +88,14 @@ function IOURequestStepWaypoint({ isFocused && (Number.isNaN(parsedWaypointIndex) || parsedWaypointIndex < 0 || parsedWaypointIndex > waypointCount || (filledWaypointCount < 2 && parsedWaypointIndex >= waypointCount)); + const goBack = () => { + if (backTo) { + Navigation.goBack(backTo); + return; + } + Navigation.goBack(ROUTES.MONEY_REQUEST_CREATE_TAB_DISTANCE.getRoute(CONST.IOU.ACTION.CREATE, iouType, transactionID, reportID)); + } + const validate = (values: FormOnyxValues<'waypointForm'>): Partial> => { const errors = {}; const waypointValue = values[`waypoint${pageIndex}`] ?? ''; @@ -147,11 +155,7 @@ function IOURequestStepWaypoint({ }; Transaction.saveWaypoint(transactionID, pageIndex, waypoint, action === CONST.IOU.ACTION.CREATE); - if (backTo) { - Navigation.goBack(backTo); - return; - } - Navigation.goBack(ROUTES.MONEY_REQUEST_CREATE_TAB_DISTANCE.getRoute(CONST.IOU.ACTION.CREATE, iouType, transactionID, reportID)); + goBack(); }; return ( @@ -165,9 +169,7 @@ function IOURequestStepWaypoint({ { - Navigation.goBack(ROUTES.MONEY_REQUEST_STEP_DISTANCE.getRoute(action, iouType, transactionID, reportID)); - }} + onBackButtonPress={goBack} shouldShowThreeDotsButton={shouldShowThreeDotsButton} shouldSetModalVisibility={false} threeDotsAnchorPosition={styles.threeDotsPopoverOffset(windowWidth)} From 106bb0dfb315252eac3b7f2d9a01f9c268c86ab0 Mon Sep 17 00:00:00 2001 From: Bernhard Owen Josephus Date: Thu, 4 Jul 2024 21:30:16 +0800 Subject: [PATCH 2/3] prettier --- src/pages/iou/request/step/IOURequestStepDistance.tsx | 4 +--- src/pages/iou/request/step/IOURequestStepWaypoint.tsx | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/pages/iou/request/step/IOURequestStepDistance.tsx b/src/pages/iou/request/step/IOURequestStepDistance.tsx index f1d9d7e67bbc..6667effde724 100644 --- a/src/pages/iou/request/step/IOURequestStepDistance.tsx +++ b/src/pages/iou/request/step/IOURequestStepDistance.tsx @@ -181,9 +181,7 @@ function IOURequestStepDistance({ */ const navigateToWaypointEditPage = useCallback( (index: number) => { - Navigation.navigate( - ROUTES.MONEY_REQUEST_STEP_WAYPOINT.getRoute(action, CONST.IOU.TYPE.SUBMIT, transactionID, report?.reportID, index.toString(), Navigation.getActiveRoute()), - ); + Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_WAYPOINT.getRoute(action, CONST.IOU.TYPE.SUBMIT, transactionID, report?.reportID, index.toString(), Navigation.getActiveRoute())); }, [action, transactionID, report?.reportID], ); diff --git a/src/pages/iou/request/step/IOURequestStepWaypoint.tsx b/src/pages/iou/request/step/IOURequestStepWaypoint.tsx index d7e42764620e..f5487ffb610b 100644 --- a/src/pages/iou/request/step/IOURequestStepWaypoint.tsx +++ b/src/pages/iou/request/step/IOURequestStepWaypoint.tsx @@ -94,7 +94,7 @@ function IOURequestStepWaypoint({ return; } Navigation.goBack(ROUTES.MONEY_REQUEST_CREATE_TAB_DISTANCE.getRoute(CONST.IOU.ACTION.CREATE, iouType, transactionID, reportID)); - } + }; const validate = (values: FormOnyxValues<'waypointForm'>): Partial> => { const errors = {}; From 4bef669c1b67768ddf08b81907da7c6f6086da82 Mon Sep 17 00:00:00 2001 From: Bernhard Owen Josephus Date: Thu, 4 Jul 2024 21:40:55 +0800 Subject: [PATCH 3/3] reuse the goback function --- src/pages/iou/request/step/IOURequestStepWaypoint.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/iou/request/step/IOURequestStepWaypoint.tsx b/src/pages/iou/request/step/IOURequestStepWaypoint.tsx index f5487ffb610b..90f1171fbb15 100644 --- a/src/pages/iou/request/step/IOURequestStepWaypoint.tsx +++ b/src/pages/iou/request/step/IOURequestStepWaypoint.tsx @@ -135,14 +135,14 @@ function IOURequestStepWaypoint({ } // Other flows will be handled by selecting a waypoint with selectWaypoint as this is mainly for the offline flow - Navigation.goBack(ROUTES.MONEY_REQUEST_STEP_DISTANCE.getRoute(action, iouType, transactionID, reportID)); + goBack(); }; const deleteStopAndHideModal = () => { Transaction.removeWaypoint(transaction, pageIndex, action === CONST.IOU.ACTION.CREATE); setRestoreFocusType(CONST.MODAL.RESTORE_FOCUS_TYPE.DELETE); setIsDeleteStopModalOpen(false); - Navigation.goBack(ROUTES.MONEY_REQUEST_STEP_DISTANCE.getRoute(action, iouType, transactionID, reportID)); + goBack(); }; const selectWaypoint = (values: Waypoint) => {