From f1911b1a891b28415f831c593034edc2cf0d6e79 Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Fri, 30 Jan 2026 21:29:35 +0700 Subject: [PATCH 1/3] fix: Map is missing green line when splitting distance expense, confirm page is empty --- src/pages/iou/request/IOURequestStartPage.tsx | 2 +- src/pages/iou/request/step/IOURequestStepWaypoint.tsx | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/iou/request/IOURequestStartPage.tsx b/src/pages/iou/request/IOURequestStartPage.tsx index 424f95fbddab3..e7c6fb3eadd46 100644 --- a/src/pages/iou/request/IOURequestStartPage.tsx +++ b/src/pages/iou/request/IOURequestStartPage.tsx @@ -190,7 +190,7 @@ function IOURequestStartPage({ personalPolicy, isFromGlobalCreate: transaction?.isFromGlobalCreate ?? isFromGlobalCreate, currentIouRequestType: transaction?.iouRequestType, - newIouRequestType: newIOUType, + newIouRequestType: newIOUType === CONST.IOU.REQUEST_TYPE.DISTANCE ? CONST.IOU.REQUEST_TYPE.DISTANCE_MAP : newIOUType, report, parentReport, currentDate, diff --git a/src/pages/iou/request/step/IOURequestStepWaypoint.tsx b/src/pages/iou/request/step/IOURequestStepWaypoint.tsx index 755ab23b2a7c6..f9a3c331e4621 100644 --- a/src/pages/iou/request/step/IOURequestStepWaypoint.tsx +++ b/src/pages/iou/request/step/IOURequestStepWaypoint.tsx @@ -101,6 +101,7 @@ function IOURequestStepWaypoint({ isFocused && (Number.isNaN(parsedWaypointIndex) || parsedWaypointIndex < 0 || parsedWaypointIndex > waypointCount || (filledWaypointCount < 2 && parsedWaypointIndex >= waypointCount)); + console.log("shouldDisableEditor", shouldDisableEditor); const goBack = () => { if (backTo) { Navigation.goBack(backTo); From ed2e592638e6bcb86806c2993a71f9f3d94223a3 Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Fri, 30 Jan 2026 21:50:18 +0700 Subject: [PATCH 2/3] fix lint --- src/pages/iou/request/step/IOURequestStepWaypoint.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/iou/request/step/IOURequestStepWaypoint.tsx b/src/pages/iou/request/step/IOURequestStepWaypoint.tsx index f9a3c331e4621..755ab23b2a7c6 100644 --- a/src/pages/iou/request/step/IOURequestStepWaypoint.tsx +++ b/src/pages/iou/request/step/IOURequestStepWaypoint.tsx @@ -101,7 +101,6 @@ function IOURequestStepWaypoint({ isFocused && (Number.isNaN(parsedWaypointIndex) || parsedWaypointIndex < 0 || parsedWaypointIndex > waypointCount || (filledWaypointCount < 2 && parsedWaypointIndex >= waypointCount)); - console.log("shouldDisableEditor", shouldDisableEditor); const goBack = () => { if (backTo) { Navigation.goBack(backTo); From 1c2b0ea7b8d0a1347ed23bb3244551e57046807c Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Tue, 3 Feb 2026 12:06:45 +0700 Subject: [PATCH 3/3] update with main solution --- src/hooks/useFetchRoute.ts | 4 ++-- src/libs/TransactionUtils/index.ts | 1 + src/pages/iou/request/IOURequestStartPage.tsx | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/hooks/useFetchRoute.ts b/src/hooks/useFetchRoute.ts index 7d66a21f0cacd..20cc574b6eeaa 100644 --- a/src/hooks/useFetchRoute.ts +++ b/src/hooks/useFetchRoute.ts @@ -2,7 +2,7 @@ import {deepEqual} from 'fast-equals'; import {useEffect} from 'react'; import type {OnyxEntry} from 'react-native-onyx'; import {getRoute} from '@libs/actions/Transaction'; -import {getValidWaypoints, hasRoute as hasRouteTransactionUtils, isMapDistanceRequest as isMapDistanceRequestTransactionUtils} from '@libs/TransactionUtils'; +import {getValidWaypoints, hasRoute as hasRouteTransactionUtils, isDistanceTypeRequest, isMapDistanceRequest as isMapDistanceRequestTransactionUtils} from '@libs/TransactionUtils'; import type {IOUAction} from '@src/CONST'; import CONST from '@src/CONST'; import type {Transaction} from '@src/types/onyx'; @@ -25,7 +25,7 @@ export default function useFetchRoute( const validatedWaypoints = getValidWaypoints(waypoints); const previousValidatedWaypoints = usePrevious(validatedWaypoints); const haveValidatedWaypointsChanged = !deepEqual(previousValidatedWaypoints, validatedWaypoints); - const isMapDistanceRequest = isMapDistanceRequestTransactionUtils(transaction); + const isMapDistanceRequest = isMapDistanceRequestTransactionUtils(transaction) || isDistanceTypeRequest(transaction); const shouldFetchRoute = isMapDistanceRequest && (isRouteAbsentWithoutErrors || haveValidatedWaypointsChanged) && !isLoadingRoute && Object.keys(validatedWaypoints).length > 1; useEffect(() => { diff --git a/src/libs/TransactionUtils/index.ts b/src/libs/TransactionUtils/index.ts index 2d5b41fb92755..790059b2e7e55 100644 --- a/src/libs/TransactionUtils/index.ts +++ b/src/libs/TransactionUtils/index.ts @@ -2863,6 +2863,7 @@ export { shouldShowExpenseBreakdown, isTimeRequest, getExpenseTypeTranslationKey, + isDistanceTypeRequest, }; export type {TransactionChanges}; diff --git a/src/pages/iou/request/IOURequestStartPage.tsx b/src/pages/iou/request/IOURequestStartPage.tsx index a0efec882ea34..66f02c2ba92e4 100644 --- a/src/pages/iou/request/IOURequestStartPage.tsx +++ b/src/pages/iou/request/IOURequestStartPage.tsx @@ -191,7 +191,7 @@ function IOURequestStartPage({ isFromGlobalCreate: transaction?.isFromGlobalCreate ?? isFromGlobalCreate, isFromFloatingActionButton: transaction?.isFromFloatingActionButton ?? transaction?.isFromGlobalCreate ?? isFromGlobalCreate, currentIouRequestType: transaction?.iouRequestType, - newIouRequestType: newIOUType === CONST.IOU.REQUEST_TYPE.DISTANCE ? CONST.IOU.REQUEST_TYPE.DISTANCE_MAP : newIOUType, + newIouRequestType: newIOUType, report, parentReport, currentDate,