diff --git a/src/components/DistanceRequest/index.tsx b/src/components/DistanceRequest/index.tsx index 3f74c148de70..5246fd322048 100644 --- a/src/components/DistanceRequest/index.tsx +++ b/src/components/DistanceRequest/index.tsx @@ -207,11 +207,11 @@ function DistanceRequest({transactionID = '', report, transaction, route, isEdit setOptimisticWaypoints(newWaypoints); // eslint-disable-next-line rulesdir/no-thenable-actions-in-views - TransactionUserActions.updateWaypoints(transactionID, newWaypoints).then(() => { + TransactionUserActions.updateWaypoints(transactionID, newWaypoints, !isEditingRequest).then(() => { setOptimisticWaypoints(undefined); }); }, - [transactionID, waypoints, waypointsList], + [transactionID, isEditingRequest, waypoints, waypointsList], ); const submitWaypoints = useCallback(() => { diff --git a/src/pages/iou/request/step/IOURequestStepWaypoint.tsx b/src/pages/iou/request/step/IOURequestStepWaypoint.tsx index eee6da9e87ef..b301fcbfff72 100644 --- a/src/pages/iou/request/step/IOURequestStepWaypoint.tsx +++ b/src/pages/iou/request/step/IOURequestStepWaypoint.tsx @@ -69,6 +69,7 @@ function IOURequestStepWaypoint({ const [isDeleteStopModalOpen, setIsDeleteStopModalOpen] = useState(false); const navigation = useNavigation(); const isFocused = navigation.isFocused(); + const isCreatingRequest = action === CONST.IOU.ACTION.CREATE; const {translate} = useLocalize(); const {isOffline} = useNetwork(); const textInput = useRef(null); @@ -113,13 +114,13 @@ function IOURequestStepWaypoint({ return errors; }; - const saveWaypoint = (waypoint: FormOnyxValues<'waypointForm'>) => Transaction.saveWaypoint(transactionID, pageIndex, waypoint, action === CONST.IOU.ACTION.CREATE); + const saveWaypoint = (waypoint: FormOnyxValues<'waypointForm'>) => Transaction.saveWaypoint(transactionID, pageIndex, waypoint, isCreatingRequest); const submit = (values: FormOnyxValues<'waypointForm'>) => { const waypointValue = values[`waypoint${pageIndex}`] ?? ''; // Allows letting you set a waypoint to an empty value if (waypointValue === '') { - Transaction.removeWaypoint(transaction, pageIndex, true); + Transaction.removeWaypoint(transaction, pageIndex, isCreatingRequest); } // While the user is offline, the auto-complete address search will not work @@ -137,7 +138,7 @@ function IOURequestStepWaypoint({ }; const deleteStopAndHideModal = () => { - Transaction.removeWaypoint(transaction, pageIndex, true); + Transaction.removeWaypoint(transaction, pageIndex, isCreatingRequest); setIsDeleteStopModalOpen(false); Navigation.goBack(ROUTES.MONEY_REQUEST_DISTANCE_TAB.getRoute(iouType)); }; @@ -150,7 +151,7 @@ function IOURequestStepWaypoint({ name: values.name, }; - Transaction.saveWaypoint(transactionID, pageIndex, waypoint, action === CONST.IOU.ACTION.CREATE); + Transaction.saveWaypoint(transactionID, pageIndex, waypoint, isCreatingRequest); if (backTo) { Navigation.goBack(backTo); return;